X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7e67846a77722885b583a0f00ffe58b634e7eb3..3b43cb33cb756c19f8c635a66053a5b99b44eb6c:/app/assets/javascripts/map.js.erb diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb index 8591e260a..8b621e3ae 100644 --- a/app/assets/javascripts/map.js.erb +++ b/app/assets/javascripts/map.js.erb @@ -1,31 +1,5 @@ // Leaflet extensions L.extend(L.LatLngBounds.prototype, { - 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; - }, - getSize: function () { return (this._northEast.lat - this._southWest.lat) * (this._northEast.lng - this._southWest.lng); @@ -36,54 +10,47 @@ L.extend(L.LatLngBounds.prototype, { } }); -L.extend(L.Bounds.prototype, { - getWidth: function () { - return this.max.x - this.min.x; - }, - - getHeight: function () { - return this.max.y - this.min.y; - } -}); - 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) { options = $.extend({zoomControl: true, panZoomControl: true, layerControl: true}, options); map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18})); @@ -142,7 +109,7 @@ function addObjectToMap(object, zoom, callback) { url: OSM.apiUrl(object), dataType: "xml", success: function (xml) { - objectLayer = new L.OSM.DataLayer(xml, { + objectLayer = new L.OSM.DataLayer(null, { style: { strokeColor: "blue", strokeWidth: 3, @@ -153,6 +120,20 @@ function addObjectToMap(object, zoom, callback) { } }); + 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) {