c80_map_floors 0.1.0.12 → 0.1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4512f69ab69b9acf2c436cc9d1577f6ec34a612
-  data.tar.gz: dffdb925312687769ef5e7f2d747f1861027bb03
+  metadata.gz: 50f534c6084f5c188d5f141ef6d0f18ebd8df9c7
+  data.tar.gz: eb692e9196cde1ddfe4173815b988bb3e8fbcc5f
 SHA512:
-  metadata.gz: bf1709ba41daabfa1399755aa22e3136d09b8d9b513c5f90c504be4a9ab90c8d27ae518d62c8f9cc06035e5d24c3659d986b4016b38d2fdb1fc9830f5bc9c73e
-  data.tar.gz: 6723df7d2d35b054460c2e47eb6d3414112405f0679b859e1279a3274e02414bdf5581dea468f34b9bddf3e6a58ae066d344640d91baeb4d7903ee1e1456f705
+  metadata.gz: 10683282932bc7141992c1496c03303974a116b437d8b87ebf6a646620f926b0112fc0941675a19c3f6185c74a778ee7317ef60c865472ba4fb550d0af4f21b1
+  data.tar.gz: 82746892067cc5f2202d42628ec3138c3a15e0eafbff87222fcd3dc6be59fe16e4626702c31a8259b1b792d9b194508937f29bcbdb01495828f3e2ee2cc82867

data/app/assets/javascripts/buttons/admin_buttons/button_update_json.js

@@ -0,0 +1,40 @@
+"use strict";
+
+// с помощью это кнопки можно перегенерировать locations.json
+
+function UpdateJsonButton() {
+
+    var _this = this;
+    _this.el = null;
+    var _map = null;
+
+    // слушаем клик по кнопке
+    this.onClick = function (e) {
+        e.preventDefault();
+
+        _map.save_preloader_klass.show();
+
+        $.ajax({
+            url: '/ajax/update_map_json',
+            type: 'POST',
+            dataType: 'script'
+        }).done(this._on_map_json_updated);
+
+    };
+
+    this._on_map_json_updated = function () {
+        _map.save_preloader_klass.hide();
+    };
+
+    // инициализация
+    this.init = function (button_css_selector, link_to_map) {
+        _map = link_to_map;
+        _this.el = $(button_css_selector);
+
+        if (_this.el.length > 0) {
+            //mark_button_present = true;
+            _this.el.on('click', this.onClick);
+        }
+    }
+
+}

data/app/assets/javascripts/src/main.js

@@ -53,7 +53,7 @@ var InitMap = function (params) {
             mapfill: true,
             zoom: true,
             zoombuttons: true,
-            maxscale: 1,
+            maxscale: 3,
             fitscale: 0.51,
             skin: '',         // css class name
             scale: 1,
@@ -237,6 +237,9 @@ var InitMap = function (params) {
             }).done(function () {
                 console.log('<ajax.done>');
 
+                self.edit_button_klass = new UpdateJsonButton();
+                self.edit_button_klass.init('.mapplic-update-json', self);
+
                 self.edit_button_klass = new EditButton();
                 self.edit_button_klass.init('.mapplic-edit-button', self);
 

data/app/assets/javascripts/ui/tabs/tabs.js

@@ -300,7 +300,7 @@ function Tabs(options) {
         }
 
         if (mark_error_occurs) {
-            alert('data error, refer log for details.');
+            //alert('data error, refer log for details.');
             console.log('<_displayContent> [ERROR] Что-то не то с данными.');
         }
 
@@ -324,4 +324,4 @@ function Tabs(options) {
 
     this._fInit(options);
 
-}
+}

data/app/assets/stylesheets/map.scss

@@ -447,6 +447,20 @@
         }
       }
 
+      &.mapplic-update-json {
+        border-radius: 0 0 1px 1px;
+        border-top: none;
+
+        &:after {
+          content: 'json';
+          font-size: 14px;
+        }
+
+        &.editing, &.edit_area, &.edit_floor {
+          background-color: #006ca1;
+        }
+      }
+
       &.mapplic-new-button {
         border-radius: 0 0 1px 1px;
         border-top: none;

data/app/controllers/c80_map_floors/ajax_controller.rb

@@ -194,5 +194,10 @@ module C80MapFloors
 
     end
 
+    # перегенерировать locations.json
+    def update_map_json
+      MapJson.update_json
+    end
+
   end
 end

data/app/views/c80_map_floors/ajax/map_edit_buttons.js.erb

@@ -3,7 +3,12 @@
     //console.log("<js.erb>");
 
     var $btn_layer = $("<%= params[:div_css_selector] %>");
-    var $html = $('<a href="#" class="mapplic-edit-button"></a>');
+    var $html;
+
+    $html = $('<a href="#" class="mapplic-update-json" title="Перегенировать locations.json"></a>');
+    $btn_layer.append($html);
+
+    $html = $('<a href="#" class="mapplic-edit-button"></a>');
     $btn_layer.append($html);
 
     $html = $('<a href="#" class="mapplic-remove-button mapplic-disabled" data-placement="right" data-toggle="tooltip" title="Удалить полигон"></a>');

data/app/views/c80_map_floors/ajax/update_map_json.js.erb

@@ -0,0 +1,2 @@
+//noinspection SillyAssignmentJS
+window.location.href = window.location.href.split('#').join('');

data/config/routes.rb

@@ -11,5 +11,6 @@ C80MapFloors::Engine.routes.draw do
   match '/ajax/fetch_unlinked_floors', to: 'ajax#fetch_unlinked_floors', via: :post
   match '/ajax/fetch_unlinked_areas', to: 'ajax#fetch_unlinked_areas', via: :post
   match '/ajax/find_shops', to: 'ajax#find_shops', via: :post
+  match '/ajax/update_map_json', to: 'ajax#update_map_json', via: :post
 
 end

data/lib/c80_map_floors/version.rb

@@ -1,3 +1,3 @@
 module C80MapFloors
-  VERSION = '0.1.0.12'
+  VERSION = '0.1.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_map_floors
 version: !ruby/object:Gem::Version
-  version: 0.1.0.12
+  version: 0.1.0.13
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,6 +121,7 @@ files:
 - app/assets/javascripts/buttons/admin_buttons/button_new.js
 - app/assets/javascripts/buttons/admin_buttons/button_remove.js
 - app/assets/javascripts/buttons/admin_buttons/button_save.js
+- app/assets/javascripts/buttons/admin_buttons/button_update_json.js
 - app/assets/javascripts/buttons/button_back_to_map.js
 - app/assets/javascripts/buttons/zoom_buttons.js
 - app/assets/javascripts/c80_map_floors.js.coffee
@@ -191,6 +192,7 @@ files:
 - app/views/c80_map_floors/ajax/shared/_select_list_unlinked_areas.html.erb
 - app/views/c80_map_floors/ajax/shared/_select_list_unlinked_buildings.html.erb
 - app/views/c80_map_floors/ajax/shared/_select_list_unlinked_floors.html.erb
+- app/views/c80_map_floors/ajax/update_map_json.js.erb
 - app/views/c80_map_floors/shared/_modal_window.html.erb
 - app/views/c80_map_floors/shared/_save_preloader.html.erb
 - app/views/c80_map_floors/shared/map_row/_area_order_button.html.erb