decidim-navigation_maps 1.2.0 → 1.3.0

data/app/packs/src/decidim/navigation_maps/navigation_maps.js

@@ -0,0 +1,43 @@
+import NavigationMapView from "src/decidim/navigation_maps/map_view.js";
+import "jsviews/jsrender";
+
+$(function() {
+
+  let $maps = $(".navigation_maps .map");
+  let $tabs = $("#navigation_maps-tabs");
+  let maps = {};
+  let tmpl = $.templates("#navigation_maps-popup");
+
+  $maps.each(function() {
+    let id = $(this).data("id");
+    maps[id] = new NavigationMapView(this);
+    maps[id].onSetLayerProperties(function(layer, props) {
+      if (!props.popup) {
+        let node = document.createElement("div");
+        let html = tmpl.render(props);
+        $(node).html(html);
+
+        layer.bindPopup(node, {
+          maxHeight: 400,
+          // autoPan: false,
+          maxWidth: 640,
+          minWidth: 200,
+          keepInView: true,
+          className: `navigation_map-info map-info-${id}-${layer._leaflet_id}`
+        });
+      }
+    });
+    maps[id].onClickArea(function(area) {
+      let popup = area.feature.properties && area.feature.properties.link && area.feature.properties.popup;
+      if (popup) {
+        location = area.feature.properties.link;
+      }
+    });
+  });
+
+  $tabs.on("change.zf.tabs", function(e, $tab, $content) {
+    let id = $content.find(".map").data("id");
+    maps[id].reload();
+  });
+
+});

data/app/{assets → packs}/stylesheets/decidim/navigation_maps/admin/navigation_maps.scss

@@ -2,10 +2,10 @@
 //= require leaflet-geoman
 //= require_self
 
-@import "decidim/variables";
-@import "decidim/utils/settings";
-@import "decidim/utils/mixins";
-@import "decidim/navigation_maps/variables";
+@import "stylesheets/decidim/variables";
+@import "stylesheets/decidim/utils/settings";
+@import "stylesheets/decidim/utils/mixins";
+@import "stylesheets/decidim/navigation_maps/variables";
 
 .navigation_maps.admin {
   .accordion-item {

data/app/{assets → packs}/stylesheets/decidim/navigation_maps/navigation_maps.scss

@@ -1,8 +1,7 @@
 //= require leaflet
 //= require leaflet-geoman
 //= require_self
-
-@import "decidim/navigation_maps/variables";
+@import "stylesheets/decidim/navigation_maps/variables";
 
 .home-section {
   .navigation_maps {

data/app/uploaders/decidim/navigation_maps/blueprint_uploader.rb

@@ -4,18 +4,10 @@ module Decidim
   module NavigationMaps
     # This class deals with uploading images to a Blueprints.
     class BlueprintUploader < Decidim::ImageUploader
-      process :validate_size, :validate_dimensions
-
-      version :thumbnail do
-        process resize_to_fit: [nil, 237]
-      end
-
-      def extension_white_list
-        %w(jpg jpeg png svg)
-      end
-
-      def max_image_height_or_width
-        8000
+      set_variants do
+        {
+          thumbnail: { resize_to_fit: [nil, 237] }
+        }
       end
     end
   end

data/app/uploaders/decidim/navigation_maps/cw/blueprint_uploader.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module NavigationMaps
+    module Cw
+      # This class deals with uploading images to a Blueprints.
+      class BlueprintUploader < Decidim::Cw::ImageUploader
+        process :validate_size, :validate_dimensions
+
+        version :thumbnail do
+          process resize_to_fit: [nil, 237]
+        end
+
+        def extension_white_list
+          %w(jpg jpeg png svg)
+        end
+
+        def max_image_height_or_width
+          8000
+        end
+      end
+    end
+  end
+end

data/config/assets.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# This file is located at `config/assets.rb` of your module.
+
+# Define the base path of your module. Please note that `Rails.root` may not be
+# used because we are not inside the Rails environment when this file is loaded.
+base_path = File.expand_path("..", __dir__)
+
+# Register an additional load path for webpack. All the assets within these
+# directories will be available for inclusion within the Decidim assets. For
+# example, if you have `app/packs/src/decidim/foo.js`, you can include that file
+# in your JavaScript entrypoints (or other JavaScript files within Decidim)
+# using `import "src/decidim/foo"` after you have registered the additional path
+# as follows.
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+
+# Register the entrypoints for your module. These entrypoints can be included
+# within your application using `javascript_pack_tag` and if you include any
+# SCSS files within the entrypoints, they become available for inclusion using
+# `stylesheet_pack_tag`.
+Decidim::Webpacker.register_entrypoints(
+  decidim_navigation_maps: "#{base_path}/app/packs/entrypoints/decidim_navigation_maps.js",
+  decidim_admin_navigation_maps: "#{base_path}/app/packs/entrypoints/decidim_admin_navigation_maps.js"
+)
+
+# If you want to import some extra SCSS files in the Decidim main SCSS file
+# without adding any extra stylesheet inclusion tags, you can use the following
+# method to register the stylesheet import for the main application.
+# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/navigation_maps/navigation_maps")
+
+# If you want to do the same but include the SCSS file for the admin panel's
+# main SCSS file, you can use the following method.
+# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/navigation_maps/admin", group: :admin)
+
+# If you want to override some SCSS variables/settings for Foundation from the
+# module, you can add the following registered import.
+# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/foo/settings", type: :settings)
+
+# If you want to do the same but override the SCSS variables of the admin
+# panel's styles, you can use the following method.
+# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/foo/admin_settings", type: :settings, group: :admin)

data/config/locales/cs.yml

@@ -29,7 +29,7 @@ cs:
           view: Zapojte se
         navigation_map_settings_form:
           add: Přidat
-          autohide_tabs: Hide tabs navigation if there's only one map
+          autohide_tabs: Skrýt navigaci v záložkách, pokud je pouze jedna mapa
           blueprint_image: Obrázek plánu
           description: Popis
           editor: Editor mapy

data/db/seeds.rb

@@ -24,18 +24,19 @@ if !ENV["SKIP_MODULE_SEEDS"] && (!Rails.env.production? || ENV["SEED"])
   blueprint1 = Decidim::NavigationMaps::Blueprint.create(
     organization: organization,
     content_block: content_block,
-    image: File.new(File.join(seeds_root, "antarctica.png")),
     title: Decidim::Faker::Localized.sentence(word_count: 2),
     description: Decidim::Faker::Localized.sentence(word_count: 10)
   )
 
-  Decidim::NavigationMaps::Blueprint.create(
+  blueprint2 = Decidim::NavigationMaps::Blueprint.create(
     organization: organization,
-    image: File.new(File.join(seeds_root, "penguins.jpg")),
     title: Decidim::Faker::Localized.sentence(word_count: 2),
     description: Decidim::Faker::Localized.sentence(word_count: 10)
   )
 
+  blueprint1.image.attach(io: File.open(File.join(seeds_root, "antarctica.png")), filename: "antarctica.png", content_type: "image/png")
+  blueprint2.image.attach(io: File.open(File.join(seeds_root, "penguins.jpg")), filename: "penguins.jpg", content_type: "image/jpeg")
+
   Decidim::NavigationMaps::BlueprintArea.create(
     blueprint: blueprint1,
     area_id: "10",
@@ -84,7 +85,7 @@ if !ENV["SKIP_MODULE_SEEDS"] && (!Rails.env.production? || ENV["SEED"])
     link_type: "link",
     color: "#ffbb00",
     title: { en: "Penguins" },
-    description: { en: "Penguins are beatiful animals" }
+    description: { en: "Penguins are beautiful animals" }
   )
 
   Decidim::NavigationMaps::BlueprintArea.create(
@@ -121,10 +122,10 @@ if !ENV["SKIP_MODULE_SEEDS"] && (!Rails.env.production? || ENV["SEED"])
     blueprint = Decidim::NavigationMaps::Blueprint.create(
       organization: organization,
       content_block: content_block,
-      image: File.new(File.join(seeds_root, "pla-cerda.jpg")),
       title: Decidim::Faker::Localized.sentence(word_count: 2),
       description: Decidim::Faker::Localized.sentence(word_count: 10)
     )
+    blueprint1.image.attach(io: File.open(File.join(seeds_root, "pla-cerda.jpg")), filename: "pla-cerda.jpg", content_type: "image/jpeg")
 
     Decidim::NavigationMaps::BlueprintArea.create(
       blueprint: blueprint,

data/lib/decidim/navigation_maps/admin_engine.rb

@@ -22,10 +22,6 @@ module Decidim
         end
       end
 
-      initializer "decidim_navigation_maps.admin_assets" do |app|
-        app.config.assets.precompile += %w(admin/decidim_navigation_maps_manifest.js admin/decidim_navigation_maps_manifest.css)
-      end
-
       def load_seed
         nil
       end

data/lib/decidim/navigation_maps/engine.rb

@@ -9,10 +9,6 @@ module Decidim
     class Engine < ::Rails::Engine
       isolate_namespace Decidim::NavigationMaps
 
-      initializer "decidim_navigation_maps.assets" do |app|
-        app.config.assets.precompile += %w(decidim_navigation_maps_manifest.js decidim_navigation_maps_manifest.css)
-      end
-
       initializer "decidim.navigation_maps.content_blocks" do
         Decidim.content_blocks.register(:homepage, :navigation_map) do |content_block|
           content_block.cell = "decidim/navigation_maps/content_blocks/navigation_map"
@@ -41,6 +37,10 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::NavigationMaps::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::NavigationMaps::Engine.root}/app/views") # for partials
       end
+
+      initializer "decidim_notify.webpacker.assets_path" do
+        Decidim.register_assets_path File.expand_path("app/packs", root)
+      end
     end
   end
 end

data/lib/decidim/navigation_maps/navigation_map_cell_helpers.rb

@@ -7,7 +7,7 @@ module Decidim
       delegate :available_locales, to: :current_organization
 
       def valid_blueprints
-        content_block_blueprints.where.not(image: [nil, ""]).order(:created_at)
+        content_block_blueprints.joins(:image_attachment).order(:created_at)
       end
 
       def valid_blueprints?

data/lib/decidim/navigation_maps/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-meetings version.
   module NavigationMaps
-    VERSION = "1.2.0"
-    DECIDIM_VERSION = [">= 0.24", "< 0.25"].freeze
+    VERSION = "1.3.0"
+    DECIDIM_VERSION = [">= 0.25", "< 0.27"].freeze
   end
 end

data/lib/decidim/navigation_maps.rb

@@ -5,8 +5,6 @@ require "decidim/navigation_maps/engine"
 require "decidim/navigation_maps/admin_engine"
 
 module Decidim
-  # This namespace holds the logic of the `NavigationMaps` component. This component
-  # allows users to create navigation_maps in a participatory space.
   module NavigationMaps
     autoload :NavigationMapCellHelpers, "decidim/navigation_maps/navigation_map_cell_helpers"
   end

data/lib/tasks/decidim_navigation_maps_webpacker_tasks.rake

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "decidim/gem_manager"
+
+namespace :decidim_navigation_maps do
+  namespace :webpacker do
+    desc "Installs Decidim Awesome webpacker files in Rails instance application"
+    task install: :environment do
+      raise "Decidim gem is not installed" if decidim_path.nil?
+
+      install_navigation_maps_npm
+    end
+
+    desc "Adds Decidim Awesome dependencies in package.json"
+    task upgrade: :environment do
+      raise "Decidim gem is not installed" if decidim_path.nil?
+
+      install_navigation_maps_npm
+    end
+
+    def install_navigation_maps_npm
+      navigation_maps_npm_dependencies.each do |type, packages|
+        system! "npm i --save-#{type} #{packages.join(" ")}"
+      end
+    end
+
+    def navigation_maps_npm_dependencies
+      @navigation_maps_npm_dependencies ||= begin
+        package_json = JSON.parse(File.read(navigation_maps_path.join("package.json")))
+
+        {
+          prod: package_json["dependencies"].map { |package, version| "#{package}@#{version}" },
+          dev: package_json["devDependencies"].map { |package, version| "#{package}@#{version}" }
+        }.freeze
+      end
+    end
+
+    def navigation_maps_path
+      @navigation_maps_path ||= Pathname.new(navigation_maps_gemspec.full_gem_path) if Gem.loaded_specs.has_key?(gem_name)
+    end
+
+    def navigation_maps_gemspec
+      @navigation_maps_gemspec ||= Gem.loaded_specs[gem_name]
+    end
+
+    def rails_app_path
+      @rails_app_path ||= Rails.root
+    end
+
+    def system!(command)
+      system("cd #{rails_app_path} && #{command}") || abort("\n== Command #{command} failed ==")
+    end
+
+    def gem_name
+      "decidim-navigation_maps"
+    end
+  end
+end

data/lib/tasks/navigation_maps_active_storage_migration_tasks.rake

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+namespace :navigation_maps do
+  namespace :active_storage_migrations do
+    desc "Migrates editor images from Carrierwave to ActiveStorage"
+    task migrate_from_carrierwave: :environment do
+      stdout = Logger.new($stdout)
+      stdout.level = Logger::INFO
+      Rails.logger.extend(ActiveSupport::Logger.broadcast(stdout))
+      Decidim::Organization.find_each do |organization|
+        puts "Migrating Organization #{organization.id} (#{organization.host})..."
+        routes_mappings = []
+        Decidim::NavigationMaps::MigrateLegacyImagesJob.perform_now(organization.id, routes_mappings)
+
+        path = Rails.root.join("tmp/navigation_maps_editor_images_mappings.csv")
+        dirname = File.dirname(path)
+        FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+        File.open(path, "wb") do |file|
+          file.write(Decidim::Exporters::CSV.new(routes_mappings).export.read)
+        end
+      end
+    end
+
+    desc "Checks editor images migrated from Carrierwave to ActiveStorage"
+    task check_migration_from_carrierwave: :environment do
+      logger = ActiveSupport::TaggedLogging.new(Logger.new($stdout))
+
+      Decidim::CarrierWaveMigratorService.check_migration(
+        klass: Decidim::NavigationMaps::Blueprint,
+        cw_attribute: "image",
+        cw_uploader: Decidim::NavigationMaps::Cw::BlueprintUploader,
+        as_attribute: "image",
+        logger: logger
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-navigation_maps
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,60 +16,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.27'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.27'
 description: Allows to create visual guiding maps in content blocks for Decidim.
 email:
 - ivan@platoniq.net
@@ -80,18 +80,6 @@ files:
 - LICENSE-AGPLv3.txt
 - README.md
 - Rakefile
-- app/assets/config/admin/decidim_navigation_maps_manifest.css
-- app/assets/config/admin/decidim_navigation_maps_manifest.js
-- app/assets/config/decidim_navigation_maps_manifest.css
-- app/assets/config/decidim_navigation_maps_manifest.js
-- app/assets/images/decidim/navigation_maps/icon.svg
-- app/assets/javascripts/decidim/navigation_maps/admin/map_editor.js
-- app/assets/javascripts/decidim/navigation_maps/admin/navigation_maps.js
-- app/assets/javascripts/decidim/navigation_maps/map_view.js
-- app/assets/javascripts/decidim/navigation_maps/navigation_maps.js
-- app/assets/stylesheets/decidim/navigation_maps/_variables.scss
-- app/assets/stylesheets/decidim/navigation_maps/admin/navigation_maps.scss
-- app/assets/stylesheets/decidim/navigation_maps/navigation_maps.scss
 - app/cells/decidim/navigation_maps/content_blocks/groups_navigation_map_cell.rb
 - app/cells/decidim/navigation_maps/content_blocks/navigation_map/_styles.erb
 - app/cells/decidim/navigation_maps/content_blocks/navigation_map/_tabs.erb
@@ -113,15 +101,29 @@ files:
 - app/forms/decidim/navigation_maps/area_form.rb
 - app/forms/decidim/navigation_maps/blueprint_form.rb
 - app/forms/decidim/navigation_maps/blueprint_forms.rb
+- app/jobs/decidim/navigation_maps/migrate_legacy_images_job.rb
 - app/models/decidim/navigation_maps/application_record.rb
 - app/models/decidim/navigation_maps/blueprint.rb
 - app/models/decidim/navigation_maps/blueprint_area.rb
+- app/packs/entrypoints/decidim_admin_navigation_maps.js
+- app/packs/entrypoints/decidim_admin_navigation_maps.scss
+- app/packs/entrypoints/decidim_navigation_maps.js
+- app/packs/entrypoints/decidim_navigation_maps.scss
+- app/packs/src/decidim/navigation_maps/admin/map_editor.js
+- app/packs/src/decidim/navigation_maps/admin/navigation_maps.js
+- app/packs/src/decidim/navigation_maps/map_view.js
+- app/packs/src/decidim/navigation_maps/navigation_maps.js
+- app/packs/stylesheets/decidim/navigation_maps/_variables.scss
+- app/packs/stylesheets/decidim/navigation_maps/admin/navigation_maps.scss
+- app/packs/stylesheets/decidim/navigation_maps/navigation_maps.scss
 - app/queries/decidim/navigation_maps/content_block_blueprints.rb
 - app/queries/decidim/navigation_maps/organization_blueprints.rb
 - app/uploaders/decidim/navigation_maps/blueprint_uploader.rb
+- app/uploaders/decidim/navigation_maps/cw/blueprint_uploader.rb
 - app/views/decidim/navigation_maps/admin/areas/_form.html.erb
 - app/views/decidim/navigation_maps/admin/areas/new.html.erb
 - app/views/decidim/navigation_maps/admin/areas/show.html.erb
+- config/assets.rb
 - config/i18n-tasks.yml
 - config/locales/ca.yml
 - config/locales/cs.yml
@@ -147,6 +149,8 @@ files:
 - lib/decidim/navigation_maps/test/factories.rb
 - lib/decidim/navigation_maps/version.rb
 - lib/tasks/custom_seeds.rake
+- lib/tasks/decidim_navigation_maps_webpacker_tasks.rake
+- lib/tasks/navigation_maps_active_storage_migration_tasks.rake
 - vendor/assets/images/draw/layers-2x.png
 - vendor/assets/images/draw/layers.png
 - vendor/assets/images/draw/marker-icon-2x.png
@@ -185,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A decidim navigation_maps module

data/app/assets/config/admin/decidim_navigation_maps_manifest.css

@@ -1,3 +0,0 @@
-/*
- *= link decidim/navigation_maps/admin/navigation_maps.css
- */

data/app/assets/config/admin/decidim_navigation_maps_manifest.js

@@ -1,3 +0,0 @@
-//= link decidim/navigation_maps/admin/navigation_maps.js
-//= require jquery.form
-//= require leaflet

data/app/assets/config/decidim_navigation_maps_manifest.css

@@ -1,3 +0,0 @@
-/*
- *= link decidim/navigation_maps/navigation_maps.css
- */

data/app/assets/config/decidim_navigation_maps_manifest.js

@@ -1 +0,0 @@
-//= link decidim/navigation_maps/navigation_maps.js

data/app/assets/images/decidim/navigation_maps/icon.svg

@@ -1 +0,0 @@
-<svg height="35px" width="35px" fill="#000000" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 1 511 511" style="enable-background:new 0 1 511 511;" xml:space="preserve"><g><path d="M205.6,146.9c-22.2,0-40.2,18-40.2,40.2c0,22.2,18,40.2,40.2,40.2c22.2,0,40.2-18,40.2-40.2   C245.9,165,227.8,146.9,205.6,146.9z M205.6,206.6c-10.7,0-19.3-8.7-19.3-19.3c0-10.7,8.7-19.3,19.3-19.3   c10.6,0,19.3,8.7,19.3,19.3C225,197.9,216.3,206.6,205.6,206.6z"/><path d="M406.6,178V70.3c0-5.8-4.2-10.1-10-10.1H10.6C4.8,60.3,0,64.6,0,70.3v304.9c0,5.8,4.8,10.9,10.6,10.9h242   c24.5,39.8,68.7,66.7,119.1,66.7c77,0,139.4-62.8,139.4-139.7C511,248.4,467.4,193.7,406.6,178z M21,365.2v-284h364.7v92.9   c-4.2-0.5-9.1-0.7-14-0.7c-0.3,0-0.6,0-0.6,0v-66.4c0-5.8-5-10-10.9-10H47.2c-5.8,0-10.5,4.2-10.5,10v231.8   c0,5.8,4.7,10.8,10.5,10.8h189.7c1.5,5.2,3.1,10.5,5.2,15.7H21z M232.9,328.6H57.6v-40.4l61.5-54.3c2.8-2.5,7-2.6,10-0.2l63.3,50.6   c10.7,8.6,26,8.4,36.5-0.5l7.6-6.5c-3,11.4-4.6,23.6-4.6,35.8C232,318.3,232.3,323.3,232.9,328.6z M215.7,267.8   c-2.8,2.4-7,2.4-10,0.1l-63.4-50.6c-10.9-8.7-26.5-8.4-37,0.9l-47.7,42V117.9H350v57.2c-37.7,6-70.1,26.8-91.4,56.4L215.7,267.8z    M371.6,431.7C306.2,431.7,253,378.4,253,313s53.2-118.6,118.6-118.6c65.4,0,118.6,53.2,118.6,118.6   C490.4,378.4,437.1,431.7,371.6,431.7z"/><path d="M435.4,234c-34.8-34.6-91-34.6-125.6,0c-13.7,13.7-22.4,31.2-25,50.4c-2.5,18.5,0.9,37.8,9.9,54.4c0,0,0,0.1,0.1,0.1   c4.4,8,9.4,14.7,15.2,20.4l55.1,55.1c2,2,4.6,3,7.4,3s5.5-1.2,7.4-3l55.1-55.1c16.9-16.9,26.2-39.2,26.2-62.8   C461.4,273,452.2,250.7,435.4,234z M420.1,344.6l-47.7,47.7l-47.7-47.7c-4.4-4.4-8.2-9.5-11.6-15.7c-14.2-26.6-9.6-58.8,11.6-80.1   c26.4-26.4,69.4-26.4,95.8,0c12.8,12.8,19.8,29.8,19.7,47.7C440.2,314.6,433,331.7,420.1,344.6z"/><path d="M372.3,241.7c-29,0-52.7,23.7-52.7,52.7c0,29,23.7,52.7,52.7,52.7s52.7-23.7,52.7-52.7   C425.1,265.4,401.5,241.7,372.3,241.7z M372.3,326c-17.5,0-31.8-14.2-31.8-31.8c0-17.5,14.3-31.8,31.8-31.8   c17.5,0,31.8,14.3,31.8,31.8C404.1,311.8,389.9,326,372.3,326z"/></g></svg>

data/app/assets/javascripts/decidim/navigation_maps/admin/map_editor.js

@@ -1,88 +0,0 @@
-// Creates a map
-//= require decidim/navigation_maps/map_view
-
-function NavigationMapEditor(map_object, table_object) {
-  var self = this;
-  // Call constructor of superclass to initialize superclass-derived members.
-  NavigationMapView.call(self, map_object, function() {
-    self.createControls();
-    if(self.blueprint) {
-      self.createAreas();
-    }
-  });
-  self.table_object = table_object;
-  this.createAreaCallback = function () {};
-  this.editAreaCallback = function () {};
-  this.removeAreaCallback = function () {};
-}
-
-// NavigationMapEditor derives from NavigationMapView
-NavigationMapEditor.prototype = Object.create(NavigationMapView.prototype);
-NavigationMapEditor.prototype.constructor = NavigationMapEditor;
-
-NavigationMapEditor.prototype.createControls = function() {
-  var self = this;
-  self.map.pm.addControls({
-    position: 'topleft',
-    drawCircle: false,
-    drawMarker: false,
-    drawCircleMarker: false,
-    drawPolyline: false,
-    cutPolygon: false
-  });
-
-  self.map.on('pm:create', function(e) {
-    var geojson = e.layer.toGeoJSON();
-    self.blueprint[e.layer._leaflet_id] = geojson;
-    self.attachEditorEvents(e.layer);
-    self.createAreaCallback(e.layer._leaflet_id, e.layer, self);
-  });
-
-  self.map.on('pm:remove', function(e) {
-    delete self.blueprint[e.layer._leaflet_id];
-    self.removeAreaCallback(e.layer._leaflet_id, e.layer, self);
-  });
-};
-
-NavigationMapEditor.prototype.editing = function() {
-  var pm = this.map.pm;
-  return pm.globalRemovalEnabled() || pm.globalDragModeEnabled() || pm.globalEditEnabled();
-};
-
-// register callback to handle area edits,removals and creations
-NavigationMapView.prototype.onCreateArea = function(callback) {
-  this.createAreaCallback = callback;
-};
-NavigationMapView.prototype.onEditArea = function(callback) {
-  this.editAreaCallback = callback;
-};
-NavigationMapView.prototype.onRemoveArea = function(callback) {
-  this.removeCreateCallback = callback;
-};
-
-NavigationMapEditor.prototype.attachEditorEvents = function (layer) {
-  var self = this;
-
-  layer.on('mouseover', function(e) {
-    e.target.getElement().classList.add('selected')
-  });
-
-  layer.on('mouseout', function(e) {
-    e.target.getElement().classList.remove('selected')
-  });
-
-  layer.on('pm:edit', function(e) {
-    self.blueprint[e.target._leaflet_id] = e.target.toGeoJSON();
-    self.editAreaCallback(e.target._leaflet_id, e.target, self);
-  });
-
-  layer.on('click', function(e) {
-    if(!self.editing()) {
-      self.clickAreaCallback(e.target._leaflet_id, e.target, self);
-    }
-  });
-};
-
-NavigationMapEditor.prototype.getBlueprint = function () {
-  return this.blueprint;
-};