kmz_compressor 2.1.3 → 2.1.4

data/app/assets/javascripts/kmz_compressor/map_layer_manager.js

@@ -17,7 +17,7 @@ window.MapLayerManager = function(map){
     var retryDelay = retryDelay || 2000;
 
     kmlURL = sanitizeURI(kmlURL);
-    options = jQuery.extend(true, {zIndex:zIndexCount++}, options); // Deep copy the options in case they are changed between now and when the map is ready to load
+    options = jQuery.extend(true, {zIndex:getDrawOrder(layerName)}, options); // Deep copy the options in case they are changed between now and when the map is ready to load
 
     return $.ajax(kmlURL, {type:'head', statusCode:{
       202: function(){ setTimeout(function(){ cacheAndLoadKMLLayer(kmlURL, layerName, options, retryDelay * 2) }, retryDelay) },
@@ -36,7 +36,7 @@ window.MapLayerManager = function(map){
   function loadKMLLayer(kmlURL, layerName, options) {
       // Replace spaces with pluses so we don't have problems with some things turning them into %20s and some not
       kmlURL = sanitizeURI(kmlURL);
-      options = jQuery.extend(true, {zIndex:zIndexCount++, map:map}, options);
+      options = jQuery.extend(true, {zIndex:getDrawOrder(layerName), map:map}, options);
 
       var kmlLayer = new google.maps.KmlLayer(kmlURL, options);
       var layer = addLayer(layerName, kmlLayer)
@@ -145,6 +145,17 @@ window.MapLayerManager = function(map){
     }
   }
 
+  // Returns the draw order for the layer if it exists,
+  // Else generates and returns a new draw order
+  function getDrawOrder(layerName){
+    var layer = getLayer(layerName)
+    if (layer){
+      return layer.kml.getZIndex()
+    } else {
+      return zIndexCount++
+    }
+  }
+
   function setKMLOptions(layerName, options){
     var layer = getLayer(layerName)
     if (layer){
@@ -218,6 +229,8 @@ window.MapLayerManager = function(map){
   // Keep layers synced with their state
   function sweep(){
       var foundLayers = [];
+      var staleLayers = []
+
       eachLayer(function(layer, index){
           var kmlStatus = layer.kml ? layer.kml.getStatus() : null;
 
@@ -235,15 +248,25 @@ window.MapLayerManager = function(map){
           }
 
           // Remove old layers
-          // Sweep through layers from the newest to oldest, if a layer name is seen more than once, delete all but the newest
+          // Sweep through layers from the newest to oldest, if a layer name is seen more than once, mark all but the newest for deletion
           // Don't delete an instance if we haven't yet seen a version of it with status 'OK'
           if ($.inArray(layer.name, foundLayers) > -1){
-              layer.kml.setMap(null);
-              layers.splice(index, 1);
+              staleLayers.push(layer)
           } else if (layer.loaded) {
               foundLayers.push(layer.name)
           }
       })
+
+      // Delete stale layers
+      $.each(staleLayers, function(_, staleLayer){
+        eachLayer(function(layer, index){
+          if (layer == staleLayer){
+            layer.kml.setMap(null);
+            layers.splice(index, 1)
+            return false
+          }
+        })
+      })
   }
 
   // Replace spaces with pluses so we don't have problems with some things turning them into %20s and some not
@@ -339,6 +362,7 @@ window.MapLayerManager = function(map){
   this.hideLayer              = hideLayer,
   this.showLayer              = showLayer,
   this.setDrawOrder           = setDrawOrder,
+  this.getDrawOrder           = getDrawOrder,
   this.eachLayer              = eachLayer,
   this.setKMLOptions          = setKMLOptions
 }

data/lib/kmz_compressor/version.rb

@@ -1,3 +1,3 @@
 module KMZCompressor
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kmz_compressor
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors: