From 6a85c8d4115a968f563369516d38549745e76303 Mon Sep 17 00:00:00 2001
From: Eric <ericmabr@gmail.com>
Date: Thu, 24 Aug 2023 12:47:57 -0400
Subject: All working except createnote undo, and center on selected pin
 getAnchor

---
 src/client/views/nodes/MapBox/MapBox.tsx | 47 ++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 12 deletions(-)

(limited to 'src/client/views/nodes/MapBox/MapBox.tsx')

diff --git a/src/client/views/nodes/MapBox/MapBox.tsx b/src/client/views/nodes/MapBox/MapBox.tsx
index 654d446a2..dbb38e763 100644
--- a/src/client/views/nodes/MapBox/MapBox.tsx
+++ b/src/client/views/nodes/MapBox/MapBox.tsx
@@ -14,6 +14,7 @@ import { ScriptField } from '../../../../fields/ScriptField';
 import { NumCast, StrCast } from '../../../../fields/Types';
 import { emptyFunction, returnEmptyDoclist, returnEmptyFilter, returnEmptyString, returnFalse, returnOne, setupMoveUpEvents, Utils } from '../../../../Utils';
 import { Docs } from '../../../documents/Documents';
+import { DocumentManager } from '../../../util/DocumentManager';
 import { DragManager } from '../../../util/DragManager';
 import { SnappingManager } from '../../../util/SnappingManager';
 import { Transform } from '../../../util/Transform';
@@ -352,10 +353,16 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
         this.layoutDoc._width = this.layoutDoc._layout_showSidebar ? NumCast(this.layoutDoc._width) * 1.2 : Math.max(20, NumCast(this.layoutDoc._width) - prevWidth);
     };
 
-    createNoteAnnotation = () => {
+    createNoteAnnotation = undoable(() => {
         !this.layoutDoc.layout_showSidebar && this.toggleSidebar();
-        setTimeout(() => this._sidebarRef.current?.anchorMenuClick(this.getAnchor(false))); // give time for sidebarRef to be created
-    };
+        setTimeout(() =>{
+          const note = this._sidebarRef.current?.anchorMenuClick(this.getAnchor(false));
+          if (note && this.selectedPin) {
+            note.latitude = this.selectedPin.latitude;
+            note.longitude = this.selectedPin.latitude;
+          }
+        }); // give time for sidebarRef to be created
+    }, "create linked note");
 
     sidebarDown = (e: React.PointerEvent) => {
         setupMoveUpEvents(this, e, this.sidebarMove, emptyFunction, () => setTimeout(this.toggleSidebar), true);
@@ -488,7 +495,7 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
      * Creates Pushpin doc and adds it to the list of annotations
      */
     @action
-    createPushpin = (latitude: number, longitude: number) => {
+    createPushpin = undoable((latitude: number, longitude: number) => {
         // Stores the pushpin as a MapMarkerDocument
         const mapMarker = Docs.Create.PushpinDocument(
             NumCast(latitude),
@@ -501,7 +508,7 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
         this.addDocument(mapMarker, this.annotationKey);
 
         // mapMarker.infoWindowOpen = true;
-    };
+    },"createpin");
 
     /*
      * Pushpin dblclick
@@ -519,6 +526,10 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
     @action
     deselectPin = () => {
         if (this.selectedPin) {
+            // Removes filter
+            Doc.setDocFilter(this.rootDoc, "latitude", this.selectedPin.latitude, "remove");
+            Doc.setDocFilter(this.rootDoc, "longitude", this.selectedPin.longitude, "remove");
+
             const temp = this.selectedPin;
             this._bingMap.current.entities.remove(this.map_docToPinMap.get(temp));
             const newpin = new this.MicrosoftMaps.Pushpin(new this.MicrosoftMaps.Location(temp.latitude, temp.longitude));
@@ -527,10 +538,15 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
             this.map_docToPinMap.set(temp, newpin);
             this.selectedPin = undefined;
 
-            // setTimeout(() => this._sidebarRef.current?.makeDocUnfiltered(this._sidebarRef.current.));
+            
         }
+        
     };
 
+    getView = async (doc: Doc) => {
+        if (this._sidebarRef?.current?.makeDocUnfiltered(doc) && !this.SidebarShown) this.toggleSidebar();
+        return new Promise<Opt<DocumentView>>(res => DocumentManager.Instance.AddViewRenderedCb(doc, dv => res(dv)));
+    };
     /*
      * Pushpin onclick
      */
@@ -539,6 +555,9 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
         this.deselectPin();
         this.selectedPin = pinDoc;
 
+        Doc.setDocFilter(this.rootDoc, "latitude", this.selectedPin.latitude, "match");
+        Doc.setDocFilter(this.rootDoc, "longitude", this.selectedPin.latitude, "match");
+
         this._bingMap.current.entities.remove(this.map_docToPinMap.get(this.selectedPin));
         const newpin = new this.MicrosoftMaps.Pushpin(new this.MicrosoftMaps.Location(this.selectedPin.latitude, this.selectedPin.longitude), {
             color: 'green',
@@ -552,17 +571,16 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
         MapAnchorMenu.Instance.LinkNote = this.createNoteAnnotation;
 
         const point = this._bingMap.current.tryLocationToPixel(new this.MicrosoftMaps.Location(this.selectedPin.latitude, this.selectedPin.longitude));
-        const x = point.x + this.props.PanelWidth() / 2;
+        const x = point.x + (this.props.PanelWidth() - this.sidebarWidth()) / 2;
         const y = point.y + this.props.PanelHeight() / 2 + 32;
         const cpt = this.props.ScreenToLocalTransform().inverse().transformPoint(x, y);
-        MapAnchorMenu.Instance.jumpTo(cpt[0] - (this.sidebarWidth() / this.panelWidth()) * 200, cpt[1], true);
+        MapAnchorMenu.Instance.jumpTo(cpt[0], cpt[1], true);
+
         document.addEventListener('pointerdown', this.tryHideMapAnchorMenu, true);
         this.MicrosoftMaps.Events.addHandler(this._bingMap.current, 'click', this.mapOnClick);
 
         // Filter sidebar:
-        // if sidebar is open, filter.
-        if (this.layoutDoc._layout_showSidebar) {
-        }
+
     };
 
     /**
@@ -573,7 +591,7 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
     }
 
     /**
-     * Map OnClick ~> creates a pushpin
+     * Map OnClick
      */
     @action
     mapOnClick = (e: { location: { latitude: any; longitude: any } }) => {
@@ -700,11 +718,16 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
         this._bingMap.current.entities.remove(this.map_docToPinMap.get(pinDoc));
         this.map_docToPinMap.delete(pinDoc);
         this.selectedPin = undefined;
+
     };
 
     @action
     deleteSelectedPin = undoable(() => {
         if (this.selectedPin) {
+            // Removes filter
+            Doc.setDocFilter(this.rootDoc, "latitude", this.selectedPin.latitude, "remove");
+            Doc.setDocFilter(this.rootDoc, "longitude", this.selectedPin.longitude, "remove");
+
             this.removePushpin(this.selectedPin);
         }
         MapAnchorMenu.Instance.fadeOut(true);
-- 
cgit v1.2.3-70-g09d2

