gmaps4rails 1.1.1 → 1.1.2

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

@@ -36,6 +36,7 @@ class @Gmaps4Rails
       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": }]    
+      raw: {}                  # raw json to pass additional options
 
     @default_markers_conf = 
       #Marker config
@@ -51,7 +52,8 @@ class @Gmaps4Rails
       max_random_distance: 100 # in meters. Each marker coordinate could be altered by this distance in a random direction
       list_container: null     # id of the ul that will host links to all markers
       offset: 0                # used when adding_markers to an existing map. Because new markers are concated with previous one, offset is here to prevent the existing from being re-created.
-  
+      raw: {}                  # raw json to pass additional options
+
     #Stored variables
     @markers = []            # contains all markers. A marker contains the following: {"description": , "longitude": , "title":, "latitude":, "picture": "", "width": "", "length": "", "sidebar": "", "serviceObject": google_marker}
     @boundsObject = null     # contains current bounds from markers, polylines etc...
@@ -68,7 +70,7 @@ class @Gmaps4Rails
       @findUserLocation(this)       
     #resets sidebar if needed
     @resetSidebarContent()
-
+      
   findUserLocation : (map_object) ->
     if (navigator.geolocation)
       #try to retrieve user's position
@@ -450,7 +452,10 @@ class @Gmaps4Rails
     return [Lat, Lng]
   
   mergeObjectWithDefault : (object1, object2) ->
-    copy_object1 = object1
+    copy_object1 = {}
+    for key, value of object1
+      copy_object1[key] = value
+
     for key, value of object2
       unless copy_object1[key]?
         copy_object1[key] = value

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

@@ -79,7 +79,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
     return new google.maps.LatLngBounds()
 
   createMap : ->
-    return new google.maps.Map document.getElementById(@map_options.id), {
+    defaultOptions = 
       maxZoom:                @map_options.maxZoom
       minZoom:                @map_options.minZoom
       zoom:                   @map_options.zoom
@@ -89,7 +89,10 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
       disableDefaultUI:       @map_options.disableDefaultUI
       disableDoubleClickZoom: @map_options.disableDoubleClickZoom
       draggable:              @map_options.draggable
-    }
+
+    mergedOptions = @mergeObjectWithDefault @map_options.raw, defaultOptions
+    
+    return new google.maps.Map document.getElementById(@map_options.id), mergedOptions
 
 
   createMarkerImage : (markerPicture, markerSize, origin, anchor, scaledSize) ->
@@ -104,12 +107,13 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
 
   createMarker : (args) ->
     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
-      return new google.maps.Marker({position: markerLatLng, map: @map, title: args.marker_title, draggable: args.marker_draggable})
+    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  
+      return new google.maps.Marker mergedOptions
 
-    else if (args.rich_marker != null)
+    if (args.rich_marker != null)
       return new RichMarker({
         position: markerLatLng
         map:       @map
@@ -119,15 +123,16 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
         anchor:    if args.marker_anchor == null then 0     else args.marker_anchor[0]
       })
 
-    else 
-      #calculate MarkerImage anchor location
-      imageAnchorPosition  = @createImageAnchorPosition args.marker_anchor
-      shadowAnchorPosition = @createImageAnchorPosition args.shadow_anchor
-
-      #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: @map, icon: markerImage, title: args.marker_title, draggable: args.marker_draggable, shadow: shadowImage})
+    #default behavior 
+    #calculate MarkerImage anchor location
+    imageAnchorPosition  = @createImageAnchorPosition args.marker_anchor
+    shadowAnchorPosition = @createImageAnchorPosition args.shadow_anchor
+    #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)
+    defaultOptions = {position: markerLatLng, map: @map, icon: markerImage, title: args.marker_title, draggable: args.marker_draggable, shadow: shadowImage}
+    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
   includeMarkerImage : (arr, obj) ->

data/lib/gmaps4rails/base.rb

@@ -212,16 +212,17 @@ module Gmaps4rails
       unless hash[:map_options].nil?
         hash[:map_options].each do |option_k, option_v|
           case option_k.to_sym 
-          when :bounds #particular case
+          when :bounds #particular case, render the content unescaped
             result << "#{map_id}.map_options.#{option_k} = #{option_v};"
-          when :class
-          when :container_class
+          when :raw #particular case, render the content unescaped
+            result << "#{map_id}.map_options.#{option_k} = #{option_v};"
+          when :class           #do nothing
+          when :container_class #do nothing
           else
             result << "#{map_id}.map_options.#{option_k} = #{Gmaps4rails.filter option_v};"
           end
         end
       end
-
       result << "#{map_id}.initialize();"
     end
 
@@ -234,7 +235,7 @@ module Gmaps4rails
 
         content[:options] ||= Array.new 
     	  content[:options].each do |option_k, option_v| 
-          if option_k == "waypoints"
+          if option_k.to_sym == :waypoints
             waypoints = Array.new
             option_v.each do |waypoint|
               waypoints << { "location" => waypoint, "stopover" => true }.to_json
@@ -249,7 +250,11 @@ module Gmaps4rails
         result << "#{map_id}.#{category} = #{content[:data]};"
         content[:options] ||= Array.new 
         content[:options].each do |option_k, option_v|
-          result << "#{map_id}.#{category}_conf.#{option_k} = #{Gmaps4rails.filter option_v};"		
+          if option_k.to_sym == :raw
+            result << "#{map_id}.#{category}_conf.#{option_k} = #{option_v};"
+          else
+            result << "#{map_id}.#{category}_conf.#{option_k} = #{Gmaps4rails.filter option_v};"
+          end	
         end
         result << "#{map_id}.create_#{category}();"
       end 
@@ -261,7 +266,6 @@ module Gmaps4rails
       result << "};"
       if hash[:last_map].nil? || hash[:last_map] == true
         result << "window.onload = function() { Gmaps.loadMaps(); };"
-        #result << "window.onload = load_map;"
       end
     end
     

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

@@ -40,7 +40,8 @@
         minZoom: null,
         auto_adjust: true,
         auto_zoom: true,
-        bounds: []
+        bounds: [],
+        raw: {}
       };
       this.default_markers_conf = {
         title: "",
@@ -52,7 +53,8 @@
         randomize: false,
         max_random_distance: 100,
         list_container: null,
-        offset: 0
+        offset: 0,
+        raw: {}
       };
       this.markers = [];
       this.boundsObject = null;
@@ -438,7 +440,11 @@
     };
     Gmaps4Rails.prototype.mergeObjectWithDefault = function(object1, object2) {
       var copy_object1, key, value;
-      copy_object1 = object1;
+      copy_object1 = {};
+      for (key in object1) {
+        value = object1[key];
+        copy_object1[key] = value;
+      }
       for (key in object2) {
         value = object2[key];
         if (copy_object1[key] == null) {

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

@@ -74,7 +74,8 @@
       return new google.maps.LatLngBounds();
     };
     Gmaps4RailsGoogle.prototype.createMap = function() {
-      return new google.maps.Map(document.getElementById(this.map_options.id), {
+      var defaultOptions, mergedOptions;
+      defaultOptions = {
         maxZoom: this.map_options.maxZoom,
         minZoom: this.map_options.minZoom,
         zoom: this.map_options.zoom,
@@ -84,7 +85,9 @@
         disableDefaultUI: this.map_options.disableDefaultUI,
         disableDoubleClickZoom: this.map_options.disableDoubleClickZoom,
         draggable: this.map_options.draggable
-      });
+      };
+      mergedOptions = this.mergeObjectWithDefault(this.map_options.raw, defaultOptions);
+      return new google.maps.Map(document.getElementById(this.map_options.id), mergedOptions);
     };
     Gmaps4RailsGoogle.prototype.createMarkerImage = function(markerPicture, markerSize, origin, anchor, scaledSize) {
       return new google.maps.MarkerImage(markerPicture, markerSize, origin, anchor, scaledSize);
@@ -93,16 +96,19 @@
       return new google.maps.Size(width, height);
     };
     Gmaps4RailsGoogle.prototype.createMarker = function(args) {
-      var imageAnchorPosition, markerImage, markerLatLng, shadowAnchorPosition, shadowImage;
+      var defaultOptions, imageAnchorPosition, markerImage, markerLatLng, mergedOptions, shadowAnchorPosition, shadowImage;
       markerLatLng = this.createLatLng(args.Lat, args.Lng);
-      if (args.marker_picture && args.rich_marker === null) {
-        return new google.maps.Marker({
+      if (args.marker_picture === "" && args.rich_marker === null) {
+        defaultOptions = {
           position: markerLatLng,
           map: this.map,
           title: args.marker_title,
           draggable: args.marker_draggable
-        });
-      } else if (args.rich_marker !== null) {
+        };
+        mergedOptions = this.mergeObjectWithDefault(this.markers_conf.raw, defaultOptions);
+        return new google.maps.Marker(mergedOptions);
+      }
+      if (args.rich_marker !== null) {
         return new RichMarker({
           position: markerLatLng,
           map: this.map,
@@ -111,20 +117,21 @@
           flat: args.marker_anchor === null ? false : args.marker_anchor[1],
           anchor: args.marker_anchor === null ? 0 : args.marker_anchor[0]
         });
-      } else {
-        imageAnchorPosition = this.createImageAnchorPosition(args.marker_anchor);
-        shadowAnchorPosition = this.createImageAnchorPosition(args.shadow_anchor);
-        markerImage = this.createOrRetrieveImage(args.marker_picture, args.marker_width, args.marker_height, imageAnchorPosition);
-        shadowImage = this.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
-        });
       }
+      imageAnchorPosition = this.createImageAnchorPosition(args.marker_anchor);
+      shadowAnchorPosition = this.createImageAnchorPosition(args.shadow_anchor);
+      markerImage = this.createOrRetrieveImage(args.marker_picture, args.marker_width, args.marker_height, imageAnchorPosition);
+      shadowImage = this.createOrRetrieveImage(args.shadow_picture, args.shadow_width, args.shadow_height, shadowAnchorPosition);
+      defaultOptions = {
+        position: markerLatLng,
+        map: this.map,
+        icon: markerImage,
+        title: args.marker_title,
+        draggable: args.marker_draggable,
+        shadow: shadowImage
+      };
+      mergedOptions = this.mergeObjectWithDefault(this.markers_conf.raw, defaultOptions);
+      return new google.maps.Marker(mergedOptions);
     };
     Gmaps4RailsGoogle.prototype.includeMarkerImage = function(arr, obj) {
       var index, object, _len;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &2156004400 !ruby/object:Gem::Requirement
+  requirement: &2152391800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156004400
+  version_requirements: *2152391800
 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,