activeadmin_latlng 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b86c5f48d53b93211c0ad478a7c86c54dd153f3e
-  data.tar.gz: ffd07c42182fecd3bf03b137c3130824d9752103
+  metadata.gz: 38b4b42f8113d60b1e6f5e770abdef40a6564086
+  data.tar.gz: f76b470fd420f00e8a2ab21fe6feb92b21cdeb65
 SHA512:
-  metadata.gz: c309eed4f718dff9303867296eb533c39bd2beb0a15b966a4391ea4d1dc6114b22c95be7db80d71682b7d809fe82972e0df4f215b3fa32c60c6e93213c48faeb
-  data.tar.gz: 55c308f1458c49cae97f85b45685606b493f79072b1c00ad9ef990b7af3318ea0560f4ee321f4fc715d4904043dd9141c8cbe2b0d7f117503b0dfb0cc348e19a
+  metadata.gz: e60d582e509b317a53fc71ab7cd5119f88d9fbaea73e6e09dd9a257060ee17e4c7cf923461d30c0a61ac4be10915965d35975f3acf2b2386ac69f5ec317594f6
+  data.tar.gz: c98623b9763916d2661644b0e7fdce687c34ee69e7a36688a6b64ee9d5332a3a0facc453c604af8b6df467dd1347868460cb12978cf136ae17b69be5a4c4654d

data/README.md

@@ -45,6 +45,12 @@ end
 
 * `api_key_env` - you can send name of ENV-variable where storing API key for map.
 
+* `default_lat` - default latitude for placemark, Moscow latitude by default.
+
+* `default_lng` - default longitude for placemark, Moscow longitude by default.
+
+* `map_zoom` - default zoom for map, `12` by default.
+
 ### Example
 
 ```ruby

data/lib/activeadmin/views/google_map_proxy.rb

@@ -6,11 +6,11 @@ module ActiveAdmin
       end
 
       def loading_map_code
-        @loading_map ? "<script src=\"https://maps.googleapis.com/maps/api/js?language=#{@lang}#{key}&callback=googleMapObject.init\" async defer></script>" : ''
+        @loading_map ? "<script src=\"https://maps.googleapis.com/maps/api/js?language=#{@lang}#{key}&libraries=places&callback=googleMapObject.init\" async defer></script>" : ''
       end
 
       def to_s
-        File.open(File.expand_path('../templates/google.html', __FILE__)).read % [loading_map_code, @height, @id_lat, @id_lng, @default_lat, @default_lng, @map_zoom]
+        File.open(File.expand_path('../templates/google.html', __FILE__)).read % [loading_map_code, @height, @id_lat, @id_lng, @map_zoom, @default_lat, @default_lng]
       end
     end
   end

data/lib/activeadmin/views/templates/google.html

@@ -8,6 +8,7 @@
       coords: null,
       map: null,
       marker: null,
+      zoom: %d,
 
       getCoordinates: function() {
         return {
@@ -27,25 +28,51 @@
 
         googleMapObject.map = new google.maps.Map(document.getElementById('google_map'), {
           center: googleMapObject.coords,
-          zoom: %d
+          zoom: googleMapObject.zoom
         });
-        
+
         var latLngCoord = new google.maps.LatLng(googleMapObject.coords.lat, googleMapObject.coords.lng);
         googleMapObject.marker = new google.maps.Marker({
           position: latLngCoord,
           map: googleMapObject.map,
           draggable: true
         });
+
         googleMapObject.map.addListener('click', function(e) {
           googleMapObject.coords = { lat: e.latLng.lat(), lng: e.latLng.lng() };
           googleMapObject.saveCoordinates();
           googleMapObject.marker.setPosition(googleMapObject.coords);
         });
+
         googleMapObject.marker.addListener('drag', function(e) {
           googleMapObject.coords = { lat: e.latLng.lat(), lng: e.latLng.lng() };
           googleMapObject.saveCoordinates();
         });
+
+        var searchBox = new google.maps.places.SearchBox(document.getElementById('latlng-search-box'));
+
+        googleMapObject.map.controls[google.maps.ControlPosition.TOP_CENTER].push(document.getElementById('latlng-search-box'));
+
+        google.maps.event.addListener(searchBox, 'places_changed', function() {
+          searchBox.set('map', null);
+
+          var bounds = new google.maps.LatLngBounds();
+
+          var place = searchBox.getPlaces()[0];
+          var location = place.geometry.location;
+
+          googleMapObject.coords = { lat: location.lat(), lng: location.lng() };
+          googleMapObject.saveCoordinates();
+
+          googleMapObject.marker.setPosition(location);
+          bounds.extend(location);
+
+          googleMapObject.map.fitBounds(bounds);
+          searchBox.set('map', googleMapObject.map);
+          googleMapObject.map.setZoom(googleMapObject.zoom);
+        });
       }
     }
   </script>
-</li>
+  <input id="latlng-search-box" type="text" style="margin-top: 10px; height: 18px;" placeholder="Search Google Maps...">
+</li>

data/lib/activeadmin_latlng/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminLatlng
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_latlng
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexey Krylov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin