gmapsjs 0.4.12 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6818ca6ff719122c3e42e7d032d7b9c64b430ca
-  data.tar.gz: af40cf33d7c8eda3eab67d9dc5de3126f5ec0e7f
+  metadata.gz: d8b359e813a7ebcf253690c132ff3cf368f13662
+  data.tar.gz: e18a21de7f15af974c952f47b2d93db41e2f486d
 SHA512:
-  metadata.gz: 37485f4bf381a96ae073c293af146b345b4f50069c65439aaff615250b4ff27daed1b5cb47a36a834ebba4774b39d85c7fc811eeef585e83862cf2307c1d5ef6
-  data.tar.gz: 58394ec97ddb47042d24d1aa472d1fa27c9f663a056d9d98a8775512d01ece9cfc08ed938fa755347af0672d3889b16bf1012d47c1f91fd9affd892433294dd2
+  metadata.gz: 0b58bb6ec5dad864e31e629bea1473be44bc86592ce8fe9da2dca3db300182838d0f2b733895f5ac73ca7f0d775820699c6b2ff6e8cd7d40ca4ab9649efbee0b
+  data.tar.gz: 9fdfed750adebbf152953dc27309405c499359ad856bd3ed33877dac860ff44c5077542a9b4f843370e4f149143671b49d8444eef452e7890b703b9605964a82

data/app/assets/javascripts/gmapsjs/gmapsjs.js

@@ -11,7 +11,7 @@
 }(this, function() {
 
 /*!
- * GMaps.js v0.4.12
+ * GMaps.js v0.4.16
  * http://hpneo.github.com/gmaps/
  *
  * Copyright 2014, Gustavo Leon
@@ -104,11 +104,13 @@ var arrayToLatLng = function(coords, useGeoJSON) {
   var i;
 
   for (i = 0; i < coords.length; i++) {
-    if (coords[i].length > 0 && typeof(coords[i][0]) == "object") {
-      coords[i] = arrayToLatLng(coords[i], useGeoJSON);
-    }
-    else {
-      coords[i] = coordsToLatLngs(coords[i], useGeoJSON);
+    if (!(coords[i] instanceof google.maps.LatLng)) {
+      if (coords[i].length > 0 && typeof(coords[i][0]) == "object") {
+        coords[i] = arrayToLatLng(coords[i], useGeoJSON);
+      }
+      else {
+        coords[i] = coordsToLatLngs(coords[i], useGeoJSON);
+      }
     }
   }
 
@@ -374,6 +376,9 @@ var GMaps = (function(global) {
       });
     };
 
+    //google.maps.event.addListener(this.map, 'idle', this.hideContextMenu);
+    google.maps.event.addListener(this.map, 'zoom_changed', this.hideContextMenu);
+
     for (var ev = 0; ev < events_that_hide_context_menu.length; ev++) {
       var name = events_that_hide_context_menu[ev];
 
@@ -500,7 +505,16 @@ GMaps.prototype.createControl = function(options) {
   }
 
   if (options.content) {
-    control.innerHTML = options.content;
+    if (typeof options.content === 'string') {
+      control.innerHTML = options.content;
+    }
+    else if (options.content instanceof HTMLElement) {
+      control.appendChild(options.content);
+    }
+  }
+
+  if (options.position) {
+    control.position = google.maps.ControlPosition[options.position.toUpperCase()];
   }
 
   for (var ev in options.events) {
@@ -517,14 +531,32 @@ GMaps.prototype.createControl = function(options) {
 };
 
 GMaps.prototype.addControl = function(options) {
-  var position = google.maps.ControlPosition[options.position.toUpperCase()];
-
-  delete options.position;
-
   var control = this.createControl(options);
   this.controls.push(control);
-  
-  this.map.controls[position].push(control);
+  this.map.controls[control.position].push(control);
+
+  return control;
+};
+
+GMaps.prototype.removeControl = function(control) {
+  var position = null;
+
+  for (var i = 0; i < this.controls.length; i++) {
+    if (this.controls[i] == control) {
+      position = this.controls[i].position;
+      this.controls.splice(i, 1);
+    }
+  }
+
+  if (position) {
+    for (i = 0; i < this.map.controls.length; i++) {
+      var controlsForPosition = this.map.controls[control.position]
+      if (controlsForPosition.getAt(i) == control) {
+        controlsForPosition.removeAt(i);
+        break;
+      }
+    }
+  }
 
   return control;
 };
@@ -701,21 +733,38 @@ GMaps.prototype.removeMarkers = function (collection) {
 
   if (typeof collection == 'undefined') {
     for (var i = 0; i < this.markers.length; i++) {
-      this.markers[i].setMap(null);
+      var marker = this.markers[i];
+      marker.setMap(null);
+
+      if(this.markerClusterer) {
+        this.markerClusterer.removeMarker(marker);
+      }
+
+      GMaps.fire('marker_removed', marker, this);
     }
     
     this.markers = new_markers;
   }
   else {
     for (var i = 0; i < collection.length; i++) {
-      if (this.markers.indexOf(collection[i]) > -1) {
-        this.markers[i].setMap(null);
+      var index = this.markers.indexOf(collection[i]);
+
+      if (index > -1) {
+        var marker = this.markers[index];
+        marker.setMap(null);
+
+        if(this.markerClusterer) {
+          this.markerClusterer.removeMarker(marker);
+        }
+
+        GMaps.fire('marker_removed', marker, this);
       }
     }
 
     for (var i = 0; i < this.markers.length; i++) {
-      if (this.markers[i].getMap() != null) {
-        new_markers.push(this.markers[i]);
+      var marker = this.markers[i];
+      if (marker.getMap() != null) {
+        new_markers.push(marker);
       }
     }
 
@@ -769,6 +818,7 @@ GMaps.prototype.drawOverlay = function(options) {
     }
 
     if (options.click) {
+      panes.overlayMouseTarget.appendChild(overlay.el);
       google.maps.event.addDomListener(overlay.el, 'click', function() {
         options.click.apply(overlay, [overlay]);
       });
@@ -1369,6 +1419,7 @@ GMaps.prototype.travelRoute = function(options) {
       destination: options.destination,
       travelMode: options.travelMode,
       waypoints : options.waypoints,
+      unitSystem: options.unitSystem,
       error: options.error,
       callback: function(e) {
         //start callback
@@ -1702,12 +1753,12 @@ GMaps.staticMapURL = function(options){
   if (styles) {
     for (var i = 0; i < styles.length; i++) {
       var styleRule = [];
-      if (styles[i].featureType && styles[i].featureType != 'all' ) {
-        styleRule.push('feature:' + styles[i].featureType);
+      if (styles[i].featureType){
+        styleRule.push('feature:' + styles[i].featureType.toLowerCase());
       }
 
-      if (styles[i].elementType && styles[i].elementType != 'all') {
-        styleRule.push('element:' + styles[i].elementType);
+      if (styles[i].elementType) {
+        styleRule.push('element:' + styles[i].elementType.toLowerCase());
       }
 
       for (var j = 0; j < styles[i].stylers.length; j++) {
@@ -1886,6 +1937,7 @@ GMaps.custom_events = ['marker_added', 'marker_removed', 'polyline_added', 'poly
 
 GMaps.on = function(event_name, object, handler) {
   if (GMaps.custom_events.indexOf(event_name) == -1) {
+    if(object instanceof GMaps) object = object.map; 
     return google.maps.event.addListener(object, event_name, handler);
   }
   else {
@@ -1903,6 +1955,7 @@ GMaps.on = function(event_name, object, handler) {
 
 GMaps.off = function(event_name, object) {
   if (GMaps.custom_events.indexOf(event_name) == -1) {
+    if(object instanceof GMaps) object = object.map; 
     google.maps.event.clearListeners(object, event_name);
   }
   else {
@@ -2029,6 +2082,17 @@ if (!google.maps.Polygon.prototype.containsLatLng) {
   };
 }
 
+if (!google.maps.Circle.prototype.containsLatLng) {
+  google.maps.Circle.prototype.containsLatLng = function(latLng) {
+    if (google.maps.geometry) {
+      return google.maps.geometry.spherical.computeDistanceBetween(this.getCenter(), latLng) <= this.getRadius();
+    }
+    else {
+      return true;
+    }
+  };
+}
+
 google.maps.LatLngBounds.prototype.containsLatLng = function(latLng) {
   return this.contains(latLng);
 };
@@ -2082,4 +2146,4 @@ if (!Array.prototype.indexOf) {
 }
   
 return GMaps;
-}));
+}));

data/lib/gmapsjs/version.rb

@@ -1,3 +1,3 @@
 module GmapsJS
-  VERSION = "0.4.12"
+  VERSION = "0.4.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmapsjs
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.16
 platform: ruby
 authors:
 - Alvaro Pereyra
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies: []
 description: |-
   gmaps.js allows you to use the potential of Google Maps in a simple way.