X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/babefbba6c9c6d7d2ed944bda7aa3634d0b917e6..168a9fc3272777fa7ab533e936715525376f8ebf:/app/assets/javascripts/map.js.erb
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index b8e53d5e0..8b621e3ae 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -1,101 +1,83 @@
// Leaflet extensions
-L.LatLngBounds.include({
- getSouthLat: function () {
- return this._southWest.lat;
- },
-
- getWestLng: function () {
- return this._southWest.lng;
- },
-
- getNorthLat: function () {
- return this._northEast.lat;
- },
-
- getEastLng: function () {
- return this._northEast.lng;
- },
-
- toBBOX: function () {
- var decimal = 6;
- var mult = Math.pow(10, decimal);
- var xmin = Math.round(this.getWestLng() * mult) / mult;
- var ymin = Math.round(this.getSouthLat() * mult) / mult;
- var xmax = Math.round(this.getEastLng() * mult) / mult;
- var ymax = Math.round(this.getNorthLat() * mult) / mult;
- return xmin + "," + ymin + "," + xmax + "," + ymax;
- },
-
+L.extend(L.LatLngBounds.prototype, {
getSize: function () {
return (this._northEast.lat - this._southWest.lat) *
(this._northEast.lng - this._southWest.lng);
- }
-});
-
-L.Bounds.include({
- getWidth: function () {
- return this.max.x - this.min.x;
},
- getHeight: function () {
- return this.max.y - this.min.y;
+ wrap: function () {
+ return new L.LatLngBounds(this._southWest.wrap(), this._northEast.wrap());
}
});
+L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
+
var map;
+var layers;
+var objectLayer;
+var objectLoader;
-var layers = [
- {
- klass: L.OSM.Mapnik,
- attribution: "",
- keyid: "mapnik",
- layerCode: "M",
- name: I18n.t("javascripts.map.base.standard")
- },
- {
- klass: L.OSM.CycleMap,
- attribution: "Tiles courtesy of Andy Allan",
- keyid: "cyclemap",
- layerCode: "C",
- name: I18n.t("javascripts.map.base.cycle_map")
- },
- {
- klass: L.OSM.TransportMap,
- attribution: "Tiles courtesy of Andy Allan",
- keyid: "transportmap",
- layerCode: "T",
- name: I18n.t("javascripts.map.base.transport_map")
- },
- {
- klass: L.OSM.MapQuestOpen,
- attribution: "Tiles courtesy of MapQuest 
",
- keyid: "mapquest",
- layerCode: "Q",
- name: I18n.t("javascripts.map.base.mapquest")
+function createMap(divName, options) {
+ if (!layers) {
+ layers = [
+ {
+ klass: L.OSM.Mapnik,
+ attribution: "",
+ keyid: "mapnik",
+ layerCode: "M",
+ name: I18n.t("javascripts.map.base.standard")
+ },
+ {
+ klass: L.OSM.CycleMap,
+ attribution: "Tiles courtesy of Andy Allan",
+ keyid: "cyclemap",
+ layerCode: "C",
+ name: I18n.t("javascripts.map.base.cycle_map")
+ },
+ {
+ klass: L.OSM.TransportMap,
+ attribution: "Tiles courtesy of Andy Allan",
+ keyid: "transportmap",
+ layerCode: "T",
+ name: I18n.t("javascripts.map.base.transport_map")
+ },
+ {
+ klass: L.OSM.MapQuestOpen,
+ attribution: "Tiles courtesy of MapQuest ",
+ keyid: "mapquest",
+ layerCode: "Q",
+ name: I18n.t("javascripts.map.base.mapquest")
+ }
+ ];
}
-];
-function createMap(divName, options) {
- map = L.map(divName, options);
+ options = $.extend({zoomControl: true, panZoomControl: true, layerControl: true}, options);
+
+ map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));
if (map.attributionControl) {
- map.attributionControl.setPrefix(''); // For tmcw
+ map.attributionControl.setPrefix('');
+ }
+
+ if (options.panZoomControl) {
+ new L.Control.Pan().addTo(map);
+ new L.Control.Zoomslider({stepHeight: 7}).addTo(map);
}
var layersControl = L.control.layers();
- if (!options || options.layerControl !== false) {
+ if (options.layerControl) {
layersControl.addTo(map);
+ map.layersControl = layersControl;
}
for (var i = 0; i < layers.length; i++) {
layers[i].layer = new (layers[i].klass)(layers[i]);
- if (i == 0) {
- layers[i].layer.addTo(map);
- }
layersControl.addBaseLayer(layers[i].layer, layers[i].name);
}
+ layers[0].layer.addTo(map);
+
$("#" + divName).on("resized", function () {
map.invalidateSize();
});
@@ -103,34 +85,31 @@ function createMap(divName, options) {
return map;
}
-function getArrowIcon() {
+function getUserIcon(url) {
return L.icon({
- iconUrl: <%= asset_path('arrow.png').to_json %>,
- iconSize: [25, 22],
- iconAnchor: [22, 20]
+ iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
+ iconSize: [25, 41],
+ iconAnchor: [12, 41],
+ popupAnchor: [1, -34],
+ shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
+ shadowSize: [41, 41]
});
}
-function addMarkerToMap(position, icon, description) {
- var marker = L.marker(position, icon ? {icon: icon} : null).addTo(map);
-
- if (description) {
- marker.bindPopup(description);
+function addObjectToMap(object, zoom, callback) {
+ if (objectLoader) {
+ objectLoader.abort();
}
- return marker;
-}
-
-function removeMarkerFromMap(marker) {
- map.removeLayer(marker);
-}
+ if (objectLayer) {
+ map.removeLayer(objectLayer);
+ }
-function addObjectToMap(object, zoom, callback) {
- $.ajax({
+ objectLoader = $.ajax({
url: OSM.apiUrl(object),
dataType: "xml",
success: function (xml) {
- var layer = new L.OSM.DataLayer(xml, {
+ objectLayer = new L.OSM.DataLayer(null, {
style: {
strokeColor: "blue",
strokeWidth: 3,
@@ -141,7 +120,21 @@ function addObjectToMap(object, zoom, callback) {
}
});
- var bounds = layer.getBounds();
+ 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;
+ }
+ };
+
+ objectLayer.addData(xml);
+
+ var bounds = objectLayer.getBounds();
if (zoom) {
map.fitBounds(bounds);
@@ -151,7 +144,7 @@ function addObjectToMap(object, zoom, callback) {
callback(bounds);
}
- layer.addTo(map);
+ objectLayer.addTo(map);
}
});
}
@@ -177,21 +170,26 @@ function getMapBaseLayer() {
}
function getMapLayers() {
+ var layerConfig = "";
for (var i = 0; i < layers.length; i++) {
if (map.hasLayer(layers[i].layer)) {
- return layers[i].layerCode;
+ layerConfig += layers[i].layerCode;
}
}
-
- return "";
+ return layerConfig;
}
function setMapLayers(layerConfig) {
+ var foundLayer = false;
for (var i = 0; i < layers.length; i++) {
- if (~layerConfig.indexOf(layers[i].layerCode)) {
+ if (layerConfig.indexOf(layers[i].layerCode) >= 0) {
map.addLayer(layers[i].layer);
+ foundLayer = true;
} else {
map.removeLayer(layers[i].layer);
}
}
+ if (!foundLayer) {
+ map.addLayer(layers[0].layer);
+ }
}