gmaps4rails 0.0.11 → 0.0.12

data/README.rdoc

@@ -0,0 +1,48 @@
+== Gmaps4rails
+
+Gmaps4rails is developed to simply create a map with model instances (say Users).
+It's still in heavy dev and I have a bug with engines (I can't find enough doc on this topic). See http://github.com/krschacht/rails_3_engine_demo/issues/issue/3/ for the bug report.
+
+
+
+== Installation
+
+	gem install gmaps4rails
+
+== Requirements
+- jQuery (for ajax json)
+- <%= yield :head %> in your header
+
+== Examples
+
+=== In your model	
+	acts_as_gmappable
+	
+  def gmaps4rails_address
+    self.address #describe how to retrieve the address from your model
+  end
+
+  def gmaps4rails_picture
+    self.picture #describe how to retrieve the picture from your model
+  end
+
+  def gmaps4rails_description
+    self.name #could be html
+  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"}	 %>
+
+== Todo
+Many customization  will be available (at least, those already developed but not written here):
+- integration of scopes to decide what you want to display precisely
+- distance filter
+
+== Copyright
+
+Copyright (c) 2010 apneadiving. See LICENSE for details.

data/app/controllers/gmaps4rails/gmaps_controller.rb

@@ -4,8 +4,10 @@ module Gmaps4rails
     
     def index
       @model = params["model"]
+      @filter = params["filter"]
+      @options = params["options"]
       if @model.constantize.is_gmappable? == true
-          @objects = @model.constantize.gmaps4rails_filter(params["filter"], params["options"])
+        @objects = @model.constantize.gmaps4rails_filter(@filter, @options)
       end
     end
         

data/app/helpers/gmaps4rails/Gmaps_helper.rb

@@ -1,7 +1,5 @@
 module Gmaps4rails
   module GmapsHelper
-    def gmaps_sanitize(entity)
-      entity.nil? ? "" : entity
-    end
+
   end
 end

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

@@ -0,0 +1,66 @@
+<% content_for :head do %>
+<style type="text/css"> 
+
+   #map-container {
+     padding: 6px;
+     border-width: 1px;
+     border-style: solid;
+     border-color: #ccc #ccc #999 #ccc;
+     -webkit-box-shadow: rgba(64, 64, 64, 0.5) 0 2px 5px;
+     -moz-box-shadow: rgba(64, 64, 64, 0.5) 0 2px 5px;
+     box-shadow: rgba(64, 64, 64, 0.1) 0 2px 5px;
+     width: 800px;
+   }
+
+   #gmaps4rails_map {
+     width: 800px;
+     height: 400px;
+   }
+
+   #actions {
+     list-style: none;
+     padding: 0;
+   }
+
+   #inline-actions {
+     padding-top: 10px;
+   }
+
+   .item {
+     margin-left: 20px;
+   }
+</style>
+<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>
+<script type="text/javascript"> 
+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_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%>';
+</script>
+<script src="/javascripts/gmaps4rails.js" type="text/javascript"></script>    
+<% 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 %>

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

@@ -1,5 +1,5 @@
 <% content_for(:head) do %>
-<meta name="viewport" content="initial-scale=1.0, user-scalable=yes" />
+<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"> </script>
 <script type="text/javascript" src="/javascripts/gmaps4rails.js"> </script>
 <script type="text/javascript">
@@ -17,7 +17,7 @@
 	  gmaps4rails_model = model;
 	  var myLatLng = new google.maps.LatLng(0,0);
 	  gmaps4rails_Options = {
-	  	    zoom: 2,
+	  	    zoom: 0,
 	  	    center: myLatLng,
 	  	    mapTypeId: google.maps.MapTypeId.ROADMAP
 	    	  }
@@ -41,7 +41,6 @@
 				request += '&options=' + split_filter_value[1];
 				}
 			}
-		alert(request); //TODO remove for real production
 	  gmaps4rails_ctaLayer = new google.maps.KmlLayer(request);
 	  gmaps4rails_ctaLayer.setMap(gmaps4rails_map);
 	}

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

@@ -0,0 +1,27 @@
+ { "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          
+%>
+]}

data/app/views/gmaps4rails/gmaps/index.xml.builder

@@ -70,7 +70,7 @@ xml.kml do
           lat = object.gmaps4rails_latitude.nil? ? "" : object.gmaps4rails_latitude
           long = object.gmaps4rails_longitude.nil? ? "" : object.gmaps4rails_longitude
           xml.styleUrl "#customMap"
-          xml.description desc
+          xml.description '<![CDATA[' + desc + ']]>'
           xml.Point do
             str = long + "," + lat + ",0"
             xml.coordinates(str)
@@ -86,7 +86,7 @@ xml.kml do
           lat = object.gmaps4rails_latitude.nil? ? "" : object.gmaps4rails_latitude
           long = object.gmaps4rails_longitude.nil? ? "" : object.gmaps4rails_longitude
 
-          xml.description desc
+          xml.description '<![CDATA[' + desc +']]>'
           xml.Point do
             str = long + "," + lat + ",0"
             xml.coordinates(str)

data/config/routes.rb

@@ -6,7 +6,7 @@ Rails.application.routes.draw do |map|
  
   map.resources :gmaps, :only => [ :index ],
                          :controller => "gmaps4rails/gmaps",
-                         :path_prefix => mount_at#,
+                         :path_prefix => mount_at
                          #:name_prefix => "gmaps4rails_"
 
 end

data/lib/acts_as_gmappable/base.rb

@@ -1,5 +1,6 @@
 require 'net/http'
 require 'uri'
+require 'crack'
 
 module Gmaps4rails
   module ActsAsGmappable
@@ -19,6 +20,16 @@ module Gmaps4rails
             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
@@ -26,28 +37,36 @@ module Gmaps4rails
       module InstanceMethods
 
         def get_coordinates
-           if self.adress.nil? || self.adress == ""
+           if self.gmaps4rails_address.nil? || self.gmaps4rails_address.empty?
              self.gmaps = false
            else
-             geocoder = "http://maps.google.com/maps/geo?q="
-             output = "&output=csv"
+             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.adress + output
+             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')
-               fields = resp.body.split(',')
-               self.gmaps4rails_latitude = fields[2]
-               self.gmaps4rails_longitude = fields[3]
-               #saves a boolean to remind the status
-               self.gmaps = true
+               #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
              end
            end
            return true
-         end
+        end
       end # InstanceMethods      
     end
   end

data/public/javascripts/gmaps4rails.js

@@ -1,49 +1,139 @@
-	var gmaps4rails_map;
-	var gmaps4rails_Options;
-	var gmaps4rails_ctaLayer;
-	var gmaps4rails_model;
-
-  function gmaps4rails_init(model) {
-	  gmaps4rails_model = model;
-	  var myLatLng = new google.maps.LatLng(0,0);
-	  gmaps4rails_Options = {
-	  	    zoom: 2,
-	  	    center: myLatLng,
-	  	    mapTypeId: google.maps.MapTypeId.ROADMAP
-	    	  }
-	  gmaps4rails_map = new google.maps.Map(document.getElementById("gmaps4rails_canvas"), gmaps4rails_Options);
-		create_map();
-}
-
-	function create_map(filter_value) {
-		var date = new Date();
-		//adding the date (which is a unique parameter, enables to bypass google map's cache on google server)
-		var request = 'http://furious-robot-66.heroku.com/gmaps.xml?model=' + gmaps4rails_model + '&time=' + date.getTime();
-		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];
-				}
-			}
-		alert(request); //TODO remove for real production
-	  gmaps4rails_ctaLayer = new google.maps.KmlLayer(request);
-	  gmaps4rails_ctaLayer.setMap(gmaps4rails_map);
+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
+	});	
+}
 
-	function gmaps4rails_raz(){
-	  gmaps4rails_map = new google.maps.Map(document.getElementById("gmaps4rails_canvas"), gmaps4rails_myOptions);
+//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 (!(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 gmaps4rails_resfreshmap()
-   {
-	 gmaps4rails_raz();
+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: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -15,10 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 +02:00
+date: 2010-10-16 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: crack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: IN HEAVY DEV. Will enable easy display of items (taken from a model) on a Google Map. Uses Javascript API V3.
 email: apnea.diving.deep@gmail.com
 executables: []
@@ -31,17 +44,20 @@ files:
 - app/controllers/gmaps4rails/gmaps_controller.rb
 - app/helpers/application_helper.rb
 - app/helpers/gmaps4rails/Gmaps_helper.rb
+- app/views/gmaps4rails/_gmaps4rails.html.erb
 - app/views/gmaps4rails/_map.html.erb
+- app/views/gmaps4rails/gmaps/index.json.erb
 - app/views/gmaps4rails/gmaps/index.xml.builder
 - config/routes.rb
 - lib/acts_as_gmappable/base.rb
 - lib/application_helper.rb
 - lib/engine.rb
 - lib/gmaps4rails.rb
+- public/images/marker.png
 - public/javascripts/gmaps4rails.js
 - README.rdoc
 has_rdoc: true
-homepage: http://github.com/apneadiving/test-for-maps
+homepage: http://github.com/apneadiving/Gmaps4rails
 licenses: []
 
 post_install_message: