rails-google-maps 0.0.14 → 0.0.15

data/README.md

@@ -34,6 +34,12 @@ And include it in your ```application.js``` file after jquery:
 
 ## Usage
 ####SimpleForm usage:
+Google maps autocomplete.
+in ```application.js```:
+```
+//= require rails-google-maps/autocomplete
+```
+in template:
 ```erb
 /*NOTE: gmap-canvas - default value and can be ommited*/
 <%= f.input :address, as: :google_maps_autocomplete, input_html: { gmap_id: 'gmap_canvas' } %> 
@@ -41,6 +47,8 @@ And include it in your ```application.js``` file after jquery:
 <div id="gmap_canvas"></div>
 ```
 Additionally on edit address point will be marked on the map.
+
+That is all, if you want to use it without SimpleForm read next part.
 ####Javascript usage:
 1) Apply google map to div element where map should appear:
 ```js
@@ -60,9 +68,9 @@ new GoogleMap({longitudeInput: '#longitude_input', latitudeInput: '#latitude_inp
 ```js
 gmap = new GoogleMap()
 gmap.apply()
-gmap.geocodeLookup('address', 'New York')
+gmap.setMarker('address', 'New York')
 //or
-gmap.geocodeLookup('latLng', new google.maps.LatLng(51.751724,-1.255284))
+gmap.setMarker('latLng', new google.maps.LatLng(51.751724,-1.255284))
 ```
 
 4) Prevent users from changing location:

data/app/inputs/google_maps_autocomplete_input.rb

@@ -2,13 +2,16 @@ class GoogleMapsAutocompleteInput < SimpleForm::Inputs::StringInput
   include ActionView::Helpers::TagHelper
   def input
     gmap_id = input_html_options.delete(:gmap_id)
+    apply = input_html_options.key?(:apply) ? input_html_options.delete(:apply) : true
+    lat_id = input_html_options.key?(:lat_id) ? input_html_options.delete(:lat_id) : nil
+    lng_id = input_html_options.key?(:lng_id) ? input_html_options.delete(:lng_id) : nil
     input = @builder.text_field(attribute_name, input_html_options)
-    (input + content_tag('script', script_text(gmap_id, input).html_safe)).html_safe
+    (input + content_tag('script', script_text(gmap_id, input, apply, lat_id, lng_id).html_safe)).html_safe
   end
 
   private
 
-  def script_text(gmap_id, tag)
+  def script_text(gmap_id, tag, apply, lat_id, lng_id)
     "$(document).ready(function(){
       if(typeof google == 'undefined')
         return;
@@ -20,11 +23,14 @@ class GoogleMapsAutocompleteInput < SimpleForm::Inputs::StringInput
       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);
+      window.gmapAutocomplete = new GmapAutocomplete('#' + id, gmap);
+      if(#{apply.to_s}){
+        gmap.apply();
+        gmapAutocomplete.apply();
+      }
+      var latId = '#{lat_id.to_s}', lngId = '#{lng_id.to_s}';
+      if(latId && lngId){
+        gmap.setOptions({longitudeInput: lngId, latitudeInput: latId});
       }
     })"
   end

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

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

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

@@ -48,8 +48,12 @@ class root.GmapAutocomplete extends Autocomplete
       self.gmap.update ui.item.geocode
 
   afterApply: ()->
+    this.syncWithMap()
     this._addKeyDownHandlers()
 
+  syncWithMap: ()->
+    @gmap.setMarker('address', $(@selector).val()) if $(@selector).val()
+
   _addKeyDownHandlers: ()->
     self = this
     $(@selector).bind 'keydown', (event)->

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

@@ -12,7 +12,7 @@ class root.GoogleMap
   mapSelector: "#gmaps-canvas"
   errorField: "#gmaps-error"
   onSucceed: []
-
+  mapless: false
   _applied: false
 
   @defaultGmapOptions: {
@@ -25,6 +25,9 @@ class root.GoogleMap
   # gmapOptions: google map api options
   constructor: (options = {}, gmapOptions = {})->
     @gmapOptions = $.extend {}, GoogleMap.defaultGmapOptions, gmapOptions
+    this.setOptions options
+
+  setOptions: (options)->
     @immutable = true if options['immutable']
     @mapSelector = options['selector'] if options['selector']
     @errorField = options['errorField'] if options['errorField']
@@ -33,10 +36,14 @@ class root.GoogleMap
       @longitudeInput = options['longitudeInput']
       @latitudeInput = options['latitudeInput']
 
+
   apply: ()->
-    @map = new google.maps.Map $(@mapSelector)[0], @gmapOptions
+    if($(@mapSelector).length > 0)
+      @map = new google.maps.Map $(@mapSelector)[0], @gmapOptions
+      @marker = new google.maps.Marker {map: @map, draggable: true}
+    else
+      @mapless = true
     @geocoder = new google.maps.Geocoder()
-    @marker = new google.maps.Marker {map: @map, draggable: true}
     @gmapErrors = new GmapErrors @errorField
     this._addListeners()
     @_applied = true
@@ -44,7 +51,7 @@ class root.GoogleMap
   applied: ()->
     @_applied
 
-  setMarker: (type, value, update = true)->
+  setMarker: (type, value, update = true, afterCallback = ()->)->
     request = {}
     request[type] = value
     self = this
@@ -54,6 +61,7 @@ class root.GoogleMap
         self._succeed(results, update)
       else
         self._failed(update, type, value)
+      afterCallback()
 
   searchGeocodes: (term, callback)->
     @geocoder.geocode {'address': term }, (results, status)->
@@ -61,37 +69,44 @@ class root.GoogleMap
 
 
   update: (geocode)->
-    @map.fitBounds geocode.geometry.viewport
-    @marker.setPosition geocode.geometry.location
+    unless @mapless
+      @map.fitBounds geocode.geometry.viewport
+      @marker.setPosition geocode.geometry.location
+    this.saveLatLang(geocode.geometry) if @saveLangLat
 
   _addListeners: ()->
     self = this
     return if @immutable
-    google.maps.event.addListener @marker, 'dragend', () ->
-      self.setMarker 'latLng', self.marker.getPosition(), false
-    google.maps.event.addListener @map, 'click', (event) ->
-      self.marker.setPosition event.latLng
-      self.setMarker 'latLng', event.latLng, false
+    unless @mapless
+      google.maps.event.addListener @marker, 'dragend', () ->
+        self.setMarker 'latLng', self.marker.getPosition(), false
+      google.maps.event.addListener @map, 'click', (event) ->
+        self.marker.setPosition event.latLng
+        self.setMarker 'latLng', event.latLng, false
 
   _succeed: (results, update)->
     if results[0]
       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
+      this.saveLatLang(results[0].geometry) if @saveLangLat
     else
       @gmapErrors.wrongInputError()
 
   _failed: (update, type, value)->
-    this._saveLatLang('', '') if @saveLangLat
+    this.clearLatLng() if @saveLangLat
     if type is 'address'
       @gmapErrors.incorrectAddress(value)
     else
       @gmapErrors.incorrectLatlng()
 
-  _saveLatLang: (lat, long)->
-    $(@latitudeInput).val(lat)
-    $(@longitudeInput).val(long)
+  saveLatLang: (geometry)->
+    $(@latitudeInput).val(geometry.location.lat())
+    $(@longitudeInput).val(geometry.location.lng())
+
+  clearLatLng: ()->
+    $(@latitudeInput).val('')
+    $(@longitudeInput).val('')
 
 # Class for displaying Gmap Errors.
 # All the errors can be customised

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-google-maps
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails