X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/743cce1d9c2e0673feaf1e96105024b7bf2827f5..6c34885fe73dfdcff1de4e3c9eb7b2931efd6b81:/vendor/assets/leaflet/leaflet.osm.js
diff --git a/vendor/assets/leaflet/leaflet.osm.js b/vendor/assets/leaflet/leaflet.osm.js
index 207f57920..6b78fe9be 100644
--- a/vendor/assets/leaflet/leaflet.osm.js
+++ b/vendor/assets/leaflet/leaflet.osm.js
@@ -2,8 +2,10 @@ L.OSM = {};
L.OSM.TileLayer = L.TileLayer.extend({
options: {
- url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
- attribution: '© OpenStreetMap and contributors, under an open license'
+ url: document.location.protocol === 'https:' ?
+ 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' :
+ 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+ attribution: '© OpenStreetMap contributors'
},
initialize: function (options) {
@@ -14,27 +16,51 @@ L.OSM.TileLayer = L.TileLayer.extend({
L.OSM.Mapnik = L.OSM.TileLayer.extend({
options: {
- url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+ url: document.location.protocol === 'https:' ?
+ 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' :
+ 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+ maxZoom: 19
}
});
L.OSM.CycleMap = L.OSM.TileLayer.extend({
options: {
- url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
+ url: document.location.protocol === 'https:' ?
+ 'https://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' :
+ 'http://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png',
+ attribution: '© OpenStreetMap contributors. Tiles courtesy of Andy Allan'
}
});
L.OSM.TransportMap = L.OSM.TileLayer.extend({
options: {
- url: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png'
+ url: document.location.protocol === 'https:' ?
+ 'https://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png' :
+ 'http://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png',
+ attribution: '© OpenStreetMap contributors. Tiles courtesy of Andy Allan'
}
});
L.OSM.MapQuestOpen = L.OSM.TileLayer.extend({
options: {
- url: 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
+ url: document.location.protocol === 'https:' ?
+ 'https://otile{s}-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png' :
+ 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
subdomains: '1234',
- attribution: "Tiles courtesy of MapQuest "
+ attribution: '© OpenStreetMap contributors. ' + document.location.protocol === 'https:' ?
+ 'Tiles courtesy of MapQuest ' :
+ 'Tiles courtesy of MapQuest '
+ }
+});
+
+L.OSM.HOT = L.OSM.TileLayer.extend({
+ options: {
+ url: document.location.protocol === 'https:' ?
+ 'https://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png' :
+ 'http://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png',
+ maxZoom: 20,
+ subdomains: 'abc',
+ attribution: '© OpenStreetMap contributors. Tiles courtesy of Humanitarian OpenStreetMap Team'
}
});
@@ -63,7 +89,9 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
for (var i = 0; i < features.length; i++) {
var feature = features[i], layer;
- if (feature.type === "node") {
+ if (feature.type === "changeset") {
+ layer = L.rectangle(feature.latLngBounds, this.options.styles.changeset);
+ } else if (feature.type === "node") {
layer = L.circleMarker(feature.latLng, this.options.styles.node);
} else {
var latLngs = new Array(feature.nodes.length);
@@ -86,7 +114,7 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
},
buildFeatures: function (xml) {
- var features = [],
+ var features = L.OSM.getChangesets(xml),
nodes = L.OSM.getNodes(xml),
ways = L.OSM.getWays(xml, nodes),
relations = L.OSM.getRelations(xml, nodes, ways);
@@ -150,6 +178,25 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
});
L.Util.extend(L.OSM, {
+ getChangesets: function (xml) {
+ var result = [];
+
+ var nodes = xml.getElementsByTagName("changeset");
+ for (var i = 0; i < nodes.length; i++) {
+ var node = nodes[i], id = node.getAttribute("id");
+ result.push({
+ id: id,
+ type: "changeset",
+ latLngBounds: L.latLngBounds(
+ [node.getAttribute("min_lat"), node.getAttribute("min_lon")],
+ [node.getAttribute("max_lat"), node.getAttribute("max_lon")]),
+ tags: this.getTags(node)
+ });
+ }
+
+ return result;
+ },
+
getNodes: function (xml) {
var result = {};