X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a5b784bdf7e093c76d0c09c56ae274c93c4cb956..3bea64f4ccf465fc755b81e7badc06d182a275b7:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 5e96c3517..49266f919 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -1,94 +1,97 @@ //= require_self //= require leaflet.sidebar +//= require leaflet.sidebar-pane +//= require leaflet.locatecontrol/src/L.Control.Locate //= require leaflet.locate //= require leaflet.layers //= require leaflet.key //= require leaflet.note //= require leaflet.share +//= require leaflet.polyline +//= require leaflet.query +//= require leaflet.contextmenu +//= require index/contextmenu //= require index/search //= require index/browse //= require index/export //= require index/notes //= require index/history +//= require index/note +//= require index/new_note +//= require index/directions +//= require index/changeset +//= require index/query //= require router +//= require qs/dist/qs $(document).ready(function () { - var params = OSM.mapParams(); + var loaderTimeout; - var map = L.map("map", { + var map = new L.OSM.Map("map", { zoomControl: false, - layerControl: false + layerControl: false, + contextmenu: true, + worldCopyJump: true }); - map.attributionControl.setPrefix(''); + OSM.loadSidebarContent = function (path, callback) { + var content_path = path; + + map.setSidebarOverlaid(false); + + clearTimeout(loaderTimeout); - map.hash = L.hash(map); + loaderTimeout = setTimeout(function () { + $("#sidebar_loader").show(); + }, 200); - $(window).on('popstate', function(e) { - // popstate is triggered when the hash changes as well as on actual navigation - // events. We want to update the hash on the latter and not the former. - if (e.originalEvent.state) { - map.hash.update(); + // IE<10 doesn't respect Vary: X-Requested-With header, so + // prevent caching the XHR response as a full-page URL. + if (content_path.indexOf("?") >= 0) { + content_path += "&xhr=1"; + } else { + content_path += "?xhr=1"; } - }); - var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'}); - var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'}); + $("#sidebar_content") + .empty(); - var layers = [ - new L.OSM.Mapnik({ - attribution: copyright + " ♥ " + donate, - 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") - }), - new L.OSM.HOT({ - attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team", - code: "H", - keyid: "hot", - name: I18n.t("javascripts.map.base.hot") - }) - ]; - - function updateLayers(params) { - var layerParam = params.layers || "M"; - var layersAdded = ""; - - for (var i = layers.length - 1; i >= 0; i--) { - if (layerParam.indexOf(layers[i].options.code) >= 0) { - map.addLayer(layers[i]); - layersAdded = layersAdded + layers[i].options.code; - } else if (i == 0 && layersAdded == "") { - map.addLayer(layers[i]); - } else { - map.removeLayer(layers[i]); + $.ajax({ + url: content_path, + dataType: "html", + complete: function (xhr) { + clearTimeout(loaderTimeout); + $("#flash").empty(); + $("#sidebar_loader").hide(); + + var content = $(xhr.responseText); + + if (xhr.getResponseHeader("X-Page-Title")) { + var title = xhr.getResponseHeader("X-Page-Title"); + document.title = decodeURIComponent(title); + } + + $("head") + .find("link[type=\"application/atom+xml\"]") + .remove(); + + $("head") + .append(content.filter("link[type=\"application/atom+xml\"]")); + + $("#sidebar_content").html(content.not("link[type=\"application/atom+xml\"]")); + + if (callback) { + callback(); + } } - } - } + }); + }; - updateLayers(params); + var params = OSM.mapParams(); - $(window).on("hashchange", function () { - updateLayers(OSM.mapParams()); - }); + map.attributionControl.setPrefix(""); + + map.updateLayers(params.layers); map.on("baselayerchange", function (e) { if (map.getZoom() > e.layer.options.maxZoom) { @@ -96,89 +99,126 @@ $(document).ready(function () { } }); - map.noteLayer = new L.LayerGroup(); - map.noteLayer.options = {code: 'N'}; - - map.dataLayer = new L.OSM.DataLayer(null); - map.dataLayer.options.code = 'D'; + var sidebar = L.OSM.sidebar("#map-ui") + .addTo(map); - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; + var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright"; - L.OSM.zoom({position: position}) - .addTo(map); + function addControlGroup(controls) { + controls.forEach(function (control) { + control.addTo(map); + }); - L.control.locate({ - position: position, - strings: { - title: I18n.t('javascripts.map.locate.title'), - popup: I18n.t('javascripts.map.locate.popup') - } - }).addTo(map); + var firstContainer = controls[0].getContainer(); + $(firstContainer).find(".control-button").first() + .addClass("control-button-first"); - var sidebar = L.OSM.sidebar('#map-ui') - .addTo(map); + var lastContainer = controls[controls.length - 1].getContainer(); + $(lastContainer).find(".control-button").last() + .addClass("control-button-last"); + } - L.OSM.layers({ - position: position, - layers: layers, - sidebar: sidebar - }).addTo(map); + addControlGroup([ + L.OSM.zoom({ position: position }), + L.OSM.locate({ position: position }) + ]); - L.OSM.key({ - position: position, - sidebar: sidebar - }).addTo(map); + addControlGroup([ + L.OSM.layers({ + position: position, + layers: map.baseLayers, + sidebar: sidebar + }), + L.OSM.key({ + position: position, + sidebar: sidebar + }), + L.OSM.share({ + "position": position, + "sidebar": sidebar, + "short": true + }) + ]); - L.OSM.share({ - position: position, - sidebar: sidebar, - short: true - }).addTo(map); + addControlGroup([ + L.OSM.note({ + position: position, + sidebar: sidebar + }) + ]); - L.OSM.note({ - position: position, - sidebar: sidebar - }).addTo(map); + addControlGroup([ + L.OSM.query({ + position: position, + sidebar: sidebar + }) + ]); L.control.scale() .addTo(map); - if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') { - initializeNotes(map); + OSM.initializeContextMenu(map); + + if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") { + OSM.initializeNotes(map); if (params.layers.indexOf(map.noteLayer.options.code) >= 0) { map.addLayer(map.noteLayer); } - initializeBrowse(map); + OSM.initializeBrowse(map); if (params.layers.indexOf(map.dataLayer.options.code) >= 0) { map.addLayer(map.dataLayer); } + + if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) { + map.addLayer(map.gpsLayer); + } } - $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'}); + var placement = $("html").attr("dir") === "rtl" ? "right" : "left"; + $(".leaflet-control .control-button").tooltip({ placement: placement, container: "body" }); + + var expiry = new Date(); + expiry.setYear(expiry.getFullYear() + 10); - map.on('moveend layeradd layerremove', function() { - updatelinks( + map.on("moveend layeradd layerremove", function () { + updateLinks( map.getCenter().wrap(), map.getZoom(), map.getLayersCode(), map._object); - var expiry = new Date(); - expiry.setYear(expiry.getFullYear() + 10); - $.cookie("_osm_location", cookieContent(map), { expires: expiry }); + Cookies.set("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/", samesite: "lax" }); + }); + + if (Cookies.get("_osm_welcome") !== "hide") { + $(".welcome").addClass("visible"); + } + + $(".welcome .btn-close").on("click", function () { + $(".welcome").removeClass("visible"); + Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" }); + }); - // Trigger hash update on layer changes. - map.hash.onMapMove(); + var bannerExpiry = new Date(); + bannerExpiry.setYear(bannerExpiry.getFullYear() + 1); + + $("#banner .btn-close").on("click", function (e) { + var cookieId = e.target.id; + $("#banner").hide(); + e.preventDefault(); + if (cookieId) { + Cookies.set(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/", samesite: "lax" }); + } }); - if (OSM.PIWIK) { - map.on('layeradd', function (e) { + if (OSM.MATOMO) { + map.on("layeradd", function (e) { if (e.layer.options) { - var goal = OSM.PIWIK.goals[e.layer.options.keyid]; + var goal = OSM.MATOMO.goals[e.layer.options.keyid]; if (goal) { - $('body').trigger('piwikgoal', goal); + $("body").trigger("matomogoal", goal); } } }); @@ -190,89 +230,130 @@ $(document).ready(function () { map.setView([params.lat, params.lon], params.zoom); } - var marker = L.marker([0, 0], {icon: getUserIcon()}); - if (params.marker) { - marker.setLatLng([params.mlat, params.mlon]).addTo(map); + L.marker([params.mlat, params.mlon]).addTo(map); } - $("#homeanchor").on("click", function(e) { + $("#homeanchor").on("click", function (e) { e.preventDefault(); var data = $(this).data(), - center = L.latLng(data.lat, data.lon); + center = L.latLng(data.lat, data.lon); map.setView(center, data.zoom); - marker.setLatLng(center).addTo(map); + L.marker(center, { icon: OSM.getUserIcon() }).addTo(map); }); - $("a[data-editor=remote]").click(function(e) { - remoteEditHandler(map.getBounds()); - e.preventDefault(); - }); + function remoteEditHandler(bbox, object) { + var remoteEditHost = "http://127.0.0.1:8111", + osmHost = location.protocol + "//" + location.host, + query = { + left: bbox.getWest() - 0.0001, + top: bbox.getNorth() + 0.0001, + right: bbox.getEast() + 0.0001, + bottom: bbox.getSouth() - 0.0001 + }; + + if (object && object.type !== "note") query.select = object.type + object.id; // can't select notes + sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + Qs.stringify(query), function () { + if (object && object.type === "note") { + var noteQuery = { url: osmHost + OSM.apiUrl(object) }; + sendRemoteEditCommand(remoteEditHost + "/import?" + Qs.stringify(noteQuery)); + } + }); - if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) { - remoteEditHandler(map.getBounds()); + function sendRemoteEditCommand(url, callback) { + var iframe = $("