Map: definitive layer order

wri · Apr 22, 2015 · 5ffd4ce · 5ffd4ce
1 parent a7b6ec0
commit 5ffd4ce
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/app/assets/javascripts/abstract/layer/OverlayLayerClass.js b/app/assets/javascripts/abstract/layer/OverlayLayerClass.js
@@ -30,15 +30,13 @@ define([
 
     addLayer: function(position, success) {
       var self = this;
-      if (this._getOverlayIndex() < 0) {
-        this._getLayer().then(_.bind(function(layer) {
-          this.map.overlayMapTypes.setAt(position, layer);
-          if (this.options.infowindow && this.options.interactivity) {
-            this.setInfowindow(layer);
-          }
-          success();
-        }, this));
-      }
+      this._getLayer().then(_.bind(function(layer) {
+        this.map.overlayMapTypes.setAt(position, layer);
+        if (this.options.infowindow && this.options.interactivity) {
+          this.setInfowindow(layer);
+        }
+        success();
+      }, this));
 
     },
 
@@ -47,7 +45,8 @@ define([
       this.removeInfowindow();
       if (overlayIndex > -1) {
         google.maps.event.clearListeners(this.map, 'click');
-        this.map.overlayMapTypes.removeAt(overlayIndex);
+        this.map.overlayMapTypes.setAt(overlayIndex, null);
+        // this.map.overlayMapTypes.removeAt(overlayIndex);
       }
     },
 
@@ -72,7 +71,6 @@ define([
           this.removeInfowindow();
 
           this.options.infowindowAPI.execute(params, _.bind(function(data) {
-            console.log(data);
             data[0].analysis = this.options.analysis;
             this.infowindow = new CustomInfowindow(ev.latLng, this.map, {
               infowindowData: data[0]
@@ -90,16 +88,13 @@ define([
     },
 
     _getOverlayIndex: function() {
-      var overlaysLength = this.map.overlayMapTypes.getLength();
-      if (overlaysLength > 0) {
-        for (var i = 0; i< overlaysLength; i++) {
-          var layer = this.map.overlayMapTypes.getAt(i);
-          if (layer && layer.name === this.getName()) {
-            return i;
-          }
+      var index = -1;
+      _.each(this.map.overlayMapTypes.getArray(), _.bind(function(layer, i){
+        if (layer && layer.name === this.getName()) {
+          index = i;
         }
-      }
-      return -1;
+      }, this ));
+      return index;
     },
 
     getName: function() {

diff --git a/app/assets/javascripts/map/models/LayerSpecModel.js b/app/assets/javascripts/map/models/LayerSpecModel.js
@@ -39,7 +39,7 @@ define([
       "lbr_resource_rights",
       "gnq_resource_rights",
       "nam_resource_rights",
-      
+
       // CONSERVATION
       "biodiversity_hotspots",
       "verified_carbon",
@@ -120,7 +120,7 @@ define([
     positionizer: function(layers) {
       var layerOrder = _.intersection(this.layerOrder, _.pluck(layers, 'slug'));
       _.each(layerOrder, _.bind(function(slug, i) {
-        layers[slug].position = this.layerOrder.indexOf(slug) + 1;
+        layers[slug].position = this.layerOrder.indexOf(slug);
       }, this ));
 
       return layers;