X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..6789fc30813990710c5fb786bf90a70867f77339:/app/assets/javascripts/embed.js.erb
diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb
index 36b23666a..66cd02b98 100644
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -1,16 +1,18 @@
-//= require leaflet
+//= depend_on settings.yml
+//= depend_on settings.local.yml
+//= require leaflet/dist/leaflet-src
//= require leaflet.osm
//= require i18n
//= require i18n/embed
-window.onload = function () {
- if (navigator.languages) {
- I18n.locale = navigator.languages[0];
- } else if (navigator.language) {
- I18n.locale = navigator.language;
- }
+if (navigator.languages) {
+ I18n.locale = navigator.languages[0];
+} else if (navigator.language) {
+ I18n.locale = navigator.language;
+}
- var query = (window.location.search || '?').substr(1),
+window.onload = function () {
+ var query = (window.location.search || '?').slice(1),
args = {};
var pairs = query.split('&');
@@ -19,9 +21,15 @@ 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 defined?(THUNDERFOREST_KEY) %>
- apikey: <%= THUNDERFOREST_KEY.to_json %>
+<% if Settings.key?(:thunderforest_key) %>
+ apikey: <%= Settings.thunderforest_key.to_json %>
<% end %>
};
@@ -29,22 +37,24 @@ window.onload = function () {
map.attributionControl.setPrefix('');
map.removeControl(map.attributionControl);
- if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") {
- new L.OSM.Mapnik().addTo(map);
+ 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 === "hot") {
new L.OSM.HOT().addTo(map);
+ } else {
+ new L.OSM.Mapnik(mapnikOptions).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 +73,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) {