consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5096 from consul/bump_leaflet

Browse Source 
Bump Leaflet from 1.5.1 to 1.9.3
This commit is contained in:
Senén Rodero
2023-04-14 17:39:51 +02:00
committed by GitHub
parent 03a12ea60b c3439ab539
commit 33f5f4cdb9
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -36,6 +36,7 @@ gem "jquery-fileupload-rails"
gem "jquery-rails", "~> 4.5.0" gem "jquery-rails", "~> 4.5.0"
gem "jquery-ui-rails", "~> 6.0.1" gem "jquery-ui-rails", "~> 6.0.1"
gem "kaminari", "~> 1.2.2" gem "kaminari", "~> 1.2.2"
gem "leaflet-rails", "~> 1.9.3"
gem "mini_magick", "~> 4.11.0" gem "mini_magick", "~> 4.11.0"
gem "omniauth", "~> 2.1.0" gem "omniauth", "~> 2.1.0"
gem "omniauth-facebook", "~> 9.0.0" gem "omniauth-facebook", "~> 9.0.0"
@@ -66,7 +67,6 @@ gem "wicked_pdf", "~> 2.6.3"
gem "wkhtmltopdf-binary", "~> 0.12.6" gem "wkhtmltopdf-binary", "~> 0.12.6"
source "https://rails-assets.org" do source "https://rails-assets.org" do
gem "rails-assets-leaflet"
gem "rails-assets-markdown-it", "~> 9.0.1" gem "rails-assets-markdown-it", "~> 9.0.1"
end end

5
Gemfile.lock
View File

@@ -1,7 +1,6 @@
GEM GEM
remote: https://rails-assets.org/ remote: https://rails-assets.org/
specs: specs:
rails-assets-leaflet (1.5.1)
rails-assets-markdown-it (9.0.1) rails-assets-markdown-it (9.0.1)
GEM GEM
@@ -327,6 +326,8 @@ GEM
kramdown (~> 2.0) kramdown (~> 2.0)
launchy (2.5.0) launchy (2.5.0)
addressable (~> 2.7) addressable (~> 2.7)
leaflet-rails (1.9.3)
rails (>= 4.2.0)
letter_opener (1.8.1) letter_opener (1.8.1)
launchy (>= 2.2, < 3) launchy (>= 2.2, < 3)
letter_opener_web (2.0.0) letter_opener_web (2.0.0)
@@ -717,6 +718,7 @@ DEPENDENCIES
kaminari (~> 1.2.2) kaminari (~> 1.2.2)
knapsack_pro (~> 3.3.1) knapsack_pro (~> 3.3.1)
launchy (~> 2.5.0) launchy (~> 2.5.0)
leaflet-rails (~> 1.9.3)
letter_opener_web (~> 2.0.0) letter_opener_web (~> 2.0.0)
mdl (~> 0.11.0) mdl (~> 0.11.0)
mini_magick (~> 4.11.0) mini_magick (~> 4.11.0)
@@ -735,7 +737,6 @@ DEPENDENCIES
pronto-scss (~> 0.11.0) pronto-scss (~> 0.11.0)
puma (~> 4.3.12) puma (~> 4.3.12)
rails (= 6.0.6.1) rails (= 6.0.6.1)
rails-assets-leaflet!
rails-assets-markdown-it (~> 9.0.1)! rails-assets-markdown-it (~> 9.0.1)!
recipient_interceptor (~> 0.3.1) recipient_interceptor (~> 0.3.1)
redcarpet (~> 3.5.1) redcarpet (~> 3.5.1)

4
app/assets/javascripts/map.js
View File

@@ -7,6 +7,9 @@
App.Map.initializeMap(this); App.Map.initializeMap(this);
}); });
}, },
attributionPrefix: function() {
return '<a href="https://leafletjs.com" title="A JavaScript library for interactive maps">Leaflet</a>';
},
destroy: function() { destroy: function() {
App.Map.maps.forEach(function(map) { App.Map.maps.forEach(function(map) {
map.off(); map.off();
@@ -118,6 +121,7 @@
}; };
mapCenterLatLng = new L.LatLng(mapCenterLatitude, mapCenterLongitude); mapCenterLatLng = new L.LatLng(mapCenterLatitude, mapCenterLongitude);
map = L.map(element.id, { scrollWheelZoom: false }).setView(mapCenterLatLng, zoom); map = L.map(element.id, { scrollWheelZoom: false }).setView(mapCenterLatLng, zoom);
map.attributionControl.setPrefix(App.Map.attributionPrefix());
App.Map.maps.push(map); App.Map.maps.push(map);
L.tileLayer(mapTilesProvider, { L.tileLayer(mapTilesProvider, {
attribution: mapAttribution attribution: mapAttribution