X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/783b5e3729228908d7404ae7404af1023501a906..51d2a846ece990db7c4109ecf923ad9201c6f8e6:/app/assets/javascripts/embed.js.erb diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb index ceb488f98..4ebb89da9 100644 --- a/app/assets/javascripts/embed.js.erb +++ b/app/assets/javascripts/embed.js.erb @@ -1,4 +1,6 @@ -//= require leaflet +//= depend_on settings.yml +//= depend_on settings.local.yml +//= require leaflet/dist/leaflet-src //= require leaflet.osm //= require i18n //= require i18n/embed @@ -10,7 +12,7 @@ window.onload = function () { I18n.locale = navigator.language; } - var query = (window.location.search || '?').substr(1), + var query = (window.location.search || '?').slice(1), args = {}; var pairs = query.split('&'); @@ -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,21 +38,25 @@ 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 === "cyclosm") { + new L.OSM.CyclOSM().addTo(map); } else if (args.layer === "cyclemap" || args.layer === "cycle map") { new L.OSM.CycleMap(thunderforestOptions).addTo(map); } else if (args.layer === "transportmap") { new L.OSM.TransportMap(thunderforestOptions).addTo(map); + } else if (args.layer === "opnvkarte") { + new L.OSM.OPNVKarte().addTo(map); } else if (args.layer === "hot") { new L.OSM.HOT().addTo(map); } 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); } @@ -63,7 +75,7 @@ window.onload = function () { L.Control.OSMReportAProblem = L.Control.Attribution.extend({ options: { position: 'bottomright', - prefix: ''+I18n.t('javascripts.embed.report_problem')+'' + prefix: ''+I18n.t('javascripts.embed.report_problem')+'' }, onAdd: function (map) {