fixes for map card, re: #4670

archesproject · Jun 27, 2019 · ffd5457 · ffd5457
1 parent 48c1ae1
commit ffd5457
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/arches/app/media/js/views/components/cards/map.js b/arches/app/media/js/views/components/cards/map.js
@@ -113,6 +113,13 @@ define([
                 }
             };
 
+            this.updateLayers = function(layers) {
+                var map = self.map();
+                var style = map.getStyle();
+                style.layers = layers.concat(self.draw.options.styles);
+                map.setStyle(style);
+            };
+
             this.draw = null;
             this.map.subscribe(function(map) {
                 self.draw = new MapboxDraw({

diff --git a/arches/app/media/js/views/components/map.js b/arches/app/media/js/views/components/map.js
@@ -154,6 +154,13 @@ define([
             }
         };
 
+        this.updateLayers = function(layers) {
+            var map = self.map();
+            var style = map.getStyle();
+            style.layers = layers;
+            map.setStyle(style);
+        };
+
         this.setupMap = function(map) {
             map.addControl(new mapboxgl.NavigationControl(), 'top-left');
             map.addControl(new MapboxGeocoder({
@@ -163,11 +170,7 @@ define([
                 bbox: bounds
             }), 'top-right');
 
-            layers.subscribe(function(layers) {
-                var style = map.getStyle();
-                style.layers = layers;
-                map.setStyle(style);
-            });
+            layers.subscribe(self.updateLayers);
 
             self.map(map);
         };

diff --git a/arches/app/templates/views/components/map-editor.htm b/arches/app/templates/views/components/map-editor.htm
@@ -128,7 +128,7 @@ <h5 data-bind="text: card.model.instructions"></h5>
                             </div>
                         </div>
                         <!-- /ko -->
-                        <!-- ko if: !self.form.nodeLookup[widget.node_id()].datatype() === 'geojson-feature-collection' -->
+                        <!-- ko if: self.form.nodeLookup[widget.node_id()].datatype() !== 'geojson-feature-collection' -->
                         <div data-bind='component: {
                             name: self.form.widgetLookup[widget.widget_id()].name,
                             params: {