cck_forms 3.4.5 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82b928a29e03d7eafdb3c427bad988484b0d7503
-  data.tar.gz: c0c74ce03ee74651f7b16fbf9d00822a18e6ef92
+  metadata.gz: efe3b0f1241b517381cbfa1aa2e5d96e0ad99c75
+  data.tar.gz: 235413f814b0fb67d658d3893647e44512720610
 SHA512:
-  metadata.gz: 1efef4474a50e3aa894dafec55577eaeb5a5763081d8cfb373dd60a63fb02016b06bf2a8e4f635796ab8a8ae8a6c47a191b7d3f698941eaf6b160c04a2cfbf15
-  data.tar.gz: b9867a4e7bf158ab0d46d986c56858d139b27c8ee0d250919bd81b3049ff2370ab9cf1f8a8644a6985a2683e40a0ba4a700a48f9f55914bdc382724fc891d016
+  metadata.gz: 92ad5f9840789a07eb5673322f0e48b5b71a9411119d303d38c69729f98bf7ec576ae5789520c71337c39522827567ef15f2996d268c0be8da834419a64fe92f
+  data.tar.gz: 016b972bbfdc29278dbe32c147c6e16755daa0755e9ffb3a3e93ab0fa4df6e7ab6816c4059ce2907869413c62805082dba1c2b8d85bc60ebec8d7ed842e02896

data/lib/cck_forms/parameter_type_class/map.rb

@@ -11,6 +11,7 @@ class CckForms::ParameterTypeClass::Map
   @@map_providers = [MAP_TYPE_YANDEX, MAP_TYPE_GOOGLE]
 
   mattr_accessor :google_maps_api_key
+  mattr_accessor :yandex_maps_api_key
 
   # In MongoDB: {latlon: [x, y], zoom: z}
   #
@@ -197,7 +198,8 @@ class CckForms::ParameterTypeClass::Map
       map_html_containers.push %Q|<div id="#{id}_#{map}" data-id=#{id} class="map_widget" style="display: none; width: #{options[:width]}px; height: #{options[:height]}px"></div>|
     end
 
-    api_key = @@google_maps_api_key.present? ? "&key=#{@@google_maps_api_key}" : nil
+    google_api_key = @@google_maps_api_key.present? ? "&key=#{@@google_maps_api_key}" : nil
+    yandex_api_key = @@yandex_maps_api_key.present? ? "&apikey=#{@@yandex_maps_api_key}" : nil
 
     %Q|
     <div class="map-canvas">
@@ -218,12 +220,12 @@ class CckForms::ParameterTypeClass::Map
         var script;
         script = document.createElement('script');
         script.type = 'text/javascript';
-        script.src = 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&callback=googleMapReady#{api_key}';
+        script.src = 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&callback=googleMapReady#{google_api_key}';
         document.body.appendChild(script);
 
         script = document.createElement('script');
         script.type = 'text/javascript';
-        script.src = 'https://api-maps.yandex.ru/2.0/?coordorder=longlat&load=package.full&wizard=constructor&lang=ru-RU&onload=yandexMapReady';
+        script.src = 'https://api-maps.yandex.ru/2.0/?coordorder=longlat&load=package.full&wizard=constructor&lang=ru-RU&onload=yandexMapReady#{yandex_api_key}';
         document.body.appendChild(script);
       }
 

data/lib/cck_forms/version.rb

@@ -1,3 +1,3 @@
 module CckForms
-  VERSION = '3.4.5'
+  VERSION = '3.5.0'
 end

data/vendor/assets/javascripts/cck_forms/map.js.coffee

@@ -35,12 +35,12 @@ class CckFormsMap.AbstractMap
     @internalMapAPI.setZoom zoom
   setMarkerToPoint: (latitudeAndLongitude) ->
 
-  setCenterByGeocode: (geocode) ->
+  setCenterByGeocode: (geocode, apikey) ->
 
     options = {
       url:      'https://geocode-maps.yandex.ru/1.x/'
       dataType: 'json'
-      data:     {format: 'json', geocode: geocode, results: 1}
+      data:     {format: 'json', geocode: geocode, results: 1, apikey: apikey}
     }
 
     xhr = $.ajax options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cck_forms
 version: !ruby/object:Gem::Version
-  version: 3.4.5
+  version: 3.5.0
 platform: ruby
 authors:
 - Ilya Konanykhin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails