X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7c06f2b47e1ba7ec67e657c233a4add502493e6c..75a776a574cd6a711c0b4bf854701646c37c391c:/app/assets/javascripts/map.js.erb?ds=sidebyside
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 1882fe4f4..6d26763f8 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -1,52 +1,5 @@
-// Leaflet extensions
-L.extend(L.LatLngBounds.prototype, {
- getSize: function () {
- return (this._northEast.lat - this._southWest.lat) *
- (this._northEast.lng - this._southWest.lng);
- },
-
- wrap: function () {
- return new L.LatLngBounds(this._southWest.wrap(), this._northEast.wrap());
- }
-});
-
-L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
-
-var objectLayer;
var objectLoader;
-function mapLayers() {
- return [{
- layer: new L.OSM.Mapnik({
- attribution: ''
- }),
- keyid: "mapnik",
- layerCode: "M",
- name: I18n.t("javascripts.map.base.standard")
- }, {
- layer: new L.OSM.CycleMap( {
- attribution: "Tiles courtesy of Andy Allan",
- }),
- keyid: "cyclemap",
- layerCode: "C",
- name: I18n.t("javascripts.map.base.cycle_map")
- }, {
- layer: new L.OSM.TransportMap({
- attribution: "Tiles courtesy of Andy Allan",
- }),
- keyid: "transportmap",
- layerCode: "T",
- name: I18n.t("javascripts.map.base.transport_map")
- }, {
- layer: new L.OSM.MapQuestOpen({
- attribution: "Tiles courtesy of MapQuest ",
- }),
- keyid: "mapquest",
- layerCode: "Q",
- name: I18n.t("javascripts.map.base.mapquest")
- }]
-}
-
function getUserIcon(url) {
return L.icon({
iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
@@ -60,13 +13,13 @@ function getUserIcon(url) {
function addObjectToMap(object, map, options) {
if (objectLoader) objectLoader.abort();
- if (objectLayer) map.removeLayer(objectLayer);
+ if (map.objectLayer) map.removeLayer(map.objectLayer);
objectLoader = $.ajax({
url: OSM.apiUrl(object),
dataType: "xml",
success: function (xml) {
- objectLayer = new L.OSM.DataLayer(null, {
+ map.objectLayer = new L.OSM.DataLayer(null, {
styles: {
node: options.style,
way: options.style,
@@ -74,7 +27,7 @@ function addObjectToMap(object, map, options) {
}
});
- objectLayer.interestingNode = function (node, ways, relations) {
+ map.objectLayer.interestingNode = function (node, ways, relations) {
if (object.type === "node") {
return true;
} else if (object.type === "relation") {
@@ -86,12 +39,12 @@ function addObjectToMap(object, map, options) {
}
};
- objectLayer.addData(xml);
+ map.objectLayer.addData(xml);
- if (options.zoom) map.fitBounds(objectLayer.getBounds());
- if (options.callback) options.callback(objectLayer.getBounds());
+ if (options.zoom) map.fitBounds(map.objectLayer.getBounds());
+ if (options.callback) options.callback(map.objectLayer.getBounds());
- objectLayer.addTo(map);
+ map.objectLayer.addTo(map);
}
});
}