kmz_compressor 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0285357fa92cfc382325fb2571dee9fb9d07014253c50b13fa4013f5f4895f2c'
-  data.tar.gz: b46dc5a57ec53f34e5a78f2c6d656832402707994128f73afec9396fc5870694
+  metadata.gz: 8d4150ed49c4d494b601e80fc834eedb42687448fabf2aa6ca15135f50a5704d
+  data.tar.gz: e69879f14f2795a1a8c81d3430ef38c2aaf88bda6f2e08bf03cc776770225a4b
 SHA512:
-  metadata.gz: 372278c020ec26c3b92b571be27df158c62eccccabc64971e8b34852e2dffbb3380a12efe35625dff970dcd91b1d1b3284f1a2ee419aa2ae0f3c9e54c8871a9e
-  data.tar.gz: 5e56612ba29b9527e38ae18012739bcff3ab35c22072750ac4698827215925e2625d41808ebd74d26b8a01a4fd2a004372e05714786099777724e1122e994af4
+  metadata.gz: af42f8519f2f32894d9e767c88cf654d68c312af9c5d9b29c03259d5294e3c3dc637564d471a32c86ddabde57eae16a851ee0504bc275884828db9575e9720fd
+  data.tar.gz: 644b4b4841d7e3a25018afb468abe4a6142fcf005edbec11879ab6a653e864c01cea0ee1f0cfa7e4bba367e07165da44bdf7214efa7f994ef0ee138d099153c2

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

@@ -16,7 +16,8 @@ window.MapLayerManager = function(map){
     var requestTimestamp = new Date;
     var retryDelay = retryDelay || 2000;
 
-    kmlURL = sanitizeURI(kmlURL);
+    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:{
@@ -24,7 +25,7 @@ window.MapLayerManager = function(map){
       200: function(){
         if (!requestTimestamps[layerName] || requestTimestamps[layerName] < requestTimestamp){
             requestTimestamps[layerName] = requestTimestamp;
-            loadKMLLayer(cachedKMZURL(kmlURL), layerName, options)
+            loadKMLLayerWithoutExtraParams(cachedKMZURL(kmlURL), layerName, options)
         }
       }
     }}).error(function(){
@@ -34,7 +35,11 @@ window.MapLayerManager = function(map){
   }
 
   function loadKMLLayer(kmlURL, layerName, options) {
-      kmlURL = sanitizeURI(kmlURL);
+    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);
@@ -268,6 +273,12 @@ window.MapLayerManager = function(map){
       })
   }
 
+  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)
@@ -301,6 +312,17 @@ window.MapLayerManager = function(map){
     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){
@@ -345,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

data/lib/kmz_compressor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kmz_compressor
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Rack Middleware which retrieves KML from Rails and produces KMZ for the client.