1 files changed, 50 insertions, 3 deletions
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index f50f306a3..369876428 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -11,7 +11,7 @@ import { RichTextField } from "../../fields/RichTextField";
 import { SchemaHeaderField } from "../../fields/SchemaHeaderField";
 import { ComputedField, ScriptField } from "../../fields/ScriptField";
 import { Cast, NumCast, StrCast } from "../../fields/Types";
-import { AudioField, ImageField, PdfField, VideoField, WebField, YoutubeField } from "../../fields/URLField";
+import { AudioField, ImageField, MapField, PdfField, VideoField, WebField, YoutubeField } from "../../fields/URLField";
 import { SharingPermissions } from "../../fields/util";
 import { Upload } from "../../server/SharedMediaTypes";
 import { OmitKeys, Utils } from "../../Utils";
@@ -60,6 +60,7 @@ import { SearchBox } from "../views/search/SearchBox";
 import { DashWebRTCVideo } from "../views/webcam/DashWebRTCVideo";
 import { DocumentType } from "./DocumentTypes";
 import { IconProp } from "@fortawesome/fontawesome-svg-core";
+import { MapBox } from "../views/nodes/MapBox/MapBox";
 const path = require('path');
 
 const defaultNativeImageDim = Number(DFLT_IMAGE_NATIVE_DIM.replace("px", ""));
@@ -155,6 +156,8 @@ export class DocumentOptions {
     x?: number;
     y?: number;
     z?: number; // whether document is in overlay (1) or not (0 or undefined)
+    lat?: number;
+    lng?: number;
     author?: string;
     _layoutKey?: string;
     unrendered?: boolean; // denotes an annotation that is not rendered with a DocumentView (e.g, rtf/pdf text selections and links to scroll locations in web/pdf)
@@ -394,6 +397,10 @@ export namespace Docs {
                 layout: { view: PDFBox, dataField: defaultDataKey },
                 options: { _curPage: 1, _fitWidth: true, links: ComputedField.MakeFunction("links(self)") as any }
             }],
+            [DocumentType.MAP, {
+                layout: { view: MapBox, dataField: defaultDataKey },
+                options: { _height: 600, _width: 800, links: ComputedField.MakeFunction("links(self)") as any }
+            }],
             [DocumentType.IMPORT, {
                 layout: { view: DirectoryImportBox, dataField: defaultDataKey },
                 options: { _height: 150 }
@@ -761,6 +768,14 @@ export namespace Docs {
             return InstanceFromProto(Prototypes.get(DocumentType.WEB), new HtmlField(html), options);
         }
 
+        export function MapDocument(documents: Array<Doc>, options: DocumentOptions = {}) {
+            return InstanceFromProto(Prototypes.get(DocumentType.MAP), new List(documents), options);
+        }
+
+        export function MapMarkerDocument(lat: number, lng: number, documents: Array<Doc>, options: DocumentOptions, id?: string) {
+            return InstanceFromProto(Prototypes.get(DocumentType.MARKER), new List(documents), { lat, lng, ...options }, id);
+        }
+
         export function KVPDocument(document: Doc, options: DocumentOptions = {}) {
             return InstanceFromProto(Prototypes.get(DocumentType.KVP), document, { title: document.title + ".kvp", ...options });
         }
@@ -791,7 +806,7 @@ export namespace Docs {
             return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { ...options, _viewType: CollectionViewType.Linear }, id);
         }
 
-        export function MapDocument(documents: Array<Doc>, options: DocumentOptions = {}) {
+        export function MapCollectionDocument(documents: Array<Doc>, options: DocumentOptions = {}) {
             return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { ...options, _viewType: CollectionViewType.Map });
         }
 
@@ -1121,7 +1136,11 @@ export namespace DocUtils {
         } else if (field instanceof List && field[0] instanceof Doc) {
             created = Docs.Create.StackingDocument(DocListCast(field), resolved);
             layout = CollectionView.LayoutString;
-        } else {
+        } else if (field instanceof MapField) {
+            created = Docs.Create.MapDocument(DocListCast(field), resolved);
+            layout = MapBox.LayoutString;
+        }
+        else {
             created = Docs.Create.TextDocument("", { ...{ _width: 200, _height: 25, _autoHeight: true }, ...resolved });
             layout = FormattedTextBox.LayoutString;
         }
@@ -1152,6 +1171,12 @@ export namespace DocUtils {
             if (!options._width) options._width = 400;
             if (!options._height) options._height = (options._width as number) * 1200 / 927;
         }
+        //TODO:al+glr
+        // if (type.indexOf("map") !== -1) {
+        //     ctor = Docs.Create.MapDocument;
+        //     if (!options._width) options._width = 800;
+        //     if (!options._height) options._height = (options._width as number) * 3 / 4;
+        // }
         if (type.indexOf("html") !== -1) {
             if (path.includes(window.location.hostname)) {
                 const s = path.split('/');
@@ -1358,6 +1383,25 @@ export namespace DocUtils {
         return optionsCollection;
     }
 
+    /**
+     * 
+     * @param dms Degree Minute Second format exif gps data
+     * @param ref ref that determines negativity of decimal coordinates
+     * @returns a decimal format of gps latitude / longitude
+     */
+    function getDecimalfromDMS(dms?: number[], ref?: string) {
+        if (dms && ref) {
+            let degrees = dms[0] / dms[1];
+            let minutes = dms[2] / dms[3] / 60.0;
+            let seconds = dms[4] / dms[5] / 3600.0;
+
+            if (['S', 'W'].includes(ref)) {
+                degrees = -degrees; minutes = -minutes; seconds = -seconds
+            }
+            return (degrees + minutes + seconds).toFixed(5);
+        }
+    }
+
     async function processFileupload(generatedDocuments: Doc[], name: string, type: string, result: Error | Upload.FileInformation, options: DocumentOptions) {
         if (result instanceof Error) {
             alert(`Upload failed: ${result.message}`);
@@ -1380,6 +1424,9 @@ export namespace DocUtils {
                     proto["data-nativeWidth"] = (result.nativeWidth < result.nativeHeight) ? maxNativeDim : maxNativeDim / (result.nativeWidth / result.nativeHeight);
                 }
                 proto.contentSize = result.contentSize;
+                // exif gps data coordinates are stored in DMS (Degrees Minutes Seconds), the following operation converts that to decimal coordinates
+                proto.lat = getDecimalfromDMS(result.exifData?.data?.gps?.GPSLatitude, result.exifData?.data?.gps?.GPSLatitudeRef);
+                proto.lng = getDecimalfromDMS(result.exifData?.data?.gps?.GPSLongitude, result.exifData?.data?.gps?.GPSLongitudeRef);
             }
             generatedDocuments.push(doc);
         }