X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6f793e1b21a534b0331a5874613c4f3c05853a45..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 e0570336b..6d26763f8 100644 --- a/app/assets/javascripts/map.js.erb +++ b/app/assets/javascripts/map.js.erb @@ -1,204 +1,50 @@ -// Leaflet extensions -L.LatLngBounds.include({ - getSouthLat: function () { - return this._southWest.lat; - }, +var objectLoader; - 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); - } -}); - -L.Bounds.include({ - getWidth: function () { - return this.max.x - this.min.x; - }, - - getHeight: function () { - return this.max.y - this.min.y; - } -}); - -var map; - -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) { - options = $.extend({zoomControl: false, 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 - } - - if (options.panZoomControl) { - new L.Control.Pan().addTo(map); - new L.Control.Zoomslider({stepHeight: 7}).addTo(map); - } - - var layersControl = L.control.layers(); - - if (options.layerControl) { - layersControl.addTo(map); - } - - 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); - } - - $("#" + divName).on("resized", function () { - map.invalidateSize(); - }); - - 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); +function addObjectToMap(object, map, options) { + if (objectLoader) objectLoader.abort(); + if (map.objectLayer) map.removeLayer(map.objectLayer); - if (description) { - marker.bindPopup(description); - } - - return marker; -} - -function removeMarkerFromMap(marker) { - map.removeLayer(marker); -} - -function addObjectToMap(object, zoom, callback) { - $.ajax({ + objectLoader = $.ajax({ url: OSM.apiUrl(object), dataType: "xml", success: function (xml) { - var layer = new L.OSM.DataLayer(xml, { - style: { - strokeColor: "blue", - strokeWidth: 3, - strokeOpacity: 0.5, - fillOpacity: 0.2, - fillColor: "lightblue", - pointRadius: 6 + map.objectLayer = new L.OSM.DataLayer(null, { + styles: { + node: options.style, + way: options.style, + area: options.style } }); - var bounds = layer.getBounds(); + map.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; + } + }; - if (zoom) { - map.fitBounds(bounds); - } + map.objectLayer.addData(xml); - if (callback) { - callback(bounds); - } + if (options.zoom) map.fitBounds(map.objectLayer.getBounds()); + if (options.callback) options.callback(map.objectLayer.getBounds()); - layer.addTo(map); + map.objectLayer.addTo(map); } }); } - -function addBoxToMap(bounds) { - var box = L.rectangle(bounds, { - weight: 2, - color: '#e90', - fillOpacity: 0 - }); - - box.addTo(map); - - return box; -} - -function getMapBaseLayer() { - for (var i = 0; i < layers.length; i++) { - if (map.hasLayer(layers[i].layer)) { - return layers[i]; - } - } -} - -function getMapLayers() { - for (var i = 0; i < layers.length; i++) { - if (map.hasLayer(layers[i].layer)) { - return layers[i].layerCode; - } - } - - return ""; -} - -function setMapLayers(layerConfig) { - for (var i = 0; i < layers.length; i++) { - if (~layerConfig.indexOf(layers[i].layerCode)) { - map.addLayer(layers[i].layer); - } else { - map.removeLayer(layers[i].layer); - } - } -}