Merge branch 'master' into ink_v1

1 files changed, 3 insertions, 1 deletions

diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index 42d93c60c..328385fda 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -22,7 +22,7 @@ import { RichTextField } from "./RichTextField";
 import { listSpec } from "./Schema";
 import { ComputedField, ScriptField } from "./ScriptField";
 import { Cast, FieldValue, NumCast, StrCast, ToConstructor } from "./Types";
-import { AudioField, ImageField, PdfField, VideoField, WebField } from "./URLField";
+import { AudioField, ImageField, MapField, PdfField, VideoField, WebField } from "./URLField";
 import { deleteProperty, GetEffectiveAcl, getField, getter, inheritParentAcls, makeEditable, makeReadOnly, normalizeEmail, setter, SharingPermissions, updateFunction } from "./util";
 import JSZip = require("jszip");
 
@@ -638,6 +638,7 @@ export namespace Doc {
             else if (value instanceof AudioField) return { url: value.url.href, __type: "audio" };
             else if (value instanceof VideoField) return { url: value.url.href, __type: "video" };
             else if (value instanceof WebField) return { url: value.url.href, __type: "web" };
+            else if (value instanceof MapField) return { url: value.url.href, __type: "map" };
             else if (value instanceof DateField) return { date: value.toString(), __type: "date" };
             else if (value instanceof ProxyField) return { fieldId: value.fieldId, __type: "proxy" };
             else if (value instanceof Array && key !== "fields") return { fields: value, __type: "list" };
@@ -1240,6 +1241,7 @@ export namespace Doc {
             case DocumentType.INK: return "pen-nib";
             case DocumentType.PDF: return "file-pdf";
             case DocumentType.LINK: return "link";
+            case DocumentType.MAP: return "map-marker-alt"
             default: return "question";
         }
     }