X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6dd451c7ee48663d6b0753bfe8b4da2060c4cf60..33bca7cd655577da0b2b2aac398db221a31700ad:/app/assets/javascripts/leaflet.map.js
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 797a57e20..6537b0b23 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -1,4 +1,4 @@
-//= require querystring
+//= require qs/dist/qs
L.extend(L.LatLngBounds.prototype, {
getSize: function () {
@@ -15,43 +15,31 @@ L.OSM.Map = L.Map.extend({
initialize: function (id, options) {
L.Map.prototype.initialize.call(this, id, options);
- var copyright = I18n.t("javascripts.map.copyright", { copyright_url: "/copyright" });
- var donate = I18n.t("javascripts.map.donate_link_text", { donate_url: "https://donate.openstreetmap.org" });
- var terms = I18n.t("javascripts.map.terms", { terms_url: "https://wiki.osmfoundation.org/wiki/Terms_of_Use" });
-
this.baseLayers = [];
- this.baseLayers.push(new L.OSM.Mapnik({
- attribution: copyright + " ♥ " + donate + ". " + terms,
- code: "M",
- keyid: "mapnik",
- name: I18n.t("javascripts.map.base.standard")
- }));
-
- if (OSM.THUNDERFOREST_KEY) {
- this.baseLayers.push(new L.OSM.CycleMap({
- attribution: copyright + ". Tiles courtesy of Andy Allan. " + terms,
- apikey: OSM.THUNDERFOREST_KEY,
- code: "C",
- keyid: "cyclemap",
- name: I18n.t("javascripts.map.base.cycle_map")
- }));
-
- this.baseLayers.push(new L.OSM.TransportMap({
- attribution: copyright + ". Tiles courtesy of Andy Allan. " + terms,
- apikey: OSM.THUNDERFOREST_KEY,
- code: "T",
- keyid: "transportmap",
- name: I18n.t("javascripts.map.base.transport_map")
- }));
- }
+ for (const layerDefinition of OSM.LAYER_DEFINITIONS) {
+ if (layerDefinition.apiKeyId && !OSM[layerDefinition.apiKeyId]) continue;
+
+ let layerConstructor = L.OSM.TileLayer;
+ const layerOptions = {};
+
+ for (const [property, value] of Object.entries(layerDefinition)) {
+ if (property === "credit") {
+ layerOptions.attribution = makeAttribution(value);
+ } else if (property === "nameId") {
+ layerOptions.name = I18n.t(`javascripts.map.base.${value}`);
+ } else if (property === "apiKeyId") {
+ layerOptions.apikey = OSM[value];
+ } else if (property === "leafletOsmId") {
+ layerConstructor = L.OSM[value];
+ } else {
+ layerOptions[property] = value;
+ }
+ }
- this.baseLayers.push(new L.OSM.HOT({
- attribution: copyright + ". Tiles style by Humanitarian OpenStreetMap Team hosted by OpenStreetMap France. " + terms,
- code: "H",
- keyid: "hot",
- name: I18n.t("javascripts.map.base.hot")
- }));
+ const layer = new layerConstructor(layerOptions);
+ this.baseLayers.push(layer);
+ }
this.noteLayer = new L.FeatureGroup();
this.noteLayer.options = { code: "N" };
@@ -61,8 +49,7 @@ L.OSM.Map = L.Map.extend({
this.gpsLayer = new L.OSM.GPS({
pane: "overlayPane",
- code: "G",
- name: I18n.t("javascripts.map.base.gps")
+ code: "G"
});
this.on("layeradd", function (event) {
@@ -70,6 +57,50 @@ L.OSM.Map = L.Map.extend({
this.setMaxZoom(event.layer.options.maxZoom);
}
});
+
+ function makeAttribution(credit) {
+ let attribution = "";
+
+ attribution += I18n.t("javascripts.map.copyright_text", {
+ copyright_link: $("", {
+ href: "/copyright",
+ text: I18n.t("javascripts.map.openstreetmap_contributors")
+ }).prop("outerHTML")
+ });
+
+ attribution += credit.donate ? " ♥ " : ". ";
+ attribution += makeCredit(credit);
+ attribution += ". ";
+
+ attribution += $("", {
+ href: "https://wiki.osmfoundation.org/wiki/Terms_of_Use",
+ text: I18n.t("javascripts.map.website_and_api_terms")
+ }).prop("outerHTML");
+
+ return attribution;
+ }
+
+ function makeCredit(credit) {
+ const children = {};
+ for (const childId in credit.children) {
+ children[childId] = makeCredit(credit.children[childId]);
+ }
+ const text = I18n.t(`javascripts.map.${credit.id}`, children);
+ if (credit.href) {
+ const link = $("", {
+ href: credit.href,
+ text: text
+ });
+ if (credit.donate) {
+ link.addClass("donate-attr");
+ } else {
+ link.attr("target", "_blank");
+ }
+ return link.prop("outerHTML");
+ } else {
+ return text;
+ }
+ }
},
updateLayers: function (layerParam) {
@@ -99,11 +130,14 @@ L.OSM.Map = L.Map.extend({
},
getMapBaseLayerId: function () {
- var baseLayerId;
- this.eachLayer(function (layer) {
- if (layer.options && layer.options.keyid) baseLayerId = layer.options.keyid;
- });
- return baseLayerId;
+ const layer = this.getMapBaseLayer();
+ if (layer) return layer.options.layerId;
+ },
+
+ getMapBaseLayer: function () {
+ for (const layer of this.baseLayers) {
+ if (this.hasLayer(layer)) return layer;
+ }
},
getUrl: function (marker) {
@@ -116,9 +150,8 @@ L.OSM.Map = L.Map.extend({
params.mlon = latLng.lng.toFixed(precision);
}
- var querystring = require("querystring-component"),
- url = window.location.protocol + "//" + OSM.SERVER_URL + "/",
- query = querystring.stringify(params),
+ var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",
+ query = Qs.stringify(params),
hash = OSM.formatHash(this);
if (query) url += "?" + query;
@@ -183,8 +216,7 @@ L.OSM.Map = L.Map.extend({
params[this._object.type] = this._object.id;
}
- var querystring = require("querystring-component"),
- query = querystring.stringify(params);
+ var query = Qs.stringify(params);
if (query) {
str += "?" + query;
}
@@ -226,42 +258,70 @@ L.OSM.Map = L.Map.extend({
interactive: false
};
+ var haloStyle = {
+ weight: 2.5,
+ radius: 20,
+ fillOpacity: 0.5,
+ color: "#FF6200"
+ };
+
this.removeObject();
- var map = this;
- this._objectLoader = $.ajax({
- url: OSM.apiUrl(object),
- dataType: "xml",
- success: function (xml) {
- map._object = object;
-
- map._objectLayer = new L.OSM.DataLayer(null, {
- styles: {
- node: objectStyle,
- way: objectStyle,
- area: objectStyle,
- changeset: changesetStyle
- }
- });
+ if (object.type === "note") {
+ this._objectLoader = {
+ abort: function () {}
+ };
- map._objectLayer.interestingNode = function (node, ways, relations) {
- if (object.type === "node") {
- return true;
- } else if (object.type === "relation") {
- for (var i = 0; i < relations.length; i++) {
- if (relations[i].members.indexOf(node) !== -1) return true;
- }
- } else {
- return false;
- }
- };
+ this._object = object;
+ this._objectLayer = L.featureGroup().addTo(this);
- map._objectLayer.addData(xml);
- map._objectLayer.addTo(map);
+ L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
- if (callback) callback(map._objectLayer.getBounds());
+ if (object.icon) {
+ L.marker(object.latLng, {
+ icon: object.icon,
+ opacity: 1,
+ interactive: true
+ }).addTo(this._objectLayer);
}
- });
+
+ if (callback) callback(this._objectLayer.getBounds());
+ } else { // element or changeset handled by L.OSM.DataLayer
+ var map = this;
+ this._objectLoader = $.ajax({
+ url: OSM.apiUrl(object),
+ dataType: "xml",
+ success: function (xml) {
+ map._object = object;
+
+ map._objectLayer = new L.OSM.DataLayer(null, {
+ styles: {
+ node: objectStyle,
+ way: objectStyle,
+ area: objectStyle,
+ changeset: changesetStyle
+ }
+ });
+
+ map._objectLayer.interestingNode = function (node, ways, relations) {
+ if (object.type === "node") {
+ return true;
+ } else if (object.type === "relation") {
+ for (var i = 0; i < relations.length; i++) {
+ if (relations[i].members.indexOf(node) !== -1) return true;
+ }
+ } else {
+ return false;
+ }
+ };
+
+ map._objectLayer.addData(xml);
+ map._objectLayer.addTo(map);
+
+ if (callback) callback(map._objectLayer.getBounds());
+ }
+ });
+ }
},
removeObject: function () {
@@ -284,12 +344,17 @@ L.OSM.Map = L.Map.extend({
},
setSidebarOverlaid: function (overlaid) {
+ var sidebarWidth = 350;
if (overlaid && !$("#content").hasClass("overlay-sidebar")) {
$("#content").addClass("overlay-sidebar");
- this.invalidateSize({ pan: false })
- .panBy([-350, 0], { animate: false });
+ this.invalidateSize({ pan: false });
+ if ($("html").attr("dir") !== "rtl") {
+ this.panBy([-sidebarWidth, 0], { animate: false });
+ }
} else if (!overlaid && $("#content").hasClass("overlay-sidebar")) {
- this.panBy([350, 0], { animate: false });
+ if ($("html").attr("dir") !== "rtl") {
+ this.panBy([sidebarWidth, 0], { animate: false });
+ }
$("#content").removeClass("overlay-sidebar");
this.invalidateSize({ pan: false });
}