X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ede8ca04554bc710206206ab45f5135e1cab239..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/assets/javascripts/embed.js.erb
diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb
index 03c43d386..ceb488f98 100644
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -1,7 +1,15 @@
//= require leaflet
//= 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;
+ }
+
var query = (window.location.search || '?').substr(1),
args = {};
@@ -11,18 +19,22 @@ window.onload = function () {
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('');
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);
} else if (args.layer === "cyclemap" || args.layer === "cycle map") {
- new L.OSM.CycleMap().addTo(map);
+ new L.OSM.CycleMap(thunderforestOptions).addTo(map);
} else if (args.layer === "transportmap") {
- new L.OSM.TransportMap().addTo(map);
- } else if (args.layer === "mapquest") {
- new L.OSM.MapQuestOpen().addTo(map);
+ new L.OSM.TransportMap(thunderforestOptions).addTo(map);
} else if (args.layer === "hot") {
new L.OSM.HOT().addTo(map);
}
@@ -44,65 +56,31 @@ window.onload = function () {
} else {
map.fitWorld();
}
- (new L.Control.OSMReportAProblem({})).addTo(map);
+
+ map.addControl(new L.Control.OSMReportAProblem());
};
L.Control.OSMReportAProblem = L.Control.Attribution.extend({
- options: {
- position: 'bottomright',
- prefix: 'Report a problem'
- },
- _layerAdd: function(e)
- {
- if (e.layer.getAttribution) {
- this.addAttribution(e.layer.getAttribution());
- }
- },
- _layerRemove: function(e)
- {
- if (e.layer.getAttribution) {
- this.removeAttribution(e.layer.getAttribution());
- }
- },
- onAdd: function (map) {
- this._container = L.DomUtil.create('div', 'leaflet-control-attribution');
- L.DomEvent.disableClickPropagation(this._container);
-
- // TODO ugly, refactor
- for (var i in map._layers) {
- if (map._layers[i].getAttribution) {
- this.addAttribution(map._layers[i].getAttribution());
- }
- }
+ options: {
+ position: 'bottomright',
+ prefix: ''+I18n.t('javascripts.embed.report_problem')+''
+ },
- this._update();
- map.on('moveend', this._update, this);
- map.on('layeradd', this._layerAdd, this);
- map.on('layerremove', this._layerRemove, this);
+ onAdd: function (map) {
+ var container = L.Control.Attribution.prototype.onAdd.call(this, map);
- return this._container;
- },
- _update: function () {
- if (!this._map) { return; }
+ map.on('moveend', this._update, this);
- var attribs = [];
+ return container;
+ },
- for (var i in this._attributions) {
- if (this._attributions[i]) {
- attribs.push(i);
- }
- }
+ _update: function () {
+ L.Control.Attribution.prototype._update.call(this);
- var prefixAndAttribs = [];
-
- if (this.options.prefix) {
- prefixAndAttribs.push(this.options.prefix);
- }
- if (attribs.length) {
- prefixAndAttribs.push(attribs.join(', '));
- }
-
- this._container.innerHTML = prefixAndAttribs.join(' | ').replace('{x}', this._map.getCenter().lat).replace('{y}', this._map.getCenter().lng).replace('{z}', this._map.getZoom());
- }
-
- });
+ this._container.innerHTML =
+ this._container.innerHTML
+ .replace('{x}', this._map.getCenter().lat)
+ .replace('{y}', this._map.getCenter().lng)
+ .replace('{z}', this._map.getZoom());
+ }
+});