X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2119911aa511d7340318367ae2e3c1dc98bcab76..5fc7a47f6daf5c05da31794b6ba5a7c7dfd0c931:/app/assets/javascripts/map.js.erb?ds=inline diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb index 90aefa945..70801306b 100644 --- a/app/assets/javascripts/map.js.erb +++ b/app/assets/javascripts/map.js.erb @@ -12,79 +12,9 @@ L.extend(L.LatLngBounds.prototype, { L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>; -var map; -var layers; var objectLayer; var objectLoader; -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") - } - ]; - } - - 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(''); - } - - 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); - map.layersControl = layersControl; - } - - for (var i = 0; i < layers.length; i++) { - layers[i].layer = new (layers[i].klass)(layers[i]); - layersControl.addBaseLayer(layers[i].layer, layers[i].name); - } - - layers[0].layer.addTo(map); - - $("#" + divName).on("resized", function () { - map.invalidateSize(); - }); - - return map; -} - function getUserIcon(url) { return L.icon({ iconUrl: url || <%= asset_path('marker-red.png').to_json %>, @@ -96,14 +26,9 @@ function getUserIcon(url) { }); } -function addObjectToMap(object, options) { - if (objectLoader) { - objectLoader.abort(); - } - - if (objectLayer) { - map.removeLayer(objectLayer); - } +function addObjectToMap(object, map, options) { + if (objectLoader) objectLoader.abort(); + if (objectLayer) map.removeLayer(objectLayer); objectLoader = $.ajax({ url: OSM.apiUrl(object), @@ -131,62 +56,10 @@ function addObjectToMap(object, options) { objectLayer.addData(xml); - var bounds = objectLayer.getBounds(); - - if (options.zoom) { - map.fitBounds(bounds); - } - - if (options.callback) { - options.callback(bounds); - } + if (options.zoom) map.fitBounds(objectLayer.getBounds()); + if (options.callback) options.callback(objectLayer.getBounds()); 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() { - var layerConfig = ""; - for (var i = 0; i < layers.length; i++) { - if (map.hasLayer(layers[i].layer)) { - layerConfig += layers[i].layerCode; - } - } - return layerConfig; -} - -function setMapLayers(layerConfig) { - var foundLayer = false; - for (var i = 0; i < layers.length; i++) { - 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); - } -}