X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4dcedf666c62e9132de7de50105f567b7963318b..c8e21c409c9bec446f0caa2526d5b07861bb3299:/app/assets/javascripts/embed.js.erb?ds=inline diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb index e76b6c356..2ced018b2 100644 --- a/app/assets/javascripts/embed.js.erb +++ b/app/assets/javascripts/embed.js.erb @@ -1,3 +1,5 @@ +//= depend_on settings.yml +//= depend_on settings.local.yml //= require leaflet/dist/leaflet-src //= require leaflet.osm //= require i18n @@ -19,6 +21,12 @@ window.onload = function () { args[parts[0]] = decodeURIComponent(parts[1] || ''); } + var mapnikOptions = { +<% if Settings.key?(:tile_cdn_url) %> + url: <%= Settings.tile_cdn_url.to_json %> +<% end %> + }; + var thunderforestOptions = { <% if Settings.key?(:thunderforest_key) %> apikey: <%= Settings.thunderforest_key.to_json %> @@ -30,7 +38,7 @@ window.onload = function () { map.removeControl(map.attributionControl); if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") { - new L.OSM.Mapnik().addTo(map); + new L.OSM.Mapnik(mapnikOptions).addTo(map); } else if (args.layer === "cyclemap" || args.layer === "cycle map") { new L.OSM.CycleMap(thunderforestOptions).addTo(map); } else if (args.layer === "transportmap") { @@ -43,10 +51,10 @@ window.onload = function () { if (args.marker) { L.marker(args.marker.split(','), {icon: L.icon({ - iconUrl: <%= asset_path('images/marker-icon.png').to_json %>, + iconUrl: <%= asset_path('leaflet/dist/images/marker-icon.png').to_json %>, iconSize: new L.Point(25, 41), iconAnchor: new L.Point(12, 41), - shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>, + shadowUrl: <%= asset_path('leaflet/dist/images/marker-shadow.png').to_json %>, shadowSize: new L.Point(41, 41) })}).addTo(map); }