gmaps4rails 1.1.4 → 1.1.5

data/app/assets/javascripts/gmaps4rails/gmaps4rails.base.js.coffee

@@ -199,11 +199,11 @@ class @Gmaps4Rails
       polygon_coordinates.push(latlng)
       #first element of an Array could contain specific configuration for this particular polygon. If no config given, use default
       if point == polygon[0]
-        strokeColor   = @polygons[i][j].strokeColor   || @polygons_conf.strokeColor
-        strokeOpacity = @polygons[i][j].strokeOpacity || @polygons_conf.strokeOpacity
-        strokeWeight  = @polygons[i][j].strokeWeight  || @polygons_conf.strokeWeight
-        fillColor     = @polygons[i][j].fillColor     || @polygons_conf.fillColor
-        fillOpacity   = @polygons[i][j].fillOpacity   || @polygons_conf.fillOpacity
+        strokeColor   = point.strokeColor   || @polygons_conf.strokeColor
+        strokeOpacity = point.strokeOpacity || @polygons_conf.strokeOpacity
+        strokeWeight  = point.strokeWeight  || @polygons_conf.strokeWeight
+        fillColor     = point.fillColor     || @polygons_conf.fillColor
+        fillOpacity   = point.fillOpacity   || @polygons_conf.fillOpacity
 
     #Construct the polygon
     new_poly = new google.maps.Polygon
@@ -389,16 +389,17 @@ class @Gmaps4Rails
     if @map_options.auto_adjust
       #from markers
       @extendBoundsWithMarkers()
+      
       #from polylines:
       for polyline in @polylines        
         polyline_points = polyline.serviceObject.latLngs.getArray()[0].getArray()
-        for point in polyline
-         @boundsObject.extend point
+        for point in polyline_points
+          @boundsObject.extend point
       
       #from polygons:
       for polygon in @polygons
         polygon_points = polygon.serviceObject.latLngs.getArray()[0].getArray()
-        for point in polygon
+        for point in polygon_points          
           @boundsObject.extend point
           
       #from circles

data/app/assets/javascripts/gmaps4rails/gmaps4rails.googlemaps.js.coffee

@@ -213,18 +213,18 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
   createInfoWindow : (marker_container) ->
     if @markers_conf.custom_infowindow_class == null && marker_container.description?
       #create the infowindow
-      info_window = new google.maps.InfoWindow({content: marker_container.description })
+      marker_container.infowindow = new google.maps.InfoWindow({content: marker_container.description })
       #add the listener associated
       currentMap = this
-      google.maps.event.addListener(marker_container.serviceObject, 'click', @openInfoWindow(currentMap, info_window, marker_container.serviceObject))
+      google.maps.event.addListener(marker_container.serviceObject, 'click', @openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject))
     else #creating custom infowindow
       if marker_container.description?
         boxText = document.createElement("div")
         boxText.setAttribute("class", @markers_conf.custom_infowindow_class) #to customize
         boxText.innerHTML = marker_container.description 
-        info_window = new InfoBox(@infobox(boxText))
+        marker_container.infowindow = new InfoBox(@infobox(boxText))
         currentMap = this
-        google.maps.event.addListener(marker_container.serviceObject, 'click', @openInfoWindow(currentMap, info_window, marker_container.serviceObject))
+        google.maps.event.addListener(marker_container.serviceObject, 'click', @openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject))
 
 
   openInfoWindow : (currentMap, infoWindow, marker) ->

data/public/javascripts/gmaps4rails/gmaps4rails.base.js

@@ -221,11 +221,11 @@
         latlng = this.createLatLng(point.lat, point.lng);
         polygon_coordinates.push(latlng);
         if (point === polygon[0]) {
-          strokeColor = this.polygons[i][j].strokeColor || this.polygons_conf.strokeColor;
-          strokeOpacity = this.polygons[i][j].strokeOpacity || this.polygons_conf.strokeOpacity;
-          strokeWeight = this.polygons[i][j].strokeWeight || this.polygons_conf.strokeWeight;
-          fillColor = this.polygons[i][j].fillColor || this.polygons_conf.fillColor;
-          fillOpacity = this.polygons[i][j].fillOpacity || this.polygons_conf.fillOpacity;
+          strokeColor = point.strokeColor || this.polygons_conf.strokeColor;
+          strokeOpacity = point.strokeOpacity || this.polygons_conf.strokeOpacity;
+          strokeWeight = point.strokeWeight || this.polygons_conf.strokeWeight;
+          fillColor = point.fillColor || this.polygons_conf.fillColor;
+          fillOpacity = point.fillOpacity || this.polygons_conf.fillOpacity;
         }
       }
       new_poly = new google.maps.Polygon({
@@ -381,8 +381,8 @@
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
           polyline = _ref[_i];
           polyline_points = polyline.serviceObject.latLngs.getArray()[0].getArray();
-          for (_j = 0, _len2 = polyline.length; _j < _len2; _j++) {
-            point = polyline[_j];
+          for (_j = 0, _len2 = polyline_points.length; _j < _len2; _j++) {
+            point = polyline_points[_j];
             this.boundsObject.extend(point);
           }
         }
@@ -390,8 +390,8 @@
         for (_k = 0, _len3 = _ref2.length; _k < _len3; _k++) {
           polygon = _ref2[_k];
           polygon_points = polygon.serviceObject.latLngs.getArray()[0].getArray();
-          for (_l = 0, _len4 = polygon.length; _l < _len4; _l++) {
-            point = polygon[_l];
+          for (_l = 0, _len4 = polygon_points.length; _l < _len4; _l++) {
+            point = polygon_points[_l];
             this.boundsObject.extend(point);
           }
         }

data/public/javascripts/gmaps4rails/gmaps4rails.googlemaps.js

@@ -237,21 +237,21 @@
       }
     };
     Gmaps4RailsGoogle.prototype.createInfoWindow = function(marker_container) {
-      var boxText, currentMap, info_window;
+      var boxText, currentMap;
       if (this.markers_conf.custom_infowindow_class === null && (marker_container.description != null)) {
-        info_window = new google.maps.InfoWindow({
+        marker_container.infowindow = new google.maps.InfoWindow({
           content: marker_container.description
         });
         currentMap = this;
-        return google.maps.event.addListener(marker_container.serviceObject, 'click', this.openInfoWindow(currentMap, info_window, marker_container.serviceObject));
+        return google.maps.event.addListener(marker_container.serviceObject, 'click', this.openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject));
       } else {
         if (marker_container.description != null) {
           boxText = document.createElement("div");
           boxText.setAttribute("class", this.markers_conf.custom_infowindow_class);
           boxText.innerHTML = marker_container.description;
-          info_window = new InfoBox(this.infobox(boxText));
+          marker_container.infowindow = new InfoBox(this.infobox(boxText));
           currentMap = this;
-          return google.maps.event.addListener(marker_container.serviceObject, 'click', this.openInfoWindow(currentMap, info_window, marker_container.serviceObject));
+          return google.maps.event.addListener(marker_container.serviceObject, 'click', this.openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject));
         }
       }
     };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2011-09-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &2152366260 !ruby/object:Gem::Requirement
+  requirement: &2152316380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152366260
+  version_requirements: *2152316380
 description: ! 'Enables easy display of items (taken from a Rails 3 model) on a Google
   Maps (JS API V3), OpenLayers, Mapquest and Bing. Geocoding + Directions included.
   Provides much options: markers customization, infowindows, auto-adjusted zoom, polylines,