gmaps4rails 1.4.5 → 1.4.6

data/README.rdoc

@@ -39,13 +39,13 @@ To make Rails serve the assets (javascripts, stylesheets and marker images) you
 - if you are using Rails 3.1 and have asset pipeline enabled ('config.assets.enabled = true' in config/application.rb), include the appropriate manifest:
 
     * //= require gmaps4rails/bing.js
-  
+                              
     * //= require gmaps4rails/googlemaps.js
-  
+                              
     * //= require gmaps4rails/mapquest.js
-  
+                              
     * //= require gmaps4rails/openlayers.js
-  
+                              
     * //= require gmaps4rails/all_apis.js
   
   Stylesheet:

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

@@ -1,6 +1,6 @@
 Gmaps = {}
 
-Gmaps.loadMaps = -> 
+Gmaps.loadMaps = ->
   #loop through all variable names.
   #there should only be maps inside so it trigger their load function
   for key, value of Gmaps
@@ -26,22 +26,22 @@ class @Gmaps4Rails
     @infobox            = -> false  #to let user use custom infoboxes
     @jsTemplate         = false     #to let user create infowindows client side
 
-    @default_map_options = 
+    @default_map_options =
       id: 'map'
       draggable: true
       detect_location: false  # should the browser attempt to use geolocation detection features of HTML5?
       center_on_user: false   # centers map on the location detected through the browser
       center_latitude: 0
-      center_longitude: 0 
+      center_longitude: 0
       zoom: 7
       maxZoom: null
       minZoom: null
       auto_adjust : true      # adjust the map to the markers if set to true
       auto_zoom: true         # zoom given by auto-adjust
-      bounds: []              # adjust map to these limits. Should be [{"lat": , "lng": }]    
+      bounds: []              # adjust map to these limits. Should be [{"lat": , "lng": }]
       raw: {}                  # raw json to pass additional options
 
-    @default_markers_conf = 
+    @default_markers_conf =
       #Marker config
       title: ""
       #MarkerImage config
@@ -65,15 +65,15 @@ class @Gmaps4Rails
     @circles = []            # contains raw data, array of hash
     @markerClusterer = null  # contains all marker clusterers
     @markerImages = []
-  
+
   #tnitializes the map
   initialize : ->
     @map = @createMap()
-    if (@map_options.detect_location == true or @map_options.center_on_user == true) 
-      @findUserLocation(this)       
+    if (@map_options.detect_location == true or @map_options.center_on_user == true)
+      @findUserLocation(this)
     #resets sidebar if needed
     @resetSidebarContent()
-      
+
   findUserLocation : (map_object) ->
     if (navigator.geolocation)
       #try to retrieve user's position
@@ -84,9 +84,9 @@ class @Gmaps4Rails
           map_object.centerMapOnUser()
       positionFailure = ->
         map_object.geolocationFailure(true)
-                 
+
       navigator.geolocation.getCurrentPosition( positionSuccessful, positionFailure)
-    else 
+    else
       #failure but the navigator doesn't handle geolocation
       map_object.geolocationFailure(false)
 
@@ -101,16 +101,16 @@ class @Gmaps4Rails
 
     directionsDisplay.setMap(@map)
     #display panel only if required
-    if @direction_conf.display_panel 
+    if @direction_conf.display_panel
       directionsDisplay.setPanel(document.getElementById(@direction_conf.panel_id))
-      
+
     directionsDisplay.setOptions
       suppressMarkers:     false
       suppressInfoWindows: false
       suppressPolylines:   false
-    
-    request = 
-      origin:             @direction_conf.origin 
+
+    request =
+      origin:             @direction_conf.origin
       destination:        @direction_conf.destination
       waypoints:          @direction_conf.waypoints
       optimizeWaypoints:  @direction_conf.optimizeWaypoints
@@ -195,7 +195,7 @@ class @Gmaps4Rails
   #creates a single polygon, triggered by create_polygons
   create_polygon : (polygon) ->
     polygon_coordinates = []
-    
+
     #Polygon points are in an Array, that's why looping is necessary
     for point in polygon
       latlng = @createLatLng(point.lat, point.lng)
@@ -225,7 +225,7 @@ class @Gmaps4Rails
   #////////////////////////////////////////////////////
   #/////////////////// POLYLINES //////////////////////
   #////////////////////////////////////////////////////
-  
+
   #replace old markers with new markers on an existing map
   replacePolylines : (new_polylines) ->
     #reset previous polylines and kill them from map
@@ -236,7 +236,7 @@ class @Gmaps4Rails
     @create_polylines()
     #.... and adjust map boundaries
     @adjustMapToBounds()
-  
+
   destroy_polylines : ->
     for polyline in @polylines
       #delete polylines from map
@@ -252,17 +252,16 @@ class @Gmaps4Rails
   #creates a single polyline, triggered by create_polylines
   create_polyline : (polyline) ->
     polyline_coordinates = []
-    
+
     #2 cases here, either we have a coded array of LatLng or we have an Array of LatLng
     for element in polyline
       #if we have a coded array
       if element.coded_array?
         decoded_array = new google.maps.geometry.encoding.decodePath(element.coded_array)
         #loop through every point in the array
-        for point in decoded_array.length
+        for point in decoded_array
           polyline_coordinates.push(point)
-          polyline_coordinates.push(point)
-    
+
       #or we have an array of latlng
       else
         #by convention, a single polyline could be customized in the first array or it uses default values
@@ -270,19 +269,22 @@ class @Gmaps4Rails
           strokeColor   = element.strokeColor   || @polylines_conf.strokeColor
           strokeOpacity = element.strokeOpacity || @polylines_conf.strokeOpacity
           strokeWeight  = element.strokeWeight  || @polylines_conf.strokeWeight
-        
+          clickable     = element.clickable     || @polylines_conf.clickable
+          zIndex        = element.zIndex        || @polylines_conf.zIndex
+
         #add latlng if positions provided
-        if element.lat? && element.lng?	
+        if element.lat? && element.lng?
           latlng = @createLatLng(element.lat, element.lng)
           polyline_coordinates.push(latlng)
 
-    # Construct the polyline		
+    # Construct the polyline
     new_poly = new google.maps.Polyline
       path:         polyline_coordinates
       strokeColor:  strokeColor
       strokeOpacity: strokeOpacity
       strokeWeight: strokeWeight
-      clickable:     false
+      clickable:    clickable
+      zIndex:       zIndex
 
     #save polyline
     polyline.serviceObject = new_poly
@@ -292,7 +294,7 @@ class @Gmaps4Rails
   #///////////////////// MARKERS //////////////////////
   #////////////////////////////////////////////////////
 
-  #creates, clusterizes and adjusts map 
+  #creates, clusterizes and adjusts map
   create_markers : ->
     @createServiceMarkersFromMarkers()
     @clusterize()
@@ -310,7 +312,7 @@ class @Gmaps4Rails
         #retrieve coordinates from the æarray
         Lat = LatLng[0]
         Lng = LatLng[1]
-      
+
       #save object
       @markers[index].serviceObject = @createMarker
         "marker_picture":   if @markers[index].picture  then @markers[index].picture else @markers_conf.picture
@@ -332,10 +334,10 @@ class @Gmaps4Rails
       @createInfoWindow(@markers[index])
       #create sidebar if enabled
       @createSidebar(@markers[index])
-      
+
     @markers_conf.offset = @markers.length
 
-  #creates Image Anchor Position or return null if nothing passed	
+  #creates Image Anchor Position or return null if nothing passed
   createImageAnchorPosition : (anchorLocation) ->
     if (anchorLocation == null)
       return null
@@ -409,31 +411,31 @@ class @Gmaps4Rails
     if @map_options.auto_adjust
       #from markers
       @extendBoundsWithMarkers()
-      
+
       #from polylines:
-      for polyline in @polylines        
+      for polyline in @polylines
         polyline_points = polyline.serviceObject.latLngs.getArray()[0].getArray()
         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_points          
+        for point in polygon_points
           @boundsObject.extend point
-          
+
       #from circles
       for circle in @circles
         @boundsObject.extend(circle.serviceObject.getBounds().getNorthEast())
         @boundsObject.extend(circle.serviceObject.getBounds().getSouthWest())
 
-    #in every case, I've to take into account the bounds set up by the user	
+    #in every case, I've to take into account the bounds set up by the user
     for bound in @map_options.bounds
       #create points from bounds provided
       #TODO:only works with google maps
       bound = @createLatLng(bound.lat, bound.lng)
       @boundsObject.extend bound
-    
+
     #SECOND_STEP: ajust the map to the bounds
     if @map_options.auto_adjust or @map_options.bounds.length > 0
 
@@ -443,13 +445,13 @@ class @Gmaps4Rails
         @map_options.center_latitude  = map_center.lat()
         @map_options.center_longitude = map_center.lng()
         @map.setCenter(map_center)
-      else   
+      else
         @fitBounds()
-    
+
   #////////////////////////////////////////////////////
   #/////////////////        KML      //////////////////
   #////////////////////////////////////////////////////
-  
+
   create_kml : ->
     for kml in @kml
       kml.serviceObject = @createKmlLayer kml
@@ -471,7 +473,7 @@ class @Gmaps4Rails
     Lat = parseFloat(Lat0) + (180/Math.PI)*(dy/6378137)
     Lng = parseFloat(Lng0) + ( 90/Math.PI)*(dx/6378137)/Math.cos(Lat0)
     return [Lat, Lng]
-  
+
   mergeObjectWithDefault : (object1, object2) ->
     copy_object1 = {}
     for key, value of object1
@@ -481,12 +483,12 @@ class @Gmaps4Rails
       unless copy_object1[key]?
         copy_object1[key] = value
     return copy_object1
-  
+
   mergeWithDefault : (objectName) ->
     default_object = @["default_" + objectName]
     object = @[objectName]
     @[objectName] = @mergeObjectWithDefault(object, default_object)
     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

@@ -3,7 +3,7 @@
 #######################################################################################################
 
 class @Gmaps4RailsGoogle extends Gmaps4Rails
- 
+
   constructor: ->
     super
     #Map settings
@@ -13,12 +13,12 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
       type:                   "ROADMAP" # HYBRID, ROADMAP, SATELLITE, TERRAIN
 
     #markers + info styling
-    @markers_conf = 
+    @markers_conf =
       clusterer_gridSize:      50
       clusterer_maxZoom:       5
       custom_cluster_pictures: null
-      custom_infowindow_class: null 
-    
+      custom_infowindow_class: null
+
     @mergeWithDefault("map_options")
     @mergeWithDefault("markers_conf")
 
@@ -40,8 +40,10 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
       strokeColor: "#FF0000"
       strokeOpacity: 1
       strokeWeight: 2
+      clickable: false
+      zIndex: null
 
-    #Circle Styling 
+    #Circle Styling
     @circles_conf =           #default style for circles
       fillColor: "#00AAFF"
       fillOpacity: 0.35
@@ -52,17 +54,17 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
       zIndex: null
 
     #Direction Settings
-    @direction_conf = 
+    @direction_conf =
       panel_id:           null
       display_panel:      false
-      origin:             null 
+      origin:             null
       destination:        null
       waypoints:          []       #[{location: "toulouse,fr", stopover: true}, {location: "Clermont-Ferrand, fr", stopover: true}]
       optimizeWaypoints:  false
       unitSystem:         "METRIC" #IMPERIAL
       avoidHighways:      false
       avoidTolls:         false
-      region:             null 
+      region:             null
       travelMode:         "DRIVING" #WALKING, BICYCLING
 
   #////////////////////////////////////////////////////
@@ -79,7 +81,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
     return new google.maps.LatLngBounds()
 
   createMap : ->
-    defaultOptions = 
+    defaultOptions =
       maxZoom:                @map_options.maxZoom
       minZoom:                @map_options.minZoom
       zoom:                   @map_options.zoom
@@ -91,7 +93,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
       draggable:              @map_options.draggable
 
     mergedOptions = @mergeObjectWithDefault @map_options.raw, defaultOptions
-    
+
     return new google.maps.Map document.getElementById(@map_options.id), mergedOptions
 
 
@@ -106,11 +108,11 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
   #////////////////////////////////////////////////////
 
   createMarker : (args) ->
-    markerLatLng = @createLatLng(args.Lat, args.Lng) 
+    markerLatLng = @createLatLng(args.Lat, args.Lng)
     #Marker sizes are expressed as a Size of X,Y
     if args.marker_picture == "" and args.rich_marker == null
       defaultOptions = {position: markerLatLng, map: @map, title: args.marker_title, draggable: args.marker_draggable}
-      mergedOptions  = @mergeObjectWithDefault @markers_conf.raw, defaultOptions  
+      mergedOptions  = @mergeObjectWithDefault @markers_conf.raw, defaultOptions
       return new google.maps.Marker mergedOptions
 
     if (args.rich_marker != null)
@@ -123,7 +125,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
         anchor:    if args.marker_anchor == null then 0     else args.marker_anchor[0]
       })
 
-    #default behavior 
+    #default behavior
     #calculate MarkerImage anchor location
     imageAnchorPosition  = @createImageAnchorPosition args.marker_anchor
     shadowAnchorPosition = @createImageAnchorPosition args.shadow_anchor
@@ -131,7 +133,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
     markerImage = @createOrRetrieveImage(args.marker_picture, args.marker_width, args.marker_height, imageAnchorPosition)
     shadowImage = @createOrRetrieveImage(args.shadow_picture, args.shadow_width, args.shadow_height, shadowAnchorPosition)
     defaultOptions = {position: markerLatLng, map: @map, icon: markerImage, title: args.marker_title, draggable: args.marker_draggable, shadow: shadowImage}
-    mergedOptions  = @mergeObjectWithDefault @markers_conf.raw, defaultOptions      
+    mergedOptions  = @mergeObjectWithDefault @markers_conf.raw, defaultOptions
     return new google.maps.Marker mergedOptions
 
   #checks if obj is included in arr Array and returns the position or false
@@ -145,13 +147,13 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
   createOrRetrieveImage : (currentMarkerPicture, markerWidth, markerHeight, imageAnchorPosition) ->
     return null if (currentMarkerPicture == "" or currentMarkerPicture == null )
 
-    test_image_index = @includeMarkerImage(@markerImages, currentMarkerPicture)   
+    test_image_index = @includeMarkerImage(@markerImages, currentMarkerPicture)
     switch test_image_index
       when false
         markerImage = @createMarkerImage(currentMarkerPicture, @createSize(markerWidth, markerHeight), null, imageAnchorPosition, null )
         @markerImages.push(markerImage)
-        return markerImage    
-        break 
+        return markerImage
+        break
       else
         return @markerImages[test_image_index] if typeof test_image_index == 'number'
         return false
@@ -210,7 +212,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
   #////////////////////////////////////////////////////
 
   #// creates infowindows
-  createInfoWindow : (marker_container) ->    
+  createInfoWindow : (marker_container) ->
     if typeof(@jsTemplate) == "function" or marker_container.description?
       marker_container.description = @jsTemplate(marker_container) if typeof(@jsTemplate) == "function"
       if @markers_conf.custom_infowindow_class != null
@@ -231,7 +233,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
   openInfoWindow : (currentMap, infoWindow, marker) ->
     return ->
       # Close the latest selected marker before opening the current one.
-      currentMap.visibleInfoWindow.close() if currentMap.visibleInfoWindow != null 
+      currentMap.visibleInfoWindow.close() if currentMap.visibleInfoWindow != null
       infoWindow.open(currentMap.map, marker)
       currentMap.visibleInfoWindow = infoWindow
 
@@ -256,4 +258,4 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
 
   centerMapOnUser : ->
     @map.setCenter(@userLocation)
-    
+

data/app/views/gmaps4rails/_gmaps4rails.html.erb

@@ -9,7 +9,7 @@ if enable_css == true && options[:scripts].nil? %>
 
 <% content_for :scripts do %>
 
-<%= gmaps4rails_js_files(options[:map_options], options[:scripts], enable_js) %>
+<%= gmaps4rails_js_files(options[:map_options], options[:scripts], enable_js, options[:markers].try(:[], :options)) %>
 <script type="text/javascript" charset="utf-8">
 <%=raw options.to_gmaps4rails %>
 </script>

data/app/views/gmaps4rails/_scripts.html.erb

@@ -7,12 +7,18 @@
   <% when "bing" %>
     <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0"></script>
   <% else %>
-    <script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.5&sensor=false&amp;libraries=geometry<%= gmaps4rails_js_libraries(map_options.try(:[], :libraries)) %>"></script>
-    <script type="text/javascript" src="//google-maps-utility-library-v3.googlecode.com/svn/tags/infobox/1.1.9/src/infobox_packed.js"></script>
-    <script type="text/javascript" src="//google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.5/src/markerclusterer_packed.js"></script>
-    <script type="text/javascript" src="//google-maps-utility-library-v3.googlecode.com/svn/trunk/richmarker/src/richmarker-compiled.js"></script>  
+    <script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.8&sensor=false&libraries=geometry<%= gmaps4rails_js_libraries(map_options.try(:[], :libraries)) %>&<%= gmaps4rails_map_language(map_options) %>"></script>
+    <% if marker_options.try(:[], :custom_infowindow_class) %>
+      <script type="text/javascript" src="//google-maps-utility-library-v3.googlecode.com/svn/tags/infobox/1.1.9/src/infobox_packed.js"></script>
+    <% end %>
+    <% if marker_options.try(:[], :do_clustering) %>
+      <script type="text/javascript" src="//google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.5/src/markerclusterer_packed.js"></script>
+    <% end %>
+    <% if marker_options.try(:[], :rich_marker) %>
+      <script type="text/javascript" src="//google-maps-utility-library-v3.googlecode.com/svn/trunk/richmarker/src/richmarker-compiled.js"></script>  
+    <% end  %>
   <% end %>
-  
+
   <% if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR < 1 %>
     <% unless scripts.try(:to_sym) == :api %>
       <%= javascript_include_tag 'gmaps4rails/gmaps4rails.base.js' %>
@@ -28,4 +34,4 @@
       <%= javascript_include_tag 'gmaps4rails/gmaps4rails.googlemaps.js' %>
     <% end %>
   <% end %>
-<% end  %>
+<% end  %>

data/lib/gmaps4rails/helper/gmaps4rails_helper.rb

@@ -1,7 +1,7 @@
 module Gmaps4railsHelper
-  
+
   # shortcut helper for basic marker display
-  
+
   def gmaps4rails(builder, enable_css = true, enable_js = true )
     options = {
       :map_options => { :auto_adjust => true},
@@ -9,36 +9,41 @@ module Gmaps4railsHelper
     }
     render :partial => '/gmaps4rails/gmaps4rails', :locals => { :options => options.with_indifferent_access, :enable_css => enable_css, :enable_js => enable_js }
   end
-  
+
   # complete helper to pass all variables alongside their options
-  
+
   def gmaps(options, enable_css = true, enable_js = true )
     render :partial => '/gmaps4rails/gmaps4rails', :locals => { :options => options.with_indifferent_access, :enable_css => enable_css, :enable_js => enable_js }
   end
-  
+
   def gmaps4rails_js_libraries(libraries_array)
     return "" if libraries_array.nil?
     "," + libraries_array.join(",")
   end
-  
+
+  def gmaps4rails_map_language(map_options)
+    "language=#{map_options.try(:[], :language) || ''}&hl=#{map_options.try(:[], :hl) || ''}&region=#{map_options.try(:[], :region) || ''}".html_safe
+  end
+
   def gmaps4rails_map_id(map_options)
     map_options.try(:[], :id) || Gmaps4rails::DEFAULT_MAP_ID
   end
-  
+
   def gmaps4rails_container_class(map_options)
     map_options.try(:[], :container_class) || "map_container"
   end
-  
+
   def gmaps4rails_map_class(map_options)
     default_class = map_options.try(:[], :provider) == "bing" ? "bing_map" : "gmaps4rails_map"
     map_options.try(:[], :class) || default_class
   end
-  
-  def gmaps4rails_js_files(map_options = nil, scripts = nil, enable_js = true)
-    render "/gmaps4rails/scripts", :map_options => map_options, :scripts => scripts, :enable_js => enable_js
+
+
+  def gmaps4rails_js_files(map_options = nil, scripts = nil, enable_js = true, marker_options = nil)
+    render "/gmaps4rails/scripts", :map_options => map_options, :scripts => scripts, :enable_js => enable_js, :marker_options => marker_options
   end
-  
+
   def gmaps4rails_html(map_options = nil)
     render "/gmaps4rails/html", :map_options => map_options
   end
-end
+end

data/lib/gmaps4rails/json_handler.rb

@@ -15,23 +15,27 @@ module Gmaps4rails
   
   def Gmaps4rails.infowindow(string)
     @json_hash[:description] = string
+    true
   end
   
   def Gmaps4rails.title(string)
     @json_hash[:title] = string
+    true
   end
   
   def Gmaps4rails.sidebar(string)
     @json_hash[:sidebar] = string
+    true
   end
   
   def Gmaps4rails.json(json)
     return @json_hash.merge! json if json.is_a? Hash
-    json
+    true
   end
   
   def Gmaps4rails.picture(hash)
     @json_hash.merge! hash
+    true
   end
   
   private
@@ -106,8 +110,7 @@ module Gmaps4rails
   #
   def Gmaps4rails.handle_block(&block)
     block_result = yield(@object, ::Gmaps4rails)
-    return Gmaps4rails.json(block_result) unless block_result.is_a? String
-    @custom_json = block_result
+    @custom_json = block_result unless block_result == true
   end
   
 end

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

@@ -268,16 +268,14 @@
       return _results;
     };
     Gmaps4Rails.prototype.create_polyline = function(polyline) {
-      var decoded_array, element, latlng, new_poly, point, polyline_coordinates, strokeColor, strokeOpacity, strokeWeight, _i, _j, _len, _len2, _ref;
+      var clickable, decoded_array, element, latlng, new_poly, point, polyline_coordinates, strokeColor, strokeOpacity, strokeWeight, zIndex, _i, _j, _len, _len2;
       polyline_coordinates = [];
       for (_i = 0, _len = polyline.length; _i < _len; _i++) {
         element = polyline[_i];
         if (element.coded_array != null) {
           decoded_array = new google.maps.geometry.encoding.decodePath(element.coded_array);
-          _ref = decoded_array.length;
-          for (_j = 0, _len2 = _ref.length; _j < _len2; _j++) {
-            point = _ref[_j];
-            polyline_coordinates.push(point);
+          for (_j = 0, _len2 = decoded_array.length; _j < _len2; _j++) {
+            point = decoded_array[_j];
             polyline_coordinates.push(point);
           }
         } else {
@@ -285,6 +283,8 @@
             strokeColor = element.strokeColor || this.polylines_conf.strokeColor;
             strokeOpacity = element.strokeOpacity || this.polylines_conf.strokeOpacity;
             strokeWeight = element.strokeWeight || this.polylines_conf.strokeWeight;
+            clickable = element.clickable || this.polylines_conf.clickable;
+            zIndex = element.zIndex || this.polylines_conf.zIndex;
           }
           if ((element.lat != null) && (element.lng != null)) {
             latlng = this.createLatLng(element.lat, element.lng);
@@ -297,7 +297,8 @@
         strokeColor: strokeColor,
         strokeOpacity: strokeOpacity,
         strokeWeight: strokeWeight,
-        clickable: false
+        clickable: clickable,
+        zIndex: zIndex
       });
       polyline.serviceObject = new_poly;
       return new_poly.setMap(this.map);

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

@@ -39,7 +39,9 @@
       this.polylines_conf = {
         strokeColor: "#FF0000",
         strokeOpacity: 1,
-        strokeWeight: 2
+        strokeWeight: 2,
+        clickable: false,
+        zIndex: null
       };
       this.circles_conf = {
         fillColor: "#00AAFF",

metadata

@@ -1,49 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gmaps4rails
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 1.4.6
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 5
-  version: 1.4.5
 platform: ruby
-authors: 
+authors:
 - Benjamin Roth
 - David Ruyer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153339940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-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, polygons, circles etc... See wiki on github for full description and examples."
-email: 
+  prerelease: false
+  version_requirements: *2153339940
+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,
+  polygons, circles etc... See wiki on github for full description and examples.'
+email:
 - apnea.diving.deep@gmail.com
 - david.ruyer@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - app/assets/javascripts/gmaps4rails/all_apis.js
 - app/assets/javascripts/gmaps4rails/bing.js
 - app/assets/javascripts/gmaps4rails/gmaps4rails.base.js.coffee
@@ -80,36 +72,27 @@ files:
 - README.rdoc
 homepage: http://github.com/apneadiving/Google-Maps-for-Rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: 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.
+summary: 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.
 test_files: []
-