gmaps4rails 1.4.2 → 1.4.3

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

@@ -6,55 +6,14 @@ if enable_css == true && options[:scripts].nil? %>
     <% end %>
 	<% end %>
 <% end %>
+
 <% content_for :scripts do %>
-<% 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>
-  <% 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<%= g_libraries(options[: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>  
-  <% end %>
-  
-  <% if Rails::VERSION::MAJOR >= 3 && 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" %>
-      <%= javascript_include_tag 'gmaps4rails/gmaps4rails.mapquest.js' %>
-    <% when "bing" %>
-      <%= javascript_include_tag 'gmaps4rails/gmaps4rails.bing.js' %>
-    <% else %>
-      <%= javascript_include_tag 'gmaps4rails/gmaps4rails.googlemaps.js' %>
-    <% end %>
-  <% end %>
-<% end  %>
-<script type="text/javascript" charset="utf-8">
 
+<%= gmaps4rails_js_files(options[:map_options], options[:scripts], enable_js) %>
+<script type="text/javascript" charset="utf-8">
 <%=raw options.to_gmaps4rails %>
-
 </script>
-<% end %>
 
+<% end %>
 
-<% case options[:map_options].try(:[], :provider)  %>
-<% when "mapquest" %>
-<div id="<%= gmaps_map_id(options) %>" style="width:750px; height:475px;">
-  <!-- TODO: change this style dynamically -->  
-</div>
-<% when "bing" %>
-  <div id="<%= gmaps_map_id(options) %>" class="<%= gmaps_map_class(options) %>"></div>
-<% else %>
-<div class="<%= gmaps_container_class(options) %>"> 
-  <div id="<%= gmaps_map_id(options) %>" class="<%= gmaps_map_class(options) %>"></div>
-</div>
-<% end %>
+<%= gmaps4rails_html(options[:map_options]) %>

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

@@ -0,0 +1,12 @@
+<% case map_options.try(:[], :provider)  %>
+<% when "mapquest" %>
+<div id="<%= gmaps4rails_map_id(map_options) %>" style="width:750px; height:475px;">
+  <!-- TODO: change this style dynamically -->  
+</div>
+<% when "bing" %>
+  <div id="<%= gmaps4rails_map_id(map_options) %>" class="<%= gmaps4rails_map_class(map_options) %>"></div>
+<% else %>
+<div class="<%= gmaps4rails_container_class(map_options) %>"> 
+  <div id="<%= gmaps4rails_map_id(map_options) %>" class="<%= gmaps4rails_map_class(map_options) %>"></div>
+</div>
+<% end %>

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

@@ -0,0 +1,31 @@
+<% if enable_js == true && scripts.try(:to_sym) != :none %>
+  <% case 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=<%= 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="//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>  
+  <% end %>
+  
+  <% if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR < 1 %>
+    <% unless scripts.try(:to_sym) == :api %>
+      <%= javascript_include_tag 'gmaps4rails/gmaps4rails.base.js' %>
+    <% end %>
+    <% case map_options.try(:[], :provider) %>
+    <% when "openlayers" %>
+      <%= javascript_include_tag 'gmaps4rails/gmaps4rails.openlayers.js' %>
+    <% when "mapquest" %>
+      <%= javascript_include_tag 'gmaps4rails/gmaps4rails.mapquest.js' %>
+    <% when "bing" %>
+      <%= javascript_include_tag 'gmaps4rails/gmaps4rails.bing.js' %>
+    <% else %>
+      <%= javascript_include_tag 'gmaps4rails/gmaps4rails.googlemaps.js' %>
+    <% end %>
+  <% end %>
+<% end  %>

data/lib/gmaps4rails.rb

@@ -17,6 +17,10 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3
          end
        end
        
+    end
+    
+    class Railtie < Rails::Railtie
+    
        initializer "include acts_as_gmappable within ORM" do
          ActiveSupport.on_load(:active_record) do
            ActiveRecord::Base.send(:include, Gmaps4rails::ActsAsGmappable)
@@ -26,7 +30,7 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3
            Mongoid::Document.send(:include, Gmaps4rails::ActsAsGmappable)
          end
        end
-       
+    
     end
   end
 end

data/lib/gmaps4rails/acts_as_gmappable.rb

@@ -38,7 +38,8 @@ module Gmaps4rails
 
       def to_gmaps4rails(&block)
         json = "["
-        json << Gmaps4rails.create_json(self, &block) #removes the extra comma
+        object_json = Gmaps4rails.create_json(self, &block)
+        json << object_json.to_s unless json.nil?
         json << "]"
       end
 

data/lib/gmaps4rails/helper/gmaps4rails_helper.rb

@@ -7,30 +7,38 @@ module Gmaps4railsHelper
       :map_options => { :auto_adjust => true},
       :markers     => { :data => builder, :options => {:do_clustering => true} }
     }
-    render :partial => 'gmaps4rails/gmaps4rails', :locals => { :options => options, :enable_css => enable_css, :enable_js => enable_js }
+    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, :enable_css => enable_css, :enable_js => enable_js }
+    render :partial => 'gmaps4rails/gmaps4rails', :locals => { :options => options.with_indifferent_access, :enable_css => enable_css, :enable_js => enable_js }
   end
   
-  def g_libraries(libraries_array)
+  def gmaps4rails_js_libraries(libraries_array)
     return "" if libraries_array.nil?
     "," + libraries_array.join(",")
   end
   
-  def gmaps_map_id(options)
-    options[:map_options].try(:[], :id) || Gmaps4rails::DEFAULT_MAP_ID
+  def gmaps4rails_map_id(map_options)
+    map_options.try(:[], :id) || Gmaps4rails::DEFAULT_MAP_ID
   end
   
-  def gmaps_container_class(options)
-    options[:map_options].try(:[], :container_class) || "map_container"
+  def gmaps4rails_container_class(map_options)
+    map_options.try(:[], :container_class) || "map_container"
   end
   
-  def gmaps_map_class(options)
-    default_class = options[:map_options].try(:[], :provider) == "bing" ? "bing_map" : "gmaps4rails_map"
-    options[:map_options].try(:[], :class) || default_class
+  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
+  end
+  
+  def gmaps4rails_html(map_options = nil)
+    render "gmaps4rails/html", :map_options => map_options
   end
 end

data/lib/gmaps4rails/js_handler.rb

@@ -31,7 +31,6 @@ module Gmaps4rails
   end
 
   def Gmaps4rails.create_general_js(hash, map_id, category)
-    hash = hash.with_indifferent_access
     output = Array.new
     output << "#{map_id}.#{category} = #{hash[:data]};"
     hash[:options] ||= Array.new
@@ -47,7 +46,6 @@ module Gmaps4rails
   end
 
   def Gmaps4rails.create_direction_js(hash, map_id)
-    hash = hash.with_indifferent_access
     output = Array.new
     output << "#{map_id}.direction_conf.origin = '#{hash["data"]["from"]}';"
     output << "#{map_id}.direction_conf.destination = '#{hash["data"]["to"]}';"
@@ -77,6 +75,7 @@ module Gmaps4rails
   #   :direction   => { :data => hash, :options => hash },
   #   :kml         => { :data => json, :options => hash }
   #}
+  #should be with only symbol keys or with indifferent access
   def Gmaps4rails.create_js_from_hash(hash)
     result = Array.new
     map_id = "Gmaps." + Gmaps4rails.get_map_id(hash[:map_options])

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

@@ -237,10 +237,25 @@
         strokeWeight: strokeWeight,
         fillColor: fillColor,
         fillOpacity: fillOpacity,
-        clickable: false
+        clickable: false,
+        map: this.map
       });
-      polygon.serviceObject = new_poly;
-      return new_poly.setMap(this.map);
+      return polygon.serviceObject = new_poly;
+    };
+    Gmaps4Rails.prototype.replacePolylines = function(new_polylines) {
+      this.destroy_polylines();
+      this.polylines = new_polylines;
+      this.create_polylines();
+      return this.adjustMapToBounds();
+    };
+    Gmaps4Rails.prototype.destroy_polylines = function() {
+      var polyline, _i, _len, _ref;
+      _ref = this.polylines;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        polyline = _ref[_i];
+        polyline.serviceObject.setMap(null);
+      }
+      return this.polylines = [];
     };
     Gmaps4Rails.prototype.create_polylines = function() {
       var polyline, _i, _len, _ref, _results;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -55,6 +55,8 @@ files:
 - app/assets/javascripts/gmaps4rails/mapquest.js
 - app/assets/javascripts/gmaps4rails/openlayers.js
 - app/views/gmaps4rails/_gmaps4rails.html.erb
+- app/views/gmaps4rails/_html.html.erb
+- app/views/gmaps4rails/_scripts.html.erb
 - lib/generators/gmaps4rails/install_generator.rb
 - lib/generators/templates/README
 - lib/gmaps4rails.rb