gmaps4rails 0.11.1 → 1.0.0

data/README.rdoc

@@ -41,6 +41,8 @@ To make Rails serve the assets (javascripts, stylesheets and marker images) you
   
   * //= require gmaps4rails/openlayers.js
   
+  * //= require gmaps4rails/all_apis.js
+  
   You even don't need the `yield :head` if you include `require gmaps4rails` in your CSS manifest.
   
 - if you are using Rails 3.0:
@@ -97,12 +99,14 @@ Done!
 
 * Refresh your map on the fly with Javascript (and Ajax)
 
+* KML support
+
+* Easy multimap
+
 * {More details in the Wiki}[https://github.com/apneadiving/Google-Maps-for-Rails/wiki]
 
 == Todo?
 
-* Integrate Markers with Label: http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerwithlabel/1.1.2/
-
 Feel free ton contact us, you have your say.
 
 == Copyright

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

@@ -1,28 +1,30 @@
 <% #thanks to enable_css, user can avoid this css to be loaded
-if enable_css == true %>
+if enable_css == true && options[:scripts].nil? %>
 	<% content_for :head do %>
 	<%= stylesheet_link_tag 'gmaps4rails' %>
 	<% end %>
 <% end %>
 <% content_for :scripts do %>
-<% if enable_js == true %>
-  <% case options['map_options'].try(:[], 'provider') %>
+<% if enable_js == true &&  options[:scripts].try(:to_sym) != :none %>
+  <% case options[:map_options].try(:[], :provider) %>
   <% when "openlayers" %>
     <script src="http://www.openlayers.org/api/OpenLayers.js"></script>
   <% when "mapquest" %>
-    <script src="http://mapquestapi.com/sdk/js/v6.0.0/mqa.toolkit.js?key=#{options['map_options'].try(:[], 'provider_key')}"></script>
+    <script src="http://mapquestapi.com/sdk/js/v6.0.0/mqa.toolkit.js?key=<%= options[:map_options].try(:[], :provider_key) %>"></script>
   <% 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="http://maps.google.com/maps/api/js?sensor=false&amp;libraries=geometry<%= g_libraries(options['map_options'].try(:[], 'libraries')) %>"></script>
+    <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&amp;libraries=geometry<%= g_libraries(options[:map_options].try(:[], :libraries)) %>"></script>
     <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/infobox/1.1.5/src/infobox.js"></script>
     <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_compiled.js"></script>
     <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/trunk/richmarker/src/richmarker-compiled.js"></script>  
   <% end %>
   
-  <% if Rails::VERSION::MINOR < 1 %>
-    <%= javascript_include_tag 'gmaps4rails/gmaps4rails.base.js' %>
-    <% case options['map_options'].try(:[], 'provider') %>
+  <% if Rails::VERSION::MAJOR >= 3 and Rails::VERSION::MINOR < 1 %>
+    <% unless options[:scripts].try(:to_sym) == :api %>
+      <%= javascript_include_tag 'gmaps4rails/gmaps4rails.base.js' %>
+    <% end %>
+    <% case options[:map_options].try(:[], :provider) %>
     <% when "openlayers" %>
       <%= javascript_include_tag 'gmaps4rails/gmaps4rails.openlayers.js' %>
     <% when "mapquest" %>
@@ -35,28 +37,24 @@ if enable_css == true %>
   <% end %>
 <% end  %>
 <script type="text/javascript" charset="utf-8">
-function gmaps4rails_init() {
-  <% #true is passed here to trigger map initialization %>
-  <%=raw options.to_gmaps4rails(true) %>
-};
 
-window.onload = gmaps4rails_init;
+<%=raw options.to_gmaps4rails %>
 
 </script>
 <% end %>
 
 
-<% case options['map_options'].try(:[], 'provider')  %>
+<% case options[:map_options].try(:[], :provider)  %>
 <% when "mapquest" %>
-<div id="mapQuest" style="width:750px; height:475px;">
+<div id="<%= gmaps_map_id(options) %>" style="width:750px; height:475px;">
   <!-- TODO: change this style dynamically -->  
 </div>
 <% when "bing" %>
-<div id="<%= options['map_options'].try(:[],'container_id') || "map_container" %>" > 
-  <div id="<%= options['map_options'].try(:[],'id') || "gmaps4rails_map" %>" class="bing_map"></div>
+<div id="<%= gmaps_container_id(options) %>" > 
+  <div id="<%= gmaps_map_id(options) %>" class="bing_map"></div>
 </div>
 <% else %>
-<div id="<%= options['map_options'].try(:[],'container_id') || "map_container" %>"> 
-  <div id="<%= options['map_options'].try(:[],'id') || "gmaps4rails_map" %>"></div>
+<div class="<%= gmaps_container_id(options) %>"> 
+  <div id="<%= gmaps_map_id(options) %>" class="<%= gmaps_map_class(options) %>"></div>
 </div>
-<% end %>
+<% end %>

data/lib/gmaps4rails/base.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'crack'
 
 module Gmaps4rails
+  DEFAULT_MAP_ID     = "map"
   
   class GeocodeStatus < StandardError; end
   class GeocodeNetStatus < StandardError; end
@@ -41,6 +42,14 @@ module Gmaps4rails
   def Gmaps4rails.sidebar(object)
     return "\"sidebar\": \"#{object.gmaps4rails_sidebar}\"," if object.respond_to?("gmaps4rails_sidebar")
   end
+  
+  def Gmaps4rails.get_map_id(hash)
+    hash.nil? || hash.try(:[], "id").nil? ? DEFAULT_MAP_ID : hash["id"]
+  end
+  
+  def Gmaps4rails.get_constructor(hash)
+    hash.nil? || hash.try(:[], "provider").nil? ? "Gmaps4RailsGoogle()" : "Gmaps4Rails#{hash["provider"].capitalize}()"
+  end
 
   # Returns picture options if gmaps4rails_marker_picture is defined in the model
   def Gmaps4rails.picture(object)
@@ -170,5 +179,91 @@ module Gmaps4rails
       Response was: #{response}"           
     end #end resp test
   end
+  
+  def Gmaps4rails.js_function_name(hash)
+    "load_" + Gmaps4rails.get_map_id(hash[:map_options])
+  end
+  
+  def Gmaps4rails.create_js_from_hash(hash, edit_map_with_id = false)
+    #the variable 'options' must have the following structure
+    #{  
+    #   :map_options => hash,
+    #   :markers     => { :data => json, :options => hash },
+    #   :polylines   => { :data => json, :options => hash },
+    #   :polygons    => { :data => json, :options => hash },
+    #   :circles     => { :data => json, :options => hash },
+    #   :direction   => { :data => hash, :options => hash },
+    #   :kml         => { :data => json, :options => hash }
+    #}
+    # "map_options", "scripts" and "direction" must be treated separately because there content is slightly different from the others:
+    # - "map_options" and "scripts" don't contain interesting data for the view
+    # - "direction" has a hash as a data and waypoints options must be processed properly
+    #
+    #TODO: clean up this method
+    result = Array.new
+    map_id = edit_map_with_id || Gmaps4rails.get_map_id(hash[:map_options])
+    map_id = "Gmaps." + map_id
+
+    #means we are creating a new map
+    if edit_map_with_id == false 
+
+      js_object_constructor = Gmaps4rails.get_constructor(hash[:map_options])
+      result << "#{map_id} = new #{js_object_constructor}" + ";"
+      result << "function #{Gmaps4rails.js_function_name(hash)}() {"
+      #extract map_options
+      unless hash[:map_options].nil?
+        hash[:map_options].each do |option_k, option_v|
+          if option_k.to_sym == :bounds #particular case
+            result << "#{map_id}.map_options.#{option_k} = #{option_v};"
+          else
+            result << "#{map_id}.map_options.#{option_k} = #{Gmaps4rails.filter option_v};"
+          end
+        end
+      end
+
+      result << "#{map_id}.initialize();"
+    end
+
+    hash.each do |category, content| #loop through options hash
+      if [:map_options, :last_map, :scripts].include? category.to_sym
+        #nothing to do
+      elsif category.to_sym == :direction
+        result <<  "#{map_id}.direction_conf.origin = '#{content["data"]["from"]}';"
+        result << "#{map_id}.direction_conf.destination = '#{content["data"]["to"]}';"
+
+        content[:options] ||= Array.new 
+    	  content[:options].each do |option_k, option_v| 
+          if option_k == "waypoints"
+            waypoints = Array.new
+            option_v.each do |waypoint|
+              waypoints << { "location" => waypoint, "stopover" => true }.to_json
+            end
+            result << "#{map_id}.direction_conf.waypoints = [#{waypoints * (",")}];"
+          else #option_k != "waypoint"
+            result << "#{map_id}.direction_conf.#{option_k} = #{Gmaps4rails.filter option_v};"	
+          end
+        end #end .each
+        result << "#{map_id}.create_direction();"
+      else #default behaviour
+        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};"		
+        end
+        result << "#{map_id}.create_#{category}();"
+      end 
+    end
+    result << "#{map_id}.callback();"
+    
+    if edit_map_with_id == false 
+      result << "};\nGmaps.mapsToLoad.push('#{Gmaps4rails.js_function_name(hash)}');"
+      if hash[:last_map].nil? || hash[:last_map] == true
+        result << "window.onload = Gmaps.loadMaps;"
+      end
+    end
+    
+    result * ('
+')
+  end
 
 end

data/lib/gmaps4rails/extensions/hash.rb

@@ -2,72 +2,8 @@ class Hash
   
   # this method extracts all info from the hash to create javascript
   # this javascript is then rendered raw to the view so it can be interpreted and executed
-  
-  def to_gmaps4rails(init = false)
-    #the variable 'options' must have the following structure
-    #{  
-    #   "map_options" => hash,
-    #   "markers"     => { "data" => json, "options" => hash },
-    #   "polylines"   => { "data" => json, "options" => hash },
-    #   "polygons"    => { "data" => json, "options" => hash },
-    #   "circles"     => { "data" => json, "options" => hash },
-    #   "direction"   => { "data" => hash, "options" => hash }
-    #}
-    # "map_options" and "direction" must be treated separately because there content is slightly different from the others:
-    # - "map_options" has no data
-    # - "direction" has a hash as a data and waypoints options must be processed properly
-    # 
-    # in the following code, I loop through the elements of the hash
-    #
-    result = Array.new
-    
-    #Don't display js concerning map if no need to be initialized
-    if init == true
-      #because map should be initialized first, we must extract possible map_options
-      unless self["map_options"].nil?
-        self["map_options"].each do |option_k, option_v|
-          if option_k == "bounds" #particular case
-            result << "Gmaps4Rails.map_options.#{option_k} = #{option_v};"
-          else
-            result << "Gmaps4Rails.map_options.#{option_k} = #{Gmaps4rails.filter option_v};"
-          end
-        end
-      end
-
-      result << "Gmaps4Rails.initialize();"
-    end #if init
-    each do |category, content| #loop through options hash
-      case category
-      when "map_options"
-        #already taken into account above => nothing to do here
-      when "direction"
-        result <<  "Gmaps4Rails.direction_conf.origin = '#{content["data"]["from"]}';"
-        result << "Gmaps4Rails.direction_conf.destination = '#{content["data"]["to"]}';"
-
-        content["options"] ||= Array.new 
-    	  content["options"].each do |option_k, option_v| 
-          if option_k == "waypoints"
-            waypoints = Array.new
-            option_v.each do |waypoint|
-              waypoints << { "location" => waypoint, "stopover" => true }.to_json
-            end
-            result << "Gmaps4Rails.direction_conf.waypoints = [#{waypoints * (",")}];"
-          else #option_k != "waypoint"
-            result << "Gmaps4Rails.direction_conf.#{option_k} = #{Gmaps4rails.filter option_v};"	
-          end
-        end #end .each
-        result << "Gmaps4Rails.create_direction();"
-      else #default behaviour in case condition
-        result << "Gmaps4Rails.#{category} = #{content["data"]};"
-        content["options"] ||= Array.new 
-        content["options"].each do |option_k, option_v|
-          result << "Gmaps4Rails.#{category}_conf.#{option_k} = #{Gmaps4rails.filter option_v};"		
-        end
-        result << "Gmaps4Rails.create_#{category}();"
-      end 
-    end
-    result << "Gmaps4Rails.callback();"
-    result * ('
-')
+  def to_gmaps4rails(edit_map_with_id = false)
+    Gmaps4rails.create_js_from_hash(self.with_indifferent_access, edit_map_with_id)
   end
+  
 end

data/lib/gmaps4rails/helper/gmaps4rails_helper.rb

@@ -5,7 +5,7 @@ module Gmaps4railsHelper
   def gmaps4rails(builder, enable_css = true, enable_js = true )
     options = {
       "map_options" => { "auto_adjust" => true},
-      "markers"     => { "data" => builder }
+      "markers"     => { "data" => builder, "options" => { "do_clustering" => true} }
     }
     render :partial => 'gmaps4rails/gmaps4rails', :locals => { :options => options, :enable_css => enable_css, :enable_js => enable_js }
   end
@@ -20,5 +20,16 @@ module Gmaps4railsHelper
     return "" if libraries_array.nil?
     "," + libraries_array.join(",")
   end
-
+  
+  def gmaps_map_id(options)
+    options[:map_options].try(:[], :id) || Gmaps4rails::DEFAULT_MAP_ID
+  end
+  
+  def gmaps_container_id(options)
+    options[:map_options].try(:[], :container_id) || "map_container"
+  end
+  
+  def gmaps_map_class(options)
+    options[:map_options].try(:[], :class) || "gmaps4rails_map"
+  end
 end

data/public/javascripts/gmaps4rails/all_apis.js

@@ -0,0 +1,5 @@
+//= require ./gmaps4rails.base.js
+//= require ./gmaps4rails.googlemaps.js
+//= require ./gmaps4rails.mapquest.js
+//= require ./gmaps4rails.openlayers.js
+//= require ./gmaps4rails.bing.js