kmz_compressor 2.0.11 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c6b78aacfa9bbcd64d2e072eb95ff06cb4c8c1
-  data.tar.gz: a8253da6b5ddb318f5fee79190b0b3c567b69f24
+  metadata.gz: 4a016ad49b9311b3f886bef8fc9ddbaf789fdafb
+  data.tar.gz: b42020c3acdd4a0a483737f4d54f0d2ee656b9fc
 SHA512:
-  metadata.gz: c8d220ee9dfca45aeab7553af0251fddeff7fbb3edd4806775c6cc951f5910b453984b162f8a58c01bfb41a75f8ad9beb707b797f29f8a5b471068c095b93a14
-  data.tar.gz: a2a5f481527b178bbba9e13982ba08e76cf1be49a44ecf8ea14dff5144f03ba411bacc0c0e5a24f222106bb21cadd1819882fdb0f60151721dcb31790fc13dd5
+  metadata.gz: 2feb0c49d00e5dd6e9a240ed63e46dfdca0e9ff48eecc5cb47df58bf7141154e34893eed1149546c09f616da108ce8d0fc80632704d83465baadbe5204084479
+  data.tar.gz: f479543d56fdfe774562ed292e4ecc0f7614f50c29238c0b8b15f0c9beb2c74a644e27a8f49d0c8d69b117da9a5a842e1d329e99bc852f880b352f42dd5069a0

data/app/assets/javascripts/kmz_compressor.js

@@ -1,2 +1,3 @@
+//= require kmz_compressor/polyfills
 //= require kmz_compressor/sha2
-//= require kmz_compressor/map_layer_manager
+//= require kmz_compressor/map_layer_manager

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

@@ -49,11 +49,12 @@ window.MapLayerManager = function(map){
 
   // Generates the url of the cached KMZ for the given kmlURL
   function cachedKMZURL(kmlURL){
-    var url = $('<a href="' + kmlURL + '"/>')[0]
-    return url.protocol + '//' + url.host + '/kmz/' + hex_sha256(kmlURL) + '.kmz'
+    var url = urlToObject(kmlURL)
+    url.href = '/kmz/' + hex_sha256(kmlURL) + '.kmz'
+    return url.href
   }
 
-  function centerWhenLoaded(layerNamez){
+  function centerWhenLoaded(layerNamez, options){
       layerNamez = makeArray(layerNamez)
 
       var handler = function(){
@@ -64,7 +65,7 @@ window.MapLayerManager = function(map){
 
           if (areLayersLoaded(layerNamez)){
               $(map.getDiv()).unbind(layerLoadedEventName, handler)
-              centerOnLayers(layerNamez);
+              centerOnLayers(layerNamez, options);
           }
       }
 
@@ -138,7 +139,7 @@ window.MapLayerManager = function(map){
       return true
   }
 
-  function centerOnLayers(layerNames){
+  function centerOnLayers(layerNames, options){
       var bounds;
       layerNames = makeArray(layerNames)
       sweep() // Discard old layers before we generate the bounds
@@ -154,8 +155,14 @@ window.MapLayerManager = function(map){
               bounds.union(layer.kml.getDefaultViewport());
           }
       }
+      var checkZoom = options.maxZoom && map.getZoom() <= options.maxZoom
+
       if (bounds){
-          map.fitBounds(bounds);
+        map.fitBounds(bounds)
+      }
+
+      if (checkZoom && map.getZoom() > options.maxZoom){
+        map.setZoom(options.maxZoom)
       }
   }
 
@@ -217,8 +224,8 @@ window.MapLayerManager = function(map){
   // 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 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
 
     output = pathname
@@ -236,8 +243,9 @@ window.MapLayerManager = function(map){
         return encodeURIComponent(kv).replace(/'/g, '%27')
       }).join('=')
     }).join('&')
+    url.href = output
 
-    return url.protocol + '//' + url.host + output
+    return url.href
   }
 
   function closeInfowindowsExcept(layerName){
@@ -268,6 +276,10 @@ window.MapLayerManager = function(map){
     }
   }
 
+  function urlToObject(url){
+    return $('<a>').attr('href', url)[0]
+  }
+
   // INIT
 
   // Because google events sometimes get missed, we ensure we're up to date every now and again

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

@@ -0,0 +1,7 @@
+
+// IE8 Doesn't support String.trim()
+if (!String.prototype.trim) {
+  String.prototype.trim = function () {
+    return this.replace(/^\s+|\s+$/g, '');
+  };
+}

data/lib/kmz_compressor/version.rb

@@ -1,3 +1,3 @@
 module KMZCompressor
-  VERSION = "2.0.11"
+  VERSION = "2.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kmz_compressor
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.17
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,6 +57,7 @@ files:
 - 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
 - lib/kmz_compressor.rb
 - lib/kmz_compressor/engine.rb
@@ -82,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Rack Middleware which retrieves KML from Rails and produces KMZ for the client.