Remove more header font size overrides

[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 57572ca48ff31dee1cd998d5312c6886443f37fb..ceb488f987681871e05c87476e5a464de126c79d 100644 (file)
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -1,32 +1,46 @@
 //= require leaflet
 //= require leaflet.osm
 //= require leaflet
 //= require leaflet.osm

+//= require i18n
+//= require i18n/embed

 
 window.onload = function () {
 
 window.onload = function () {

+  if (navigator.languages) {
+    I18n.locale = navigator.languages[0];
+  } else if (navigator.language) {
+    I18n.locale = navigator.language;
+  }
+

   var query = (window.location.search || '?').substr(1),
       args  = {};
 
   var query = (window.location.search || '?').substr(1),
       args  = {};
 

-  query.replace(/([^&=]+)=?([^&]*)(?:&+|$)/g, function(match, key, value) {
-    value = value.split(",");
-    if (value.length == 1)
-      value = value[0];
-    args[key] = value;
-  });
+  var pairs = query.split('&');
+  for (var i = 0; i < pairs.length; i++) {
+    var parts = pairs[i].split('=');
+    args[parts[0]] = decodeURIComponent(parts[1] || '');
+  }
+
+  var thunderforestOptions = {
+<% if Settings.key?(:thunderforest_key) %>
+    apikey: <%= Settings.thunderforest_key.to_json %>
+<% end %>
+  };

 
   var map = L.map("map");
   map.attributionControl.setPrefix('');
 
   var map = L.map("map");
   map.attributionControl.setPrefix('');

+  map.removeControl(map.attributionControl);

 
 

-  if (!args.layer || args.layer == "mapnik" || args.layer == "osmarender") {
+  if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") {

     new L.OSM.Mapnik().addTo(map);
     new L.OSM.Mapnik().addTo(map);

-  } else if (args.layer == "cyclemap" || args.layer == "cycle map") {
-    new L.OSM.CycleMap().addTo(map);
-  } else if (args.layer == "transportmap") {
-    new L.OSM.TransportMap().addTo(map);
-  } else if (args.layer == "mapquest") {
-    new L.OSM.MapQuestOpen().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);

   }
 
   if (args.marker) {
   }
 
   if (args.marker) {

-    L.marker(args.marker, {icon: L.icon({
+    L.marker(args.marker.split(','), {icon: L.icon({

       iconUrl: <%= asset_path('images/marker-icon.png').to_json %>,
       iconSize: new L.Point(25, 41),
       iconAnchor: new L.Point(12, 41),
       iconUrl: <%= asset_path('images/marker-icon.png').to_json %>,
       iconSize: new L.Point(25, 41),
       iconAnchor: new L.Point(12, 41),


@@ -36,9 +50,37 @@ window.onload = function () {
   }
 
   if (args.bbox) {
   }
 
   if (args.bbox) {

-    map.fitBounds([L.latLng(args.bbox[1], args.bbox[0]),
-                   L.latLng(args.bbox[3], args.bbox[2])])
+    var bbox = args.bbox.split(',');
+    map.fitBounds([L.latLng(bbox[1], bbox[0]),
+                   L.latLng(bbox[3], bbox[2])]);

   } else {
     map.fitWorld();
   }
   } else {
     map.fitWorld();
   }

+
+  map.addControl(new L.Control.OSMReportAProblem());

 };
 };

+
+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>'
+  },
+
+  onAdd: function (map) {
+    var container = L.Control.Attribution.prototype.onAdd.call(this, map);
+
+    map.on('moveend', this._update, this);
+
+    return container;
+  },
+
+  _update: function () {
+    L.Control.Attribution.prototype._update.call(this);
+
+    this._container.innerHTML =
+      this._container.innerHTML
+        .replace('{x}', this._map.getCenter().lat)
+        .replace('{y}', this._map.getCenter().lng)
+        .replace('{z}', this._map.getZoom());
+  }
+});