kmz_compressor 2.1.3 → 2.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 8d4150ed49c4d494b601e80fc834eedb42687448fabf2aa6ca15135f50a5704d
+  data.tar.gz: e69879f14f2795a1a8c81d3430ef38c2aaf88bda6f2e08bf03cc776770225a4b
+SHA512:
+  metadata.gz: af42f8519f2f32894d9e767c88cf654d68c312af9c5d9b29c03259d5294e3c3dc637564d471a32c86ddabde57eae16a851ee0504bc275884828db9575e9720fd
+  data.tar.gz: 644b4b4841d7e3a25018afb468abe4a6142fcf005edbec11879ab6a653e864c01cea0ee1f0cfa7e4bba367e07165da44bdf7214efa7f994ef0ee138d099153c2

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

@@ -16,15 +16,16 @@ window.MapLayerManager = function(map){
     var requestTimestamp = new Date;
     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
+    kmlURL = prepareUrl(kmlURL);
+
+    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) },
       200: function(){
         if (!requestTimestamps[layerName] || requestTimestamps[layerName] < requestTimestamp){
             requestTimestamps[layerName] = requestTimestamp;
-            loadKMLLayer(cachedKMZURL(kmlURL), layerName, options)
+            loadKMLLayerWithoutExtraParams(cachedKMZURL(kmlURL), layerName, options)
         }
       }
     }}).error(function(){
@@ -34,9 +35,12 @@ 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);
+    kmlURL = prepareUrl(kmlURL);
+    loadKMLLayerWithoutExtraParams(kmlURL, layerName, options)
+  }
+
+  function loadKMLLayerWithoutExtraParams(kmlURL, layerName, 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 +149,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){
@@ -171,7 +186,7 @@ window.MapLayerManager = function(map){
 
       for (var i = 0; i < layerNames.length; i++){
           var layer = getLayer(layerNames[i])
-          if (layer.error){
+          if (!layer || layer.error){
               continue
           }
 
@@ -218,6 +233,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,44 +252,77 @@ 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
-  // Matches the middleware process
-  function sanitizeURI(uri){
+  function prepareUrl(kmlURL) {
+    kmlURL = sanitizeURI(kmlURL);
+    kmlURL = addExtraParams(kmlURL, window.MapLayerManager.extraParams);
+    return kmlURL;
+  }
+
+  function sanitizeURI(uri) {
     var url = urlToObject(uri)
-    var pathname = ('/' + decodeURI(url.pathname)).replace(/^\/+/, '/').trim()                  // Ensure there is a leading slash (IE doesn't provide one, Chrome does, FF does)
-    var search = decodeURIComponent(url.search.replace(/\+/g, '%20')).trim().replace(/^\?/, '') // Ensure all "plus spaces" are hex encoded spaces
+    var pathname = ('/' + decodeURI(url.pathname)).replace(/^\/+/, '/').trim() // Ensure there is a leading slash (IE doesn't provide one, Chrome does, FF does)
 
-    output = pathname
+    var search = url.search.replace(/%26/g, '%2526').replace(/%3D/g, '%253D') // Double encode & and = or else we will be unable to tell them apart from unencoded ones
+    search = search.replace(/\+/g, '%20') // Ensure all "plus spaces" are hex encoded spaces
+    search = decodeURIComponent(search).trim().replace(/^\?/, '') // Remove any leading ?
 
-    if (search !== ''){
-      output += '?'
-    }
+    output = pathname
+    if (search !== '') { output += '?' }
 
     // Encode the individual uri components
     output += $.map(search.split('&'), function(component){
       return $.map(component.split('='), function(kv){
+        // Unencode double encoded & and = from earlier
+        kv = kv.replace(/%26/g, '&').replace(/%3D/g, '=')
+
+        kv = encodeURIComponent(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')
+        kv = kv.replace(/'/g, '%27')
+
+        return kv
       }).join('=')
     }).join('&')
+
     url.href = output
 
     return url.href
   }
 
+  function addExtraParams(url, extraParams) {
+    url = urlToObject(url)
+    var paramString = $.param(extraParams || {})
+
+    if (paramString) {
+      url.search = url.search ? url.search + '&' + paramString : paramString
+    }
+
+    return url.href
+  }
+
   function closeInfowindowsExcept(layerName){
     eachLayer(function(layer){
       if (layer.name != layerName){
@@ -317,6 +367,7 @@ window.MapLayerManager = function(map){
     $(manager).trigger(data).trigger(nameData)
   }
 
+
   // INIT
 
   // Because google events sometimes get missed, we ensure we're up to date every now and again
@@ -339,6 +390,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/railtie.rb

@@ -6,7 +6,7 @@ require 'kmz_compressor/middleware'
 module KMZCompressor
   class Railtie < Rails::Railtie
     initializer "kmz_compressor.init" do |app|
-      app.config.middleware.use "KMZCompressor::Middleware"
+      app.config.middleware.use KMZCompressor::Middleware
 
       Mime::Type.register "application/vnd.google-earth.kml+xml", :kml
     end

data/lib/kmz_compressor/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kmz_compressor
 version: !ruby/object:Gem::Version
-  version: 2.1.3
-  prerelease: 
+  version: 2.3.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -10,34 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -45,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -58,41 +47,39 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- app/assets/javascripts/kmz_compressor.js
 - app/assets/javascripts/kmz_compressor/map_layer_manager.js
 - app/assets/javascripts/kmz_compressor/polyfills.js
 - app/assets/javascripts/kmz_compressor/sha2.js
-- app/assets/javascripts/kmz_compressor.js
-- app/helpers/kmz_compressor/kml_helper.rb
+- lib/kmz_compressor.rb
 - lib/kmz_compressor/controller_extensions.rb
 - lib/kmz_compressor/engine.rb
 - lib/kmz_compressor/middleware.rb
 - lib/kmz_compressor/railtie.rb
 - lib/kmz_compressor/version.rb
-- lib/kmz_compressor.rb
-- MIT-LICENSE
-- README.rdoc
 homepage: http://github.com/culturecode/kmz_compressor
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.7.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rack Middleware which retrieves KML from Rails and produces KMZ for the client.
 test_files: []

data/app/helpers/kmz_compressor/kml_helper.rb

@@ -1,8 +0,0 @@
-module KmzCompressor
-  module KmlHelper
-    # Converts KML colours which are BBGGRR into web colours which are RRGGBB
-    def kml_colour(html_hex_colour)
-      html_hex_colour.gsub(/([0-9A-F][0-9A-F])([0-9A-F][0-9A-F])([0-9A-F][0-9A-F])/i, '\3\2\1')
-    end
-  end
-end