X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9cf698322ce70e2fdb718be6624b0ac4e8eaf285..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/app/assets/javascripts/leaflet.map.js?ds=sidebyside
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index d952a7376..02ed318ac 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -1,3 +1,5 @@
+//= require qs/dist/qs
+
L.extend(L.LatLngBounds.prototype, {
getSize: function () {
return (this._northEast.lat - this._southWest.lat) *
@@ -10,65 +12,103 @@ L.extend(L.LatLngBounds.prototype, {
});
L.OSM.Map = L.Map.extend({
- initialize: function(id, options) {
+ 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'});
-
this.baseLayers = [];
- this.baseLayers.push(new L.OSM.Mapnik({
- attribution: copyright + " ♥ " + donate,
- 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",
- 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",
- 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 courtesy of Humanitarian OpenStreetMap Team",
- 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'};
+ this.noteLayer.options = { code: "N" };
this.dataLayer = new L.OSM.DataLayer(null);
- this.dataLayer.options.code = 'D';
+ this.dataLayer.options.code = "D";
this.gpsLayer = new L.OSM.GPS({
pane: "overlayPane",
- code: "G",
- name: I18n.t("javascripts.map.base.gps")
+ code: "G"
});
+
+ this.on("layeradd", function (event) {
+ if (this.baseLayers.indexOf(event.layer) >= 0) {
+ 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) {
- layerParam = layerParam || "M";
- var layersAdded = "";
+ updateLayers: function (layerParam) {
+ var layers = layerParam || "M",
+ layersAdded = "";
for (var i = this.baseLayers.length - 1; i >= 0; i--) {
- if (layerParam.indexOf(this.baseLayers[i].options.code) >= 0) {
+ if (layers.indexOf(this.baseLayers[i].options.code) >= 0) {
this.addLayer(this.baseLayers[i]);
layersAdded = layersAdded + this.baseLayers[i].options.code;
} else if (i === 0 && layersAdded === "") {
@@ -80,24 +120,24 @@ L.OSM.Map = L.Map.extend({
},
getLayersCode: function () {
- var layerConfig = '';
- for (var i in this._layers) { // TODO: map.eachLayer
- var layer = this._layers[i];
+ var layerConfig = "";
+ this.eachLayer(function (layer) {
if (layer.options && layer.options.code) {
layerConfig += layer.options.code;
}
- }
+ });
return layerConfig;
},
getMapBaseLayerId: function () {
- for (var i in this._layers) { // TODO: map.eachLayer
- var layer = this._layers[i];
- if (layer.options && layer.options.keyid) return layer.options.keyid;
- }
+ var baseLayerId;
+ this.eachLayer(function (layer) {
+ if (layer.options && layer.options.layerId) baseLayerId = layer.options.layerId;
+ });
+ return baseLayerId;
},
- getUrl: function(marker) {
+ getUrl: function (marker) {
var precision = OSM.zoomPrecision(this.getZoom()),
params = {};
@@ -107,78 +147,81 @@ L.OSM.Map = L.Map.extend({
params.mlon = latLng.lng.toFixed(precision);
}
- var url = window.location.protocol + '//' + OSM.SERVER_URL + '/',
- query = querystring.stringify(params),
- hash = OSM.formatHash(this);
+ var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",
+ query = Qs.stringify(params),
+ hash = OSM.formatHash(this);
- if (query) url += '?' + query;
+ if (query) url += "?" + query;
if (hash) url += hash;
return url;
},
- getShortUrl: function(marker) {
+ getShortUrl: function (marker) {
var zoom = this.getZoom(),
- latLng = marker && this.hasLayer(marker) ? marker.getLatLng().wrap() : this.getCenter().wrap(),
- str = window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
- window.location.protocol + '//osm.org/go/' :
- window.location.protocol + '//' + window.location.hostname + '/go/',
- char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",
- x = Math.round((latLng.lng + 180.0) * ((1 << 30) / 90.0)),
- y = Math.round((latLng.lat + 90.0) * ((1 << 30) / 45.0)),
- // JavaScript only has to keep 32 bits of bitwise operators, so this has to be
- // done in two parts. each of the parts c1/c2 has 30 bits of the total in it
- // and drops the last 4 bits of the full 64 bit Morton code.
- c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff),
- digit;
-
- for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
- digit = (c1 >> (24 - 6 * i)) & 0x3f;
+ latLng = marker && this.hasLayer(marker) ? marker.getLatLng().wrap() : this.getCenter().wrap(),
+ str = window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
+ window.location.protocol + "//osm.org/go/" :
+ window.location.protocol + "//" + window.location.hostname + "/go/",
+ char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",
+ x = Math.round((latLng.lng + 180.0) * ((1 << 30) / 90.0)),
+ y = Math.round((latLng.lat + 90.0) * ((1 << 30) / 45.0)),
+ // JavaScript only has to keep 32 bits of bitwise operators, so this has to be
+ // done in two parts. each of the parts c1/c2 has 30 bits of the total in it
+ // and drops the last 4 bits of the full 64 bit Morton code.
+ c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff),
+ digit,
+ i;
+
+ for (i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
+ digit = (c1 >> (24 - (6 * i))) & 0x3f;
str += char_array.charAt(digit);
}
for (i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {
- digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
+ digit = (c2 >> (24 - (6 * (i - 5)))) & 0x3f;
str += char_array.charAt(digit);
}
for (i = 0; i < ((zoom + 8) % 3); ++i) str += "-";
// Called to interlace the bits in x and y, making a Morton code.
function interlace(x, y) {
- x = (x | (x << 8)) & 0x00ff00ff;
- x = (x | (x << 4)) & 0x0f0f0f0f;
- x = (x | (x << 2)) & 0x33333333;
- x = (x | (x << 1)) & 0x55555555;
- y = (y | (y << 8)) & 0x00ff00ff;
- y = (y | (y << 4)) & 0x0f0f0f0f;
- y = (y | (y << 2)) & 0x33333333;
- y = (y | (y << 1)) & 0x55555555;
- return (x << 1) | y;
+ var interlaced_x = x,
+ interlaced_y = y;
+ interlaced_x = (interlaced_x | (interlaced_x << 8)) & 0x00ff00ff;
+ interlaced_x = (interlaced_x | (interlaced_x << 4)) & 0x0f0f0f0f;
+ interlaced_x = (interlaced_x | (interlaced_x << 2)) & 0x33333333;
+ interlaced_x = (interlaced_x | (interlaced_x << 1)) & 0x55555555;
+ interlaced_y = (interlaced_y | (interlaced_y << 8)) & 0x00ff00ff;
+ interlaced_y = (interlaced_y | (interlaced_y << 4)) & 0x0f0f0f0f;
+ interlaced_y = (interlaced_y | (interlaced_y << 2)) & 0x33333333;
+ interlaced_y = (interlaced_y | (interlaced_y << 1)) & 0x55555555;
+ return (interlaced_x << 1) | interlaced_y;
}
var params = {};
- var layers = this.getLayersCode().replace('M', '');
+ var layers = this.getLayersCode().replace("M", "");
if (layers) {
params.layers = layers;
}
if (marker && this.hasLayer(marker)) {
- params.m = '';
+ params.m = "";
}
if (this._object) {
params[this._object.type] = this._object.id;
}
- var query = querystring.stringify(params);
+ var query = Qs.stringify(params);
if (query) {
- str += '?' + query;
+ str += "?" + query;
}
return str;
},
- getGeoUri: function(marker) {
+ getGeoUri: function (marker) {
var precision = OSM.zoomPrecision(this.getZoom()),
latLng,
params = {};
@@ -193,10 +236,10 @@ L.OSM.Map = L.Map.extend({
params.lon = latLng.lng.toFixed(precision);
params.zoom = this.getZoom();
- return 'geo:' + params.lat + ',' + params.lon + '?z=' + params.zoom;
+ return "geo:" + params.lat + "," + params.lon + "?z=" + params.zoom;
},
- addObject: function(object, callback) {
+ addObject: function (object, callback) {
var objectStyle = {
color: "#FF6200",
weight: 4,
@@ -206,57 +249,85 @@ L.OSM.Map = L.Map.extend({
var changesetStyle = {
weight: 4,
- color: '#FF9500',
+ color: "#FF9500",
opacity: 1,
fillOpacity: 0,
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 () {}
+ };
+
+ this._object = object;
+ this._objectLayer = L.featureGroup().addTo(this);
- 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());
+ L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
+
+ 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() {
+ removeObject: function () {
this._object = null;
if (this._objectLoader) this._objectLoader.abort();
if (this._objectLayer) this.removeLayer(this._objectLayer);
},
- getState: function() {
+ getState: function () {
return {
center: this.getCenter().wrap(),
zoom: this.getZoom(),
@@ -264,20 +335,25 @@ L.OSM.Map = L.Map.extend({
};
},
- setState: function(state, options) {
+ setState: function (state, options) {
if (state.center) this.setView(state.center, state.zoom, options);
if (state.layers) this.updateLayers(state.layers);
},
- setSidebarOverlaid: function(overlaid) {
+ 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});
+ this.invalidateSize({ pan: false });
}
return this;
}
@@ -294,7 +370,7 @@ L.Icon.Default.imageUrls = {
L.extend(L.Icon.Default.prototype, {
_oldGetIconUrl: L.Icon.Default.prototype._getIconUrl,
- _getIconUrl: function (name) {
+ _getIconUrl: function (name) {
var url = this._oldGetIconUrl(name);
return L.Icon.Default.imageUrls[url];
}