X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9bf18a360e995b359a1d9f8ea2000bcf3b227625..78d6bde4850a09a7cd9cb5774f394fd64680d664:/app/assets/javascripts/index.js?ds=inline diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 9aed3c3f7..e46ca6d9d 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -1,156 +1,179 @@ //= require_self +//= require leaflet.sidebar +//= require leaflet.locate +//= require leaflet.layers +//= require leaflet.key +//= require leaflet.note +//= require leaflet.share +//= require index/search //= require index/browse //= require index/export -//= require index/key //= require index/notes -//= require index/map_ui $(document).ready(function () { - var permalinks = $("#permalink").detach().html(); - var marker; var params = OSM.mapParams(); - var map = createMap("map", { + + var map = L.map("map", { zoomControl: false, layerControl: false - }, { - locateControl: true }); - L.control.zoom({position: 'topright'}) - .addTo(map); + map.attributionControl.setPrefix(''); + + map.hash = L.hash(map); + + var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'}); + + var layers = [ + new L.OSM.Mapnik({ + attribution: copyright, + code: "M", + keyid: "mapnik", + name: I18n.t("javascripts.map.base.standard") + }), + new L.OSM.CycleMap({ + attribution: copyright + ". Tiles courtesy of Andy Allan", + code: "C", + keyid: "cyclemap", + name: I18n.t("javascripts.map.base.cycle_map") + }), + new L.OSM.TransportMap({ + attribution: copyright + ". Tiles courtesy of Andy Allan", + code: "T", + keyid: "transportmap", + name: I18n.t("javascripts.map.base.transport_map") + }), + new L.OSM.MapQuestOpen({ + attribution: copyright + ". Tiles courtesy of MapQuest ", + code: "Q", + keyid: "mapquest", + name: I18n.t("javascripts.map.base.mapquest") + }) + ]; + + for (var i = layers.length - 1; i >= 0; i--) { + if (i === 0 || params.layers.indexOf(layers[i].options.code) >= 0) { + map.addLayer(layers[i]); + break; + } + } + + map.noteLayer = new L.LayerGroup(); + map.noteLayer.options = {code: 'N'}; + + map.dataLayer = new L.OSM.DataLayer(null); + map.dataLayer.options.code = 'D'; - OSM.mapUI().addTo(map); + $("#sidebar").on("opened closed", function () { + map.invalidateSize(); + }); + + var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; + + L.OSM.zoom({position: position}) + .addTo(map); L.control.locate({ - position: 'topright' + position: position, + strings: { + title: I18n.t('javascripts.map.locate.title'), + popup: I18n.t('javascripts.map.locate.popup') + } + }).addTo(map); + + var sidebar = L.OSM.sidebar('#map-ui') + .addTo(map); + + L.OSM.layers({ + position: position, + layers: layers, + sidebar: sidebar }).addTo(map); - L.control.scale().addTo(map); - map.attributionControl.setPrefix(permalinks); + L.OSM.key({ + position: position, + sidebar: sidebar + }).addTo(map); - map.on("moveend layeradd layerremove", updateLocation); + L.OSM.share({ + position: position, + sidebar: sidebar, + short: true + }).addTo(map); - if (!params.object_zoom) { - if (params.bbox) { - var bbox = L.latLngBounds([params.minlat, params.minlon], - [params.maxlat, params.maxlon]); + L.OSM.note({ + position: position, + sidebar: sidebar + }).addTo(map); + + L.control.scale() + .addTo(map); - map.fitBounds(bbox); + $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'}); - if (params.box) { - addBoxToMap(bbox); - } + map.on('moveend layeradd layerremove', updateLocation); + + var marker = L.marker([0, 0], {icon: getUserIcon()}); + + if (!params.object_zoom) { + if (params.bounds) { + map.fitBounds(params.bounds); } else { map.setView([params.lat, params.lon], params.zoom); } } - if (params.layers) { - setMapLayers(params.layers); + if (params.box) { + L.rectangle(params.box, { + weight: 2, + color: '#e90', + fillOpacity: 0 + }).addTo(map); } if (params.marker) { - marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map); + marker.setLatLng([params.mlat, params.mlon]).addTo(map); } if (params.object) { - addObjectToMap(params.object, { zoom: params.object_zoom }); + map.addObject(params.object, { zoom: params.object_zoom }); } - handleResize(); - - $("body").on("click", "a.set_position", function (e) { + $("#homeanchor").on("click", function(e) { e.preventDefault(); - var data = $(this).data(); - var centre = L.latLng(data.lat, data.lon); - - 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 (data.type && data.id) { - addObjectToMap(data, { zoom: true, style: { opacity: 0.2, fill: false } }); - } - - if (marker) { - map.removeLayer(marker); - } + var data = $(this).data(), + center = L.latLng(data.lat, data.lon); - marker = L.marker(centre, {icon: getUserIcon()}).addTo(map); + map.setView(center, data.zoom); + marker.setLatLng(center).addTo(map); }); - function updateLocation() { - var center = map.getCenter().wrap(); - var zoom = map.getZoom(); - var layers = getMapLayers(); - var extents = map.getBounds().wrap(); - - updatelinks(center.lng, - center.lat, - zoom, - layers, - extents.getWest(), - extents.getSouth(), - extents.getEast(), - extents.getNorth(), - params.object); - - var expiry = new Date(); - expiry.setYear(expiry.getFullYear() + 10); - $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry}); - } - - function remoteEditHandler() { - var extent = map.getBounds(); - var loaded = false; - - $("#linkloader").load(function () { loaded = true; }); - $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.getWest() - + "&bottom=" + extent.getSouth() - + "&right=" + extent.getEast() - + "&top=" + extent.getNorth()); - - setTimeout(function () { - if (!loaded) alert(I18n.t('site.index.remote_failed')); - }, 1000); - - return false; - } - - $("a[data-editor=remote]").click(remoteEditHandler); + $("a[data-editor=remote]").click(function(e) { + remoteEditHandler(map.getBounds()); + e.preventDefault(); + }); if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) { - remoteEditHandler(); + remoteEditHandler(map.getBounds()); } - $(window).resize(handleResize); - - $("#search_form").submit(function () { - var bounds = map.getBounds(); - - $("#sidebar_title").html(I18n.t('site.sidebar.search_results')); - $("#sidebar_content").load($(this).attr("action"), { - query: $("#query").val(), - minlon: bounds.getWest(), - minlat: bounds.getSouth(), - maxlon: bounds.getEast(), - maxlat: bounds.getNorth() - }, openSidebar); + initializeSearch(map); + initializeExport(map); + initializeBrowse(map, params); + initializeNotes(map, params); +}); - return false; - }); +function updateLocation() { + updatelinks(this.getCenter().wrap(), + this.getZoom(), + this.getLayersCode(), + this.getBounds().wrap()); - if ($("#query").val()) { - $("#search_form").submit(); - } + var expiry = new Date(); + expiry.setYear(expiry.getFullYear() + 10); + $.cookie("_osm_location", cookieContent(this), { expires: expiry }); - // Focus the search field for browsers that don't support - // the HTML5 'autofocus' attribute - if (!("autofocus" in document.createElement("input"))) { - $("#query").focus(); - } -}); + // Trigger hash update on layer changes. + this.hash.onMapMove(); +}