gmaps4rails 0.1.0 → 0.2.0

data/README.rdoc

@@ -1,7 +1,7 @@
 == Gmaps4rails
 
-Gmaps4rails is developped to simply create a map with model instances (say Users).
-It's based on Rails 3 Engines.
+Gmaps4rails is developped to simply create a Google Map (Gmaps) with model instances (say Users).
+It's based on Ruby on Rails 3 Engines.
 It works properly but I still have something to correct: making it work without resorting to the serve_static_assets to true in production.
 
 == Installation
@@ -10,87 +10,96 @@ It works properly but I still have something to correct: making it work without
 
 == Requirements
 - jQuery (used for ajax json)
-- <%= yield :head %> in your header
+- <%= yield :head %> (in your header)
+- <%= yield :scripts %> (in your footer)
 - config.serve_static_assets = true  (in your production.rb)
 
 == Quickstart
-In your model	
-	acts_as_gmappable
-	
-  def gmaps4rails_address
-    self.address #describe how to retrieve the address from your model
-  end
+Say you have a User model.
+In your model, add:
 
-  def gmaps4rails_picture
-    self.picture #describe how to retrieve the picture from your model
-  end
+	acts_as_gmappable
 
-  def gmaps4rails_description
-    self.name #could be html it's rendered when user clicks on the markers on the map
-  end
+	def gmaps4rails_address
+	  self.address #describe how to retrieve the address from your model
+	end
 
 Create a migration and add the following fields to your table:
-  t.string   "gmaps4rails_latitude"
-  t.string   "gmaps4rails_longitude"
-  t.boolean  "gmaps"
 
-In your view
-	<%= render :partial => 'gmaps4rails/gmaps4rails', :locals => { :model => "User"}	 %>
+	add_column :users, :latitude, :float
+	add_column :users, :longitude, :float
+	add_column :users, :gmaps, :boolean
+
+In your view:
 
+	<%= gmaps4rails_map("User") %>
 
 == Options
 
-=== Setting Map Center
-	<%= render :partial => 'gmaps4rails/gmaps4rails', :locals => { :model => "User", :ref_latitude => 0 , :ref_longitude => 0 }	 %>
+=== Add an info window
+To add an info window (visible when you click a marker), add this method in your model:
+
+	def gmaps4rails_infowindow
+	  # add here whatever html content you desire, it will be displayed when users clicks on the marker
+	end
+
+=== List of Options
+You can customize the following:
+
+	processing: 'rails_model', //or 'json'
+	marker_picture : 'http://www.mbs.edu/i/gmap_marker_default.gif,
+	model_scope : null,         
+	marker_width : 22,          
+	marker_length : 32,         
+	map_center_latitude : 0,    
+	map_center_longitude : 0,   
+	map_zoom : 1,               
+	do_clustering: true,        
+	clusterer_gridSize: 50,     
+	clusterer_maxZoom: 10       
+
+=== How to set your own options
+Change the call in your view this way and add an additional hash containing the options you want:
+	<%= gmaps4rails_map("User", {"map_center_longitude" => "90", "do_clustering" => false}) %>
 
 === Scopes (displays a dropdown list enabling you to filter the map content)
-In your model:
-  # Whatever scope you want
-	scope :low_height, lambda {|height| 
-  	where("users.height <= ?", height)
-  }
-	scope :high_height, lambda {|height| 
-  	where("users.height >= ?", height)
-	}
-	
-	# method to fill in the dropdown list: provide scope argument, variable to pass to it, and text you want to display
-  def self.gmaps4rails_filters
-    [
-     {"filter" => "All", "options" => "", "display" => "All"}, 
-     {"filter" => "low", "options" => "130", "display" => "People Under 130cm"}, 
-     {"filter" => "low", "options" => "100", "display" => "People Under 100cm"}, 
-     {"filter" => "high", "options" =>"190", "display" => "People Above 190cm"},
-     {"filter" => "high", "options" =>"200", "display" => "People Above 200cm"}
-    ]
-  end
-  
-	# method to filter your requests given the parameters you provided above
-  def self.gmaps4rails_filter(filter, options)
-    case filter
-      when 'low' then self.low_height(options)
-      when 'high' then self.high_height(options)
-      else self.all
-    end
-  end
+Note that you can pass a model_scope in the options to filter the data you want to be displayed.
+So as above, change the call in your view:
 
-In your view:
-	<%=raw gmaps4rails_filters_display("User") %>
+	<%= gmaps4rails_map("User", {"model_scope" => "my_scope"}) %>
 
-=== Styling your Marker
-In your model, add the following:
+In this case, you must add in your model:
 
-	def self.gmaps4rails_markers_pic
-	  { "picture" => "http://www.ci.burlington.vt.us/planning/images/google_maps_marker.png",
-	  "width" => 22,
-	  "length" => 32 }
+	def self.gmaps4rails_trusted_scopes
+	  ["my_scope", "another_trusted_scope"]
 	end
 
-== Todo
-Still much more customization to provide, some ideas:
-- direct integration of scopes to decide what you want to display precisely
-- distance filter
+Why? because you shall never trust the params, so it's a way to keep control.
+
+=== Create from your own json
+If you want to use your own json to initialize the map, create your json with the following attributes
+
+	@json = '[
+	         {"description": "", "longitude": "", "latitude": "", "picture": "", "width": "", "height": ""},
+	         {"longitude": "", "latitude": "" }
+	        ]'
+
+Only `latitude` and `longitude` are mandatory. But you can customize any single marker.
+
+Then in your view:
+
+	<%= gmaps4rails_map(@json, { "processing" => 'json' }) %>
+
+Or with options as well:
+  
+	<%= gmaps4rails_map("json", @json, {"processing" => 'json', "map_center_longitude" => "90"}) %>
+	
+
+== Todo?
+
+Maybe use Geokit to handle the geocoding stuff.
 
 Feel free ton contact me, you have your say. I hope I'll have time enough to improve it.
-== Copyright
 
-Copyright (c) 2010 apneadiving. See LICENSE for details.
+== Copyright
+Copyright (c) 2011 apneadiving. See LICENSE for details.

data/app/controllers/gmaps4rails/gmaps_controller.rb

@@ -3,15 +3,16 @@ module Gmaps4rails
     unloadable    
     
     def index
-      if request.xhr?
-        @model = params["model"]
-        @filter = params["filter"]
-        @options = params["options"]
-        if @model.constantize.is_gmappable? == true
-          @objects = @model.constantize.gmaps4rails_filter(@filter, @options)
-        end
-      end
-   end
-        
+      @model = params["model"]
+      @scope = params["scope"]
+      @model = @model.constantize
+      
+      if @scope && !@scope.empty? && @model.gmaps4rails_trusted_scopes.include?(@scope)
+        @objects = eval("#{@model}.#{@scope}") # Cannot use send with lambda scope 
+                                                # because the arguments have to be separated
+      else
+        @objects = @model.all
+      end 
+    end        
   end
 end

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

@@ -1,7 +1,11 @@
 <% content_for :head do %>
 <%= stylesheet_link_tag 'gmaps4rails' %>
-<script src="http://www.google.com/jsapi"></script> 
+<% end %>
+
+<% content_for :scripts do %>
+<script src="http://www.google.com/jsapi"></script>
 <script type="text/javascript" src='http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer.js'></script>
+<%=javascript_include_tag 'gmaps4rails' %>
 <script type="text/javascript" charset="utf-8">
 var styles = [{
   url: 'http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/images/people35.png',
@@ -11,25 +15,14 @@ var styles = [{
   opt_textColor: '#ff00ff',
   opt_textSize: 10
 }];
-var gmaps4rails_ref_lat = <%= defined?(ref_latitude) ? ref_latitude : 'null' %>;
-var gmaps4rails_ref_long = <%= defined?(ref_longitude) ? ref_longitude : 'null' %>;
-var gmaps4rails_marker_picture = '<%= model.constantize.gmaps4rails_markers_pic["picture"] %>';
-var gmaps4rails_marker_width = <%= model.constantize.gmaps4rails_markers_pic["width"] %>;
-var gmaps4rails_marker_length = <%= model.constantize.gmaps4rails_markers_pic["length"] %>;
-var gmaps4rails_model = '<%= model %>';
-var gmaps4rails_map_center_lat = <%= model.constantize.gmaps4rails_map_options["latitude"] %>;
-var gmaps4rails_map_center_long = <%= model.constantize.gmaps4rails_map_options["longitude"] %>;
-var gmaps4rails_map_zoom = <%= model.constantize.gmaps4rails_map_options["zoom"] %>;
-var gmaps4rails_base_url = '<%= url_for gmaps_path %>';
+<% options.each do |key, value| %>
+Gmaps4Rails.<%= key %> = <%=raw value.is_a?(String) ?  "'#{value}'" : value  %>;
+<% end %>	
+var builder = <%=raw options[""] == "json" ? builder : "'#{builder}'" %>;
+Gmaps4Rails.initialize(builder);
 </script>
-<%=javascript_include_tag 'gmaps4rails' %>
 <% end %>
-    <div id="map-container"> 
-      <div id="gmaps4rails_map"></div> 
-    </div> 
-<% if defined?(ref_longitude) && defined?(ref_latitude)%>
-    <div id="inline-actions">
-			<input id="gmaps4rails_user_distance" >
-			<input type="submit" value="Filter" class="item" onclick="filter_distance()">
-    </div> 
-<% end %>
+
+<div id="map-container"> 
+  <div id="gmaps4rails_map"></div> 
+</div>

data/app/views/gmaps4rails/gmaps/index.js.erb

@@ -1,27 +1,19 @@
- { "count": <%= @objects.size.to_s %>, 
-   "markers": [
-	<% if @objects.first.respond_to?('gmaps4rails_info') 
-				@objects.each do |object|
-				desc = object.gmaps4rails_info.nil? ? "No description provided" : CGI::escapeHTML(object.gmaps4rails_info)
-				lat = object.gmaps4rails_latitude.nil? ? "" : object.gmaps4rails_latitude
-				long = object.gmaps4rails_longitude.nil? ? "" : object.gmaps4rails_longitude
-	%>
-{"description": "<%=raw desc %>", "longitude": <%= long %>, "latitude": <%= lat %>, "marker_object": "null"}
-	<% end
-
-	else
-		@objects.each do |object|
-			stat = object.status.nil? ? "" : CGI::escapeHTML(object.status)
-			desc = object.picture.nil? ? "No description provided" :  "<img width='40' heigth='40' src='" + object.gmaps4rails_picture + "'>" + stat
-			
-			lat = object.gmaps4rails_latitude.nil? ? "" : object.gmaps4rails_latitude
-			long = object.gmaps4rails_longitude.nil? ? "" : object.gmaps4rails_longitude
-	
-			if (!(lat == "" || long == "")) %>
-{"description": "<%=raw desc %>", "longitude": <%= long %>, "latitude": <%= lat %>, "marker_object": "null"} <%= ',' unless object == @objects.last %>
-	<% 
-			end
-		end
-	end          
+[ 
+<% 
+	@objects.each do |object|
+		# lat = object.gmaps4rails_latitude.nil? ? "" : object.gmaps4rails_latitude
+		# long = object.gmaps4rails_longitude.nil? ? "" : object.gmaps4rails_longitude
+		if (!(object.gmaps4rails_latitude == "" || object.gmaps4rails_longitude == ""))
 %>
-]}
+		 {"description": "<%=raw object.gmaps4rails_infowindow %>",
+		  "longitude": "<%= object.gmaps4rails_longitude %>",
+		  "latitude": "<%= object.gmaps4rails_latitude %>",
+		  "picture": "<%= object.gmaps4rails_marker_picture["picture"] %>",
+		  "width": "<%= object.gmaps4rails_marker_picture["width"] %>",
+		  "height": "<%= object.gmaps4rails_marker_picture["height"] %>"
+		  } <%= ',' unless object == @objects.last %>
+<% 
+		end 
+	end
+%>
+]

data/config/routes.rb

@@ -1,13 +1,5 @@
-#Rails.application.routes.draw do |map|
 Rails.application.routes.draw do 
 
-  #mount_at = Gmaps4rails::Engine.config.mount_at
-
-  #match mount_at => 'gmaps4rails/gmaps#index'
- 
   resources :gmaps, :only => [ :index ], :controller => "gmaps4rails/gmaps"
-                          #,
-   #                      :path_prefix => mount_at
-                         #:name_prefix => "gmaps4rails_"
 
 end

data/lib/acts_as_gmappable/base.rb

@@ -15,57 +15,60 @@ module Gmaps4rails
       module Config
         def acts_as_gmappable options = {}
           before_save :get_coordinates
-
-          def self.is_gmappable?
-            true
-          end
-          
-          def self.gmaps4rails_markers_pic
-            { "picture" =>'http://inmotionchiro.com/gmap_plugin/imgs/markers/marker.png',
-              "width" => 22,
-              "length" => 32 }
-          end
-          
-          def gmaps4rails_map_options
-            { "zoom" =>1, "latitude" => 0, "longitude" => 0}
-          end
-          
           include Gmaps4rails::ActsAsGmappable::Base::InstanceMethods
         end
       end
       
       module InstanceMethods
-
+        
+        def gmaps4rails_infowindow
+    			self.gmaps4rails_picture.blank? ? "" :  "<img width='40' heigth='40' src='" + self.gmaps4rails_picture + "'>"
+        end
+        
+        def gmaps4rails_picture
+          ""
+        end
+        
+        def gmaps4rails_marker_picture
+          {
+            "picture" => "",
+            "width" => "",
+            "height" => ""
+          }
+        end
+        
+        def self.gmaps4rails_trusted_scopes
+          []
+        end
+ 
         def get_coordinates
-           if self.gmaps4rails_address.nil? || self.gmaps4rails_address.empty?
-             self.gmaps = false
-           else
-             geocoder = "http://maps.googleapis.com/maps/api/geocode/json?address="
-             output = "&sensor=false"
-             #send request to the google api to get the lat/lng
-             request = geocoder + self.gmaps4rails_address + output
-             url = URI.escape(request)
-             resp = Net::HTTP.get_response(URI.parse(url))
-             #parse result if result received properly
-             if resp.inspect.include?('HTTPOK 200 OK')
-               #parse the json
-               parse = Crack::JSON.parse(resp.body)
-               #check if google went well
-               if parse["status"] == "OK"
-                 #TODO maybe handle case when there are many results
-                 #TODO store the country name and maybe other details?
-                 latitude = parse["results"].first["geometry"]["location"]["lat"]
-                 longitude = parse["results"].first["geometry"]["location"]["lng"]
-                 self.gmaps4rails_latitude = latitude
-                 self.gmaps4rails_longitude = longitude
-                 #saves a boolean to remind the status
-                 self.gmaps = true
-               end
-             else
-               self.gmaps = false
+         if self.gmaps4rails_address.nil? || self.gmaps4rails_address.empty?
+           self.gmaps = false
+         else
+           geocoder = "http://maps.googleapis.com/maps/api/geocode/json?address="
+           output = "&sensor=false"
+           #send request to the google api to get the lat/lng
+           request = geocoder + self.gmaps4rails_address + output
+           url = URI.escape(request)
+           resp = Net::HTTP.get_response(URI.parse(url))
+           #parse result if result received properly
+           if resp.inspect.include?('HTTPOK 200 OK')
+             #parse the json
+             parse = Crack::JSON.parse(resp.body)
+             #check if google went well
+             if parse["status"] == "OK"
+               #TODO maybe handle case when there are many results
+               #TODO store the country name and maybe other details?
+               self.gmaps4rails_latitude = parse["results"].first["geometry"]["location"]["lat"]
+               self.gmaps4rails_longitude = parse["results"].first["geometry"]["location"]["lng"]
+               #saves a boolean to remind the status
+               self.gmaps = true
              end
+           else
+             self.gmaps = false
            end
-           return true
+         end
+         return true
         end
       end # InstanceMethods      
     end

data/lib/application_helper.rb

@@ -1,15 +1,7 @@
 module ApplicationHelper
-
-  def gmaps4rails_filters_display(model)
-    if model.constantize.respond_to?("gmaps4rails_filters") 
-      display = '<form name="gmaps4rails_form">'
-      display += '<select name="gmaps4rails_list" onChange="gmaps4rails_resfreshmap()">'
-      model.constantize.gmaps4rails_filters.each do |filter_hash|
-        display += '<option value="' + filter_hash["filter"] + '+' + filter_hash["options"] +'">' + filter_hash["display"]
-      end
-      display += '</select></form>'
-    end
-    return display
+  
+  def gmaps4rails_map(builder, options = {})
+    render :partial => 'gmaps4rails/gmaps4rails', :locals => { :builder => builder, :options => options }
   end
   
 end

data/lib/gmaps4rails.rb

@@ -1,29 +1,14 @@
 if defined?(Rails) && Rails::VERSION::MAJOR == 3
   module Gmaps4rails
-  #  require 'rails/all'
     require "rails"
     require "action_controller"
-  #  require 'action_controller'
     require 'application_helper'
     require 'acts_as_gmappable/base'
   
     class Engine < Rails::Engine
-       # config.autoload_paths += %W(#{config.root}/lib)
-       # 
-       # initializer "static assets" do |app|
-       #   app.middleware.use ::ActionDispatch::Static, "#{root}/public%s"
-       # end
-       # 
-       # def self.activate
-       #   Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*.rb")) do |c|
-       #     Rails.env.production? ? require(c) : load(c)
-       #   end
-       # end
-       # 
-       # config.to_prepare &method(:activate).to_proc
-       # initializer 'gmaps.helper' do |app|
-       #     ActionView::Base.send :include, Gmaps4rails::GmapsHelper
-       # end
+       initializer "static assets" do |app|
+         app.middleware.use ::ActionDispatch::Static, "#{root}/public"
+       end
      end
   end
 end

data/public/javascripts/gmaps4rails.js

@@ -1,139 +1,122 @@
 google.load('maps', '3', { other_params: 'sensor=false' });
 
-google.setOnLoadCallback(initialize);
-var gmaps4rails_map = null;
-var gmaps4rails_data = null;
-var markerClusterer = null;
-var gmaps4rails_infowindow = null;
-var gmaps_circle = null ;
-
-//put markers on the map + launch the clusterer
-function setMarkers(locations) {
-	
-	//variable used for Marker Clusterer
-	var markers = [];
+var Gmaps4Rails = {
+	processing: 'rails_model',
+	map: null,
+  marker_picture : 'http://inmotionchiro.com/gmap_plugin/imgs/markers/marker.png',
+	marker_width : 22,
+	marker_length : 32,
+	map_center_latitude : 0,
+	map_center_longitude : 0, 
+	map_zoom : 1,
+	base_url : '/gmaps',
+	rails_model : null,
+	model_scope : null,
+ 	ref_latitude : null,
+  ref_longitude : null,
+  info_window : null,
+  locations : null,
+  markerClusterer: null,
+  do_clustering: true,
+  clusterer_gridSize: 50,
+	clusterer_maxZoom: 10,
+	//Triggers the creation of the map.
+	//Two options:
+	// 1- processing == "rails_model"  && builder = model_name
+	// 2- processing == "json"    && builder = json in format: [{"description": , "longitude": , "latitude":, "picture": "", "width": "", "length": ""}]
+	initialize: function(builder) {
+		this.reset_map();
+		//infowindow closes when user clicks on the map
+		google.maps.event.addListener(this.map, 'click', function() 
+			{ if (this.info_window != null) {this.info_window.close();} 
+		});
+		if (this.processing == "rails_model")
+		{ 
+			this.rails_model = builder;
+			this.create_from_model();
+		}
+		else if (this.processing == "json")
+		{
+			this.locations = builder;
+			this.setup_Markers();
+		}
+	},
 	
-	if (markerClusterer) {
-		markerClusterer.clearMarkers();
-	}
-  // Add markers to the map
-  for (var i = 0; i < locations.markers.length; ++i) {
- 		 // Marker sizes are expressed as a Size of X,Y
-		  var image = new google.maps.MarkerImage(gmaps4rails_marker_picture,
-		      new google.maps.Size(gmaps4rails_marker_width, gmaps4rails_marker_length));
-		  var myLatLng = new google.maps.LatLng(locations.markers[i].latitude, locations.markers[i].longitude); 
-		  var ThisMarker = new google.maps.Marker({position: myLatLng, map: gmaps4rails_map, icon: image}); //TODO Offer title customization title: "title"
-			//save object for later use, basically, to get back the text to display when clicking it
-			locations.markers[i].marker_object = ThisMarker; 
-			//save the marker again in a list for the clusterer
-			markers.push(ThisMarker);
-			
-			//add click listener
-  	  google.maps.event.addListener(locations.markers[i].marker_object, 'click', function() { if (gmaps4rails_infowindow!=null) {gmaps4rails_infowindow.close();}; getInfoWindow(this);});
+	//resets the map, removes all markers
+	reset_map: function(){
+			this.map = new google.maps.Map(document.getElementById('gmaps4rails_map'), {
+					zoom: this.map_zoom,
+					center: new google.maps.LatLng(this.map_center_latitude, this.map_center_longitude),
+					mapTypeId: google.maps.MapTypeId.ROADMAP
+			});
+	},
 	
-  }
-
-	markerClusterer = new MarkerClusterer(gmaps4rails_map, markers, {
-		maxZoom: 10,
-		gridSize: 50,
-		//styles: styles TODO: offer clusterer customization
-	});	
-}
+	//creates the necessary query to get the model + scope, and sends json to setup_Markers
+	create_from_model: function (filter_value) {		
+	  	request = this.base_url + '?model=' + this.rails_model;
 
-//get infowindow content when listener calls it
-function getInfoWindow(which)
-{	
-  for ( var m = 0; m < gmaps4rails_data.markers.length; ++m )
-  {
-    var markerInfo = gmaps4rails_data.markers[m].marker_object;
-    if ( markerInfo == which ) 
-    {
-        gmaps4rails_infowindow = new google.maps.InfoWindow({content: gmaps4rails_data.markers[m].description });
-        gmaps4rails_infowindow.open( gmaps4rails_map, which );
-        return;
-    }
-  }
-}
+		  if(this.model_scope != null)
+		  	{ request += '&scope=' + this.model_scope; }
 
-//initializes the map
-function create_map(filter_value) {
-	request = gmaps4rails_base_url + '?model=' + gmaps4rails_model;
+  			jQuery.getJSON(request,function(data){
+													Gmaps4Rails.locations = data;
+												  Gmaps4Rails.setup_Markers();			
+													}
+			);
+	},
 	
-	if (!(filter_value == null))
-		{
-		split_filter_value = filter_value.split('+');
-		if (!(split_filter_value[0] == null))
-			{
-				request += '&filter=' + split_filter_value[0];
-			}
-		if (!(split_filter_value[1] == null))
-			{
-			request += '&options=' + split_filter_value[1];
-			}
-		}
-	jQuery.getJSON(request,
-		        function(data){
-								gmaps4rails_data = data;
-							  setMarkers(gmaps4rails_data);			
-	});
-}
-
-function initialize() {
-	gmaps4rails_reset();
-	//infowindow closes when user clicks on the map
-	google.maps.event.addListener(gmaps4rails_map, 'click', function() 
-		{ if (gmaps4rails_infowindow != null) {gmaps4rails_infowindow.close();} 
-	});
-	create_map();
-}
-
-function gmaps4rails_resfreshmap() {
-	 gmaps4rails_reset();
-   var index = document.gmaps4rails_form.gmaps4rails_list.selectedIndex;
-   var filter_value = document.gmaps4rails_form.gmaps4rails_list.options[index].value;
-	 create_map(filter_value);
-}
-
-function gmaps4rails_reset(){
-		gmaps4rails_map = new google.maps.Map(document.getElementById('gmaps4rails_map'), {
-				zoom: gmaps4rails_map_zoom,
-				center: new google.maps.LatLng(gmaps4rails_map_center_lat, gmaps4rails_map_center_long),
-				mapTypeId: google.maps.MapTypeId.ROADMAP
-		});
-}
-
-// max_distance in km
-function filter_distance() {
-	var max_distance = parseInt(document.getElementById('gmaps4rails_user_distance').value, 10);
-	if (!(max_distance>0 || max_distance<0))
-	{ 
-	 alert('Please set the max distance');
-	}
-	else{
-		if (gmaps_circle!=null) { gmaps_circle.setMap(null);}
-		var myCenter = new google.maps.LatLng(gmaps4rails_ref_lat, gmaps4rails_ref_long);
-		var filtered_markers = {"markers":[]};
-
+  //Creates Marker from the locations passed + markerClusterer
+  setup_Markers: function () {		
+		//variable used for Marker Clusterer
+		var markers = [];
 	
-		for (var i = 0; i < gmaps4rails_data.markers.length; ++i) {
-			if (get_distance(gmaps4rails_ref_long, gmaps4rails_data.markers[i].longitude, gmaps4rails_ref_lat, gmaps4rails_data.markers[i].latitude) < max_distance)
-				{ filtered_markers.markers.push(gmaps4rails_data.markers[i]);}
-			setMarkers(filtered_markers);
+		//resests Clusterer if needed
+		if (this.markerClusterer) {
+			this.markerClusterer.clearMarkers();
 		}
-		//radius is in meters
-		gmaps_circle = new google.maps.Circle({radius: max_distance*1000, center: myCenter, fillColor:"#00FF00", strokeColor: "#00EE00"}); 
-		gmaps_circle.setMap(gmaps4rails_map);
+	  // Add markers to the map
+	  for (var i = 0; i < this.locations.length; ++i) {
+		   
+		   //test if value passed or use default 
+		   var marker_picture = this.locations[i].picture != "" && typeof this.locations[i].picture !== "undefined" ? this.locations[i].picture : this.marker_picture;
+		   var marker_width = this.locations[i].width != "" && typeof this.locations[i].width !== "undefined" ? this.locations[i].width : this.marker_width;
+		   var marker_height = this.locations[i].height != "" && typeof this.locations[i].height !== "undefined" ? this.locations[i].height : this.marker_length;
+	 		 // Marker sizes are expressed as a Size of X,Y
+			  var image = new google.maps.MarkerImage(marker_picture,
+			      																		new google.maps.Size(marker_width, marker_height)
+																								);
+			  var myLatLng = new google.maps.LatLng(this.locations[i].latitude, this.locations[i].longitude); 
+			  var ThisMarker = new google.maps.Marker({position: myLatLng, map: this.map, icon: image}); //TODO Offer title customization title: "title"
+				//save object for later use, basically, to get back the text to display when clicking it
+				this.locations[i].marker_object = ThisMarker; 
+				//save the marker again in a list for the clusterer
+				markers.push(ThisMarker);		
+				//add click listener
+	  	  google.maps.event.addListener(Gmaps4Rails.locations[i].marker_object, 'click', function() { if (Gmaps4Rails.info_window!=null) {Gmaps4Rails.info_window.close();}; Gmaps4Rails.getInfoWindow(this);});		
+  	}
+		if (this.do_clustering == true)
+			{
+				this.markerClusterer = new MarkerClusterer(this.map, markers, {
+				maxZoom: this.clusterer_maxZoom,
+				gridSize: this.clusterer_gridSize,
+				//styles: styles TODO: offer clusterer customization
+		  	});
+		  }
+	},
+	
+	//get info_window content when listener calls it
+	getInfoWindow: function(which)
+	{	
+	  for ( var m = 0; m < this.locations.length; ++m )
+	  {
+	    var markerInfo = this.locations[m].marker_object;
+	    if ( markerInfo == which && this.locations[m].description != "") 
+	    {
+	        this.info_window = new google.maps.InfoWindow({content: this.locations[m].description });
+	        this.info_window.open( this.map, which );
+	        return;
+	    }
+	  }
 	}
-}
-
-function get_distance(long1, long2, lat1, lat2) {
-	var theta = long1 - long2; 
-	var dist = Math.sin(deg2rad(lat1)) * Math.sin(deg2rad(lat2)) +  Math.cos(deg2rad(lat1)) * Math.cos(deg2rad(lat2)) * Math.cos(deg2rad(theta)); 
-  dist = Math.acos(dist); 
-  dist = rad2deg(dist); 
-  var km = dist * 60 * 1.853;
-	return km;
-}
-
-function deg2rad(value) { return value*Math.PI/180;}
-function rad2deg(value) { return value*180/Math.PI;}
+	
+};

data/public/javascripts/old.js

@@ -0,0 +1,144 @@
+google.load('maps', '3', { other_params: 'sensor=false' });
+
+google.setOnLoadCallback(initialize);
+var gmaps4rails_map = null;
+var gmaps4rails_data = null;
+var markerClusterer = null;
+var gmaps4rails_infowindow = null;
+var gmaps_circle = null ;
+
+//put markers on the map + launch the clusterer
+function setMarkers(locations) {
+	
+	//variable used for Marker Clusterer
+	var markers = [];
+	
+	if (markerClusterer) {
+		markerClusterer.clearMarkers();
+	}
+  // Add markers to the map
+  for (var i = 0; i < locations.markers.length; ++i) {
+ 		 // Marker sizes are expressed as a Size of X,Y
+		  var image = new google.maps.MarkerImage(gmaps4rails_marker_picture,
+		      																		new google.maps.Size(gmaps4rails_marker_width, gmaps4rails_marker_length)
+																							);
+		  var myLatLng = new google.maps.LatLng(locations.markers[i].latitude, locations.markers[i].longitude); 
+		  var ThisMarker = new google.maps.Marker({position: myLatLng, map: gmaps4rails_map, icon: image}); //TODO Offer title customization title: "title"
+			//save object for later use, basically, to get back the text to display when clicking it
+			locations.markers[i].marker_object = ThisMarker; 
+			//save the marker again in a list for the clusterer
+			markers.push(ThisMarker);
+			
+			//add click listener
+  	  google.maps.event.addListener(locations.markers[i].marker_object, 'click', function() { if (gmaps4rails_infowindow!=null) {gmaps4rails_infowindow.close();}; getInfoWindow(this);});
+	
+  }
+
+	markerClusterer = new MarkerClusterer(gmaps4rails_map, markers, {
+		maxZoom: 10,
+		gridSize: 50,
+		//styles: styles TODO: offer clusterer customization
+	});	
+}
+
+//get infowindow content when listener calls it
+function getInfoWindow(which)
+{	
+  for ( var m = 0; m < gmaps4rails_data.markers.length; ++m )
+  {
+    var markerInfo = gmaps4rails_data.markers[m].marker_object;
+    if ( markerInfo == which ) 
+    {
+        gmaps4rails_infowindow = new google.maps.InfoWindow({content: gmaps4rails_data.markers[m].description });
+        gmaps4rails_infowindow.open( gmaps4rails_map, which );
+        return;
+    }
+  }
+}
+
+//initializes the map
+function create_map(filter_value) {
+	request = gmaps4rails_base_url + '?model=' + gmaps4rails_model;
+
+  // if(gmaps4rails_scope != null)
+  // 	  request += '&scope=' + gmaps4rails_scope;
+	
+	if (!(filter_value == null))
+		{
+		split_filter_value = filter_value.split('+');
+		if (!(split_filter_value[0] == null))
+			{
+				request += '&filter=' + split_filter_value[0];
+			}
+		if (!(split_filter_value[1] == null))
+			{
+			request += '&options=' + split_filter_value[1];
+			}
+		}
+	jQuery.getJSON(request,
+		        function(data){
+								gmaps4rails_data = data;
+							  setMarkers(gmaps4rails_data);			
+	});
+}
+
+function initialize() {
+	gmaps4rails_reset();
+	//infowindow closes when user clicks on the map
+	google.maps.event.addListener(gmaps4rails_map, 'click', function() 
+		{ if (gmaps4rails_infowindow != null) {gmaps4rails_infowindow.close();} 
+	});
+	create_map();
+}
+
+function gmaps4rails_resfreshmap() {
+	 gmaps4rails_reset();
+   var index = document.gmaps4rails_form.gmaps4rails_list.selectedIndex;
+   var filter_value = document.gmaps4rails_form.gmaps4rails_list.options[index].value;
+	 create_map(filter_value);
+}
+
+function gmaps4rails_reset(){
+		gmaps4rails_map = new google.maps.Map(document.getElementById('gmaps4rails_map'), {
+				zoom: gmaps4rails_map_zoom,
+				center: new google.maps.LatLng(gmaps4rails_map_center_lat, gmaps4rails_map_center_long),
+				mapTypeId: google.maps.MapTypeId.ROADMAP
+		});
+}
+
+// max_distance in km
+function filter_distance() {
+	var max_distance = parseInt(document.getElementById('gmaps4rails_user_distance').value, 10);
+	if (!(max_distance>0 || max_distance<0))
+	{ 
+	 alert('Please set the max distance');
+	}
+	else{
+		if (gmaps_circle!=null) { gmaps_circle.setMap(null);}
+		var myCenter = new google.maps.LatLng(gmaps4rails_ref_lat, gmaps4rails_ref_long);
+		var filtered_markers = {"markers":[]};
+
+	
+		for (var i = 0; i < gmaps4rails_data.markers.length; ++i) {
+			if (get_distance(gmaps4rails_ref_long, gmaps4rails_data.markers[i].longitude, gmaps4rails_ref_lat, gmaps4rails_data.markers[i].latitude) < max_distance)
+				{ filtered_markers.markers.push(gmaps4rails_data.markers[i]);}
+			setMarkers(filtered_markers);
+		}
+		//radius is in meters
+		gmaps_circle = new google.maps.Circle({radius: max_distance*1000, center: myCenter, fillColor:"#00FF00", strokeColor: "#00EE00"}); 
+		gmaps_circle.setMap(gmaps4rails_map);
+	}
+}
+
+function get_distance(long1, long2, lat1, lat2) 
+{
+	var theta = long1 - long2; 
+	var dist = Math.sin(deg2rad(lat1)) * Math.sin(deg2rad(lat2)) +  Math.cos(deg2rad(lat1)) * Math.cos(deg2rad(lat2)) * Math.cos(deg2rad(theta)); 
+  dist = Math.acos(dist); 
+  dist = rad2deg(dist); 
+  var km = dist * 60 * 1.853;
+	return km;
+}
+
+function deg2rad(value) { return value*Math.PI/180;}
+function rad2deg(value) { return value*180/Math.PI;}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +01:00
+date: 2011-02-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Enables easy display of items (taken from a model) on a Google Map. Uses Javascript API V3.
+description: Enables easy display of items (taken from a Rails 3 model) on a Google Map. Uses Javascript API V3.
 email: apnea.diving.deep@gmail.com
 executables: []
 
@@ -57,6 +57,7 @@ files:
 - lib/tasks/install.rake
 - public/images/marker.png
 - public/javascripts/gmaps4rails.js
+- public/javascripts/old.js
 - public/stylesheets/gmaps4rails.css
 - README.rdoc
 - test/test_helper.rb
@@ -66,8 +67,8 @@ homepage: http://github.com/apneadiving/Gmaps4rails
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -91,10 +92,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: Enables easy display of items (taken from a model) on a Google Map. Uses Javascript API V3.
+summary: Enables easy display of items (taken from a Rails 3 model) on a Google Map. Uses Javascript API V3.
 test_files: 
 - test/test_helper.rb
 - test/unit/gmaps4rails_widget_test.rb