gmaps4rails 0.4.1 → 0.5.0

data/README.rdoc

@@ -1,5 +1,6 @@
 == Google Maps for Rails (gmaps4rails)
 
+
 Gmaps4rails is developped to simply create a Google Map (Gmaps) from:
 
 - model instances (say Users),
@@ -8,7 +9,6 @@ Gmaps4rails is developped to simply create a Google Map (Gmaps) from:
 
 It's based on Ruby on Rails 3 Engines and uses Google Maps API V3 with Marker Clusterer in option.
 
-
 == Installation
 
 	gem install gmaps4rails
@@ -76,4 +76,6 @@ Done again!
 Feel free ton contact us, you have your say.
 
 == Copyright
-MIT license. Authors: Benjamin Roth, David Ruyer
+MIT license. 
+Authors: Benjamin Roth, David Ruyer
+Contributor: Alex Vorobiev

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

@@ -7,22 +7,17 @@
 <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',
-  height: 35,
-  width: 35,
-  opt_anchor: [16, 0],
-  opt_textColor: '#ff00ff',
-  opt_textSize: 10
-}];
 <% options.each do |key, value| %>
 Gmaps4Rails.<%= key %> = <%=raw value.is_a?(String) ?  "'#{value}'" : value  %>;
 <% end %>	
 var builder = <%=raw options["processing"] == "json" ? builder : "'#{builder}'" %>;
-Gmaps4Rails.initialize(builder);
+
+window.onload = function() {
+  Gmaps4Rails.initialize(builder);
+}
 </script>
 <% end %>
 
-<div id="map-container"> 
-  <div id="gmaps4rails_map"></div> 
-</div>
+<div id="<%= options['map_container_id'] || "map_container" %>"> 
+  <div id="<%= options['map_id'] || "gmaps4rails_map" %>"></div> 
+</div>

data/lib/acts_as_gmappable/base.rb

@@ -10,12 +10,9 @@ module Gmaps4rails
   
   def Gmaps4rails.create_json(object)
     unless object[object.gmaps4rails_options[:lat_column]].blank? && object[object.gmaps4rails_options[:lng_column]].blank?
-"{\"description\": \"#{object.gmaps4rails_infowindow}\",
-\"longitude\": \"#{object[object.gmaps4rails_options[:lng_column]]}\",
-\"latitude\": \"#{object[object.gmaps4rails_options[:lat_column]]}\",
-\"picture\": \"#{object.gmaps4rails_marker_picture['picture']}\",
-\"width\": \"#{object.gmaps4rails_marker_picture['width']}\",
-\"height\": \"#{object.gmaps4rails_marker_picture['height']}\"
+"{
+\"description\": \"#{object.gmaps4rails_infowindow}\", \"title\": \"#{object.gmaps4rails_title}\",
+\"longitude\": \"#{object[object.gmaps4rails_options[:lng_column]]}\", \"latitude\": \"#{object[object.gmaps4rails_options[:lat_column]]}\", \"picture\": \"#{object.gmaps4rails_marker_picture['picture']}\", \"width\": \"#{object.gmaps4rails_marker_picture['width']}\", \"height\": \"#{object.gmaps4rails_marker_picture['height']}\"
 } ,"
     end
   end
@@ -92,6 +89,9 @@ module Gmaps4rails
         def gmaps4rails_infowindow
         end
         
+        def gmaps4rails_title
+        end
+        
         def process_geocoding
           #to prevent geocoding each time a save is made
           return true if gmaps4rails_options[:check_process] == true && self[gmaps4rails_options[:checker]] == true

data/public/javascripts/gmaps4rails.js

@@ -1,8 +1,20 @@
 google.load('maps', '3', { other_params: 'sensor=false' });
 
+//marker_clusterer styles
+var styles = [{
+  url: 'http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/images/people35.png',
+  height: 35,
+  width: 35,
+  opt_anchor: [16, 0],
+  opt_textColor: '#ff00ff',
+  opt_textSize: 10
+}];
+
 var Gmaps4Rails = {
 	processing: 'rails_model',
 	map: null,
+  map_id: 'gmaps4rails_map',
+  markers: null,
   marker_picture : "",
 	marker_width : 22,
 	marker_length : 32,
@@ -46,14 +58,40 @@ var Gmaps4Rails = {
 			this.map.fitBounds(this.bounds);
 		}
 	},
+
+  // clear markers
+  clear_markers: function(){
+    if (this.markers) {
+      for (i in this.markers) {
+        this.markers[i].setMap(null);
+      }
+      this.markers = null;
+    }
+  },
+
+  // replace old markers with new markers on an existing map
+  replace_markers: function(new_markers){
+	  this.clear_markers();
+		this.locations = [];
+		this.add_markers(new_markers);
+  },
+
+	//add new markers to on an existing map (beware, it doesn't check duplicates)
+  add_markers: function(new_markers){
+    this.locations = this.locations.concat(new_markers);
+    this.setup_Markers();
+		if (this.auto_adjust) {
+			this.map.fitBounds(this.bounds);
+		}
+  },
 	
 	//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
-			});
+		this.map = new google.maps.Map(document.getElementById(this.map_id), {
+				zoom: this.map_zoom,
+				center: new google.maps.LatLng(this.map_center_latitude, this.map_center_longitude),
+				mapTypeId: google.maps.MapTypeId.ROADMAP
+		});
 	},
 	
 	//creates the necessary query to get the model + scope, and sends json to setup_Markers
@@ -76,7 +114,7 @@ var Gmaps4Rails = {
 		//variable used for Auto-adjust
 		this.bounds = new google.maps.LatLngBounds(); 
 		
-		//resests Clusterer if needed
+		//resets Clusterer if needed
 		if (this.markerClusterer) {
 			this.markerClusterer.clearMarkers();
 		}
@@ -84,17 +122,23 @@ var Gmaps4Rails = {
 	  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;
+			   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;
+			   var marker_title 	= this.locations[i].title 	!= "" && typeof this.locations[i].title 	!== "undefined" ? this.locations[i].title 	: null;
+      
 				 var myLatLng = new google.maps.LatLng(this.locations[i].latitude, this.locations[i].longitude); 
-			 
+			 	 //extending bounds, ref: http://unicornless.com/code/google-maps-v3-auto-zoom-and-auto-center
+				 if (this.auto_adjust) {
+				    this.bounds.extend(myLatLng);
+				 }
+				
 				 // Marker sizes are expressed as a Size of X,Y
 		 		 if (marker_picture == "")
-					{ var ThisMarker = new google.maps.Marker({position: myLatLng, map: this.map});	}
+					{ var ThisMarker = new google.maps.Marker({position: myLatLng, map: this.map, title: marker_title});	}
 					else 
 				  {
 						var image = new google.maps.MarkerImage(marker_picture, new google.maps.Size(marker_width, marker_height) );
-						var ThisMarker = new google.maps.Marker({position: myLatLng, map: this.map, icon: image}); //TODO Offer title customization title: "title"
+						var ThisMarker = new google.maps.Marker({position: myLatLng, map: this.map, icon: image, title: marker_title});
 					}
 					//save object for later use, basically, to get back the text to display when clicking it
 					this.locations[i].marker_object = ThisMarker; 
@@ -102,12 +146,6 @@ var Gmaps4Rails = {
 					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);});
-		
-					//extending bounds, ref: http://unicornless.com/code/google-maps-v3-auto-zoom-and-auto-center
-					if (this.auto_adjust) {
-					    var ll = new google.maps.LatLng(this.locations[i].latitude, this.locations[i].longitude);
-					    this.bounds.extend(ll);
-					}		
 		 }
 		this.setup_Clusterer(markers);
 	},
@@ -136,4 +174,4 @@ var Gmaps4Rails = {
 																																	  	});
 	  }
 	}
-};
+};

data/test/dummy/spec/models/user_spec.rb

@@ -18,11 +18,11 @@ describe "Acts as gmappable" do
 
     it "should render a valid json from an array of ojects" do
       @user2 = User.create!(:name => "me", :address => "Paris, France" )
-      User.all.to_gmaps4rails.should == "[{\"description\": \"\",\n\"longitude\": \"5.9311119\",\n\"latitude\": \"43.1251606\",\n\"picture\": \"\",\n\"width\": \"\",\n\"height\": \"\"\n} ,{\"description\": \"\",\n\"longitude\": \"2.3509871\",\n\"latitude\": \"48.8566667\",\n\"picture\": \"\",\n\"width\": \"\",\n\"height\": \"\"\n} ]"
+      User.all.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ,{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
 
     it "should render a valid json from a single object" do
-      @user.to_gmaps4rails.should == "[{\"description\": \"\",\n\"longitude\": \"5.9311119\",\n\"latitude\": \"43.1251606\",\n\"picture\": \"\",\n\"width\": \"\",\n\"height\": \"\"\n} ]"
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
     
     it "should not geocode again after address changes if checker is true" do
@@ -52,7 +52,7 @@ describe "Acts as gmappable" do
     end
     
     it "should not set boolean to true when address update fails" do
-      @user["gmaps"].should_not == true
+      @user.gmaps.should_not == true
     end
   end
 
@@ -114,7 +114,7 @@ describe "Acts as gmappable" do
       @user.long_test.should == 5.9311119
       @user.longitude.should == nil
       @user.latitude.should  == nil
-      @user.to_gmaps4rails.should == "[{\"description\": \"\",\n\"longitude\": \"5.9311119\",\n\"latitude\": \"43.1251606\",\n\"picture\": \"\",\n\"width\": \"\",\n\"height\": \"\"\n} ]"
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
     
     it "should not save the boolean if check_process is false" do
@@ -159,7 +159,7 @@ describe "Acts as gmappable" do
         end
       end
       @user = User.create!(:name => "me", :address => "Toulon, France", :picture => "http://www.blankdots.com/img/github-32x32.png")
-      @user.to_gmaps4rails.should == "[{\"description\": \"My Beautiful Picture: http://www.blankdots.com/img/github-32x32.png\",\n\"longitude\": \"5.9311119\",\n\"latitude\": \"43.1251606\",\n\"picture\": \"\",\n\"width\": \"\",\n\"height\": \"\"\n} ]"
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"My Beautiful Picture: http://www.blankdots.com/img/github-32x32.png\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
     
     it "should take into account the picture provided in the model" do 
@@ -176,7 +176,17 @@ describe "Acts as gmappable" do
         end
       end
       @user = User.create!(:name => "me", :address => "Toulon, France")
-      @user.to_gmaps4rails.should == "[{\"description\": \"\",\n\"longitude\": \"5.9311119\",\n\"latitude\": \"43.1251606\",\n\"picture\": \"http://www.blankdots.com/img/github-32x32.png\",\n\"width\": \"32\",\n\"height\": \"32\"\n} ]"
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"\n} ]"
+    end
+    
+    it "should take into account the title provided in the model" do
+      User.class_eval do
+        def gmaps4rails_title
+          "Sweet Title"
+        end
+      end
+      @user = User.create!(:name => "me", :address => "Toulon, France")
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"Sweet Title\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"\n} ]"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
+date: 2011-03-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,6 @@ files:
 - lib/tasks/install.rake
 - public/images/marker.png
 - public/javascripts/gmaps4rails.js
-- public/javascripts/old.js
 - public/stylesheets/gmaps4rails.css
 - README.rdoc
 - test/dummy/app/controllers/application_controller.rb

data/public/javascripts/old.js

@@ -1,144 +0,0 @@
-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;}