gmaps4rails 1.1.0 → 1.1.1

data/README.rdoc

@@ -8,7 +8,7 @@ Gmaps4rails is developped to simply create a Google Map:
 
 It's based on Ruby on Rails 3 Engines and uses Google Maps API V3.
 
-See screencasts here: http://www.youtube.com/user/TheApneadiving
+See (somewhat outdated) screencasts here: http://www.youtube.com/user/TheApneadiving
 
 == When Gmaps4rails finally means Global Maps for Rails
 

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

@@ -96,7 +96,7 @@ class @Gmaps4Rails
 
     directionsDisplay.setMap(@map)
     #display panel only if required
-    if this.direction_conf.display_panel 
+    if @direction_conf.display_panel 
       directionsDisplay.setPanel(document.getElementById(@direction_conf.panel_id))
       
     directionsDisplay.setOptions
@@ -143,14 +143,14 @@ class @Gmaps4Rails
       # always check if a config is given, if not, use defaults
       # NOTE: is there a cleaner way to do this? Maybe a hash merge of some sort?
       newCircle = new google.maps.Circle
-        center:        this.createLatLng(circle.lat, circle.lng)
-        strokeColor:   circle.strokeColor   || this.circles_conf.strokeColor
-        strokeOpacity: circle.strokeOpacity || this.circles_conf.strokeOpacity
-        strokeWeight:  circle.strokeWeight  || this.circles_conf.strokeWeight
-        fillOpacity:   circle.fillOpacity   || this.circles_conf.fillOpacity
-        fillColor:     circle.fillColor     || this.circles_conf.fillColor
-        clickable:     circle.clickable     || this.circles_conf.clickable
-        zIndex:        circle.zIndex        || this.circles_conf.zIndex
+        center:        @createLatLng(circle.lat, circle.lng)
+        strokeColor:   circle.strokeColor   || @circles_conf.strokeColor
+        strokeOpacity: circle.strokeOpacity || @circles_conf.strokeOpacity
+        strokeWeight:  circle.strokeWeight  || @circles_conf.strokeWeight
+        fillOpacity:   circle.fillOpacity   || @circles_conf.fillOpacity
+        fillColor:     circle.fillColor     || @circles_conf.fillColor
+        clickable:     circle.clickable     || @circles_conf.clickable
+        zIndex:        circle.zIndex        || @circles_conf.zIndex
         radius:        circle.radius
 
       circle.serviceObject = newCircle
@@ -197,11 +197,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   = 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   = @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
 
     #Construct the polygon
     new_poly = new google.maps.Polygon
@@ -290,9 +290,9 @@ class @Gmaps4Rails
       
       #save object
       @markers[index].serviceObject = @createMarker
-        "marker_picture":   if @markers[index].picture  then @markers[index].picture else this.markers_conf.picture
-        "marker_width":     if @markers[index].width    then @markers[index].width   else this.markers_conf.width
-        "marker_height":    if @markers[index].height   then @markers[index].height  else this.markers_conf.length
+        "marker_picture":   if @markers[index].picture  then @markers[index].picture else @markers_conf.picture
+        "marker_width":     if @markers[index].width    then @markers[index].width   else @markers_conf.width
+        "marker_height":    if @markers[index].height   then @markers[index].height  else @markers_conf.length
         "marker_title":     if @markers[index].title    then @markers[index].title   else null
         "marker_anchor":    if @markers[index].marker_anchor  then @markers[index].marker_anchor  else null
         "shadow_anchor":    if @markers[index].shadow_anchor  then @markers[index].shadow_anchor  else null
@@ -312,7 +312,6 @@ class @Gmaps4Rails
       
     @markers_conf.offset = @markers.length
 
-
   #creates Image Anchor Position or return null if nothing passed	
   createImageAnchorPosition : (anchorLocation) ->
     if (anchorLocation == null)
@@ -331,9 +330,9 @@ class @Gmaps4Rails
     #reset sidebar content if exists
     @resetSidebarContent()
     #add new markers
+    @markers_conf.offset = 0
     @addMarkers(new_markers)
 
-
   #add new markers to on an existing map
   addMarkers : (new_markers) ->
     #update the list of markers to take into account
@@ -356,7 +355,7 @@ class @Gmaps4Rails
       html = if marker_container.sidebar? then marker_container.sidebar else "Marker"
       aSel.innerHTML = html
       currentMap = this
-      aSel.onclick = this.sidebar_element_handler(currentMap, marker_container.serviceObject, 'click')
+      aSel.onclick = @sidebar_element_handler(currentMap, marker_container.serviceObject, 'click')
       li.appendChild(aSel)
       ul.appendChild(li)
 
@@ -464,5 +463,4 @@ class @Gmaps4Rails
     return true
   
   #gives a value between -1 and 1
-  random : -> return(Math.random() * 2 -1)
-
+  random : -> return(Math.random() * 2 -1)

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

@@ -112,7 +112,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
     else if (args.rich_marker != null)
       return new RichMarker({
         position: markerLatLng
-        map:       @this.map
+        map:       @map
         draggable: args.marker_draggable
         content:   args.rich_marker
         flat:      if args.marker_anchor == null then false else args.marker_anchor[1]
@@ -127,7 +127,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
       #create or retrieve existing MarkerImages
       markerImage = @createOrRetrieveImage(args.marker_picture, args.marker_width, args.marker_height, imageAnchorPosition)
       shadowImage = @createOrRetrieveImage(args.shadow_picture, args.shadow_width, args.shadow_height, shadowAnchorPosition)
-      return new google.maps.Marker({position: markerLatLng, map: this.map, icon: markerImage, title: args.marker_title, draggable: args.marker_draggable, shadow: shadowImage})
+      return new google.maps.Marker({position: markerLatLng, map: @map, icon: markerImage, title: args.marker_title, draggable: args.marker_draggable, shadow: shadowImage})
 
   #checks if obj is included in arr Array and returns the position or false
   includeMarkerImage : (arr, obj) ->
@@ -183,7 +183,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
   #////////////////////////////////////////////////////
 
   createClusterer : (markers_array) ->
-    return new MarkerClusterer( @map, markers_array, {  maxZoom: this.markers_conf.clusterer_maxZoom, gridSize: @markers_conf.clusterer_gridSize, styles: @customClusterer() })
+    return new MarkerClusterer( @map, markers_array, {  maxZoom: @markers_conf.clusterer_maxZoom, gridSize: @markers_conf.clusterer_gridSize, styles: @customClusterer() })
 
   clearClusterer : ->
     @markerClusterer.clearMarkers()

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

@@ -107,7 +107,7 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
     @boundsObject = new OpenLayers.Bounds()
   
   clearMarkersLayerIfExists: -> 
-    this.map.removeLayer(this.markersLayer) if @markersLayer != null and @map.getLayer(@markersLayer.id) != null
+    @map.removeLayer(@markersLayer) if @markersLayer != null and @map.getLayer(@markersLayer.id) != null
   
   extendBoundsWithMarkers: ->
     for marker in @markers
@@ -171,9 +171,8 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
   #////////////////////////////////////////////////////
 
   #// creates infowindows
-  createInfoWindow: -> (marker_container) ->
-    if marker_container.description?
-      marker_container.serviceObject.infoWindow = marker_container.description
+  createInfoWindow: (marker_container) ->
+    marker_container.serviceObject.infoWindow = marker_container.description if marker_container.description?
   
   onPopupClose: (evt) ->
     #// 'this' is the popup.

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

@@ -330,6 +330,7 @@
       this.markers = new Array;
       this.boundsObject = this.createLatLngBounds();
       this.resetSidebarContent();
+      this.markers_conf.offset = 0;
       return this.addMarkers(new_markers);
     };
     Gmaps4Rails.prototype.addMarkers = function(new_markers) {

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

@@ -105,7 +105,7 @@
       } else if (args.rich_marker !== null) {
         return new RichMarker({
           position: markerLatLng,
-          map: this["this"].map,
+          map: this.map,
           draggable: args.marker_draggable,
           content: args.rich_marker,
           flat: args.marker_anchor === null ? false : args.marker_anchor[1],

data/public/javascripts/gmaps4rails/gmaps4rails.openlayers.js

@@ -164,12 +164,10 @@
     Gmaps4RailsOpenlayers.prototype.clearClusterer = function() {
       return this.map.removeLayer(this.markerClusterer);
     };
-    Gmaps4RailsOpenlayers.prototype.createInfoWindow = function() {
-      return function(marker_container) {
-        if (marker_container.description != null) {
-          return marker_container.serviceObject.infoWindow = marker_container.description;
-        }
-      };
+    Gmaps4RailsOpenlayers.prototype.createInfoWindow = function(marker_container) {
+      if (marker_container.description != null) {
+        return marker_container.serviceObject.infoWindow = marker_container.description;
+      }
     };
     Gmaps4RailsOpenlayers.prototype.onPopupClose = function(evt) {
       return this.markersControl.unselect(this.feature);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000Z
+date: 2011-09-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &2152327280 !ruby/object:Gem::Requirement
+  requirement: &2156004400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152327280
+  version_requirements: *2156004400
 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,