X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/08837b2f8b3a8434875682f8f18962a9bce73c46..bc70cae711fb6947233d6a750cb33f115aa7a01b:/app/assets/javascripts/index.js?ds=inline diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index f3df5ae67..c419f9321 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -1,66 +1,77 @@ //= require_self //= require leaflet.sidebar +//= require leaflet.sidebar-pane +//= require leaflet.locatecontrol/dist/L.Control.Locate.umd //= 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/layers/data //= require index/export -//= require index/notes +//= require index/layers/notes //= require index/history //= require index/note //= require index/new_note +//= require index/directions +//= require index/changeset +//= require index/query //= require router -//= require routing -//= require_tree ./routing_engines +//= require qs/dist/qs -(function() { - var loaderTimeout; +$(document).ready(function () { + var map = new L.OSM.Map("map", { + zoomControl: false, + layerControl: false, + contextmenu: true, + worldCopyJump: true + }); - OSM.loadSidebarContent = function(path, callback) { - clearTimeout(loaderTimeout); + OSM.loadSidebarContent = function (path, callback) { + var content_path = path; - loaderTimeout = setTimeout(function() { - $('#sidebar_loader').show(); - }, 200); + map.setSidebarOverlaid(false); + + $("#sidebar_loader").show().addClass("delayed-fade-in"); // IE<10 doesn't respect Vary: X-Requested-With header, so // prevent caching the XHR response as a full-page URL. - if (path.indexOf('?') >= 0) { - path += '&xhr=1' + if (content_path.indexOf("?") >= 0) { + content_path += "&xhr=1"; } else { - path += '?xhr=1' + content_path += "?xhr=1"; } - $('#sidebar_content') + $("#sidebar_content") .empty(); $.ajax({ - url: path, + url: content_path, dataType: "html", - complete: function(xhr) { - clearTimeout(loaderTimeout); - $('#flash').empty(); - $('#sidebar_loader').hide(); + complete: function (xhr) { + $("#flash").empty(); + $("#sidebar_loader").removeClass("delayed-fade-in").hide(); var content = $(xhr.responseText); - if (xhr.getResponseHeader('X-Page-Title')) { - var title = xhr.getResponseHeader('X-Page-Title'); - document.title = decodeURIComponent(escape(title)); + if (xhr.getResponseHeader("X-Page-Title")) { + var title = xhr.getResponseHeader("X-Page-Title"); + document.title = decodeURIComponent(title); } - $('head') - .find('link[type="application/atom+xml"]') + $("head") + .find("link[type=\"application/atom+xml\"]") .remove(); - $('head') - .append(content.filter('link[type="application/atom+xml"]')); + $("head") + .append(content.filter("link[type=\"application/atom+xml\"]")); - $('#sidebar_content').html(content.not('link[type="application/atom+xml"]')); + $("#sidebar_content").html(content.not("link[type=\"application/atom+xml\"]")); if (callback) { callback(); @@ -68,17 +79,10 @@ } }); }; -})(); -$(document).ready(function () { var params = OSM.mapParams(); - var map = new L.OSM.Map("map", { - zoomControl: false, - layerControl: false - }); - - map.attributionControl.setPrefix(''); + map.attributionControl.setPrefix(""); map.updateLayers(params.layers); @@ -88,91 +92,125 @@ $(document).ready(function () { } }); - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; - - L.OSM.zoom({position: position}) + var sidebar = L.OSM.sidebar("#map-ui") .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 position = $("html").attr("dir") === "rtl" ? "topleft" : "topright"; - var sidebar = L.OSM.sidebar('#map-ui') - .addTo(map); - - L.OSM.layers({ - position: position, - layers: map.baseLayers, - sidebar: sidebar - }).addTo(map); + function addControlGroup(controls) { + controls.forEach(function (control) { + control.addTo(map); + }); - L.OSM.key({ - position: position, - sidebar: sidebar - }).addTo(map); + var firstContainer = controls[0].getContainer(); + $(firstContainer).find(".control-button").first() + .addClass("control-button-first"); - L.OSM.share({ - position: position, - sidebar: sidebar, - short: true - }).addTo(map); + var lastContainer = controls[controls.length - 1].getContainer(); + $(lastContainer).find(".control-button").last() + .addClass("control-button-last"); + } - L.OSM.note({ - position: position, - sidebar: sidebar - }).addTo(map); + addControlGroup([ + L.OSM.zoom({ position: position }), + L.OSM.locate({ position: position }) + ]); + + 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 + }) + ]); + + addControlGroup([ + L.OSM.note({ + position: position, + sidebar: sidebar + }) + ]); + + 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.initializeNotesLayer(map); if (params.layers.indexOf(map.noteLayer.options.code) >= 0) { map.addLayer(map.noteLayer); } - initializeBrowse(map); + OSM.initializeDataLayer(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'}); + $(".leaflet-control .control-button").tooltip({ placement: "left", container: "body" }); var expiry = new Date(); expiry.setYear(expiry.getFullYear() + 10); - map.on('moveend layeradd layerremove', function() { + map.on("moveend layeradd layerremove", function () { updateLinks( map.getCenter().wrap(), map.getZoom(), map.getLayersCode(), map._object); - $.removeCookie("_osm_location"); - $.cookie("_osm_location", cookieContent(map), { expires: expiry, path: "/" }); + Cookies.set("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/", samesite: "lax" }); }); - if ($.cookie('_osm_welcome') == 'hide') { - $('.welcome').hide(); + if (Cookies.get("_osm_welcome") !== "hide") { + $(".welcome").removeAttr("hidden"); } - $('.welcome .close').on('click', function() { - $('.welcome').hide(); - $.cookie("_osm_welcome", 'hide', { expires: expiry }); + $(".welcome .btn-close").on("click", function () { + $(".welcome").hide(); + Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" }); + }); + + 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); } } }); @@ -184,189 +222,196 @@ $(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) { + 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)); + } + }); + + function sendRemoteEditCommand(url, callback) { + var iframe = $("