X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/898cc828dd1f1167f85abbf35c8e3f0ed640ac1e..f12c6b77ccd940784597cb306d1cb26e08072a15:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 7c80b0108..029c0bfd1 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -1,20 +1,101 @@ //= require_self +//= require leaflet.sidebar +//= require leaflet.locate +//= require leaflet.layers +//= require leaflet.key +//= require leaflet.note +//= require leaflet.share //= require index/browse //= require index/export -//= require index/key //= require index/notes $(document).ready(function () { - var permalinks = $("#permalink").detach().html(); - var marker; var params = OSM.mapParams(); - var map = createMap("map"); - L.control.scale().addTo(map); + var map = L.map("map", { + zoomControl: false, + layerControl: false + }); + + map.attributionControl.setPrefix(''); + + var layers = [ + new L.OSM.Mapnik({ + attribution: '', + code: "M", + keyid: "mapnik", + name: I18n.t("javascripts.map.base.standard") + }), + new L.OSM.CycleMap({ + attribution: "Tiles courtesy of Andy Allan", + code: "C", + keyid: "cyclemap", + name: I18n.t("javascripts.map.base.cycle_map") + }), + new L.OSM.TransportMap({ + attribution: "Tiles courtesy of Andy Allan", + code: "T", + keyid: "transportmap", + name: I18n.t("javascripts.map.base.transport_map") + }), + new L.OSM.MapQuestOpen({ + attribution: "Tiles courtesy of MapQuest ", + code: "Q", + keyid: "mapquest", + name: I18n.t("javascripts.map.base.mapquest") + }) + ]; + + layers[0].addTo(map); + + map.noteLayer = new L.LayerGroup({code: 'N'}); + map.dataLayer = new L.OSM.DataLayer(null); + + $("#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: position}) + .addTo(map); + + var sidebar = L.OSM.sidebar('#map-ui') + .addTo(map); - map.attributionControl.setPrefix(permalinks); + L.OSM.layers({ + position: position, + layers: layers, + sidebar: sidebar + }).addTo(map); - map.on("moveend baselayerchange", updateLocation); + L.OSM.key({ + position: position, + sidebar: sidebar + }).addTo(map); + + L.OSM.share({ + position: position, + getShortUrl: getShortUrl, + getUrl: getUrl, + sidebar: sidebar, + short: true + }).addTo(map); + + L.OSM.note({ + position: position, + sidebar: sidebar + }).addTo(map); + + L.control.scale() + .addTo(map); + + map.on('moveend layeradd layerremove', updateLocation); + + map.markerLayer = L.layerGroup().addTo(map); if (!params.object_zoom) { if (params.bbox) { @@ -24,7 +105,11 @@ $(document).ready(function () { map.fitBounds(bbox); if (params.box) { - addBoxToMap(bbox); + L.rectangle(bbox, { + weight: 2, + color: '#e90', + fillOpacity: 0 + }).addTo(map); } } else { map.setView([params.lat, params.lon], params.zoom); @@ -32,107 +117,104 @@ $(document).ready(function () { } 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, params.object_zoom); + addObjectToMap(params.object, map, { zoom: params.object_zoom }); } - handleResize(); - - $("body").on("click", "a.set_position", 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 (marker) { - map.removeLayer(marker); - } + $("body").on("click", "a.set_position", setPositionLink(map)); - marker = L.marker(centre, {icon: getUserIcon()}).addTo(map); + $("a[data-editor=remote]").click(function(e) { + remoteEditHandler(map.getBounds()); + e.preventDefault(); }); - 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.getWestLng(), - extents.getSouthLat(), - extents.getEastLng(), - extents.getNorthLat(), - params.object); - - var expiry = new Date(); - expiry.setYear(expiry.getFullYear() + 10); - $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry}); + if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) { + remoteEditHandler(map.getBounds()); } - function remoteEditHandler() { - var extent = map.getBounds(); - var loaded = false; + $("#search_form").submit(submitSearch(map)); - $("#linkloader").load(function () { loaded = true; }); - $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.getWestLng() - + "&bottom=" + extent.getSouthLat() - + "&right=" + extent.getEastLng() - + "&top=" + extent.getNorthLat()); - setTimeout(function () { - if (!loaded) alert(I18n.t('site.index.remote_failed')); - }, 1000); + if ($("#query").val()) { + $("#search_form").submit(); + } - return false; + // Focus the search field for browsers that don't support + // the HTML5 'autofocus' attribute + if (!("autofocus" in document.createElement("input"))) { + $("#query").focus(); } - $("a[data-editor=remote]").click(remoteEditHandler); + initializeExport(map); + initializeBrowse(map); + initializeNotes(map); +}); + +function updateLocation() { + updatelinks(this.getCenter().wrap(), + this.getZoom(), + this.getLayersCode(), + this.getBounds().wrap()); + + var expiry = new Date(); + expiry.setYear(expiry.getFullYear() + 10); + $.cookie("_osm_location", cookieContent(this), { expires: expiry }); +} + +function setPositionLink(map) { + return function(e) { + var data = $(this).data(), + center = 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(center, data.zoom); + } - if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) { - remoteEditHandler(); - } + if (data.type && data.id) { + addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } }); + } + + 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')); $("#sidebar_content").load($(this).attr("action"), { query: $("#query").val(), - minlon: bounds.getWestLng(), - minlat: bounds.getSouthLat(), - maxlon: bounds.getEastLng(), - maxlat: bounds.getNorthLat() + minlon: bounds.getWest(), + minlat: bounds.getSouth(), + maxlon: bounds.getEast(), + 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(); - } -}); + return e.preventDefault(); + }; +}