rails_admin_place_field 0.0.8 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f43dc0c284e2982ee9d6a4ad25f28f543af39d9
-  data.tar.gz: 19b3dc88b7bf3473cf9178af8012f89b245b4ed6
+  metadata.gz: 06dca4f89f425f0fa4e0709b5c73e9420d315677
+  data.tar.gz: e1eb546f328754a779666c14be2cacdaec126b5b
 SHA512:
-  metadata.gz: 352c1570bbf58f106b6b5d72125e57e3612df581f3b696758e101ac7899f7d3f29f5a2a3f1ffb4c4045bc4b1df8e67561be6d7548bb34e4109f2515ae4f285a0
-  data.tar.gz: 0e00a819ac8395d726f672cbf2faf67db92d12bf639b8686b33caf299168e1f144a18a3ed9dbd3e0b5de32555b6f006eefdd3a19c260fc9e8fe19b509c0db53d
+  metadata.gz: b3cfe6dfa1e9dad56a863ebaf6cfb10bbe0b2dfa8bf9ce3fd4d78492eba01ed5a24dc770305e76a3384df7e93b4f17973eda052ff0d90103656afed6596bbaeb
+  data.tar.gz: 52aee01597c3f43d01c58d183aea35959d2ae3f2f5eb92460e1542ba1c56338c1ad1f81fe309ced6c6be8d61fbb8b30bea6ab772212da054e9f2e160c30dcb99

data/README.md

@@ -48,6 +48,8 @@ RailsAdmin.config do |config|
     edit do
       field :latitude, :place do
         longitude_field :longitude
+        foursquare_field :foursquare
+        gplace_field :gplace
         google_api_key "a1b2c3d4e5f6deadbeef"
         places_api_key "a1b2c3d4e5f6deadbeef"
         foursquare_api_key "a1b2c3d4e5f6deadbeef"

data/app/views/rails_admin/main/_place_select.html.haml

@@ -1,23 +1,38 @@
-= javascript_include_tag ("//maps.googleapis.com/maps/api/js?key=#{field.google_api_key}&sensor=false&callback=init_map_field")
+= javascript_include_tag ("//maps.googleapis.com/maps/api/js?key=#{field.google_api_key}&sensor=false&libraries=places&callback=init_map_field")
 
 = javascript_tag do
   :plain
     function init_map_field()
     {
     jQuery(function() {
+
       var marker = null;
       var latlng = new google.maps.LatLng(
         #{form.object.send(field.name) || field.default_latitude},
         #{form.object.send(field.longitude_field) || field.default_longitude}
       );
 
-      var myOptions = {
+      var map_options = {
         zoom: #{field.default_zoom_level},
         center: latlng,
         mapTypeId: google.maps.MapTypeId.ROADMAP
       };
 
-      var map = new google.maps.Map(document.getElementById("#{field.dom_name}"), myOptions);
+      var map = new google.maps.Map(document.getElementById("#{field.dom_name}"), map_options);
+
+      // Try HTML5 geolocation
+      if ( navigator.geolocation )
+      {
+        navigator.geolocation.getCurrentPosition(
+          function(position) {
+            var pos = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
+            map.setCenter(pos);
+          },
+          function() {
+            handleNoGeolocation(true);
+          }
+        );
+      }
 
   - if form.object.send(field.name) && form.object.send(field.longitude_field)
     :plain
@@ -30,6 +45,9 @@
       google.maps.event.addListener(map, 'click', function(e) {
         map_update(e.latLng);
         foursquare_search(e.latLng.lat() + ',' + e.latLng.lng());
+        places_search(e.latLng);
+
+        $('#foursquare_options #foursquare_venue').html('<select id="foursquare_venue_select"><option></option></select>');
       });
 
       function map_update(location)
@@ -64,7 +82,7 @@
             if ( response && response.meta.code == 200 )
             {
               response.response.venues.forEach(function(venue) {
-                jQuery('#foursquare_venue').append('<option value="'+venue.id+'">'+venue.name+'</option>').change(function() {
+                jQuery('#foursquare_venue_select').append('<option value="'+venue.id+'">'+venue.name+'</option>').change(function() {
                   jQuery("##{field.foursquare_dom_name}").val($(this).val());
                 });
               });
@@ -76,13 +94,73 @@
           });
       }
 
+      // @todo : make this add a new marker so that the user knows that both the original geo + the places geo are recorded
+      function places_search(location)
+      {
+        autocomplete = new google.maps.places.Autocomplete(
+          document.getElementById('google_place_input'),
+          {
+            bounds: new google.maps.Circle({center: location, radius: 100}).getBounds()
+          }
+        );
+
+        google.maps.event.addListener(autocomplete, 'place_changed', function() {
+          var place = autocomplete.getPlace();
+
+          console.log(place.id);
+
+          $("##{field.gplace_dom_name}").val(place.id);
+
+          if ( ! place.geometry )
+          {
+            alert('A place was not found');
+            return;
+          }
+
+          // If the place has a geometry, then present it on a map.
+          if ( place.geometry.viewport )
+          {
+            // Use the viewport if it is provided.
+            map.fitBounds(place.geometry.viewport);
+          }
+          else {
+            // Otherwise use the location and set a chosen zoom level.
+            map.setCenter(place.geometry.location);
+            map.setZoom(17);
+          }
+          var image = {
+            url: place.icon,
+            size: new google.maps.Size(71, 71),
+            origin: new google.maps.Point(0, 0),
+            anchor: new google.maps.Point(17, 34),
+            scaledSize: new google.maps.Size(25, 25)
+          };
+          marker.setIcon(image);
+          marker.setPosition(place.geometry.location);
+        });
+      }
+
     })};
 
 
-%div.ramf-map-container{:id => field.dom_name, :style => "width:300px;height:200px"}
-%select#foursquare_venue
-  %option
+%h3 Geo Location Data
+%p Click on the map to select a geo location. Once you've selected this, the foursquare and google places boxes will become active (if you've set them up correctly), for you to choose a relevant association.
+%div.ramf-map-container{:id => field.dom_name, :style => "width:90%; height:300px"}
+
+%hr
+
+#places_options
+  %h4 Google Place
+  %input#google_place_input{ :type => 'text', :style => "width: 90%;" }
+
+%hr
+
+#foursquare_options
+  %h4 Foursquare Venue
+  #foursquare_venue You have to select a place on the map to retrieve a list of nearby results
+  %br
 
-= form.send :hidden_field, field.foursquare_field, :id => field.foursquare_dom_name
 = form.send :hidden_field, field.name, :id => field.latitude_dom_name
-= form.send :hidden_field, field.longitude_field, :id => field.longitude_dom_name
+= form.send :hidden_field, field.longitude_field, :id => field.longitude_dom_name
+= form.send :hidden_field, field.foursquare_field, :id => field.foursquare_dom_name
+= form.send :hidden_field, field.gplace_field, :id => field.gplace_dom_name

data/lib/rails_admin_place_field/rails_admin/config/fields/types/place.rb

@@ -4,7 +4,7 @@ module RailsAdmin::Config::Fields::Types
     RailsAdmin::Config::Fields::Types::register(:place, self)
 
     def allowed_methods
-      [@name, longitude_field, foursquare_field]
+      [@name, longitude_field, foursquare_field, gplace_field]
     end
 
     # THe name of the corresponding longitude field to match the latitude field
@@ -17,6 +17,10 @@ module RailsAdmin::Config::Fields::Types
       :foursquare
     end
 
+    register_instance_option(:gplace_field) do
+      :gplace
+    end
+
     register_instance_option(:partial) do
       :place_select
     end
@@ -25,10 +29,6 @@ module RailsAdmin::Config::Fields::Types
       nil
     end
 
-    register_instance_option(:places_api_key) do
-      nil
-    end
-
     register_instance_option(:foursquare_api_key) do
       nil
     end
@@ -68,5 +68,9 @@ module RailsAdmin::Config::Fields::Types
     def foursquare_dom_name
       @foursquare_dom_name ||= "#{bindings[:form].object_name}_#{foursquare_field}"
     end
+
+    def gplace_dom_name
+      @gplace_dom_name ||= "#{bindings[:form].object_name}_#{gplace_field}"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_place_field
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.12
 platform: ruby
 authors:
 - Clay McIlrath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -52,8 +52,8 @@ dependencies:
     - - '>'
       - !ruby/object:Gem::Version
         version: 0.0.1
-description: A place field for RailsAdmin that can be used to retrieve a google place
-  or foursquare venue
+description: A place field for RailsAdmin that can be used to retrieve and associate
+  a google place or foursquare venue
 email:
 - clay.mcilrath@gmail.com
 executables: []