kmz_compressor 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c7923fe3dfcc2c50afee65808b17b21325d9c6c
-  data.tar.gz: 5756db8aaabb107fed7cc7c516d6f7059030c97c
+  metadata.gz: 22764bfbcf300cc16f3a91cf77ad61db40401293
+  data.tar.gz: 356096d49bbc8de00898e36759242376859230db
 SHA512:
-  metadata.gz: 518dbe4543455963feeb7c499eab3bb35fd9fc0b36a16009c5b954d3b8ce1285e8732ef0bb0da5af617342b588817e9912a1776ac0fcd4069b60558b623858ef
-  data.tar.gz: d9ca743c4584382a68c099dbf6b8615e6dbeccffe1aaa5404c6789a1c658f45f4e2fdd0f7575c22040b84201c97d29201586873f2248fda6d68637cf4e3a7f56
+  metadata.gz: d9d982f62b06c2e760e3219c2edefcda8a3850b3d98de26f042e951ca918f93381d186def9c9f29b8c4e34b7410123109a3ef86daf8894d684e9c9aea2f0a275
+  data.tar.gz: bf93ed0dec8c85c2515c1916dc2aeaf81dbe9d5d45828cc5a3e0c9e19ac6dbd7d8022292153e5423f63444e8c4147773256a08760686f890fcb05000c50a0b0a

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

@@ -7,6 +7,7 @@ window.MapLayerManager = function(map){
   var layerLoadedEventName  = 'map:layerLoaded'
   var layerRemovedEventName = 'map:layerRemoved'
   var layerHiddenEventName  = 'map:layerHidden'
+  var layerClickedEventName = 'map:layerClicked'
 
   // Prime the KMZ cache on the server before unleashing google's many tilemills
   function cacheAndLoadKMLLayer(kmlURL, layerName, options) {
@@ -37,14 +38,12 @@ window.MapLayerManager = function(map){
           sweep();
       });
 
-      // Add a listener to catch clicks and close all info windows on other layers
       google.maps.event.addListener(kmlLayer, 'click', function(){
-          everyLayer(function(layer){
-              if (layer.kml != kmlLayer){ // Don't close this layer's info window
-                  layer.kml.setOptions({suppressInfoWindows:true})
-                  layer.kml.setOptions({suppressInfoWindows:false})
-              }
-          })
+        // Add a listener to catch clicks and close all info windows on other layers
+        closeInfowindowsExcept(layerName)
+
+        // Create a bubbling event when a layer is clicked
+        $(map.getDiv()).trigger({type: layerClickedEventName, layer:layer})
       });
   }
 
@@ -166,76 +165,95 @@ window.MapLayerManager = function(map){
       });
   }
 
-    function removeLayers(){
-        everyLayer(function(layer){
-            removeLayer(layer.name);
-        })
-    }
-    function everyLayer(fn){
-        // NOTE: We use an iterator instead of a for loop because modifications to layers that occur during iteration can mess us up
-        //       e.g. if we're responding to an event during the loop and the event adds a layer, we may end up re-iterating on a layer we've already processed
-        $.each(layers.slice(0), function(index, layer){
-            fn(layer, index);
-        })
-    }
+  function removeLayers(){
+      everyLayer(function(layer){
+          removeLayer(layer.name);
+      })
+  }
+  function everyLayer(fn){
+      // NOTE: We use an iterator instead of a for loop because modifications to layers that occur during iteration can mess us up
+      //       e.g. if we're responding to an event during the loop and the event adds a layer, we may end up re-iterating on a layer we've already processed
+      $.each(layers.slice(0), function(index, layer){
+          fn(layer, index);
+      })
+  }
 
-    // Keep layers synced with their state
-    function sweep(){
-        var foundLayers = [];
-        everyLayer(function(layer, index){
-            var kmlStatus = layer.kml ? layer.kml.getStatus() : null;
-
-            // If the layer just finished loading
-            if (!layer.loaded && kmlStatus) {
-                loadingCount--
-                layer.loaded = true
-                layer.error = kmlStatus == 'OK' ? null : kmlStatus // if there were any errors, record them
-                $(map.getDiv()).trigger({type: layerLoadedEventName, layer:layer})
-            }
-
-            // A layer should be hidden, but the kml is showing, hide it (i.e. correct layers that were hidden before the kml was loaded)
-            if (layer.hidden && layer.loaded && layer.kml.getMap()){
-                hideLayer(layer.name)
-            }
-
-            // 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
-            // 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);
-            } else if (layer.loaded) {
-                foundLayers.push(layer.name)
-            }
-        })
-    }
+  // Keep layers synced with their state
+  function sweep(){
+      var foundLayers = [];
+      everyLayer(function(layer, index){
+          var kmlStatus = layer.kml ? layer.kml.getStatus() : null;
+
+          // If the layer just finished loading
+          if (!layer.loaded && kmlStatus) {
+              loadingCount--
+              layer.loaded = true
+              layer.error = kmlStatus == 'OK' ? null : kmlStatus // if there were any errors, record them
+              $(map.getDiv()).trigger({type: layerLoadedEventName, layer:layer})
+          }
+
+          // A layer should be hidden, but the kml is showing, hide it (i.e. correct layers that were hidden before the kml was loaded)
+          if (layer.hidden && layer.loaded && layer.kml.getMap()){
+              hideLayer(layer.name)
+          }
+
+          // 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
+          // 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);
+          } else if (layer.loaded) {
+              foundLayers.push(layer.name)
+          }
+      })
+  }
+
+  // Replace spaces with pluses so we don't have problems with some things turning them into %20s and some not
+  // Matches the middleware process
+  function sanitizeURI(uri){
+    var url = $('<a href="' + uri + '"/>')[0]
+    var pathname = decodeURI(url.pathname).trim().replace(/^\/\//, '/') // IE will return a path name with a leading double slash, so ensure it's only a single slash
+    var search = decodeURIComponent(url.search.replace(/\+/g, '%20')).trim().replace(/^\?/, '') // Ensure all "plus spaces" are hex encoded spaces
 
-    // Replace spaces with pluses so we don't have problems with some things turning them into %20s and some not
-    // Matches the middleware process
-    function sanitizeURI(uri){
-      var url = $('<a href="' + uri + '"/>')[0]
-      var pathname = decodeURI(url.pathname).trim().replace(/^\/\//, '/') // IE will return a path name with a leading double slash, so ensure it's only a single slash
-      var search = decodeURIComponent(url.search.replace(/\+/g, '%20')).trim().replace(/^\?/, '') // Ensure all "plus spaces" are hex encoded spaces
+    output = pathname
 
-      output = pathname
+    if (search !== ''){
+      output += '?'
+    }
+
+    // Encode the individual uri components
+    output += $.map(search.split('&'), function(component){
+      return $.map(component.split('='), function(kv){
+        // HACK: Firefox 'helps' us out by encoding apostrophes as %27 in AJAX requests, However its encodeURIcomponent method
+        // does not. This difference causes a mismatch between the url we use to calculate the cache path in the browser
+        // and on the server. This hack undoes the damage. See https://bugzilla.mozilla.org/show_bug.cgi?id=407172
+        return encodeURIComponent(kv).replace(/'/g, '%27')
+      }).join('=')
+    }).join('&')
+
+    return url.protocol + '//' + url.host + output
+  }
 
-      if (search !== ''){
-        output += '?'
+  function closeInfowindowsExcept(layerName){
+    everyLayer(function(layer){
+      if (layer.name != layerName){
+        closeInfowindow(layer)
       }
+    })
+  }
 
-      // Encode the individual uri components
-      output += $.map(search.split('&'), function(component){
-        return $.map(component.split('='), function(kv){
-          // HACK: Firefox 'helps' us out by encoding apostrophes as %27 in AJAX requests, However its encodeURIcomponent method
-          // does not. This difference causes a mismatch between the url we use to calculate the cache path in the browser
-          // and on the server. This hack undoes the damage. See https://bugzilla.mozilla.org/show_bug.cgi?id=407172
-          return encodeURIComponent(kv).replace(/'/g, '%27')
-        }).join('=')
-      }).join('&')
-
-      return url.protocol + '//' + url.host + output
-    }
+  function closeInfowindows(){
+    everyLayer(function(layer){
+      closeInfowindow(layer)
+    })
+  }
 
+  function closeInfowindow(layer){
+    // Close info window by toggling the suppressInfoWindow setting (ensuring it retains its original value)
+    layer.kml.setOptions({suppressInfoWindows:!layer.kml.get('suppressInfoWindows')})
+    layer.kml.setOptions({suppressInfoWindows:!layer.kml.get('suppressInfoWindows')})
+  }
 
   // INIT
 
@@ -245,5 +263,5 @@ window.MapLayerManager = function(map){
 
   // PUBLIC INTERFACE
 
-  return {cacheAndLoadKMLLayer:cacheAndLoadKMLLayer, loadKMLLayer:loadKMLLayer, centerWhenLoaded:centerWhenLoaded, addLayer:addLayer, removeLayer:removeLayer, layerNames:layerNames, map:map, loadingCount:loadingCount}
+  return {cacheAndLoadKMLLayer:cacheAndLoadKMLLayer, loadKMLLayer:loadKMLLayer, centerWhenLoaded:centerWhenLoaded, addLayer:addLayer, removeLayer:removeLayer, layerNames:layerNames, map:map, loadingCount:loadingCount, closeInfowindows:closeInfowindows, closeInfowindowsExcept:closeInfowindowsExcept}
 }

data/lib/kmz_compressor/version.rb

@@ -1,3 +1,3 @@
 module KMZCompressor
-  VERSION = "2.0.9"
+  VERSION = "2.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kmz_compressor
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails