2 files changed, 29 insertions, 17 deletions
diff --git a/src/client/views/SidebarAnnos.tsx b/src/client/views/SidebarAnnos.tsx
index 741e87644..42993bfc4 100644
--- a/src/client/views/SidebarAnnos.tsx
+++ b/src/client/views/SidebarAnnos.tsx
@@ -219,7 +219,10 @@ export class SidebarAnnos extends React.Component<FieldViewProps & ExtraProps> {
                     {Array.from(this.allMetadata.keys())
                         .sort()
                         .map(key => renderMeta(key, this.allMetadata.get(key)))}
+                    Hello
                 </div>
+
+
                 <div style={{ width: '100%', height: `calc(100% - 38px)`, position: 'relative' }}>
                     <CollectionStackingView
                         {...this.props}
diff --git a/src/client/views/nodes/MapBox/MapBox.tsx b/src/client/views/nodes/MapBox/MapBox.tsx
index d87974bd4..fdd703604 100644
--- a/src/client/views/nodes/MapBox/MapBox.tsx
+++ b/src/client/views/nodes/MapBox/MapBox.tsx
@@ -104,7 +104,7 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
     @observable private _marqueeing: number[] | undefined;
     @observable private inputRef = React.createRef<HTMLInputElement>();
     @observable private searchMarkers: google.maps.Marker[] = [];
-    @observable private searchBox = new window.google.maps.places.Autocomplete(this.inputRef.current!, options);
+    // @observable private searchBox = new window.google.maps.places.Autocomplete(this.inputRef.current!, options);
     @observable private _savedAnnotations = new ObservableMap<number, HTMLDivElement[]>();
     @computed get allSidebarDocs() {
         return DocListCast(this.dataDoc[this.SidebarKey]);
@@ -607,17 +607,20 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
     };
 
     infobox: any;
-    pushpinClicked = (e: { target: { metadata: { title: any; description: any }; getLocation: () => any } }) => {
+    pushpinClicked = (e: {
+        isSelected: boolean; target: { metadata: { title: any; description: any }; getLocation: () => any } 
+}, pin:Doc) => {
+        // pin.isSelected = true;
         //Make sure the infobox has metadata to display.
-        if (e.target.metadata) {
-            //Set the infobox options with the metadata of the pushpin. // HOW DO I GET THE CORRECT INFOBOX FOR THIS PIN? CAN I use this e?
-            this.infobox.setOptions({
-                location: e.target.getLocation(),
-                title: e.target.metadata.title,
-                description: e.target.metadata.description,
-                visible: true,
-            });
-        }
+        // if (e.target.metadata) {
+        //     //Set the infobox options with the metadata of the pushpin. // HOW DO I GET THE CORRECT INFOBOX FOR THIS PIN? CAN I use this e?
+        //     this.infobox.setOptions({
+        //         location: e.target.getLocation(),
+        //         title: e.target.metadata.title,
+        //         description: e.target.metadata.description,
+        //         visible: true,
+        //     });
+        // }
     };
 
     //PushpinClicked using MapBoxInfoWindow
@@ -643,7 +646,6 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
             this.createPushpin(e.location.latitude, e.location.longitude);
             this.addAllPins();
             this.placePinOn = false;
-            console.log('PUSHPIN CREATED');
         }
     };
 
@@ -693,16 +695,23 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
         if (this.searched_pin) this._bingMap.current.entities.push(this.searched_pin);
         this.allMapPushpins.map(pin => this.createInfobox(pin));
         this.allMapPushpins.map(pin => this._bingMap.current.entities.push(pin));
+        
+        var numSelected = 0
+        this.allMapPushpins.filter(pin => pin.isSelected).forEach(pin=>numSelected++)
+        console.log(numSelected)
+        
     };
 
     @action
     createInfobox = (pin: any) => {
+        var pushPin2 = new this.MicrosoftMaps.Pushpin(new this.MicrosoftMaps.Location(pin.lat, pin.lng), {icon: 'http://icons.iconarchive.com/icons/icons-land/vista-map-markers/24/Map-Marker-Marker-Outside-Chartreuse-icon.png'});
         var pushPin = new this.MicrosoftMaps.Pushpin(new this.MicrosoftMaps.Location(pin.lat, pin.lng), {
-            // title: this.bingSearchBarContents,
-            // subTitle: 'subtitle here',
-            // text: '1'
+            title: this.bingSearchBarContents,
+            subTitle: 'subtitle here',
+            text: '1',
+            // height: '50px'
         });
-        this._bingMap.current.entities.push(pushPin);
+        this._bingMap.current.entities.push(pushPin2);
 
         var id = Utils.GenerateGuid();
         document.getElementById(id);
@@ -740,7 +749,7 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
         // this.MicrosoftMaps.Events.addHandler(pushPin, 'click', this.pushpinClicked);
 
         // For our infowindow
-        this.MicrosoftMaps.Events.addHandler(pushPin, 'click', (e: any) => this.pushpinClicked(e));
+        this.MicrosoftMaps.Events.addHandler(pushPin, 'click', (e: any) => this.pushpinClicked(e, pushPin));
         // this.MicrosoftMaps.Events.addHandler(pushPin, 'mouseover', (e:any) => this.onHover(e));
     };