c80_map 0.1.0 → 0.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd89e83da9ff01fcdbab1ebff4e3e4b66279b254
-  data.tar.gz: 9130f925242ae7cf4dafc4d0f59e27d639c3ba53
+  metadata.gz: 45604d02c597521234df05dd9a4e5b6d6f102bad
+  data.tar.gz: 3f5b26bce2ab3ade46ebac5bedd3e7381a0b91e0
 SHA512:
-  metadata.gz: 12ce4d2c50b665134b914ba23ca51ff30976b117325a06d1887f24706ce6e0f51ce1d995589484675d08b8cf6267415268fbc7b4c7503f323e35d7ae86c07e86
-  data.tar.gz: 5ca2a0b5ccc59e366e1628f03ed8ce12b4181024fa2301e614c63289b2fcccab09d8d8e637375e81dc4f7e01713f5716c1fa38cf52e03b9da2426cfa6bd83641
+  metadata.gz: 6a05585ebb025b8e3ef2f8ceadd2e5dea6adaedd5ff6cdede468d65a41a333bd254573cfc03eebe875f2a93a4c6e93172146c869201109a284dba1a6835d8ef2
+  data.tar.gz: bcaecce4a5783e6eec963d47e8e3cef0ddf577b3f42d542d3028c0dd86f40f65b403375783c76ff282062a215e44040e881ed0c6bbad2559edecc627e06a1b57

data/.gitignore

@@ -7,4 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-.idea
+.idea
+*.gem

data/app/admin/c80_map/buildings.rb

@@ -0,0 +1,37 @@
+ActiveAdmin.register C80Map::Building, as: 'Building' do
+
+  menu :label => "Buildings", :parent => 'Карта'
+
+  before_filter :skip_sidebar!, :only => :index
+
+  permit_params :img_bg, :img_overlay, :coords, :tag
+
+  config.sort_order = 'id_asc'
+
+  index do
+    column :tag
+    # column :coords
+    column 'img_bg' do |sp|
+      "#{ link_to image_tag(sp.img_bg.thumb.url, :style => 'background-color: #cfcfcf;'), sp.img_bg.url, :target => '_blank' }<br>
+      ".html_safe
+    end
+    # column 'img_overlay' do |sp|
+    #   "#{ link_to image_tag(sp.img_overlay.thumb.url), sp.img_overlay.url, :target => '_blank' }<br>
+    #   ".html_safe
+    # end
+    actions
+  end
+
+  form(:html => {:multipart => true}) do |f|
+
+    f.inputs 'Properties' do
+      f.input :tag
+      f.input :coords
+      f.input :img_bg, :hint => "#{image_tag(f.object.img_bg.thumb.url)}".html_safe
+      f.input :img_overlay, :hint => "#{image_tag(f.object.img_overlay.thumb.url)}".html_safe
+    end
+
+    f.actions
+  end
+
+end

data/app/assets/javascripts/map_objects/area.js

@@ -56,6 +56,11 @@ function Area() {
             _this._options["id"] = Math.ceil((Math.random()*100000));
         }
 
+        // [56dfaw1]
+        for (var i=0; i<_this._options.coords.length; i++) {
+            _this._options.coords[i] = Number(_this._options.coords[i]);
+        }
+
         _this._options.parent_building_hash = parent_building_hash;
         //clog(_this._options.parent_building_hash);
 

data/app/assets/javascripts/map_objects/building.js

@@ -201,6 +201,11 @@ function Building() {
         _options = options;
         _this.options = options;
 
+        // [56dfaw1]
+        for (var i=0; i<_this.options.coords.length; i++) {
+            _this.options.coords[i] = Number(_this.options.coords[i]);
+        }
+
         // [4ddl5df]: в случае, если это только что отрисованное Здание - генерим временный случайный id
         if (_this.options["id"] == undefined) {
             _this.options["id"] = Math.ceil((Math.random()*100000));

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

@@ -474,8 +474,9 @@ var clog = function () {
                                 }
                             }
 
-                            /* если находимся в режиме просмотра здания - входим в площадь*/
-                            else if (self.mode == 'view_building') {
+                            /* если находимся в режиме просмотра здания - входим в площадь */
+                            /* если находится в режиме просмотра площади - переключаемся на другую площадь */
+                            else if (self.mode == 'view_building' || self.mode == 'view_area') {
 
                                 // добираемся до объекта класса Area, который обслуживает полигон
                                 p = $(event.target).parent()[0];

data/app/controllers/c80_map/map_ajax_controller.rb

@@ -2,11 +2,18 @@ module C80Map
   class MapAjaxController < ApplicationController
 
     def save_map_data
-      puts "<MapAjaxController.save_map_data> #{params[:buildings]}"
+      Rails.logger.debug "<MapAjaxController.save_map_data> params = #{params}"
 
       #{ "buildings"=>{"0"=>{"coords"=>["2496.5894495412845",...]}} }
       #{ "areas"=>{"0"=>{"coords"=>["2496.5894495412845",...]}} }
 
+      # ЗДАНИЯ
+      # в случае успеха - вернём id созданного здания,
+      # тогда js обновит id и перенесёт здание из массива "новые здания" (drawn_buildings).
+      # в случае неудачи - вернём описание ошибки
+      # завершаем всё обновленным locations.json, который Map возьмёт
+      # и положит в data
+
       result = {
           areas: [],
           buildings: [],
@@ -16,37 +23,42 @@ module C80Map
       if params[:buildings].present?
         params[:buildings].each_key do |key|
           new_building_options = params[:buildings][key]
-          puts "<MapAjaxController.save_map_data> new_building_options = #{new_building_options}"
-          puts "<MapAjaxController.save_map_data> new_building_options[:coords] = #{new_building_options[:coords]}"
+          # puts "<MapAjaxController.save_map_data> new_building_options = #{new_building_options}"
+          # puts "<MapAjaxController.save_map_data> new_building_options[:coords] = #{new_building_options[:coords]}"
           b = Building.new({ coords: new_building_options[:coords].join(',') })
 
-          # в случае успеха - вернём id созданного здания,
-          # тогда js обновит id и перенесёт здание из массива "новые здания" (drawn_buildings).
-          # в случае неудачи - вернём описание ошибки
-          # завершаем всё обновленным locations.json, который Map возьмёт
-          # и положит в data
-
           if b.valid?
             b.save
-            result[:buildings] << { id: b.id }
+            result[:buildings] << { id: b.id, old_temp_id: new_building_options["id"] }
           else
             result[:buildings] << { id: new_building_options.id, status: 'error' }
           end
         end
       end
 
-      # if params[:areas].present?
-      #   params[:areas].each_with_key do |new_area_options,key|
-          #
-          # if b.present?
-          #
-          # end
-        # end
-      # end
+      if params[:areas].present?
+        params[:areas].each_key do |key|
+          new_area_options = params[:areas][key]
+          # Rails.logger.debug "<MapAjaxController.save_map_data> new_area_options = #{new_area_options}"
+          # puts "<MapAjaxController.save_map_data> new_area_options[:coords] = #{new_area_options[:coords]}"
+          a = Area.new({
+                           coords: new_area_options[:coords].join(','),
+                           building_id: new_area_options[:parent_building_id]
+                       })
+
+          if a.valid?
+            a.save
+            result[:areas] << { id: a.id, old_temp_id: new_area_options["id"] }
+          else
+            result[:areas] << { id: new_area_options.id, status: 'error' }
+          end
+        end
+      end
+
       puts "<MapAjaxController.save_map_data> result = #{result.to_json}"
 
       respond_to do |format|
-        format.json { render json: params }
+        format.json { render json: result }
       end
     end
 

data/app/models/c80_map/area.rb

@@ -1,5 +1,14 @@
 module C80Map
   class Area < ActiveRecord::Base
     belongs_to :building
+    validates :coords, uniqueness: true
+    after_save :update_json
+
+    protected
+
+    def update_json
+      MapJson.update_json
+    end
+
   end
 end

data/app/models/c80_map/building.rb

@@ -3,70 +3,13 @@ module C80Map
     has_many :areas, :class_name => 'C80Map::Area', :dependent => :destroy
     validates :coords, uniqueness: true
     after_save :update_json
+    mount_uploader :img_bg, C80Map::BuildingImageUploader
+    mount_uploader :img_overlay, C80Map::BuildingImageUploader
 
     private
 
     def update_json
-
-      locations_path = Rails.root.join("public", "locations.json")
-      locs = File.read(locations_path)
-      puts "<update_json> #{ Rails.root.join("public", "locations.json") }"
-
-      locs_hash = JSON.parse(locs)
-
-
-      # и заполняем объектами из собранного массива
-
-      # обходим все Building и составляем массив вида
-      # [{id, object_type=object_type, coords, building_hash, img, childs:[<areas>]},..]
-      buildings_to_location_json = []
-      Building.all.each do |b|
-        ob = {
-            id: b.id,
-            object_type: 'building',
-            coords: b.coords,
-            building_hash: {
-                id: 2,
-                title: "Здание 2",
-                props: {
-                    square: "1234 кв.м.",
-                    square_free: "124 кв. м",
-                    floor_height: "6 кв. м",
-                    column_step: "2 м",
-                    gate_type: "рaспашные",
-                    communications: "Интернет, электричество, водоснабжение",
-                    price: "от 155 руб/кв.м в месяц"
-                }
-            },
-            img: {
-                bg: {
-                    src: "/assets/sample_bg-e36f4b42acde72d4ff05376498e5834423165d43e73650dd24a342ecb20779b9.gif"
-                },
-                overlay: {
-                    src: "/assets/sample_overlay-f99419a8904207a6ac74288bccac16c76b388b7162bf2629a2a8dd825746f49b.gif"
-                }
-            },
-            childs: []
-        }
-        buildings_to_location_json << ob
-      end
-
-      # после чего удаляем из locs_hash все object_type=building
-      # locs_hash["childs"].each do |child|
-      #   if child["object_type"] == 'building'
-      #     delete locs_hash["childs"]
-      #   end
-      # end
-
-      # просто заменяем всех детей
-      locs_hash["childs"] = buildings_to_location_json
-
-      puts "<Building.update_json> #{locs_hash}"
-
-      # File.open(locations_path, 'w') do |f|
-      #   f.write(locs_hash.to_json)
-      # end
-
+      MapJson.update_json
     end
 
   end

data/app/models/c80_map/map_json.rb

@@ -0,0 +1,85 @@
+module C80Map
+
+  class MapJson < ActiveRecord::Base
+
+    def self.update_json
+      locations_path = Rails.root.join("public", "locations.json")
+      locs = File.read(locations_path)
+      # puts "<MapJson.update_json> #{ Rails.root.join("public", "locations.json") }"
+
+      locs_hash = JSON.parse(locs)
+
+      # обходим все Building и составляем массив вида
+      # [{id, object_type=object_type, coords, building_hash, img, childs:[<areas>]},..]
+      buildings_to_location_json = []
+      Building.all.each do |b|
+
+        # сначала соберём детей - Area
+        childs = []
+        b.areas.each do |area|
+          Rails.logger.debug "<MapJson.update_json> area #{area}"
+
+          ab = {
+              id: area.id,
+              object_type: 'area',
+              coords: area.coords.split(','),
+              area_hash: {
+                  id: 2,
+                  title: "Площадь #{area.id}.#{area.id}",
+                  is_free: true,
+                  props: {
+                      square: "124 кв.м.",
+                      floor_height: "6 кв. м",
+                      column_step: "2 м",
+                      gate_type: "распашные",
+                      communications: "Интернет, электричество, водоснабжение",
+                      price: "от 155 руб/кв.м в месяц"
+                  }
+              }
+          }
+          childs << ab
+        end
+
+        ob = {
+            id: b.id,
+            object_type: 'building',
+            coords: b.coords.split(","),
+            building_hash: {
+                id: 2,
+                title: "Здание 2",
+                props: {
+                    square: "1234 кв.м.",
+                    square_free: "124 кв. м",
+                    floor_height: "6 кв. м",
+                    column_step: "2 м",
+                    gate_type: "рaспашные",
+                    communications: "Интернет, электричество, водоснабжение",
+                    price: "от 155 руб/кв.м в месяц"
+                }
+            },
+            img: {
+                bg: {
+                    src: b.img_bg.url
+                },
+                overlay: {
+                    src: b.img_overlay.url
+                }
+            },
+            childs: childs
+        }
+        buildings_to_location_json << ob
+      end
+
+      # просто заменяем всех детей
+      locs_hash["childs"] = buildings_to_location_json
+
+      Rails.logger.debug "<MapJson.update_json> #{locs_hash}"
+
+      File.open(locations_path, 'w') do |f|
+        f.write(locs_hash.to_json)
+      end
+    end
+
+  end
+
+end

data/app/uploaders/c80_map/building_image_uploader.rb

@@ -0,0 +1,31 @@
+module C80Map
+
+  class BuildingImageUploader < CarrierWave::Uploader::Base
+
+    include CarrierWave::MiniMagick
+
+    storage :file
+
+    version :thumb do
+      process :resize_to_fit => [500,500]
+    end
+
+    def store_dir
+      "uploads/map/buildings"
+    end
+
+    def filename
+      if original_filename
+        "img_#{secure_token(4)}.#{file.extension}"
+      end
+    end
+
+    protected
+    def secure_token(length=16)
+      var = :"@#{mounted_as}_secure_token"
+      model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
+    end
+
+  end
+
+end

data/db/migrate/{20160620040204_create_c80_map_buildings.rb → 20160620040206_create_c80_map_buildings.rb}

@@ -1,7 +1,10 @@
 class CreateC80MapBuildings < ActiveRecord::Migration
   def change
     create_table :c80_map_buildings, :options => 'COLLATE=utf8_unicode_ci' do |t|
-      t.string :coords
+      t.string :tag
+      t.text :coords
+      t.string :img_bg
+      t.string :img_overlay
       t.timestamps
     end
   end

data/lib/c80_map/version.rb

@@ -1,3 +1,3 @@
 module C80Map
-  VERSION = "0.1.0"
+  VERSION = "0.1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_map
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.0.1
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/admin/c80_map/buildings.rb
 - app/admin/c80_map/settings.rb
 - app/assets/javascripts/buttons/admin_buttons/button_back_to_map.js
 - app/assets/javascripts/buttons/admin_buttons/button_cancel_create.js
@@ -93,7 +94,9 @@ files:
 - app/helpers/c80_map/application_helper.rb
 - app/models/c80_map/area.rb
 - app/models/c80_map/building.rb
+- app/models/c80_map/map_json.rb
 - app/models/c80_map/setting.rb
+- app/uploaders/c80_map/building_image_uploader.rb
 - app/uploaders/c80_map/map_image_uploader.rb
 - app/views/c80_map/_map_row.html.erb
 - app/views/c80_map/_map_row_index.html.erb
@@ -104,7 +107,7 @@ files:
 - config/routes.rb
 - db/migrate/20160617130000_create_c80_map_settings.rb
 - db/migrate/20160620040202_create_c80_map_areas.rb
-- db/migrate/20160620040204_create_c80_map_buildings.rb
+- db/migrate/20160620040206_create_c80_map_buildings.rb
 - db/seeds/801_fill_map_settings.rb
 - lib/c80_map.rb
 - lib/c80_map/engine.rb