rails-google-maps 0.0.13 → 0.0.14

data/README.md

@@ -33,7 +33,15 @@ And include it in your ```application.js``` file after jquery:
 
 
 ## Usage
-
+####SimpleForm usage:
+```erb
+/*NOTE: gmap-canvas - default value and can be ommited*/
+<%= f.input :address, as: :google_maps_autocomplete, input_html: { gmap_id: 'gmap_canvas' } %> 
+...
+<div id="gmap_canvas"></div>
+```
+Additionally on edit address point will be marked on the map.
+####Javascript usage:
 1) Apply google map to div element where map should appear:
 ```js
 (new GoogleMap()).apply()

data/app/inputs/google_maps_autocomplete_input.rb

@@ -0,0 +1,31 @@
+class GoogleMapsAutocompleteInput < SimpleForm::Inputs::StringInput
+  include ActionView::Helpers::TagHelper
+  def input
+    gmap_id = input_html_options.delete(:gmap_id)
+    input = @builder.text_field(attribute_name, input_html_options)
+    (input + content_tag('script', script_text(gmap_id, input).html_safe)).html_safe
+  end
+
+  private
+
+  def script_text(gmap_id, tag)
+    "$(document).ready(function(){
+      if(typeof google == 'undefined')
+        return;
+      var selector = '#{gmap_id}';
+      if(selector.length > 0){
+        selector = '#' + selector;
+      }
+      window.gmap = new GoogleMap({selector: selector});
+      input = $('#{tag}');
+      var id = input.attr('id');
+      var location = input.val();
+      window.googleAutocomplete = new GmapAutocomplete('#' + id, gmap);
+      gmap.apply();
+      googleAutocomplete.apply();
+      if(location.length > 0){
+        gmap.setMarker('address', location);
+      }
+    })"
+  end
+end

data/lib/rails-google-maps/version.rb

@@ -1,3 +1,3 @@
 module RailsGoogleMaps
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/vendor/assets/javascripts/rails-google-maps/autocomplete.js.coffee

@@ -31,19 +31,21 @@ class root.Autocomplete
 class root.GmapAutocomplete extends Autocomplete
 
   constructor: (@selector, @gmap)->
+    self = this
+    @gmap.onSucceed.push (address)->
+      $(self.selector).val address
 
   source: (self)->
     (request, response)->
-      self.gmap.geocoder.geocode {'address': request.term }, (results, status)->
+      self.gmap.searchGeocodes request.term, (results)->
         response $.map results, (item) ->
-            label: item.formatted_address
-            value: item.formatted_address
-            geocode: item
+          label: item.formatted_address
+          value: item.formatted_address
+          geocode: item
 
   select: (self)->
     (event, ui) ->
-      self.gmap.updateUi  ui.item.value, ui.item.geocode.geometry.location
-      self.gmap.updateMap ui.item.geocode.geometry
+      self.gmap.update ui.item.geocode
 
   afterApply: ()->
     this._addKeyDownHandlers()
@@ -52,7 +54,7 @@ class root.GmapAutocomplete extends Autocomplete
     self = this
     $(@selector).bind 'keydown', (event)->
       if event.keyCode == 13
-        self.gmap.geocodeLookup  'address', $(self.selector).val()
+        self.gmap.setMarker  'address', $(self.selector).val()
         $(self.selector).autocomplete "disable"
       else
         $(self.selector).autocomplete "enable"

data/vendor/assets/javascripts/rails-google-maps/google_maps.js.coffee

@@ -7,12 +7,11 @@ return unless google?
 #   gmap.apply()
 class root.GoogleMap
 
-  inputField: '#gmaps-input-address'
-
   #defines whether user can change map pin or not
-  immutable = false
-  mapSelector = "#gmaps-canvas"
-  errorField = "#gmaps-error"
+  immutable: false
+  mapSelector: "#gmaps-canvas"
+  errorField: "#gmaps-error"
+  onSucceed: []
 
   _applied: false
 
@@ -42,17 +41,10 @@ class root.GoogleMap
     this._addListeners()
     @_applied = true
 
-  updateMap: (geometry)->
-    @map.fitBounds( geometry.viewport )
-    @marker.setPosition( geometry.location )
-
-  updateUi: (address, latLng)->
-    $(@inputField).val(address)
-
   applied: ()->
     @_applied
 
-  geocodeLookup: (type, value, update = true)->
+  setMarker: (type, value, update = true)->
     request = {}
     request[type] = value
     self = this
@@ -63,19 +55,29 @@ class root.GoogleMap
       else
         self._failed(update, type, value)
 
+  searchGeocodes: (term, callback)->
+    @geocoder.geocode {'address': term }, (results, status)->
+      callback(results, status)
+
+
+  update: (geocode)->
+    @map.fitBounds geocode.geometry.viewport
+    @marker.setPosition geocode.geometry.location
+
   _addListeners: ()->
     self = this
     return if @immutable
     google.maps.event.addListener @marker, 'dragend', () ->
-      self.geocodeLookup 'latLng', self.marker.getPosition(), false
+      self.setMarker 'latLng', self.marker.getPosition(), false
     google.maps.event.addListener @map, 'click', (event) ->
       self.marker.setPosition event.latLng
-      self.geocodeLookup 'latLng', event.latLng, false
+      self.setMarker 'latLng', event.latLng, false
 
   _succeed: (results, update)->
     if results[0]
-      this.updateUi results[0].formatted_address, results[0].geometry.location
-      this.updateMap(results[0].geometry) if update
+      this.update(results[0]) if update
+      $.map @onSucceed, (callback)->
+        callback(results[0].formatted_address)
       this._saveLatLang(results[0].geometry.location.lat(), results[0].geometry.location.lng()) if @saveLangLat
     else
       @gmapErrors.wrongInputError()
@@ -86,7 +88,6 @@ class root.GoogleMap
       @gmapErrors.incorrectAddress(value)
     else
       @gmapErrors.incorrectLatlng()
-      this.updateUi('', value)
 
   _saveLatLang: (lat, long)->
     $(@latitudeInput).val(lat)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-google-maps
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -55,6 +55,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/inputs/google_maps_autocomplete_input.rb
 - lib/rails-google-maps.rb
 - lib/rails-google-maps/rails.rb
 - lib/rails-google-maps/version.rb