X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6619b777e353cbdfdcc6f7ac0e77f8bca9f78656..6dcd087abcf718fcaf9aca9283b6b39b9dbbcdcb:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index d50253318..19e1f16de 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -1,184 +1,212 @@ //= require_self +//= require leaflet.sidebar +//= require leaflet.locate //= require leaflet.layers -//= require leaflet.share +//= require leaflet.key //= require leaflet.note -//= require leaflet.locate -//= require leaflet.customzoom +//= require leaflet.share //= require index/browse //= require index/export -//= require index/key //= require index/notes -var map, layers; // TODO: remove globals - $(document).ready(function () { - var marker; var params = OSM.mapParams(); - map = L.map("map", { + var map = L.map("map", { zoomControl: false, layerControl: false }); map.attributionControl.setPrefix(''); - layers = [{ - layer: new L.OSM.Mapnik({ - attribution: '' + map.hash = L.hash(map); + + var layers = [ + new L.OSM.Mapnik({ + attribution: '', + code: "M", + keyid: "mapnik", + name: I18n.t("javascripts.map.base.standard") }), - keyid: "mapnik", - layerCode: "M", - name: I18n.t("javascripts.map.base.standard") - }, { - layer: new L.OSM.CycleMap({ + new L.OSM.CycleMap({ attribution: "Tiles courtesy of Andy Allan", + code: "C", + keyid: "cyclemap", + name: I18n.t("javascripts.map.base.cycle_map") }), - keyid: "cyclemap", - layerCode: "C", - name: I18n.t("javascripts.map.base.cycle_map") - }, { - layer: new L.OSM.TransportMap({ + new L.OSM.TransportMap({ attribution: "Tiles courtesy of Andy Allan", + code: "T", + keyid: "transportmap", + name: I18n.t("javascripts.map.base.transport_map") }), - keyid: "transportmap", - layerCode: "T", - name: I18n.t("javascripts.map.base.transport_map") - }, { - layer: new L.OSM.MapQuestOpen({ + new L.OSM.MapQuestOpen({ attribution: "Tiles courtesy of MapQuest ", - }), - keyid: "mapquest", - layerCode: "Q", - name: I18n.t("javascripts.map.base.mapquest") - }]; + code: "Q", + keyid: "mapquest", + name: I18n.t("javascripts.map.base.mapquest") + }) + ]; + + layers[0].addTo(map); - layers[0].layer.addTo(map); + map.noteLayer = new L.LayerGroup(); + map.noteLayer.options = {code: 'N'}; - $("#map").on("resized", function () { + map.dataLayer = new L.OSM.DataLayer(null); + map.dataLayer.options.code = 'D'; + + $("#sidebar").on("opened closed", function () { map.invalidateSize(); }); - L.control.customZoom({position: 'topright'}) + var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; + + L.OSM.zoom({position: position}) .addTo(map); - L.OSM.layers({position: 'topright', layers: layers}) + L.control.locate({position: position}) .addTo(map); - L.control.share({ - getUrl: getShortUrl + var sidebar = L.OSM.sidebar('#map-ui') + .addTo(map); + + L.OSM.layers({ + position: position, + layers: layers, + sidebar: sidebar }).addTo(map); - L.control.note({ - position: 'topright' + L.OSM.key({ + position: position, + sidebar: sidebar }).addTo(map); - L.control.locate({ - position: 'topright' + L.OSM.share({ + position: position, + sidebar: sidebar, + short: true }).addTo(map); - L.control.scale().addTo(map); + L.OSM.note({ + position: position, + sidebar: sidebar + }).addTo(map); + + L.control.scale() + .addTo(map); - map.on("moveend layeradd layerremove", updateLocation); + map.on('moveend layeradd layerremove', updateLocation); + + map.markerLayer = L.layerGroup().addTo(map); if (!params.object_zoom) { - if (params.bbox) { - var bbox = L.latLngBounds([params.minlat, params.minlon], - [params.maxlat, params.maxlon]); - - map.fitBounds(bbox); - - if (params.box) { - L.rectangle(bbox, { - weight: 2, - color: '#e90', - fillOpacity: 0 - }).addTo(map); - } + if (params.bounds) { + map.fitBounds(params.bounds); } else { map.setView([params.lat, params.lon], params.zoom); } } + if (params.box) { + L.rectangle(params.box, { + weight: 2, + color: '#e90', + fillOpacity: 0 + }).addTo(map); + } + if (params.layers) { - setMapLayers(params.layers); + var foundLayer = false; + for (var i = 0; i < layers.length; i++) { + if (params.layers.indexOf(layers[i].options.code) >= 0) { + map.addLayer(layers[i]); + foundLayer = true; + } else { + map.removeLayer(layers[i]); + } + } + if (!foundLayer) { + map.addLayer(layers[0]); + } } if (params.marker) { - marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map); + L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map.markerLayer); } if (params.object) { addObjectToMap(params.object, map, { zoom: params.object_zoom }); } - handleResize(); + $("body").on("click", "a.set_position", setPositionLink(map)); - $("body").on("click", "a.set_position", function (e) { - e.preventDefault(); - - var data = $(this).data(); - var centre = L.latLng(data.lat, data.lon); + $("a[data-editor=remote]").click(function(e) { + remoteEditHandler(map.getBounds()); + e.preventDefault(); + }); - if (data.minLon && data.minLat && data.maxLon && data.maxLat) { - map.fitBounds([[data.minLat, data.minLon], - [data.maxLat, data.maxLon]]); - } else { - map.setView(centre, data.zoom); - } + if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) { + remoteEditHandler(map.getBounds()); + } - if (data.type && data.id) { - addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } }); - } + $("#search_form").submit(submitSearch(map)); - if (marker) { - map.removeLayer(marker); - } - marker = L.marker(centre, {icon: getUserIcon()}).addTo(map); - }); + if ($("#query").val()) { + $("#search_form").submit(); + } - function updateLocation() { - var center = map.getCenter().wrap(); - var zoom = map.getZoom(); - var layers = getMapLayers(); - var extents = map.getBounds().wrap(); + // Focus the search field for browsers that don't support + // the HTML5 'autofocus' attribute + if (!("autofocus" in document.createElement("input"))) { + $("#query").focus(); + } - updatelinks(center, zoom, layers, extents, params.object); + initializeExport(map); + initializeBrowse(map, params); + initializeNotes(map, params); +}); - var expiry = new Date(); - expiry.setYear(expiry.getFullYear() + 10); - $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry}); - } +function updateLocation() { + updatelinks(this.getCenter().wrap(), + this.getZoom(), + this.getLayersCode(), + this.getBounds().wrap()); - function remoteEditHandler() { - var extent = map.getBounds(); - var loaded = false; + var expiry = new Date(); + expiry.setYear(expiry.getFullYear() + 10); + $.cookie("_osm_location", cookieContent(this), { expires: expiry }); - $("#linkloader").load(function () { loaded = true; }); - $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?" + - querystring.stringify({ - left: extent.getWest(), - bottom: extent.getSouth(), - right: extent.getEast(), - top: extent.getNorth() - })); + // Trigger hash update on layer changes. + this.hash.onMapMove(); +} - setTimeout(function () { - if (!loaded) alert(I18n.t('site.index.remote_failed')); - }, 1000); +function setPositionLink(map) { + return function(e) { + var data = $(this).data(), + center = L.latLng(data.lat, data.lon); - return false; - } + if (data.minLon && data.minLat && data.maxLon && data.maxLat) { + map.fitBounds([[data.minLat, data.minLon], + [data.maxLat, data.maxLon]]); + } else { + map.setView(center, data.zoom); + } - $("a[data-editor=remote]").click(remoteEditHandler); + if (data.type && data.id) { + addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } }); + } - if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) { - remoteEditHandler(); - } + map.markerLayer.clearLayers(); + L.marker(center, {icon: getUserIcon()}).addTo(map.markerLayer); - $(window).resize(handleResize); + return e.preventDefault(); + }; +} - $("#search_form").submit(function () { +function submitSearch(map) { + return function(e) { var bounds = map.getBounds(); $("#sidebar_title").html(I18n.t('site.sidebar.search_results')); @@ -190,49 +218,6 @@ $(document).ready(function () { maxlat: bounds.getNorth() }, openSidebar); - return false; - }); - - if ($("#query").val()) { - $("#search_form").submit(); - } - - // Focus the search field for browsers that don't support - // the HTML5 'autofocus' attribute - if (!("autofocus" in document.createElement("input"))) { - $("#query").focus(); - } -}); - -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); - } + return e.preventDefault(); + }; }