X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8c788ce387fe147b3d74a7f89d003d61cb6d83d6..6dcd087abcf718fcaf9aca9283b6b39b9dbbcdcb:/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 323d16378..6d26763f8 100644 --- a/app/assets/javascripts/map.js.erb +++ b/app/assets/javascripts/map.js.erb @@ -1,50 +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(), - 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 %>, @@ -57,19 +12,14 @@ function getUserIcon(url) { } function addObjectToMap(object, map, options) { - if (objectLoader) { - objectLoader.abort(); - } - - if (objectLayer) { - map.removeLayer(objectLayer); - } + if (objectLoader) objectLoader.abort(); + 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, @@ -77,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") { @@ -89,19 +39,12 @@ function addObjectToMap(object, map, options) { } }; - objectLayer.addData(xml); - - var bounds = objectLayer.getBounds(); - - if (options.zoom) { - map.fitBounds(bounds); - } + map.objectLayer.addData(xml); - if (options.callback) { - options.callback(bounds); - } + if (options.zoom) map.fitBounds(map.objectLayer.getBounds()); + if (options.callback) options.callback(map.objectLayer.getBounds()); - objectLayer.addTo(map); + map.objectLayer.addTo(map); } }); }