From 6c1d1c2cdea001c59d8ff39833f3f28693ab1c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Thu, 3 Aug 2017 19:46:23 +0200 Subject: [PATCH 01/17] Add map settings to backend. Install leaflet assets to render maps. --- Gemfile | 3 ++ Gemfile.lock | 2 + app/assets/javascripts/application.js | 3 ++ app/assets/javascripts/map.js.coffee | 44 ++++++++++++++++++++ app/assets/stylesheets/admin.scss | 36 ++++++++++++++++ app/assets/stylesheets/application.scss | 1 + app/controllers/admin/settings_controller.rb | 7 ++++ app/views/admin/settings/_map_form.html.erb | 31 ++++++++++++++ app/views/admin/settings/index.html.erb | 8 ++++ config/locales/en/admin.yml | 15 +++++-- config/locales/en/settings.yml | 1 + config/locales/es/admin.yml | 7 ++++ config/locales/es/settings.yml | 1 + config/routes.rb | 2 + db/dev_seeds.rb | 4 ++ db/seeds.rb | 6 +++ spec/features/admin/settings_spec.rb | 35 ++++++++++++++++ 17 files changed, 202 insertions(+), 4 deletions(-) create mode 100644 app/assets/javascripts/map.js.coffee create mode 100644 app/views/admin/settings/_map_form.html.erb diff --git a/Gemfile b/Gemfile index a6c1dc71e..d4a2777a9 100644 --- a/Gemfile +++ b/Gemfile @@ -53,6 +53,9 @@ gem 'turnout', '~> 2.4.0' gem 'uglifier', '~> 3.2.0' gem 'unicorn', '~> 5.3.0' gem 'whenever', '~> 0.9.7', require: false +source 'https://rails-assets.org' do + gem 'rails-assets-leaflet' +end group :development, :test do gem "bullet", '~> 5.5.1' diff --git a/Gemfile.lock b/Gemfile.lock index f15f0c6e9..6435af58e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -334,6 +334,7 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.9) sprockets-rails + rails-assets-leaflet (1.1.0) rails-assets-markdown-it (8.2.2) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -542,6 +543,7 @@ DEPENDENCIES poltergeist (~> 1.15.0) quiet_assets (~> 1.1.0) rails (= 4.2.9) + rails-assets-leaflet! rails-assets-markdown-it (~> 8.2.1)! redcarpet (~> 3.4.0) responders (~> 2.4.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0b3ee0201..d7c36e944 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -67,6 +67,8 @@ //= require tree_navigator //= require custom //= require tag_autocomplete +//= require leaflet +//= require map var initialize_modules = function() { App.Comments.initialize(); @@ -103,6 +105,7 @@ var initialize_modules = function() { App.Documentable.initialize(); App.Imageable.initialize(); App.TagAutocomplete.initialize(); + App.Map.initialize(); }; $(function(){ diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee new file mode 100644 index 000000000..c3821e338 --- /dev/null +++ b/app/assets/javascripts/map.js.coffee @@ -0,0 +1,44 @@ +App.Map = + + initialize: -> + maps = $('*[data-map]') + + if maps.length > 0 + $.each maps, (index, map) -> + App.Map.initializeMap map + + initializeMap: (element) -> + latitude = $(element).data('latitude') + longitude = $(element).data('longitude') + zoom = $(element).data('zoom') + mapTilesProvider = $(element).data('tiles-provider') + mapAttributionSelector = $(element).data('tiles-attribution-selector') + latitudeInputSelector = $(element).data('latitude-input-selector') + longitudeInputSelector = $(element).data('longitude-input-selector') + zoomInputSelector = $(element).data('zoom-input-selector') + + latLng = new (L.LatLng)(latitude, longitude) + map = L.map(element.id).setView(latLng, zoom) + attribution = $(mapAttributionSelector) + L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map + + marker_icon = L.divIcon( + iconSize: null + html: '
') + marker = L.marker(latLng, { icon: marker_icon, draggable: 'true' }) + marker.addTo(map) + + onMapClick = (e) -> + marker.setLatLng(e.latlng) + updateFormfields() + return + + updateFormfields = -> + $(latitudeInputSelector).val marker.getLatLng().lat + $(longitudeInputSelector).val marker.getLatLng().lng + $(zoomInputSelector).val map.getZoom() + return + + marker.on 'dragend', updateFormfields + map.on 'zoomend', updateFormfields + map.on 'click', onMapClick \ No newline at end of file diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 3dcf4a474..2ef6fea23 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -8,6 +8,7 @@ // 06. Polls // 07. Legislation // 08. CMS +// 09. Map // // 01. Global styles @@ -967,3 +968,38 @@ table { border: 0; } } + +// 09. Map +// -------------- + +.map{ + width: 100%; + height: 350px; + .map-marker { + visibility: visible; + width: 30px; + height: 30px; + border-radius: 50% 50% 50% 0; + background: #00cae9; + position: absolute; + transform: rotate(-45deg); + left: 50%; + top: 50%; + margin: -45px 0 0 -15px; + } + .map-marker:after { + content: ""; + width: 14px; + height: 14px; + margin: 8px 0 0 8px; + background: white; + position: absolute; + border-radius: 50%; + } +} +.map-marker{ + visibility: hidden; +} +.map-attributtion{ + visibility: hidden; +} \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 361dcfde3..aff55c88c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -18,3 +18,4 @@ @import 'datepicker_overrides'; @import 'jquery-ui/autocomplete'; @import 'autocomplete_overrides'; +@import 'leaflet'; diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 70541a3a0..2d69ff19a 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -14,6 +14,13 @@ class Admin::SettingsController < Admin::BaseController redirect_to admin_settings_path, notice: t("admin.settings.flash.updated") end + def update_map + Setting["map.latitude"] = params[:latitude].to_f + Setting["map.longitude"] = params[:longitude].to_f + Setting["map.zoom"] = params[:zoom].to_i + redirect_to admin_settings_path, notice: t("admin.settings.index.map.flash.update") + end + private def settings_params diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb new file mode 100644 index 000000000..1187cfa96 --- /dev/null +++ b/app/views/admin/settings/_map_form.html.erb @@ -0,0 +1,31 @@ +
+
+
" + data-longitude="<%= Setting["map.longitude"] %>" + data-zoom="<%= Setting["map.zoom"] %>" + data-tiles-attribution-selector="#admin-map-attribution" + data-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" + data-latitude-input-selector="#latitude" + data-longitude-input-selector="#longitude" + data-zoom-input-selector="#zoom" + data-marker-selector="#admin-map-marker"> +
+
+ © OpenStreetMap contributors +
+ + <%= form_tag admin_update_map_path, method: :put, id: 'map-form' do |f| %> + + <%= hidden_field_tag :latitude, Setting["map.latitude"] %> + <%= hidden_field_tag :longitude, Setting["map.longitude"] %> + <%= hidden_field_tag :zoom, Setting["map.zoom"] %> + +
+ <%= submit_tag t("admin.settings.index.map.form.submit"), + class: "button hollow expanded" %> +
+ + <% end %> +
+
\ No newline at end of file diff --git a/app/views/admin/settings/index.html.erb b/app/views/admin/settings/index.html.erb index 14c89b776..e49174fca 100644 --- a/app/views/admin/settings/index.html.erb +++ b/app/views/admin/settings/index.html.erb @@ -95,3 +95,11 @@ <% end %> + +<% if feature?(:map) %> +

<%= t("admin.settings.index.map.title") %>

+

<%= t("admin.settings.index.map.help") %>

+ + <%= render "map_form" %> + +<% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 236ffd51e..be20333d8 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -40,8 +40,8 @@ en: errors: form: error: - one: "prevented this banner from being saved" - other: 'prevented this banner from being saved' + one: "error prevented this banner from being saved" + other: 'errors prevented this banner from being saved' new: creating: Create banner activity: @@ -697,6 +697,13 @@ en: disabled: "Feature disabled" enable: "Enable" disable: "Disable" + map: + title: Map configuration + help: Here you can customize the way the map is displayed to users. Drag map marker or click anywhere over the map, set desired zoom and click button "Update". + flash: + update: Map configuration updated succesfully. + form: + submit: Update shared: booths_search: button: Search @@ -788,8 +795,8 @@ en: errors: form: error: - one: "prevented this geozone from being saved" - other: 'prevented this geozone from being saved' + one: "error prevented this geozone from being saved" + other: 'errors prevented this geozone from being saved' edit: form: submit_button: Save changes diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml index e1d84393f..81ddd57d9 100644 --- a/config/locales/en/settings.yml +++ b/config/locales/en/settings.yml @@ -40,6 +40,7 @@ en: voting_allowed: Voting on investment projects legislation: Legislation community: Community on proposals and investments + map: Proposals and budget investments geolocation mailer_from_name: Origin email name mailer_from_address: Origin email address meta_description: "Site description (SEO)" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 91af8db6c..f2e38be7f 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -697,6 +697,13 @@ es: disabled: "Funcionalidad desactivada" enable: "Activar" disable: "Desactivar" + map: + title: Configuración del mapa + help: Aquí puedes personalizar la manera en la que se muestra el mapa a los usuarios. Arrastra el marcador o pulsa sobre cualquier parte del mapa, ajusta el zoom y pulsa el botón 'Actualizar'. + flash: + update: La configuración del mapa se ha guardado correctamente. + form: + submit: Actualizar shared: booths_search: button: Buscar diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml index f0a7b53a2..e6cfde3b1 100644 --- a/config/locales/es/settings.yml +++ b/config/locales/es/settings.yml @@ -40,6 +40,7 @@ es: voting_allowed: Votaciones sobre propuestas de inversión legislation: Legislación community: Comunidad en propuestas y proyectos de inversión + map: Geolocalización de propuestas y proyectos de inversión mailer_from_name: Nombre email remitente mailer_from_address: Dirección email remitente meta_description: "Descripción del sitio (SEO)" diff --git a/config/routes.rb b/config/routes.rb index 1cb2d45b9..410f2dced 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -250,6 +250,8 @@ Rails.application.routes.draw do end resources :settings, only: [:index, :update] + put :update_map, to: "settings#update_map" + resources :moderators, only: [:index, :create, :destroy] do get :search, on: :collection end diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 1223d94a4..45b0ed27b 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -37,6 +37,7 @@ Setting.create(key: 'feature.google_login', value: "true") Setting.create(key: 'feature.signature_sheets', value: "true") Setting.create(key: 'feature.legislation', value: "true") Setting.create(key: 'feature.community', value: "true") +Setting.create(key: 'feature.map', value: "true") Setting.create(key: 'per_page_code_head', value: "") Setting.create(key: 'per_page_code_body', value: "") Setting.create(key: 'comments_body_max_length', value: '1000') @@ -47,6 +48,9 @@ Setting.create(key: 'meta_keywords', value: 'citizen participation, open governm Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/') Setting.create(key: 'min_age_to_participate', value: '16') Setting.create(key: 'proposal_improvement_path', value: nil) +Setting.create(key: 'map.latitude', value: 51.48) +Setting.create(key: 'map.longitude', value: 0) +Setting.create(key: 'map.zoom', value: 10) puts " ✅" print "Creating Geozones" diff --git a/db/seeds.rb b/db/seeds.rb index 96916f29a..13a532a92 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -80,6 +80,7 @@ Setting['feature.budgets'] = true Setting['feature.signature_sheets'] = true Setting['feature.legislation'] = true Setting['feature.community'] = true +Setting['feature.map'] = true # Spending proposals feature flags Setting['feature.spending_proposal_features.voting_allowed'] = nil @@ -108,3 +109,8 @@ Setting['min_age_to_participate'] = 16 # Proposal improvement url path ('/more-information/proposal-improvement') Setting['proposal_improvement_path'] = nil + +# City map feature default configuration (Greenwich) +Setting['map.latitude'] = 51.48 +Setting['map.longitude'] = 0 +Setting['map.zoom'] = 10 diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb index c92b4b525..0a220d05b 100644 --- a/spec/features/admin/settings_spec.rb +++ b/spec/features/admin/settings_spec.rb @@ -28,4 +28,39 @@ feature 'Admin settings' do expect(page).to have_content 'Value updated' end + describe "Update map" do + + scenario "Should not be able when map feature deactivated" do + Setting['feature.map'] = false + admin = create(:administrator).user + login_as(admin) + visit admin_settings_path + + expect(page).not_to have_content "Map configuration" + end + + scenario "Should be able when map feature deactivated" do + Setting['feature.map'] = true + admin = create(:administrator).user + login_as(admin) + visit admin_settings_path + + expect(page).to have_content "Map configuration" + end + + scenario "Should show successful notice" do + Setting['feature.map'] = true + admin = create(:administrator).user + login_as(admin) + visit admin_settings_path + + within "#map-form" do + click_on "Update" + end + + expect(page).to have_content "Map configuration updated succesfully" + end + + end + end \ No newline at end of file From 5956207a0070090ac3228a1e082cafb56d413af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2017 11:10:38 +0200 Subject: [PATCH 02/17] Add map locations. Each map location can belongs to proposal or budget investment. --- app/assets/javascripts/map.js.coffee | 40 +++++++++++++------ .../budgets/investments_controller.rb | 3 +- app/controllers/proposals_controller.rb | 3 +- app/models/budget/investment.rb | 2 + app/models/map_location.rb | 6 +++ app/models/proposal.rb | 2 + app/views/admin/settings/_map_form.html.erb | 3 +- app/views/budgets/investments/_form.html.erb | 13 ++++++ app/views/map_locations/_form_fields.html.erb | 25 ++++++++++++ app/views/proposals/_form.html.erb | 13 ++++++ config/locales/en/general.yml | 2 + config/locales/es/general.yml | 2 + .../20170805132736_create_map_locations.rb | 11 +++++ db/schema.rb | 11 +++++ 14 files changed, 119 insertions(+), 17 deletions(-) create mode 100644 app/models/map_location.rb create mode 100644 app/views/map_locations/_form_fields.html.erb create mode 100644 db/migrate/20170805132736_create_map_locations.rb diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index c3821e338..8aca94bc7 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -16,20 +16,15 @@ App.Map = latitudeInputSelector = $(element).data('latitude-input-selector') longitudeInputSelector = $(element).data('longitude-input-selector') zoomInputSelector = $(element).data('zoom-input-selector') + removeMarkerSelector = $(element).data('remove-marker-selector') + attribution = $(mapAttributionSelector) + marker_icon = L.divIcon( + iconSize: null + html: '
') - latLng = new (L.LatLng)(latitude, longitude) - map = L.map(element.id).setView(latLng, zoom) - attribution = $(mapAttributionSelector) - L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map - - marker_icon = L.divIcon( - iconSize: null - html: '
') - marker = L.marker(latLng, { icon: marker_icon, draggable: 'true' }) - marker.addTo(map) - - onMapClick = (e) -> + placeMarker = (e) -> marker.setLatLng(e.latlng) + marker.addTo(map) updateFormfields() return @@ -39,6 +34,25 @@ App.Map = $(zoomInputSelector).val map.getZoom() return + clearFormfields = -> + $(latitudeInputSelector).val '' + $(longitudeInputSelector).val '' + $(zoomInputSelector).val '' + return + + removeMarker = (e) -> + e.preventDefault() + map.removeLayer(marker) + clearFormfields() + return + + latLng = new (L.LatLng)(latitude, longitude) + map = L.map(element.id).setView(latLng, zoom) + marker = L.marker(latLng, { icon: marker_icon, draggable: 'true' }) + L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map + marker.addTo(map) + + $(removeMarkerSelector).on 'click', removeMarker marker.on 'dragend', updateFormfields map.on 'zoomend', updateFormfields - map.on 'click', onMapClick \ No newline at end of file + map.on 'click', placeMarker \ No newline at end of file diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb index fb82c51db..bb00f24af 100644 --- a/app/controllers/budgets/investments_controller.rb +++ b/app/controllers/budgets/investments_controller.rb @@ -107,7 +107,8 @@ module Budgets .permit(:title, :description, :external_url, :heading_id, :tag_list, :organization_name, :location, :terms_of_service, image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], - documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) + documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], + map_location_attributes: [:latitude, :longitude, :zoom]) end def load_ballot diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 9e6fc521d..d1db0e4a2 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -77,7 +77,8 @@ class ProposalsController < ApplicationController params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :geozone_id, image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], - documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] ) + documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], + map_location_attributes: [:latitude, :longitude, :zoom]) end def retired_params diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 857025375..af8feac1d 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -27,6 +27,8 @@ class Budget has_many :valuators, through: :valuator_assignments has_many :comments, as: :commentable has_many :milestones + has_one :map_location + accepts_nested_attributes_for :map_location validates :title, presence: true validates :author, presence: true diff --git a/app/models/map_location.rb b/app/models/map_location.rb new file mode 100644 index 000000000..61cb10893 --- /dev/null +++ b/app/models/map_location.rb @@ -0,0 +1,6 @@ +class MapLocation < ActiveRecord::Base + + belongs_to :proposal + belongs_to :investment + +end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index 7a0abcb6e..7ad7a863b 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -25,6 +25,8 @@ class Proposal < ActiveRecord::Base belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :geozone + has_one :map_location + accepts_nested_attributes_for :map_location has_many :comments, as: :commentable has_many :proposal_notifications diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 1187cfa96..53eb3d882 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -8,8 +8,7 @@ data-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" data-latitude-input-selector="#latitude" data-longitude-input-selector="#longitude" - data-zoom-input-selector="#zoom" - data-marker-selector="#admin-map-marker"> + data-zoom-input-selector="#zoom">
© OpenStreetMap contributors diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index 0d0bdd7f1..789d0f8a9 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -29,6 +29,19 @@ <%= render 'documents/nested_documents', documentable: @investment, f: f %>
+ <% if feature?(:map) %> +
+ + <%= render 'map_locations/form_fields', + form: f, + map_location: @investment.map_location || MapLocation.new, + label: t("proposals.form.map_location"), + help: t("proposals.form.map_location_instructions"), + parent_class: "budget_investment" %> + +
+ <% end %> +
<%= f.text_field :location %>
diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb new file mode 100644 index 000000000..7c4a1785e --- /dev/null +++ b/app/views/map_locations/_form_fields.html.erb @@ -0,0 +1,25 @@ +<%= form.label :map_location, label %> +

<%= help %>

+
" + data-longitude="<%= map_location.present? && map_location.longitude.present? ? map_location.longitude : Setting["map.longitude"] %>" + data-zoom="<%= map_location.present? && map_location.zoom.present? ? map_location.zoom : Setting["map.zoom"] %>" + data-tiles-attribution-selector="#map-location-attribution" + data-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" + data-latitude-input-selector="#<%= parent_class %>_map_location_attributes_latitude" + data-longitude-input-selector="#<%= parent_class %>_map_location_attributes_longitude" + data-zoom-input-selector="#<%= parent_class %>_map_location_attributes_zoom" + data-remove-marker-selector=".location-map-remove-marker-button"> +
+ +
+ © OpenStreetMap contributors +
+ +Remove marker + +<%= form.fields_for :map_location, map_location do |map_location_fields| %> + <%= map_location_fields.hidden_field :latitude, value: map_location.latitude, id: "#{parent_class}_map_location_attributes_latitude" %> + <%= map_location_fields.hidden_field :longitude, value: map_location.longitude, id: "#{parent_class}_map_location_attributes_longitude" %> + <%= map_location_fields.hidden_field :zoom, value: map_location.zoom, id: "#{parent_class}_map_location_attributes_zoom" %> +<% end %> \ No newline at end of file diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb index df1e096e9..72feba9c3 100644 --- a/app/views/proposals/_form.html.erb +++ b/app/views/proposals/_form.html.erb @@ -59,6 +59,19 @@ <%= f.select :geozone_id, geozone_select_options, {include_blank: t("geozones.none"), label: false} %> + <% if feature?(:map) %> +
+ + <%= render 'map_locations/form_fields', + form: f, + map_location: @proposal.map_location || MapLocation.new, + label: t("proposals.form.map_location"), + help: t("proposals.form.map_location_instructions"), + parent_class: "proposal" %> + +
+ <% end %> +
<%= f.label :tag_list, t("proposals.form.tags_label") %>

<%= t("proposals.form.tags_instructions") %>

diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 6312a9a5c..c118db367 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -333,6 +333,8 @@ en: tags_instructions: "Tag this proposal. You can choose from proposed categories or add your own" tags_label: Tags tags_placeholder: "Enter the tags you would like to use, separated by commas (',')" + map_location: "Map location" + map_location_instructions: "Navigate the map to the location and place the marker." index: featured_proposals: Featured filter_topic: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 4b1ebe2ba..46664e2ae 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -333,6 +333,8 @@ es: tags_label: Temas tag_category_label: "Categorías" tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')" + map_location: "Ubicación en el mapa" + map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador." index: featured_proposals: Destacadas filter_topic: diff --git a/db/migrate/20170805132736_create_map_locations.rb b/db/migrate/20170805132736_create_map_locations.rb new file mode 100644 index 000000000..a75820d54 --- /dev/null +++ b/db/migrate/20170805132736_create_map_locations.rb @@ -0,0 +1,11 @@ +class CreateMapLocations < ActiveRecord::Migration + def change + create_table :map_locations do |t| + t.float :latitude + t.float :longitude + t.integer :zoom + t.integer :proposal_id, index: true + t.integer :investment_id, index: true + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 41063df03..86d22f3b2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -549,6 +549,17 @@ ActiveRecord::Schema.define(version: 20170918231410) do add_index "managers", ["user_id"], name: "index_managers_on_user_id", using: :btree + create_table "map_locations", force: :cascade do |t| + t.float "latitude" + t.float "longitude" + t.integer "zoom" + t.integer "proposal_id" + t.integer "investment_id" + end + + add_index "map_locations", ["investment_id"], name: "index_map_locations_on_investment_id", using: :btree + add_index "map_locations", ["proposal_id"], name: "index_map_locations_on_proposal_id", using: :btree + create_table "moderators", force: :cascade do |t| t.integer "user_id" end From 874a951dd27f5cc9060c1a3df9b6929918b9e994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2017 11:59:25 +0200 Subject: [PATCH 03/17] Add map locations helper. Allow to configure map marker edition on map instantiation at views. --- app/assets/javascripts/map.js.coffee | 24 ++++++------ app/helpers/map_locations_helper.rb | 19 +++++++++ app/views/budgets/investments/_form.html.erb | 5 ++- app/views/map_locations/_form_fields.html.erb | 39 ++++++++++++------- app/views/proposals/_form.html.erb | 1 + config/locales/en/budgets.yml | 3 ++ config/locales/en/general.yml | 1 + config/locales/es/budgets.yml | 3 ++ config/locales/es/general.yml | 1 + 9 files changed, 68 insertions(+), 28 deletions(-) create mode 100644 app/helpers/map_locations_helper.rb diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index 8aca94bc7..fb82d0800 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -8,16 +8,17 @@ App.Map = App.Map.initializeMap map initializeMap: (element) -> - latitude = $(element).data('latitude') - longitude = $(element).data('longitude') - zoom = $(element).data('zoom') - mapTilesProvider = $(element).data('tiles-provider') - mapAttributionSelector = $(element).data('tiles-attribution-selector') + latitude = $(element).data('marker-latitude') + longitude = $(element).data('marker-longitude') + zoom = $(element).data('map-zoom') + mapTilesProvider = $(element).data('map-tiles-provider') + mapAttributionSelector = $(element).data('map-tiles-attribution-selector') latitudeInputSelector = $(element).data('latitude-input-selector') longitudeInputSelector = $(element).data('longitude-input-selector') zoomInputSelector = $(element).data('zoom-input-selector') - removeMarkerSelector = $(element).data('remove-marker-selector') + removeMarkerSelector = $(element).data('marker-remove-selector') attribution = $(mapAttributionSelector) + editable = $(element).data('marker-editable') marker_icon = L.divIcon( iconSize: null html: '
') @@ -48,11 +49,12 @@ App.Map = latLng = new (L.LatLng)(latitude, longitude) map = L.map(element.id).setView(latLng, zoom) - marker = L.marker(latLng, { icon: marker_icon, draggable: 'true' }) + marker = L.marker(latLng, { icon: marker_icon, draggable: editable }) L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map marker.addTo(map) - $(removeMarkerSelector).on 'click', removeMarker - marker.on 'dragend', updateFormfields - map.on 'zoomend', updateFormfields - map.on 'click', placeMarker \ No newline at end of file + if editable + $(removeMarkerSelector).on 'click', removeMarker + marker.on 'dragend', updateFormfields + map.on 'zoomend', updateFormfields + map.on 'click', placeMarker \ No newline at end of file diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb new file mode 100644 index 000000000..08d16391f --- /dev/null +++ b/app/helpers/map_locations_helper.rb @@ -0,0 +1,19 @@ +module MapLocationsHelper + + def map_location_latitude(map_location) + map_location.present? && map_location.latitude.present? ? map_location.latitude : Setting["map.latitude"] + end + + def map_location_longitude(map_location) + map_location.present? && map_location.longitude.present? ? map_location.longitude : Setting["map.longitude"] + end + + def map_location_zoom(map_location) + map_location.present? && map_location.zoom.present? ? map_location.zoom : Setting["map.zoom"] + end + + def map_location_input_id(prefix, attribute) + "#{prefix}_map_location_attributes_#{attribute}" + end + +end \ No newline at end of file diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index 789d0f8a9..8a19c188a 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -35,8 +35,9 @@ <%= render 'map_locations/form_fields', form: f, map_location: @investment.map_location || MapLocation.new, - label: t("proposals.form.map_location"), - help: t("proposals.form.map_location_instructions"), + label: t("budgets.investments.form.map_location"), + help: t("budgets.investments.form.map_location_instructions"), + remove_marker_label: t("budgets.investments.form.map_remove_marker"), parent_class: "budget_investment" %>
diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index 7c4a1785e..4fcefa2fa 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -1,25 +1,34 @@ <%= form.label :map_location, label %>

<%= help %>

-
" - data-longitude="<%= map_location.present? && map_location.longitude.present? ? map_location.longitude : Setting["map.longitude"] %>" - data-zoom="<%= map_location.present? && map_location.zoom.present? ? map_location.zoom : Setting["map.zoom"] %>" - data-tiles-attribution-selector="#map-location-attribution" - data-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" - data-latitude-input-selector="#<%= parent_class %>_map_location_attributes_latitude" - data-longitude-input-selector="#<%= parent_class %>_map_location_attributes_longitude" - data-zoom-input-selector="#<%= parent_class %>_map_location_attributes_zoom" - data-remove-marker-selector=".location-map-remove-marker-button"> + +
© OpenStreetMap contributors
-Remove marker +<%= remove_marker_label %> -<%= form.fields_for :map_location, map_location do |map_location_fields| %> - <%= map_location_fields.hidden_field :latitude, value: map_location.latitude, id: "#{parent_class}_map_location_attributes_latitude" %> - <%= map_location_fields.hidden_field :longitude, value: map_location.longitude, id: "#{parent_class}_map_location_attributes_longitude" %> - <%= map_location_fields.hidden_field :zoom, value: map_location.zoom, id: "#{parent_class}_map_location_attributes_zoom" %> +<%= form.fields_for :map_location, map_location do |m_l_fields| %> + <%= m_l_fields.hidden_field :latitude, + value: map_location.latitude, + id: map_location_input_id(parent_class, 'latitude') %> + <%= m_l_fields.hidden_field :longitude, + value: map_location.longitude, + id: map_location_input_id(parent_class, 'latitude') %> + <%= m_l_fields.hidden_field :zoom, + value: map_location.zoom, + id: map_location_input_id(parent_class, 'latitude') %> <% end %> \ No newline at end of file diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb index 72feba9c3..2390b62f6 100644 --- a/app/views/proposals/_form.html.erb +++ b/app/views/proposals/_form.html.erb @@ -67,6 +67,7 @@ map_location: @proposal.map_location || MapLocation.new, label: t("proposals.form.map_location"), help: t("proposals.form.map_location_instructions"), + remove_marker_label: t("proposals.form.map_remove_marker"), parent_class: "proposal" %>
diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index c1879df16..1f29370bb 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -55,6 +55,9 @@ en: tags_instructions: "Tag this proposal. You can choose from proposed categories or add your own" tags_label: Tags tags_placeholder: "Enter the tags you would like to use, separated by commas (',')" + map_location: "Map location" + map_location_instructions: "Navigate the map to the location and place the marker." + map_remove_marker: "Remove map marker" index: title: Participatory budgeting unfeasible: Unfeasible investment projects diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index c118db367..290e1a278 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -335,6 +335,7 @@ en: tags_placeholder: "Enter the tags you would like to use, separated by commas (',')" map_location: "Map location" map_location_instructions: "Navigate the map to the location and place the marker." + map_remove_marker: "Remove map marker" index: featured_proposals: Featured filter_topic: diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 78b81fbd3..5c76c8abe 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -55,6 +55,9 @@ es: tags_label: Temas tag_category_label: "Categorías" tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')" + map_location: "Ubicación en el mapa" + map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador." + map_remove_marker: "Eliminar el marcador" index: title: Presupuestos participativos unfeasible: Propuestas de inversión no viables diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 46664e2ae..722c0dabb 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -335,6 +335,7 @@ es: tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')" map_location: "Ubicación en el mapa" map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador." + map_remove_marker: "Eliminar el marcador" index: featured_proposals: Destacadas filter_topic: From a14bb77f49c8c805fe07c4cfaf11c304fe093395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2017 13:22:37 +0200 Subject: [PATCH 04/17] Fix map location form fields ids definition. --- app/views/map_locations/_form_fields.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index 4fcefa2fa..2b1b3738c 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -1,7 +1,7 @@ <%= form.label :map_location, label %>

<%= help %>

-
<%= m_l_fields.hidden_field :longitude, value: map_location.longitude, - id: map_location_input_id(parent_class, 'latitude') %> + id: map_location_input_id(parent_class, 'longitude') %> <%= m_l_fields.hidden_field :zoom, value: map_location.zoom, - id: map_location_input_id(parent_class, 'latitude') %> + id: map_location_input_id(parent_class, 'zoom') %> <% end %> \ No newline at end of file From dd7afd3593a2fbb33855cc5412b3c71a63a9d41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2017 18:08:20 +0200 Subject: [PATCH 05/17] Add methods to map locations helper. --- app/assets/stylesheets/admin.scss | 5 ++ app/helpers/map_locations_helper.rb | 46 +++++++++++++++++++ app/views/admin/settings/_map_form.html.erb | 14 +++--- app/views/map_locations/_form_fields.html.erb | 22 +-------- 4 files changed, 61 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 2ef6fea23..aec72b35b 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -996,10 +996,15 @@ table { position: absolute; border-radius: 50%; } + .map-attributtion{ + visibility: visible; + height: auto; + } } .map-marker{ visibility: hidden; } .map-attributtion{ visibility: hidden; + height: 0; } \ No newline at end of file diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 08d16391f..805d5504c 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -16,4 +16,50 @@ module MapLocationsHelper "#{prefix}_map_location_attributes_#{attribute}" end + def map_location_attribution_id(map_location) + "attribution-#{dom_id(map_location)}" + end + + def map_location_remove_marker_link_id(map_location) + "remove-marker-link-#{dom_id(map_location)}" + end + + def render_map(map_location, parent_class, editable, remove_marker_label) + map = content_tag_for :div, + map_location, + class: "map", + data:{ + map: "", + map_zoom: map_location_zoom(map_location), + map_tiles_attribution_selector: map_location_attribution_id(map_location), + map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png", + marker_editable: editable, + marker_latitude: map_location_latitude(map_location), + marker_longitude: map_location_longitude(map_location), + marker_remove_selector: "##{map_location_remove_marker_link_id(map_location)}", + latitude_input_selector: "##{map_location_input_id(parent_class, 'latitude')}", + longitude_input_selector: "##{map_location_input_id(parent_class, 'longitude')}", + zoom_input_selector: "##{map_location_input_id(parent_class, 'zoom')}" + } + map += map_attributtion(map_location) + map += map_location_remove_marker(map_location, remove_marker_label) if editable + end + + def map_attributtion(map_location, klass = nil) + content = "©#{link_to("OpenStreetMap", "http://osm.org/copyright")} contributors".html_safe + content_tag :div, id: map_location_attribution_id(map_location), class: "map-attributtion #{klass}" do + content + end + end + + def map_location_remove_marker(map_location, text) + content_tag :div, class: "small-12 column text-right" do + content_tag :a, + id: map_location_remove_marker_link_id(map_location), + class: "location-map-remove-marker-button delete" do + text + end + end + end + end \ No newline at end of file diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 53eb3d882..256bcd478 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -1,11 +1,13 @@
-
" - data-longitude="<%= Setting["map.longitude"] %>" - data-zoom="<%= Setting["map.zoom"] %>" - data-tiles-attribution-selector="#admin-map-attribution" - data-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" +
" + data-map-tiles-attribution-selector="#admin-map-attribution" + data-map-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" + data-marker-editable="true" + data-marker-latitude="<%= Setting["map.latitude"] %>" + data-marker-longitude="<%= Setting["map.longitude"] %>" data-latitude-input-selector="#latitude" data-longitude-input-selector="#longitude" data-zoom-input-selector="#zoom"> diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index 2b1b3738c..f838d1f98 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -1,25 +1,7 @@ <%= form.label :map_location, label %>

<%= help %>

-
-
- -
- © OpenStreetMap contributors -
- -<%= remove_marker_label %> +<%= render_map(map_location, parent_class, true, remove_marker_label) %> <%= form.fields_for :map_location, map_location do |m_l_fields| %> <%= m_l_fields.hidden_field :latitude, @@ -27,7 +9,7 @@ id: map_location_input_id(parent_class, 'latitude') %> <%= m_l_fields.hidden_field :longitude, value: map_location.longitude, - id: map_location_input_id(parent_class, 'longitude') %> + id: map_location_input_id(parent_class, 'longitude') %> <%= m_l_fields.hidden_field :zoom, value: map_location.zoom, id: map_location_input_id(parent_class, 'zoom') %> From 130e4533ac7b241f7d65ee60b9612844bb80725b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 10:47:35 +0200 Subject: [PATCH 06/17] Allow to render map without marker on new forms. --- app/assets/javascripts/map.js.coffee | 69 ++++++++++++------- app/helpers/map_locations_helper.rb | 11 ++- app/models/budget/investment.rb | 4 +- app/models/map_location.rb | 4 ++ app/models/proposal.rb | 4 +- app/views/admin/settings/_map_form.html.erb | 2 + .../investments/_investment_show.html.erb | 4 ++ app/views/proposals/show.html.erb | 4 ++ spec/models/map_location_spec.rb | 9 +++ 9 files changed, 79 insertions(+), 32 deletions(-) create mode 100644 spec/models/map_location_spec.rb diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index fb82d0800..33f13d25c 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -8,24 +8,47 @@ App.Map = App.Map.initializeMap map initializeMap: (element) -> - latitude = $(element).data('marker-latitude') - longitude = $(element).data('marker-longitude') - zoom = $(element).data('map-zoom') - mapTilesProvider = $(element).data('map-tiles-provider') - mapAttributionSelector = $(element).data('map-tiles-attribution-selector') - latitudeInputSelector = $(element).data('latitude-input-selector') - longitudeInputSelector = $(element).data('longitude-input-selector') - zoomInputSelector = $(element).data('zoom-input-selector') - removeMarkerSelector = $(element).data('marker-remove-selector') - attribution = $(mapAttributionSelector) - editable = $(element).data('marker-editable') - marker_icon = L.divIcon( + + mapCenterLatitude = $(element).data('map-center-latitude') + mapCenterLongitude = $(element).data('map-center-longitude') + markerLatitude = $(element).data('marker-latitude') + markerLongitude = $(element).data('marker-longitude') + zoom = $(element).data('map-zoom') + mapTilesProvider = $(element).data('map-tiles-provider') + mapAttributionSelector = $(element).data('map-tiles-attribution-selector') + latitudeInputSelector = $(element).data('latitude-input-selector') + longitudeInputSelector = $(element).data('longitude-input-selector') + zoomInputSelector = $(element).data('zoom-input-selector') + removeMarkerSelector = $(element).data('marker-remove-selector') + attribution = $(mapAttributionSelector) + editable = $(element).data('marker-editable') + marker = null; + markerIcon = L.divIcon( iconSize: null html: '
') - placeMarker = (e) -> - marker.setLatLng(e.latlng) + createMarker = (latitude, longitude) -> + markerLatLng = new (L.LatLng)(latitude, longitude) + marker = L.marker(markerLatLng, { icon: markerIcon, draggable: editable }) + if editable + marker.on 'dragend', updateFormfields marker.addTo(map) + return marker + + removeMarker = (e) -> + e.preventDefault() + if marker + map.removeLayer(marker) + marker = null; + clearFormfields() + return + + moveOrPlaceMarker = (e) -> + if marker + marker.setLatLng(e.latlng) + else + marker = createMarker(e.latlng.lat, e.latlng.lng) + updateFormfields() return @@ -41,20 +64,14 @@ App.Map = $(zoomInputSelector).val '' return - removeMarker = (e) -> - e.preventDefault() - map.removeLayer(marker) - clearFormfields() - return - - latLng = new (L.LatLng)(latitude, longitude) - map = L.map(element.id).setView(latLng, zoom) - marker = L.marker(latLng, { icon: marker_icon, draggable: editable }) + mapCenterLatLng = new (L.LatLng)(mapCenterLatitude, mapCenterLongitude) + map = L.map(element.id).setView(mapCenterLatLng, zoom) L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map - marker.addTo(map) + + if markerLatitude && markerLongitude + marker = createMarker(markerLatitude, markerLongitude) if editable $(removeMarkerSelector).on 'click', removeMarker - marker.on 'dragend', updateFormfields map.on 'zoomend', updateFormfields - map.on 'click', placeMarker \ No newline at end of file + map.on 'click', moveOrPlaceMarker \ No newline at end of file diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 805d5504c..1df7a861c 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -1,5 +1,9 @@ module MapLocationsHelper + def map_location_available?(map_location) + map_location.present? && map_location.filled? + end + def map_location_latitude(map_location) map_location.present? && map_location.latitude.present? ? map_location.latitude : Setting["map.latitude"] end @@ -30,12 +34,14 @@ module MapLocationsHelper class: "map", data:{ map: "", + map_center_latitude: map_location_latitude(map_location), + map_center_longitude: map_location_longitude(map_location), map_zoom: map_location_zoom(map_location), map_tiles_attribution_selector: map_location_attribution_id(map_location), map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png", marker_editable: editable, - marker_latitude: map_location_latitude(map_location), - marker_longitude: map_location_longitude(map_location), + marker_latitude: map_location.latitude, + marker_longitude: map_location.longitude, marker_remove_selector: "##{map_location_remove_marker_link_id(map_location)}", latitude_input_selector: "##{map_location_input_id(parent_class, 'latitude')}", longitude_input_selector: "##{map_location_input_id(parent_class, 'longitude')}", @@ -43,6 +49,7 @@ module MapLocationsHelper } map += map_attributtion(map_location) map += map_location_remove_marker(map_location, remove_marker_label) if editable + map end def map_attributtion(map_location, klass = nil) diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index af8feac1d..e48bc2c57 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -27,8 +27,8 @@ class Budget has_many :valuators, through: :valuator_assignments has_many :comments, as: :commentable has_many :milestones - has_one :map_location - accepts_nested_attributes_for :map_location + has_one :map_location, dependent: :destroy + accepts_nested_attributes_for :map_location, allow_destroy: true validates :title, presence: true validates :author, presence: true diff --git a/app/models/map_location.rb b/app/models/map_location.rb index 61cb10893..8db4cda9c 100644 --- a/app/models/map_location.rb +++ b/app/models/map_location.rb @@ -3,4 +3,8 @@ class MapLocation < ActiveRecord::Base belongs_to :proposal belongs_to :investment + def filled? + latitude.present? && longitude.present? && zoom.present? + end + end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index 7ad7a863b..b8d919e97 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -25,8 +25,8 @@ class Proposal < ActiveRecord::Base belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :geozone - has_one :map_location - accepts_nested_attributes_for :map_location + has_one :map_location, dependent: :destroy + accepts_nested_attributes_for :map_location, allow_destroy: true has_many :comments, as: :commentable has_many :proposal_notifications diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 256bcd478..beac8e87b 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -2,6 +2,8 @@
" + data-map-center-longitude="<%= Setting["map.longitude"] %>" data-map-zoom="<%= Setting["map.zoom"] %>" data-map-tiles-attribution-selector="#admin-map-attribution" data-map-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index e257de0bb..eab4de525 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -45,6 +45,10 @@ <%= safe_html_with_links investment.description.html_safe %> + <% if feature?(:map) && map_location_available?(@investment.map_location) %> + <%= render_map(@investment.map_location, "budget_investment", false, nil) %> + <% end %> + <% if investment.external_url.present? %>
<%= text_with_links investment.external_url %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 96999ca7d..e25bdf9f7 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -68,6 +68,10 @@ <%= safe_html_with_links @proposal.description %> + <% if feature?(:map) && map_location_available?(@proposal.map_location) %> + <%= render_map(@proposal.map_location, "proposal", false, nil) %> + <% end %> + <% if @proposal.external_url.present? %>

diff --git a/spec/models/map_location_spec.rb b/spec/models/map_location_spec.rb new file mode 100644 index 000000000..e0b61f53a --- /dev/null +++ b/spec/models/map_location_spec.rb @@ -0,0 +1,9 @@ +require 'rails_helper' + +describe MapLocation do + + context "#filled?" do + + end + +end From 3b04f881e765e57c9e956c896dcd755afac00542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 11:37:00 +0200 Subject: [PATCH 07/17] Fix map marker positioning. --- app/assets/javascripts/map.js.coffee | 6 +++-- app/assets/stylesheets/admin.scss | 33 +++++++++++++++------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index 33f13d25c..493de07cc 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -24,8 +24,10 @@ App.Map = editable = $(element).data('marker-editable') marker = null; markerIcon = L.divIcon( - iconSize: null - html: '

') + className: 'map-marker' + iconSize: [30, 30] + iconAnchor: [15, 40] + html: '
') createMarker = (latitude, longitude) -> markerLatLng = new (L.LatLng)(latitude, longitude) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index aec72b35b..c025944f6 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -977,24 +977,27 @@ table { height: 350px; .map-marker { visibility: visible; - width: 30px; - height: 30px; - border-radius: 50% 50% 50% 0; - background: #00cae9; position: absolute; - transform: rotate(-45deg); left: 50%; top: 50%; - margin: -45px 0 0 -15px; - } - .map-marker:after { - content: ""; - width: 14px; - height: 14px; - margin: 8px 0 0 8px; - background: white; - position: absolute; - border-radius: 50%; + margin-top: -5px; + .map-icon{ + transform: rotate(-45deg); + width: 30px; + height: 30px; + border-radius: 50% 50% 50% 0; + background: #00cae9; + transform: rotate(-45deg); + } + .map-icon:after { + content: ""; + width: 14px; + height: 14px; + margin: 8px 0 0 8px; + background: white; + position: absolute; + border-radius: 50%; + } } .map-attributtion{ visibility: visible; From 5815389cb8c3b356281095b5863a4d0e5607ef7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 11:56:46 +0200 Subject: [PATCH 08/17] Rename map settings keys --- app/controllers/admin/settings_controller.rb | 6 +++--- app/helpers/map_locations_helper.rb | 6 +++--- app/views/admin/settings/_map_form.html.erb | 16 ++++++++-------- config/locales/en/settings.yml | 3 +++ config/locales/es/settings.yml | 3 +++ db/dev_seeds.rb | 6 +++--- db/seeds.rb | 6 +++--- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 2d69ff19a..14dfc6658 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -15,9 +15,9 @@ class Admin::SettingsController < Admin::BaseController end def update_map - Setting["map.latitude"] = params[:latitude].to_f - Setting["map.longitude"] = params[:longitude].to_f - Setting["map.zoom"] = params[:zoom].to_i + Setting["map_latitude"] = params[:latitude].to_f + Setting["map_longitude"] = params[:longitude].to_f + Setting["map_zoom"] = params[:zoom].to_i redirect_to admin_settings_path, notice: t("admin.settings.index.map.flash.update") end diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 1df7a861c..e0350773c 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -5,15 +5,15 @@ module MapLocationsHelper end def map_location_latitude(map_location) - map_location.present? && map_location.latitude.present? ? map_location.latitude : Setting["map.latitude"] + map_location.present? && map_location.latitude.present? ? map_location.latitude : Setting["map_latitude"] end def map_location_longitude(map_location) - map_location.present? && map_location.longitude.present? ? map_location.longitude : Setting["map.longitude"] + map_location.present? && map_location.longitude.present? ? map_location.longitude : Setting["map_longitude"] end def map_location_zoom(map_location) - map_location.present? && map_location.zoom.present? ? map_location.zoom : Setting["map.zoom"] + map_location.present? && map_location.zoom.present? ? map_location.zoom : Setting["map_zoom"] end def map_location_input_id(prefix, attribute) diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index beac8e87b..1f74698f1 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -2,14 +2,14 @@
" - data-map-center-longitude="<%= Setting["map.longitude"] %>" - data-map-zoom="<%= Setting["map.zoom"] %>" + data-map-center-latitude="<%= Setting["map_latitude"] %>" + data-map-center-longitude="<%= Setting["map_longitude"] %>" + data-map-zoom="<%= Setting["map_zoom"] %>" data-map-tiles-attribution-selector="#admin-map-attribution" data-map-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" data-marker-editable="true" - data-marker-latitude="<%= Setting["map.latitude"] %>" - data-marker-longitude="<%= Setting["map.longitude"] %>" + data-marker-latitude="<%= Setting["map_latitude"] %>" + data-marker-longitude="<%= Setting["map_longitude"] %>" data-latitude-input-selector="#latitude" data-longitude-input-selector="#longitude" data-zoom-input-selector="#zoom"> @@ -20,9 +20,9 @@ <%= form_tag admin_update_map_path, method: :put, id: 'map-form' do |f| %> - <%= hidden_field_tag :latitude, Setting["map.latitude"] %> - <%= hidden_field_tag :longitude, Setting["map.longitude"] %> - <%= hidden_field_tag :zoom, Setting["map.zoom"] %> + <%= hidden_field_tag :latitude, Setting["map_latitude"] %> + <%= hidden_field_tag :longitude, Setting["map_longitude"] %> + <%= hidden_field_tag :zoom, Setting["map_zoom"] %>
<%= submit_tag t("admin.settings.index.map.form.submit"), diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml index 81ddd57d9..eaf610f4d 100644 --- a/config/locales/en/settings.yml +++ b/config/locales/en/settings.yml @@ -41,6 +41,9 @@ en: legislation: Legislation community: Community on proposals and investments map: Proposals and budget investments geolocation + map_latitude: Latitude + map_longitude: Longitude + map_zoom: Zoom mailer_from_name: Origin email name mailer_from_address: Origin email address meta_description: "Site description (SEO)" diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml index e6cfde3b1..b23c6e688 100644 --- a/config/locales/es/settings.yml +++ b/config/locales/es/settings.yml @@ -41,6 +41,9 @@ es: legislation: Legislación community: Comunidad en propuestas y proyectos de inversión map: Geolocalización de propuestas y proyectos de inversión + map_latitude: Latitud + map_longitude: Longitud + map_zoom: Zoom mailer_from_name: Nombre email remitente mailer_from_address: Dirección email remitente meta_description: "Descripción del sitio (SEO)" diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 45b0ed27b..fcd86c44a 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -48,9 +48,9 @@ Setting.create(key: 'meta_keywords', value: 'citizen participation, open governm Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/') Setting.create(key: 'min_age_to_participate', value: '16') Setting.create(key: 'proposal_improvement_path', value: nil) -Setting.create(key: 'map.latitude', value: 51.48) -Setting.create(key: 'map.longitude', value: 0) -Setting.create(key: 'map.zoom', value: 10) +Setting.create(key: 'map_latitude', value: 51.48) +Setting.create(key: 'map_longitude', value: 0.0) +Setting.create(key: 'map_zoom', value: 10) puts " ✅" print "Creating Geozones" diff --git a/db/seeds.rb b/db/seeds.rb index 13a532a92..a2f25e340 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -111,6 +111,6 @@ Setting['min_age_to_participate'] = 16 Setting['proposal_improvement_path'] = nil # City map feature default configuration (Greenwich) -Setting['map.latitude'] = 51.48 -Setting['map.longitude'] = 0 -Setting['map.zoom'] = 10 +Setting['map_latitude'] = 51.48 +Setting['map_longitude'] = 0.0 +Setting['map_zoom'] = 10 From 053a87eb2cc8a56e1a8e7e2066e2c15ae87a5323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 12:14:06 +0200 Subject: [PATCH 09/17] Refactor map locations helper --- app/helpers/map_locations_helper.rb | 36 +++++++++++-------- app/views/map_locations/_form_fields.html.erb | 2 +- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index e0350773c..8d295b1b6 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -32,21 +32,7 @@ module MapLocationsHelper map = content_tag_for :div, map_location, class: "map", - data:{ - map: "", - map_center_latitude: map_location_latitude(map_location), - map_center_longitude: map_location_longitude(map_location), - map_zoom: map_location_zoom(map_location), - map_tiles_attribution_selector: map_location_attribution_id(map_location), - map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png", - marker_editable: editable, - marker_latitude: map_location.latitude, - marker_longitude: map_location.longitude, - marker_remove_selector: "##{map_location_remove_marker_link_id(map_location)}", - latitude_input_selector: "##{map_location_input_id(parent_class, 'latitude')}", - longitude_input_selector: "##{map_location_input_id(parent_class, 'longitude')}", - zoom_input_selector: "##{map_location_input_id(parent_class, 'zoom')}" - } + data: prepare_map_settings(map_location, editable, parent_class) map += map_attributtion(map_location) map += map_location_remove_marker(map_location, remove_marker_label) if editable map @@ -69,4 +55,24 @@ module MapLocationsHelper end end + private + + def prepare_map_settings(map_location, editable, parent_class) + options = { + map: "", + map_center_latitude: map_location_latitude(map_location), + map_center_longitude: map_location_longitude(map_location), + map_zoom: map_location_zoom(map_location), + map_tiles_attribution_selector: map_location_attribution_id(map_location), + map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png", + marker_editable: editable, + marker_latitude: map_location.latitude, + marker_longitude: map_location.longitude, + marker_remove_selector: "##{map_location_remove_marker_link_id(map_location)}", + latitude_input_selector: "##{map_location_input_id(parent_class, 'latitude')}", + longitude_input_selector: "##{map_location_input_id(parent_class, 'longitude')}", + zoom_input_selector: "##{map_location_input_id(parent_class, 'zoom')}" + } + end + end \ No newline at end of file diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index f838d1f98..95e0331ae 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -1,7 +1,7 @@ <%= form.label :map_location, label %>

<%= help %>

-<%= render_map(map_location, parent_class, true, remove_marker_label) %> +<%= render_map(map_location, parent_class, editable = true, remove_marker_label) %> <%= form.fields_for :map_location, map_location do |m_l_fields| %> <%= m_l_fields.hidden_field :latitude, From 011ef41ae18ea42dc8d5a2ba384499a05e6fe754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 12:33:52 +0200 Subject: [PATCH 10/17] Add map location missing specs --- app/assets/stylesheets/admin.scss | 1 - app/helpers/map_locations_helper.rb | 2 +- app/models/map_location.rb | 2 +- spec/factories.rb | 16 ++++++++++++++- spec/models/map_location_spec.rb | 31 +++++++++++++++++++++++++++-- 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index c025944f6..b6f237c15 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -982,7 +982,6 @@ table { top: 50%; margin-top: -5px; .map-icon{ - transform: rotate(-45deg); width: 30px; height: 30px; border-radius: 50% 50% 50% 0; diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 8d295b1b6..03823e25c 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -1,7 +1,7 @@ module MapLocationsHelper def map_location_available?(map_location) - map_location.present? && map_location.filled? + map_location.present? && map_location.available? end def map_location_latitude(map_location) diff --git a/app/models/map_location.rb b/app/models/map_location.rb index 8db4cda9c..6635bf995 100644 --- a/app/models/map_location.rb +++ b/app/models/map_location.rb @@ -3,7 +3,7 @@ class MapLocation < ActiveRecord::Base belongs_to :proposal belongs_to :investment - def filled? + def available? latitude.present? && longitude.present? && zoom.present? end diff --git a/spec/factories.rb b/spec/factories.rb index 160b81664..3fc3d7c36 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -821,7 +821,7 @@ LOREM_IPSUM factory :direct_upload do user - + trait :proposal do resource_type "Proposal" end @@ -840,4 +840,18 @@ LOREM_IPSUM initialize_with { new(attributes) } end + factory :map_location do + latitude 51.48 + longitude 0.0 + zoom 10 + + trait :proposal_map_location do + proposal + end + + trait :investment_map_location do + investment + end + end + end diff --git a/spec/models/map_location_spec.rb b/spec/models/map_location_spec.rb index e0b61f53a..bd093a71e 100644 --- a/spec/models/map_location_spec.rb +++ b/spec/models/map_location_spec.rb @@ -2,8 +2,35 @@ require 'rails_helper' describe MapLocation do - context "#filled?" do - + let(:map_location) { build(:map_location, :proposal_map_location ) } + + it "should be valid" do + expect(map_location).to be_valid + end + + context "#available?" do + + it "should return true when latitude, longitude and zoom defined" do + expect(map_location.available?).to be(true) + end + + it "should return false when longitude is nil" do + map_location.longitude = nil + + expect(map_location.available?).to be(false) + end + + it "should return false when latitude is nil" do + map_location.latitude = nil + + expect(map_location.available?).to be(false) + end + + it "should return false when zoom is nil" do + map_location.zoom = nil + + expect(map_location.available?).to be(false) + end end end From 5113fefef64736590ac492e38ed42f5bd7118577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 15:08:16 +0200 Subject: [PATCH 11/17] Change open street maps tile server url. --- app/helpers/map_locations_helper.rb | 2 +- app/views/admin/settings/_map_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 03823e25c..59711fce4 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -64,7 +64,7 @@ module MapLocationsHelper map_center_longitude: map_location_longitude(map_location), map_zoom: map_location_zoom(map_location), map_tiles_attribution_selector: map_location_attribution_id(map_location), - map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png", + map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", marker_editable: editable, marker_latitude: map_location.latitude, marker_longitude: map_location.longitude, diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 1f74698f1..56ca958a9 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -6,7 +6,7 @@ data-map-center-longitude="<%= Setting["map_longitude"] %>" data-map-zoom="<%= Setting["map_zoom"] %>" data-map-tiles-attribution-selector="#admin-map-attribution" - data-map-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" + data-map-tiles-provider="//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" data-marker-editable="true" data-marker-latitude="<%= Setting["map_latitude"] %>" data-marker-longitude="<%= Setting["map_longitude"] %>" From 5a09b79da4c52d1d9e0ed311cc5389173e2f6314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 16:07:33 +0200 Subject: [PATCH 12/17] Move map tiles provider server and map tiles attribution to secrets. --- app/assets/javascripts/map.js.coffee | 5 ++--- app/helpers/map_locations_helper.rb | 16 ++-------------- app/views/admin/settings/_map_form.html.erb | 7 ++----- config/secrets.yml.example | 5 +++++ 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index 493de07cc..53c346c9e 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -15,12 +15,11 @@ App.Map = markerLongitude = $(element).data('marker-longitude') zoom = $(element).data('map-zoom') mapTilesProvider = $(element).data('map-tiles-provider') - mapAttributionSelector = $(element).data('map-tiles-attribution-selector') + mapAttribution = $(element).data('map-tiles-provider-attribution') latitudeInputSelector = $(element).data('latitude-input-selector') longitudeInputSelector = $(element).data('longitude-input-selector') zoomInputSelector = $(element).data('zoom-input-selector') removeMarkerSelector = $(element).data('marker-remove-selector') - attribution = $(mapAttributionSelector) editable = $(element).data('marker-editable') marker = null; markerIcon = L.divIcon( @@ -68,7 +67,7 @@ App.Map = mapCenterLatLng = new (L.LatLng)(mapCenterLatitude, mapCenterLongitude) map = L.map(element.id).setView(mapCenterLatLng, zoom) - L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map + L.tileLayer(mapTilesProvider, attribution: mapAttribution).addTo map if markerLatitude && markerLongitude marker = createMarker(markerLatitude, markerLongitude) diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 59711fce4..42159385a 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -20,10 +20,6 @@ module MapLocationsHelper "#{prefix}_map_location_attributes_#{attribute}" end - def map_location_attribution_id(map_location) - "attribution-#{dom_id(map_location)}" - end - def map_location_remove_marker_link_id(map_location) "remove-marker-link-#{dom_id(map_location)}" end @@ -33,18 +29,10 @@ module MapLocationsHelper map_location, class: "map", data: prepare_map_settings(map_location, editable, parent_class) - map += map_attributtion(map_location) map += map_location_remove_marker(map_location, remove_marker_label) if editable map end - def map_attributtion(map_location, klass = nil) - content = "©#{link_to("OpenStreetMap", "http://osm.org/copyright")} contributors".html_safe - content_tag :div, id: map_location_attribution_id(map_location), class: "map-attributtion #{klass}" do - content - end - end - def map_location_remove_marker(map_location, text) content_tag :div, class: "small-12 column text-right" do content_tag :a, @@ -63,8 +51,8 @@ module MapLocationsHelper map_center_latitude: map_location_latitude(map_location), map_center_longitude: map_location_longitude(map_location), map_zoom: map_location_zoom(map_location), - map_tiles_attribution_selector: map_location_attribution_id(map_location), - map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", + map_tiles_provider: Rails.application.secrets.map_tiles_provider, + map_tiles_provider_attribution: Rails.application.secrets.map_tiles_provider_attribution, marker_editable: editable, marker_latitude: map_location.latitude, marker_longitude: map_location.longitude, diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 56ca958a9..074d92bd4 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -5,8 +5,8 @@ data-map-center-latitude="<%= Setting["map_latitude"] %>" data-map-center-longitude="<%= Setting["map_longitude"] %>" data-map-zoom="<%= Setting["map_zoom"] %>" - data-map-tiles-attribution-selector="#admin-map-attribution" - data-map-tiles-provider="//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" + data-map-tiles-provider="<%= Rails.application.secrets.map_tiles_provider %>" + data-map-tiles-provider-attribution="<%= Rails.application.secrets.map_tiles_provider_attribution %>" data-marker-editable="true" data-marker-latitude="<%= Setting["map_latitude"] %>" data-marker-longitude="<%= Setting["map_longitude"] %>" @@ -14,9 +14,6 @@ data-longitude-input-selector="#longitude" data-zoom-input-selector="#zoom">
-
- © OpenStreetMap contributors -
<%= form_tag admin_update_map_path, method: :put, id: 'map-form' do |f| %> diff --git a/config/secrets.yml.example b/config/secrets.yml.example index f67ea65c0..6f01d715c 100644 --- a/config/secrets.yml.example +++ b/config/secrets.yml.example @@ -1,5 +1,7 @@ default: &default secret_key_base: "56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4" + map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" + map_tiles_provider_attribution: "© OpenStreetMap contributors" development: <<: *default @@ -36,6 +38,9 @@ production: &production rollbar_server_token: "" server_name: "" + map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" + map_tiles_provider_attribution: "© OpenStreetMap contributors" + preproduction: server_name: "" <<: *production From 05350b0f40679aaef4659c3c876d65046e9bfd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 18:03:44 +0200 Subject: [PATCH 13/17] Fix scss lint warnings --- app/assets/stylesheets/admin.scss | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index b6f237c15..ece444c76 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -972,41 +972,47 @@ table { // 09. Map // -------------- -.map{ +.map { width: 100%; height: 350px; + .map-marker { visibility: visible; position: absolute; left: 50%; top: 50%; margin-top: -5px; - .map-icon{ + + .map-icon { width: 30px; height: 30px; border-radius: 50% 50% 50% 0; background: #00cae9; transform: rotate(-45deg); } - .map-icon:after { - content: ""; + + .map-icon::after { + content: ''; width: 14px; height: 14px; margin: 8px 0 0 8px; - background: white; + background: #fff; position: absolute; border-radius: 50%; } } - .map-attributtion{ + + .map-attributtion { visibility: visible; height: auto; } } -.map-marker{ + +.map-marker { visibility: hidden; } -.map-attributtion{ + +.map-attributtion { visibility: hidden; height: 0; -} \ No newline at end of file +} From c9963b1c4f75bcf6f7ffa0cdf7e99f5c0440ef72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 18:07:08 +0200 Subject: [PATCH 14/17] Some alignment fixes --- app/helpers/map_locations_helper.rb | 2 +- app/views/admin/settings/_map_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 42159385a..26766e96d 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -34,7 +34,7 @@ module MapLocationsHelper end def map_location_remove_marker(map_location, text) - content_tag :div, class: "small-12 column text-right" do + content_tag :div, class: "text-right" do content_tag :a, id: map_location_remove_marker_link_id(map_location), class: "location-map-remove-marker-button delete" do diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 074d92bd4..9c411bb12 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -21,7 +21,7 @@ <%= hidden_field_tag :longitude, Setting["map_longitude"] %> <%= hidden_field_tag :zoom, Setting["map_zoom"] %> -
+
<%= submit_tag t("admin.settings.index.map.form.submit"), class: "button hollow expanded" %>
From 7b54451491e3a10540e2b741011487fe2568778d Mon Sep 17 00:00:00 2001 From: taitus Date: Mon, 11 Sep 2017 19:29:29 +0200 Subject: [PATCH 15/17] Add missing specs on admin --- spec/features/admin/settings_spec.rb | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb index 0a220d05b..e3c968eca 100644 --- a/spec/features/admin/settings_spec.rb +++ b/spec/features/admin/settings_spec.rb @@ -39,7 +39,7 @@ feature 'Admin settings' do expect(page).not_to have_content "Map configuration" end - scenario "Should be able when map feature deactivated" do + scenario "Should be able when map feature activated" do Setting['feature.map'] = true admin = create(:administrator).user login_as(admin) @@ -61,6 +61,26 @@ feature 'Admin settings' do expect(page).to have_content "Map configuration updated succesfully" end + scenario "Should update marker", :js do + Setting['feature.map'] = true + admin = create(:administrator).user + login_as(admin) + visit admin_settings_path + + expect(find("#latitude", visible: false).value).to eq "51.48" + expect(find("#longitude", visible: false).value).to eq "0.0" + + find("#admin-map").click + + within "#map-form" do + click_on "Update" + end + + expect(find("#latitude", visible: false).value).not_to eq "51.48" + expect(page).to have_content "Map configuration updated succesfully" + end + + end -end \ No newline at end of file +end From 51c53b6f31d891eaab554251bd9bc1db1aa7bb5f Mon Sep 17 00:00:00 2001 From: taitus Date: Wed, 13 Sep 2017 16:19:40 +0200 Subject: [PATCH 16/17] Add missing specs from Maps on New, Edit and Show. --- app/assets/javascripts/map.js.coffee | 2 +- app/helpers/map_locations_helper.rb | 3 +- app/models/map_location.rb | 2 +- app/views/map_locations/_form_fields.html.erb | 5 +- db/seeds.rb | 2 +- spec/factories.rb | 4 +- spec/features/budgets/investments_spec.rb | 8 + spec/features/proposals_spec.rb | 39 ++++ spec/shared/features/documentable.rb | 1 - spec/shared/features/mapeable.rb | 220 ++++++++++++++++++ 10 files changed, 278 insertions(+), 8 deletions(-) create mode 100644 spec/shared/features/mapeable.rb diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index 53c346c9e..3f28024a7 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -75,4 +75,4 @@ App.Map = if editable $(removeMarkerSelector).on 'click', removeMarker map.on 'zoomend', updateFormfields - map.on 'click', moveOrPlaceMarker \ No newline at end of file + map.on 'click', moveOrPlaceMarker diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 26766e96d..ae45e7c1d 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -37,6 +37,7 @@ module MapLocationsHelper content_tag :div, class: "text-right" do content_tag :a, id: map_location_remove_marker_link_id(map_location), + href: "#", class: "location-map-remove-marker-button delete" do text end @@ -63,4 +64,4 @@ module MapLocationsHelper } end -end \ No newline at end of file +end diff --git a/app/models/map_location.rb b/app/models/map_location.rb index 6635bf995..14e91d92c 100644 --- a/app/models/map_location.rb +++ b/app/models/map_location.rb @@ -1,7 +1,7 @@ class MapLocation < ActiveRecord::Base belongs_to :proposal - belongs_to :investment + belongs_to :investment, class_name: Budget::Investment def available? latitude.present? && longitude.present? && zoom.present? diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index 95e0331ae..39c87c7e4 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -4,6 +4,9 @@ <%= render_map(map_location, parent_class, editable = true, remove_marker_label) %> <%= form.fields_for :map_location, map_location do |m_l_fields| %> + <%= m_l_fields.hidden_field :id, + value: map_location.id, + id: map_location_input_id(parent_class, 'id') %> <%= m_l_fields.hidden_field :latitude, value: map_location.latitude, id: map_location_input_id(parent_class, 'latitude') %> @@ -13,4 +16,4 @@ <%= m_l_fields.hidden_field :zoom, value: map_location.zoom, id: map_location_input_id(parent_class, 'zoom') %> -<% end %> \ No newline at end of file +<% end %> diff --git a/db/seeds.rb b/db/seeds.rb index a2f25e340..ee444bd91 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -80,7 +80,7 @@ Setting['feature.budgets'] = true Setting['feature.signature_sheets'] = true Setting['feature.legislation'] = true Setting['feature.community'] = true -Setting['feature.map'] = true +Setting['feature.map'] = nil # Spending proposals feature flags Setting['feature.spending_proposal_features.voting_allowed'] = nil diff --git a/spec/factories.rb b/spec/factories.rb index 3fc3d7c36..b0a287aea 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -849,8 +849,8 @@ LOREM_IPSUM proposal end - trait :investment_map_location do - investment + trait :budget_investment_map_location do + association :investment, factory: :budget_investment end end diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index f54b2e3c4..6d487772e 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -485,6 +485,14 @@ feature 'Budget Investments' do "Create Investment", "Budget Investment created successfully." + it_behaves_like "mapeable", + "budget_investment", + "investment", + "new_budget_investment_path", + "", + "budget_investment_path", + { "budget_id": "budget_id" } + context "Destroy" do scenario "Admin cannot destroy budget investments" do diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 0c3481fa1..53af5d6ac 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -1328,6 +1328,14 @@ feature 'Proposals' do "Save changes", "Proposal updated successfully" + it_behaves_like "mapeable", + "proposal", + "proposal", + "new_proposal_path", + "edit_proposal_path", + "proposal_path", + { } + scenario 'Erased author' do user = create(:user) proposal = create(:proposal, author: user) @@ -1533,6 +1541,37 @@ feature 'Proposals' do end + scenario 'Add Map on proposal' do + author = create(:user) + login_as(author) + + visit new_proposal_path + fill_in 'proposal_title', with: 'Help refugees' + fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?' + fill_in 'proposal_summary', with: 'In summary, what we want is...' + check 'proposal_terms_of_service' + + click_button 'Create proposal' + + expect(page).to have_content 'Proposal created successfully.' + expect(page).to have_content 'Help refugees' + expect(page).not_to have_content 'You can also see more information about improving your campaign' + + click_link 'Not now, go to my proposal' + + expect(page).to have_content 'Help refugees' + expect(page).to have_content '¿Would you like to give assistance to war refugees?' + expect(page).to have_content 'In summary, what we want is...' + expect(page).to have_content 'This is very important because...' + expect(page).to have_content 'http://rescue.org/refugees' + expect(page).to have_content 'http://youtube.com' + expect(page).to have_content author.name + expect(page).to have_content 'Refugees' + expect(page).to have_content 'Solidarity' + expect(page).to have_content I18n.l(Proposal.last.created_at.to_date) + end + + end feature 'Successful proposals' do diff --git a/spec/shared/features/documentable.rb b/spec/shared/features/documentable.rb index 126573348..2bd9d8f86 100644 --- a/spec/shared/features/documentable.rb +++ b/spec/shared/features/documentable.rb @@ -5,7 +5,6 @@ shared_examples "documentable" do |documentable_factory_name, documentable_path, let!(:user) { create(:user) } let!(:arguments) { {} } let!(:documentable) { create(documentable_factory_name, author: user) } - let!(:documentable_dom_name) { documentable_factory_name.parameterize } before do create(:administrator, user: administrator) diff --git a/spec/shared/features/mapeable.rb b/spec/shared/features/mapeable.rb new file mode 100644 index 000000000..1ed69d049 --- /dev/null +++ b/spec/shared/features/mapeable.rb @@ -0,0 +1,220 @@ +shared_examples "mapeable" do |mapeable_factory_name, mapeable_association_name, mapeable_new_path, mapeable_edit_path, mapeable_show_path, mapeable_path_arguments| + + include ActionView::Helpers + + let!(:user) { create(:user, :level_two) } + + before do + Setting['feature.map'] = true + end + + describe "At #{mapeable_new_path}" do + + let!(:arguments) { {} } + let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } + + before { set_arguments(arguments, mapeable, mapeable_path_arguments) } + + scenario "Should not show marker by default on create #{mapeable_factory_name}", :js do + login_as user + visit send(mapeable_new_path, arguments) + + send("fill_in_#{mapeable_factory_name}_form") + + within ".map_location" do + expect(page).not_to have_css(".map-icon") + end + end + + scenario "Should show marker on create #{mapeable_factory_name} when click on map", :js do + login_as user + visit send(mapeable_new_path, arguments) + + send("fill_in_#{mapeable_factory_name}_form") + find("#new_map_location").click + + within ".map_location" do + expect(page).to have_css(".map-icon") + end + end + + scenario "Should create #{mapeable_factory_name} with map", :js do + login_as user + visit send(mapeable_new_path, arguments) + + send("fill_in_#{mapeable_factory_name}_form") + find("#new_map_location").click + send("submit_#{mapeable_factory_name}_form") + + expect(page).to have_css(".map_location") + end + + scenario "Can not display map on #{mapeable_factory_name} when not fill marker on map", :js do + login_as user + visit send(mapeable_new_path, arguments) + + send("fill_in_#{mapeable_factory_name}_form") + expect(page).to have_css ".map_location" + send("submit_#{mapeable_factory_name}_form") + + expect(page).not_to have_css(".map_location") + end + + scenario "Can not display map on #{mapeable_factory_name} when feature.map is disabled", :js do + Setting['feature.map'] = false + login_as user + visit send(mapeable_new_path, arguments) + + send("fill_in_#{mapeable_factory_name}_form") + expect(page).not_to have_css ".map_location" + send("submit_#{mapeable_factory_name}_form") + + expect(page).not_to have_css(".map_location") + end + + end + + describe "At #{mapeable_edit_path}" do + + let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } + + before { skip } unless mapeable_edit_path.present? + + scenario "Should edit map on #{mapeable_factory_name} and contain default values", :js do + login_as mapeable.author + + visit send(mapeable_edit_path, id: mapeable.id) + + expect(page).to have_content "Navigate the map to the location and place the marker." + validate_latitude_longitude(mapeable_factory_name) + end + + scenario "Should edit default values from map on #{mapeable_factory_name} edit page", :js do + login_as mapeable.author + + visit send(mapeable_edit_path, id: mapeable.id) + find(".map_location").click + click_on("Save changes") + mapeable.reload + + expect(page).to have_css(".map_location") + expect(page).not_to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") + expect(page).to have_selector(".map_location[data-marker-latitude='#{mapeable.map_location.latitude}']") + end + + scenario "Should edit mapeable on #{mapeable_factory_name} without change map", :js do + login_as mapeable.author + + visit send(mapeable_edit_path, id: mapeable.id) + fill_in "#{mapeable_factory_name}_title", with: "New title" + click_on("Save changes") + mapeable.reload + + expect(page).to have_css(".map_location") + expect(page).to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") + expect(page).to have_selector(".map_location[data-marker-latitude='#{mapeable.map_location.latitude}']") + end + + scenario "Can not display map on #{mapeable_factory_name} edit when remove map marker", :js do + login_as mapeable.author + + visit send(mapeable_edit_path, id: mapeable.id) + click_link "Remove map marker" + click_on "Save changes" + + expect(page).not_to have_css(".map_location") + end + + scenario "Can not display map on #{mapeable_factory_name} edit when feature.map is disabled", :js do + Setting['feature.map'] = false + login_as mapeable.author + + visit send(mapeable_edit_path, id: mapeable.id) + fill_in "#{mapeable_factory_name}_title", with: "New title" + click_on("Save changes") + + expect(page).not_to have_css(".map_location") + end + + end + + describe "At #{mapeable_show_path}" do + + let!(:arguments) { {} } + let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } + + before { set_arguments(arguments, mapeable, mapeable_path_arguments) } + + scenario "Should display map on #{mapeable_factory_name} show page", :js do + arguments.merge!("id": mapeable.id) + + visit send(mapeable_show_path, arguments) + + expect(page).to have_css(".map_location") + end + + scenario "Should not display map on #{mapeable_factory_name} show when marker is not defined", :js do + mapeable_without_map = create("#{mapeable_factory_name}".to_sym) + set_arguments(arguments, mapeable_without_map, mapeable_path_arguments) + arguments.merge!("id": mapeable_without_map.id) + + visit send(mapeable_show_path, arguments) + + expect(page).not_to have_css(".map_location") + end + + scenario "Should not display map on #{mapeable_factory_name} show page when feature.map is disable", :js do + Setting['feature.map'] = false + arguments.merge!("id": mapeable.id) + + visit send(mapeable_show_path, arguments) + + expect(page).not_to have_css(".map_location") + end + + end + +end + +def fill_in_proposal_form + fill_in 'proposal_title', with: 'Help refugees' + fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?' + fill_in 'proposal_summary', with: 'In summary, what we want is...' +end + +def submit_proposal_form + check :proposal_terms_of_service + click_button 'Create proposal' + + click_link 'Not now, go to my proposal' +end + +def validate_latitude_longitude(mapeable_factory_name) + expect(find("##{mapeable_factory_name}_map_location_attributes_latitude", visible: false).value).to eq "51.48" + expect(find("##{mapeable_factory_name}_map_location_attributes_longitude", visible: false).value).to eq "0.0" + expect(mapeable.map_location.latitude).to eq 51.48 + expect(mapeable.map_location.longitude).to eq 0.0 +end + +def fill_in_budget_investment_form + page.select mapeable.heading.name_scoped_by_group, from: :budget_investment_heading_id + fill_in :budget_investment_title, with: "Budget investment title" + fill_in_ckeditor "budget_investment_description", with: "Budget investment description" + check :budget_investment_terms_of_service +end + +def submit_budget_investment_form + check :budget_investment_terms_of_service + click_button 'Create Investment' +end + +def set_arguments(arguments, mapeable, mapeable_path_arguments) + if mapeable_path_arguments + mapeable_path_arguments.each do |argument_name, path_to_value| + arguments.merge!("#{argument_name}": mapeable.send(path_to_value)) + end + end +end From a0603985ef438fbd1041333bf0c78b07aa9d58f0 Mon Sep 17 00:00:00 2001 From: taitus Date: Wed, 13 Sep 2017 18:07:18 +0200 Subject: [PATCH 17/17] Refactor. --- app/models/budget/investment.rb | 3 +- app/models/concerns/mappable.rb | 9 + app/models/proposal.rb | 5 +- spec/features/admin/settings_spec.rb | 11 +- spec/features/budgets/investments_spec.rb | 2 +- spec/features/proposals_spec.rb | 33 +--- spec/shared/features/mapeable.rb | 220 ---------------------- spec/shared/features/mappable.rb | 220 ++++++++++++++++++++++ 8 files changed, 243 insertions(+), 260 deletions(-) create mode 100644 app/models/concerns/mappable.rb delete mode 100644 spec/shared/features/mapeable.rb create mode 100644 spec/shared/features/mappable.rb diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index e48bc2c57..ddf6e819c 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -8,6 +8,7 @@ class Budget include Followable include Communitable include Imageable + include Mappable include Documentable documentable max_documents_allowed: 3, max_file_size: 3.megabytes, @@ -27,8 +28,6 @@ class Budget has_many :valuators, through: :valuator_assignments has_many :comments, as: :commentable has_many :milestones - has_one :map_location, dependent: :destroy - accepts_nested_attributes_for :map_location, allow_destroy: true validates :title, presence: true validates :author, presence: true diff --git a/app/models/concerns/mappable.rb b/app/models/concerns/mappable.rb new file mode 100644 index 000000000..c108bdca7 --- /dev/null +++ b/app/models/concerns/mappable.rb @@ -0,0 +1,9 @@ +module Mappable + extend ActiveSupport::Concern + + included do + has_one :map_location, dependent: :destroy + accepts_nested_attributes_for :map_location, allow_destroy: true + end + +end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index b8d919e97..da0fc109f 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -11,10 +11,11 @@ class Proposal < ActiveRecord::Base include Followable include Communitable include Imageable + include Mappable include Documentable documentable max_documents_allowed: 3, max_file_size: 3.megabytes, - accepted_content_types: [ "application/pdf" ] + accepted_content_types: [ "application/pdf" ] include EmbedVideosHelper acts_as_votable @@ -25,8 +26,6 @@ class Proposal < ActiveRecord::Base belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :geozone - has_one :map_location, dependent: :destroy - accepts_nested_attributes_for :map_location, allow_destroy: true has_many :comments, as: :commentable has_many :proposal_notifications diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb index e3c968eca..73d190cb9 100644 --- a/spec/features/admin/settings_spec.rb +++ b/spec/features/admin/settings_spec.rb @@ -61,17 +61,24 @@ feature 'Admin settings' do expect(page).to have_content "Map configuration updated succesfully" end - scenario "Should update marker", :js do + scenario "Should display marker by default", :js do Setting['feature.map'] = true admin = create(:administrator).user login_as(admin) + visit admin_settings_path expect(find("#latitude", visible: false).value).to eq "51.48" expect(find("#longitude", visible: false).value).to eq "0.0" + end + scenario "Should update marker", :js do + Setting['feature.map'] = true + admin = create(:administrator).user + login_as(admin) + + visit admin_settings_path find("#admin-map").click - within "#map-form" do click_on "Update" end diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 6d487772e..d17bd9c91 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -485,7 +485,7 @@ feature 'Budget Investments' do "Create Investment", "Budget Investment created successfully." - it_behaves_like "mapeable", + it_behaves_like "mappable", "budget_investment", "investment", "new_budget_investment_path", diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 53af5d6ac..f0e50c7eb 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -1328,7 +1328,7 @@ feature 'Proposals' do "Save changes", "Proposal updated successfully" - it_behaves_like "mapeable", + it_behaves_like "mappable", "proposal", "proposal", "new_proposal_path", @@ -1541,37 +1541,6 @@ feature 'Proposals' do end - scenario 'Add Map on proposal' do - author = create(:user) - login_as(author) - - visit new_proposal_path - fill_in 'proposal_title', with: 'Help refugees' - fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?' - fill_in 'proposal_summary', with: 'In summary, what we want is...' - check 'proposal_terms_of_service' - - click_button 'Create proposal' - - expect(page).to have_content 'Proposal created successfully.' - expect(page).to have_content 'Help refugees' - expect(page).not_to have_content 'You can also see more information about improving your campaign' - - click_link 'Not now, go to my proposal' - - expect(page).to have_content 'Help refugees' - expect(page).to have_content '¿Would you like to give assistance to war refugees?' - expect(page).to have_content 'In summary, what we want is...' - expect(page).to have_content 'This is very important because...' - expect(page).to have_content 'http://rescue.org/refugees' - expect(page).to have_content 'http://youtube.com' - expect(page).to have_content author.name - expect(page).to have_content 'Refugees' - expect(page).to have_content 'Solidarity' - expect(page).to have_content I18n.l(Proposal.last.created_at.to_date) - end - - end feature 'Successful proposals' do diff --git a/spec/shared/features/mapeable.rb b/spec/shared/features/mapeable.rb deleted file mode 100644 index 1ed69d049..000000000 --- a/spec/shared/features/mapeable.rb +++ /dev/null @@ -1,220 +0,0 @@ -shared_examples "mapeable" do |mapeable_factory_name, mapeable_association_name, mapeable_new_path, mapeable_edit_path, mapeable_show_path, mapeable_path_arguments| - - include ActionView::Helpers - - let!(:user) { create(:user, :level_two) } - - before do - Setting['feature.map'] = true - end - - describe "At #{mapeable_new_path}" do - - let!(:arguments) { {} } - let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } - let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } - - before { set_arguments(arguments, mapeable, mapeable_path_arguments) } - - scenario "Should not show marker by default on create #{mapeable_factory_name}", :js do - login_as user - visit send(mapeable_new_path, arguments) - - send("fill_in_#{mapeable_factory_name}_form") - - within ".map_location" do - expect(page).not_to have_css(".map-icon") - end - end - - scenario "Should show marker on create #{mapeable_factory_name} when click on map", :js do - login_as user - visit send(mapeable_new_path, arguments) - - send("fill_in_#{mapeable_factory_name}_form") - find("#new_map_location").click - - within ".map_location" do - expect(page).to have_css(".map-icon") - end - end - - scenario "Should create #{mapeable_factory_name} with map", :js do - login_as user - visit send(mapeable_new_path, arguments) - - send("fill_in_#{mapeable_factory_name}_form") - find("#new_map_location").click - send("submit_#{mapeable_factory_name}_form") - - expect(page).to have_css(".map_location") - end - - scenario "Can not display map on #{mapeable_factory_name} when not fill marker on map", :js do - login_as user - visit send(mapeable_new_path, arguments) - - send("fill_in_#{mapeable_factory_name}_form") - expect(page).to have_css ".map_location" - send("submit_#{mapeable_factory_name}_form") - - expect(page).not_to have_css(".map_location") - end - - scenario "Can not display map on #{mapeable_factory_name} when feature.map is disabled", :js do - Setting['feature.map'] = false - login_as user - visit send(mapeable_new_path, arguments) - - send("fill_in_#{mapeable_factory_name}_form") - expect(page).not_to have_css ".map_location" - send("submit_#{mapeable_factory_name}_form") - - expect(page).not_to have_css(".map_location") - end - - end - - describe "At #{mapeable_edit_path}" do - - let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } - let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } - - before { skip } unless mapeable_edit_path.present? - - scenario "Should edit map on #{mapeable_factory_name} and contain default values", :js do - login_as mapeable.author - - visit send(mapeable_edit_path, id: mapeable.id) - - expect(page).to have_content "Navigate the map to the location and place the marker." - validate_latitude_longitude(mapeable_factory_name) - end - - scenario "Should edit default values from map on #{mapeable_factory_name} edit page", :js do - login_as mapeable.author - - visit send(mapeable_edit_path, id: mapeable.id) - find(".map_location").click - click_on("Save changes") - mapeable.reload - - expect(page).to have_css(".map_location") - expect(page).not_to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") - expect(page).to have_selector(".map_location[data-marker-latitude='#{mapeable.map_location.latitude}']") - end - - scenario "Should edit mapeable on #{mapeable_factory_name} without change map", :js do - login_as mapeable.author - - visit send(mapeable_edit_path, id: mapeable.id) - fill_in "#{mapeable_factory_name}_title", with: "New title" - click_on("Save changes") - mapeable.reload - - expect(page).to have_css(".map_location") - expect(page).to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") - expect(page).to have_selector(".map_location[data-marker-latitude='#{mapeable.map_location.latitude}']") - end - - scenario "Can not display map on #{mapeable_factory_name} edit when remove map marker", :js do - login_as mapeable.author - - visit send(mapeable_edit_path, id: mapeable.id) - click_link "Remove map marker" - click_on "Save changes" - - expect(page).not_to have_css(".map_location") - end - - scenario "Can not display map on #{mapeable_factory_name} edit when feature.map is disabled", :js do - Setting['feature.map'] = false - login_as mapeable.author - - visit send(mapeable_edit_path, id: mapeable.id) - fill_in "#{mapeable_factory_name}_title", with: "New title" - click_on("Save changes") - - expect(page).not_to have_css(".map_location") - end - - end - - describe "At #{mapeable_show_path}" do - - let!(:arguments) { {} } - let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } - let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } - - before { set_arguments(arguments, mapeable, mapeable_path_arguments) } - - scenario "Should display map on #{mapeable_factory_name} show page", :js do - arguments.merge!("id": mapeable.id) - - visit send(mapeable_show_path, arguments) - - expect(page).to have_css(".map_location") - end - - scenario "Should not display map on #{mapeable_factory_name} show when marker is not defined", :js do - mapeable_without_map = create("#{mapeable_factory_name}".to_sym) - set_arguments(arguments, mapeable_without_map, mapeable_path_arguments) - arguments.merge!("id": mapeable_without_map.id) - - visit send(mapeable_show_path, arguments) - - expect(page).not_to have_css(".map_location") - end - - scenario "Should not display map on #{mapeable_factory_name} show page when feature.map is disable", :js do - Setting['feature.map'] = false - arguments.merge!("id": mapeable.id) - - visit send(mapeable_show_path, arguments) - - expect(page).not_to have_css(".map_location") - end - - end - -end - -def fill_in_proposal_form - fill_in 'proposal_title', with: 'Help refugees' - fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?' - fill_in 'proposal_summary', with: 'In summary, what we want is...' -end - -def submit_proposal_form - check :proposal_terms_of_service - click_button 'Create proposal' - - click_link 'Not now, go to my proposal' -end - -def validate_latitude_longitude(mapeable_factory_name) - expect(find("##{mapeable_factory_name}_map_location_attributes_latitude", visible: false).value).to eq "51.48" - expect(find("##{mapeable_factory_name}_map_location_attributes_longitude", visible: false).value).to eq "0.0" - expect(mapeable.map_location.latitude).to eq 51.48 - expect(mapeable.map_location.longitude).to eq 0.0 -end - -def fill_in_budget_investment_form - page.select mapeable.heading.name_scoped_by_group, from: :budget_investment_heading_id - fill_in :budget_investment_title, with: "Budget investment title" - fill_in_ckeditor "budget_investment_description", with: "Budget investment description" - check :budget_investment_terms_of_service -end - -def submit_budget_investment_form - check :budget_investment_terms_of_service - click_button 'Create Investment' -end - -def set_arguments(arguments, mapeable, mapeable_path_arguments) - if mapeable_path_arguments - mapeable_path_arguments.each do |argument_name, path_to_value| - arguments.merge!("#{argument_name}": mapeable.send(path_to_value)) - end - end -end diff --git a/spec/shared/features/mappable.rb b/spec/shared/features/mappable.rb new file mode 100644 index 000000000..ccbcd5625 --- /dev/null +++ b/spec/shared/features/mappable.rb @@ -0,0 +1,220 @@ +shared_examples "mappable" do |mappable_factory_name, mappable_association_name, mappable_new_path, mappable_edit_path, mappable_show_path, mappable_path_arguments| + + include ActionView::Helpers + + let!(:user) { create(:user, :level_two) } + + before do + Setting['feature.map'] = true + end + + describe "At #{mappable_new_path}" do + + let!(:arguments) { {} } + let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } + + before { set_arguments(arguments, mappable, mappable_path_arguments) } + + scenario "Should not show marker by default on create #{mappable_factory_name}", :js do + login_as user + visit send(mappable_new_path, arguments) + + send("fill_in_#{mappable_factory_name}_form") + + within ".map_location" do + expect(page).not_to have_css(".map-icon") + end + end + + scenario "Should show marker on create #{mappable_factory_name} when click on map", :js do + login_as user + visit send(mappable_new_path, arguments) + + send("fill_in_#{mappable_factory_name}_form") + find("#new_map_location").click + + within ".map_location" do + expect(page).to have_css(".map-icon") + end + end + + scenario "Should create #{mappable_factory_name} with map", :js do + login_as user + visit send(mappable_new_path, arguments) + + send("fill_in_#{mappable_factory_name}_form") + find("#new_map_location").click + send("submit_#{mappable_factory_name}_form") + + expect(page).to have_css(".map_location") + end + + scenario "Can not display map on #{mappable_factory_name} when not fill marker on map", :js do + login_as user + visit send(mappable_new_path, arguments) + + send("fill_in_#{mappable_factory_name}_form") + expect(page).to have_css ".map_location" + send("submit_#{mappable_factory_name}_form") + + expect(page).not_to have_css(".map_location") + end + + scenario "Can not display map on #{mappable_factory_name} when feature.map is disabled", :js do + Setting['feature.map'] = false + login_as user + visit send(mappable_new_path, arguments) + + send("fill_in_#{mappable_factory_name}_form") + expect(page).not_to have_css ".map_location" + send("submit_#{mappable_factory_name}_form") + + expect(page).not_to have_css(".map_location") + end + + end + + describe "At #{mappable_edit_path}" do + + let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } + + before { skip } unless mappable_edit_path.present? + + scenario "Should edit map on #{mappable_factory_name} and contain default values", :js do + login_as mappable.author + + visit send(mappable_edit_path, id: mappable.id) + + expect(page).to have_content "Navigate the map to the location and place the marker." + validate_latitude_longitude(mappable_factory_name) + end + + scenario "Should edit default values from map on #{mappable_factory_name} edit page", :js do + login_as mappable.author + + visit send(mappable_edit_path, id: mappable.id) + find(".map_location").click + click_on("Save changes") + mappable.reload + + expect(page).to have_css(".map_location") + expect(page).not_to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") + expect(page).to have_selector(".map_location[data-marker-latitude='#{mappable.map_location.latitude}']") + end + + scenario "Should edit mappable on #{mappable_factory_name} without change map", :js do + login_as mappable.author + + visit send(mappable_edit_path, id: mappable.id) + fill_in "#{mappable_factory_name}_title", with: "New title" + click_on("Save changes") + mappable.reload + + expect(page).to have_css(".map_location") + expect(page).to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") + expect(page).to have_selector(".map_location[data-marker-latitude='#{mappable.map_location.latitude}']") + end + + scenario "Can not display map on #{mappable_factory_name} edit when remove map marker", :js do + login_as mappable.author + + visit send(mappable_edit_path, id: mappable.id) + click_link "Remove map marker" + click_on "Save changes" + + expect(page).not_to have_css(".map_location") + end + + scenario "Can not display map on #{mappable_factory_name} edit when feature.map is disabled", :js do + Setting['feature.map'] = false + login_as mappable.author + + visit send(mappable_edit_path, id: mappable.id) + fill_in "#{mappable_factory_name}_title", with: "New title" + click_on("Save changes") + + expect(page).not_to have_css(".map_location") + end + + end + + describe "At #{mappable_show_path}" do + + let!(:arguments) { {} } + let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } + + before { set_arguments(arguments, mappable, mappable_path_arguments) } + + scenario "Should display map on #{mappable_factory_name} show page", :js do + arguments.merge!("id": mappable.id) + + visit send(mappable_show_path, arguments) + + expect(page).to have_css(".map_location") + end + + scenario "Should not display map on #{mappable_factory_name} show when marker is not defined", :js do + mappable_without_map = create("#{mappable_factory_name}".to_sym) + set_arguments(arguments, mappable_without_map, mappable_path_arguments) + arguments.merge!("id": mappable_without_map.id) + + visit send(mappable_show_path, arguments) + + expect(page).not_to have_css(".map_location") + end + + scenario "Should not display map on #{mappable_factory_name} show page when feature.map is disable", :js do + Setting['feature.map'] = false + arguments.merge!("id": mappable.id) + + visit send(mappable_show_path, arguments) + + expect(page).not_to have_css(".map_location") + end + + end + +end + +def fill_in_proposal_form + fill_in 'proposal_title', with: 'Help refugees' + fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?' + fill_in 'proposal_summary', with: 'In summary, what we want is...' +end + +def submit_proposal_form + check :proposal_terms_of_service + click_button 'Create proposal' + + click_link 'Not now, go to my proposal' +end + +def validate_latitude_longitude(mappable_factory_name) + expect(find("##{mappable_factory_name}_map_location_attributes_latitude", visible: false).value).to eq "51.48" + expect(find("##{mappable_factory_name}_map_location_attributes_longitude", visible: false).value).to eq "0.0" + expect(mappable.map_location.latitude).to eq 51.48 + expect(mappable.map_location.longitude).to eq 0.0 +end + +def fill_in_budget_investment_form + page.select mappable.heading.name_scoped_by_group, from: :budget_investment_heading_id + fill_in :budget_investment_title, with: "Budget investment title" + fill_in_ckeditor "budget_investment_description", with: "Budget investment description" + check :budget_investment_terms_of_service +end + +def submit_budget_investment_form + check :budget_investment_terms_of_service + click_button 'Create Investment' +end + +def set_arguments(arguments, mappable, mappable_path_arguments) + if mappable_path_arguments + mappable_path_arguments.each do |argument_name, path_to_value| + arguments.merge!("#{argument_name}": mappable.send(path_to_value)) + end + end +end