Merge pull request #3686 from AntonKhorev/embed-https

[rails.git] / app / assets / javascripts / embed.js.erb

diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb
index 12a5a46a844adcc0ab02699781be12f79b05314f..4ebb89da93134a422133640e6680119c6ab9e752 100644 (file)
--- 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
 //= require leaflet/dist/leaflet-src
 //= require leaflet.osm
 //= require i18n


@@ -10,7 +12,7 @@ window.onload = function () {
     I18n.locale = navigator.language;
   }
 
     I18n.locale = navigator.language;
   }
 

-  var query = (window.location.search || '?').substr(1),
+  var query = (window.location.search || '?').slice(1),

       args  = {};
 
   var pairs = query.split('&');
       args  = {};
 
   var pairs = query.split('&');


@@ -37,6 +39,8 @@ window.onload = function () {
 
   if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") {
     new L.OSM.Mapnik(mapnikOptions).addTo(map);
 
   if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") {
     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") {
   } else if (args.layer === "cyclemap" || args.layer === "cycle map") {
     new L.OSM.CycleMap(thunderforestOptions).addTo(map);
   } else if (args.layer === "transportmap") {


@@ -71,7 +75,7 @@ window.onload = function () {
 L.Control.OSMReportAProblem = L.Control.Attribution.extend({
   options: {
     position: 'bottomright',
 L.Control.OSMReportAProblem = L.Control.Attribution.extend({
   options: {
     position: 'bottomright',

-    prefix: '<a href="http://www.openstreetmap.org/fixthemap?lat={x}&lon={y}&zoom={z}" target="_blank">'+I18n.t('javascripts.embed.report_problem')+'</a>'
+    prefix: '<a href="https://www.openstreetmap.org/fixthemap?lat={x}&lon={y}&zoom={z}" target="_blank">'+I18n.t('javascripts.embed.report_problem')+'</a>'

   },
 
   onAdd: function (map) {
   },
 
   onAdd: function (map) {