From: Tom Hughes Date: Sun, 6 Apr 2025 14:21:54 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/5863' X-Git-Tag: live X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/HEAD?hp=2b1741b9e6ac41e41eabb0f51cc913b0b5949280 Merge remote-tracking branch 'upstream/pull/5863' --- diff --git a/Dockerfile b/Dockerfile index 5df13d717..884d69ef1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,10 +42,10 @@ RUN mkdir -p /app WORKDIR /app # Install Ruby packages -ADD Gemfile Gemfile.lock /app/ +COPY Gemfile Gemfile.lock /app/ RUN bundle install # Install NodeJS packages using yarn -ADD package.json yarn.lock /app/ -ADD bin/yarn /app/bin/ +COPY package.json yarn.lock /app/ +COPY bin/yarn /app/bin/ RUN bundle exec bin/yarn install diff --git a/Gemfile.lock b/Gemfile.lock index 925eebe3c..eee8346e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,8 +96,8 @@ GEM autoprefixer-rails (10.4.19.0) execjs (~> 2) aws-eventstream (1.3.2) - aws-partitions (1.1073.0) - aws-sdk-core (3.221.0) + aws-partitions (1.1078.0) + aws-sdk-core (3.222.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -107,7 +107,7 @@ GEM aws-sdk-kms (1.99.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.182.0) + aws-sdk-s3 (1.183.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -365,7 +365,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.6) + logger (1.7.0) logstasher (2.1.5) activesupport (>= 5.2) request_store @@ -407,7 +407,7 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.4) - nokogiri (1.18.6) + nokogiri (1.18.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth (1.1.0) @@ -469,7 +469,7 @@ GEM iniparse (~> 1.4) rexml (>= 3.3.9) parallel (1.26.3) - parser (3.3.7.2) + parser (3.3.7.4) ast (~> 2.4.1) racc pg (1.5.9) @@ -550,7 +550,7 @@ GEM rb-inotify (0.11.1) ffi (~> 1.0) rchardet (1.9.0) - rdoc (6.13.0) + rdoc (6.13.1) psych (>= 4.0.0) regexp_parser (2.10.0) reline (0.6.0) @@ -563,7 +563,7 @@ GEM rouge (4.5.1) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.74.0) + rubocop (1.75.1) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -571,7 +571,7 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.38.0, < 2.0) + rubocop-ast (>= 1.43.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) rubocop-ast (1.43.0) @@ -583,19 +583,19 @@ GEM rubocop-factory_bot (2.27.1) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) - rubocop-minitest (0.37.1) + rubocop-minitest (0.38.0) lint_roller (~> 1.1) - rubocop (>= 1.72.1, < 2.0) + rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.38.0, < 2.0) - rubocop-performance (1.24.0) + rubocop-performance (1.25.0) lint_roller (~> 1.1) - rubocop (>= 1.72.1, < 2.0) + rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.38.0, < 2.0) - rubocop-rails (2.30.3) + rubocop-rails (2.31.0) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) - rubocop (>= 1.72.1, < 2.0) + rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.38.0, < 2.0) rubocop-rake (0.7.1) lint_roller (~> 1.1) diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js index bfc3fc012..041e49f7e 100644 --- a/app/assets/javascripts/diary_entry.js +++ b/app/assets/javascripts/diary_entry.js @@ -11,7 +11,7 @@ $(function () { map.removeLayer(marker); } - marker = L.marker(e.latlng, { icon: OSM.getUserIcon() }).addTo(map) + marker = L.marker(e.latlng, { icon: OSM.getMarker({}) }).addTo(map) .bindPopup(OSM.i18n.t("diary_entries.edit.marker_text")); } @@ -30,13 +30,12 @@ $(function () { zoomControl: false }).addLayer(new L.OSM.Mapnik()); - L.OSM.zoom({ position: position }) - .addTo(map); + L.OSM.zoom({ position }).addTo(map); map.setView(centre, params.zoom); if ($("#latitude").val() && $("#longitude").val()) { - marker = L.marker(centre, { icon: OSM.getUserIcon() }).addTo(map) + marker = L.marker(centre, { icon: OSM.getMarker({}) }).addTo(map) .bindPopup(OSM.i18n.t("diary_entries.edit.marker_text")); } diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js index d60d4b82d..b5c8a4153 100644 --- a/app/assets/javascripts/id.js +++ b/app/assets/javascripts/id.js @@ -76,5 +76,10 @@ document.addEventListener("DOMContentLoaded", function () { const data = parent.OSM.mapParams(); goToLocation(data); }); + + const projectTitle = parent.document.title; + new MutationObserver(() => + parent.document.title = [document.title, projectTitle].filter(t => t).join(" | ") + ).observe(document.querySelector("title"), { childList: true, subtree: true, characterData: true }); } }); diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index b3ec71b92..7ff8a40d1 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -1,7 +1,6 @@ //= 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 @@ -111,39 +110,30 @@ $(function () { } addControlGroup([ - L.OSM.zoom({ position: position }), - L.OSM.locate({ position: position }) + L.OSM.zoom({ position }), + L.OSM.locate({ position }) ]); addControlGroup([ L.OSM.layers({ - position: position, - layers: map.baseLayers, - sidebar: sidebar - }), - L.OSM.key({ - position: position, - sidebar: sidebar + position, + sidebar, + layers: map.baseLayers }), + L.OSM.key({ position, sidebar }), L.OSM.share({ - "position": position, - "sidebar": sidebar, + position, + sidebar, "short": true }) ]); addControlGroup([ - L.OSM.note({ - position: position, - sidebar: sidebar - }) + L.OSM.note({ position, sidebar }) ]); addControlGroup([ - L.OSM.query({ - position: position, - sidebar: sidebar - }) + L.OSM.query({ position, sidebar }) ]); L.control.scale() @@ -288,9 +278,6 @@ $(function () { if (params.has("query")) { $("#sidebar .search_form input[name=query]").value(params.get("query")); } - if (!("autofocus" in document.createElement("input"))) { - $("#sidebar .search_form input[name=query]").focus(); - } return map.getState(); }; diff --git a/app/assets/javascripts/index/directions-endpoint.js b/app/assets/javascripts/index/directions-endpoint.js index a4b3a928b..97b841f14 100644 --- a/app/assets/javascripts/index/directions-endpoint.js +++ b/app/assets/javascripts/index/directions-endpoint.js @@ -1,15 +1,8 @@ -OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, changeCallback) { +OSM.DirectionsEndpoint = function Endpoint(map, input, marker, dragCallback, changeCallback) { const endpoint = {}; endpoint.marker = L.marker([0, 0], { - icon: L.icon({ - iconUrl: iconUrl, - iconSize: [25, 41], - iconAnchor: [12, 41], - popupAnchor: [1, -34], - shadowUrl: OSM.MARKER_SHADOW, - shadowSize: [41, 41] - }), + icon: OSM.getMarker(marker), draggable: true, autoPan: true }); diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 057933453..8b3047b68 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -33,8 +33,8 @@ OSM.Directions = function (map) { }; const endpoints = [ - OSM.DirectionsEndpoint(map, $("input[name='route_from']"), OSM.MARKER_GREEN, endpointDragCallback, endpointChangeCallback), - OSM.DirectionsEndpoint(map, $("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointChangeCallback) + OSM.DirectionsEndpoint(map, $("input[name='route_from']"), { icon: "MARKER_GREEN" }, endpointDragCallback, endpointChangeCallback), + OSM.DirectionsEndpoint(map, $("input[name='route_to']"), { icon: "MARKER_RED" }, endpointDragCallback, endpointChangeCallback) ]; let downloadURL = null; @@ -184,7 +184,7 @@ OSM.Directions = function (map) { ); // Add each row - route.steps.forEach(function (step) { + for (const [i, step] of route.steps.entries()) { const [ll, direction, instruction, dist, lineseg] = step; const row = $(""); @@ -193,7 +193,7 @@ OSM.Directions = function (map) { } else { row.append(""); } - row.append("" + instruction); + row.append(`${i + 1}. ${instruction}`); row.append("" + formatStepDistance(dist)); row.on("click", function () { @@ -212,7 +212,7 @@ OSM.Directions = function (map) { }); turnByTurnTable.append(row); - }); + } const blob = new Blob([JSON.stringify(polyline.toGeoJSON())], { type: "application/json" }); URL.revokeObjectURL(downloadURL); diff --git a/app/assets/javascripts/index/directions/fossgis_osrm.js b/app/assets/javascripts/index/directions/fossgis_osrm.js index b2586e68e..b5faca510 100644 --- a/app/assets/javascripts/index/directions/fossgis_osrm.js +++ b/app/assets/javascripts/index/directions/fossgis_osrm.js @@ -89,7 +89,7 @@ } const steps = route.legs.flatMap( - leg => leg.steps.map(function (step, idx) { + leg => leg.steps.map(function (step) { const maneuver_id = getManeuverId(step.maneuver); const instrPrefix = "javascripts.directions.instructions."; @@ -97,7 +97,7 @@ const step_geometry = L.PolylineUtil.decode(step.geometry, { precision: 5 }).map(L.latLng); - let instText = "" + (idx + 1) + ". "; + let instText; const destinations = "" + step.destinations + ""; let namedRoad = true; let name; @@ -114,16 +114,16 @@ } if (step.maneuver.type.match(/^exit (rotary|roundabout)$/)) { - instText += OSM.i18n.t(template, { name: name }); + instText = OSM.i18n.t(template, { name: name }); } else if (step.maneuver.type.match(/^(rotary|roundabout)$/)) { if (step.maneuver.exit) { if (step.maneuver.exit <= 10) { - instText += OSM.i18n.t(template + "_with_exit_ordinal", { exit: OSM.i18n.t(instrPrefix + "exit_counts." + numToWord(step.maneuver.exit)), name: name }); + instText = OSM.i18n.t(template + "_with_exit_ordinal", { exit: OSM.i18n.t(instrPrefix + "exit_counts." + numToWord(step.maneuver.exit)), name: name }); } else { - instText += OSM.i18n.t(template + "_with_exit", { exit: step.maneuver.exit, name: name }); + instText = OSM.i18n.t(template + "_with_exit", { exit: step.maneuver.exit, name: name }); } } else { - instText += OSM.i18n.t(template + "_without_exit", { name: name }); + instText = OSM.i18n.t(template + "_without_exit", { name: name }); } } else if (step.maneuver.type.match(/^(on ramp|off ramp)$/)) { const params = {}; @@ -133,9 +133,9 @@ if (Object.keys(params).length > 0) { template = template + "_with_" + Object.keys(params).join("_"); } - instText += OSM.i18n.t(template, params); + instText = OSM.i18n.t(template, params); } else { - instText += OSM.i18n.t(template + "_without_exit", { name: name }); + instText = OSM.i18n.t(template + "_without_exit", { name: name }); } return [[step.maneuver.location[1], step.maneuver.location[0]], ICON_MAP[maneuver_id], instText, step.distance, step_geometry]; }) diff --git a/app/assets/javascripts/index/directions/fossgis_valhalla.js b/app/assets/javascripts/index/directions/fossgis_valhalla.js index d5e781e4a..48b3ad64a 100644 --- a/app/assets/javascripts/index/directions/fossgis_valhalla.js +++ b/app/assets/javascripts/index/directions/fossgis_valhalla.js @@ -53,15 +53,14 @@ precision: 6 }); - const legSteps = leg.maneuvers.map(function (manoeuvre, idx) { - const num = `${idx + 1}. `; + const legSteps = leg.maneuvers.map(function (manoeuvre) { const lineseg = legLine .slice(manoeuvre.begin_shape_index, manoeuvre.end_shape_index + 1) .map(([lat, lng]) => ({ lat, lng })); return [ lineseg[0], INSTR_MAP[manoeuvre.type], - num + manoeuvre.instruction, + manoeuvre.instruction, manoeuvre.length * 1000, lineseg ]; diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js index b11c49472..20de38e37 100644 --- a/app/assets/javascripts/index/directions/graphhopper.js +++ b/app/assets/javascripts/index/directions/graphhopper.js @@ -21,15 +21,14 @@ function _processDirections(path) { const line = L.PolylineUtil.decode(path.points); - const steps = path.instructions.map(function (instr, i) { - const num = `${i + 1}. `; + const steps = path.instructions.map(function (instr) { const lineseg = line .slice(instr.interval[0], instr.interval[1] + 1) .map(([lat, lng]) => ({ lat, lng })); return [ lineseg[0], GH_INSTR_MAP[instr.sign], - num + instr.text, + instr.text, instr.distance, lineseg ]; // TODO does graphhopper map instructions onto line indices? diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index 9f883367a..1a23ac7b1 100644 --- a/app/assets/javascripts/index/history.js +++ b/app/assets/javascripts/index/history.js @@ -104,6 +104,10 @@ OSM.History = function (map) { function displayFirstChangesets(html) { $("#sidebar_content .changesets").html(html); + + if (location.pathname === "/history") { + setPaginationMapHashes(); + } } function displayMoreChangesets(div, html) { @@ -130,29 +134,34 @@ OSM.History = function (map) { nextNewList.children().appendTo(oldList); nextNewList.remove(); } + + if (location.pathname === "/history") { + setPaginationMapHashes(); + } + } + + function setPaginationMapHashes() { + $("#sidebar .pagination a").each(function () { + $(this).prop("hash", OSM.formatHash({ + center: map.getCenter(), + zoom: map.getZoom() + })); + }); } function loadFirstChangesets() { const data = new URLSearchParams(); - const params = new URLSearchParams(location.search); disableChangesetIntersectionObserver(); if (location.pathname === "/history") { - data.set("bbox", map.getBounds().wrap().toBBoxString()); + setBboxFetchData(data); const feedLink = $("link[type=\"application/atom+xml\"]"), feedHref = feedLink.attr("href").split("?")[0]; feedLink.attr("href", feedHref + "?" + data); } - data.set("list", "1"); - - if (params.has("before")) { - data.set("before", params.get("before")); - } - if (params.has("after")) { - data.set("after", params.get("after")); - } + setListFetchData(data, location); fetch(location.pathname + "?" + data) .then(response => response.text()) @@ -160,13 +169,15 @@ OSM.History = function (map) { displayFirstChangesets(html); enableChangesetIntersectionObserver(); - if (params.has("before")) { + if (data.has("before")) { const [firstItem] = $("#sidebar_content .changesets ol").children().first(); firstItem?.scrollIntoView(); - } - if (params.has("after")) { + } else if (data.has("after")) { const [lastItem] = $("#sidebar_content .changesets ol").children().last(); lastItem?.scrollIntoView(false); + } else { + const [sidebar] = $("#sidebar"); + sidebar.scrollTop = 0; } updateMap(); @@ -179,14 +190,51 @@ OSM.History = function (map) { const div = $(this).parents(".changeset_more"); - $(this).hide(); - div.find(".loader").show(); + div.find(".pagination").addClass("invisible"); + div.find("[hidden]").prop("hidden", false); - $.get($(this).attr("href"), function (html) { - displayMoreChangesets(div, html); - enableChangesetIntersectionObserver(); - updateMap(); - }); + const data = new URLSearchParams(); + + if (location.pathname === "/history") { + setBboxFetchData(data); + } + + const url = new URL($(this).attr("href"), location); + setListFetchData(data, url); + + fetch(url.pathname + "?" + data) + .then(response => response.text()) + .then(function (html) { + displayMoreChangesets(div, html); + enableChangesetIntersectionObserver(); + + updateMap(); + }); + } + + function setBboxFetchData(data) { + const crs = map.options.crs; + const sw = map.getBounds().getSouthWest(); + const ne = map.getBounds().getNorthEast(); + const swClamped = crs.unproject(crs.project(sw)); + const neClamped = crs.unproject(crs.project(ne)); + + if (sw.lat >= swClamped.lat || ne.lat <= neClamped.lat || ne.lng - sw.lng < 360) { + data.set("bbox", map.getBounds().wrap().toBBoxString()); + } + } + + function setListFetchData(data, url) { + const params = new URLSearchParams(url.search); + + data.set("list", "1"); + + if (params.has("before")) { + data.set("before", params.get("before")); + } + if (params.has("after")) { + data.set("after", params.get("after")); + } } function reloadChangesetsBecauseOfMapMovement() { diff --git a/app/assets/javascripts/index/home.js b/app/assets/javascripts/index/home.js index 597b68eff..1cc644cf2 100644 --- a/app/assets/javascripts/index/home.js +++ b/app/assets/javascripts/index/home.js @@ -17,7 +17,7 @@ OSM.Home = function (map) { map.setView(OSM.home, 15, { reset: true }); }); marker = L.marker(OSM.home, { - icon: OSM.getUserIcon(), + icon: OSM.getMarker({}), title: OSM.i18n.t("javascripts.home.marker_title") }).addTo(map); } else { diff --git a/app/assets/javascripts/index/layers/data.js b/app/assets/javascripts/index/layers/data.js index 6452c2a41..6c8bdc025 100644 --- a/app/assets/javascripts/index/layers/data.js +++ b/app/assets/javascripts/index/layers/data.js @@ -2,21 +2,6 @@ OSM.initializeDataLayer = function (map) { let dataLoader, loadedBounds; const dataLayer = map.dataLayer; - dataLayer.setStyle({ - way: { - weight: 3, - color: "#000000", - opacity: 0.4 - }, - area: { - weight: 3, - color: "#ff0000" - }, - node: { - color: "#00ff00" - } - }); - dataLayer.isWayArea = function () { return false; }; @@ -132,6 +117,8 @@ OSM.initializeDataLayer = function (map) { if (map._objectLayer) { map._objectLayer.bringToFront(); } + + dataLoader = null; }) .catch(function (error) { if (error.name === "AbortError") return; @@ -139,9 +126,10 @@ OSM.initializeDataLayer = function (map) { displayLoadError(error?.message, () => { $("#browse_status").empty(); }); + + dataLoader = null; }) .finally(() => { - dataLoader = null; spanLoading.remove(); }); } diff --git a/app/assets/javascripts/index/layers/notes.js b/app/assets/javascripts/index/layers/notes.js index 104f6f2f2..00f1fb4e9 100644 --- a/app/assets/javascripts/index/layers/notes.js +++ b/app/assets/javascripts/index/layers/notes.js @@ -3,24 +3,6 @@ OSM.initializeNotesLayer = function (map) { const noteLayer = map.noteLayer; let notes = {}; - const noteIcons = { - "new": L.icon({ - iconUrl: OSM.NEW_NOTE_MARKER, - iconSize: [25, 40], - iconAnchor: [12, 40] - }), - "open": L.icon({ - iconUrl: OSM.OPEN_NOTE_MARKER, - iconSize: [25, 40], - iconAnchor: [12, 40] - }), - "closed": L.icon({ - iconUrl: OSM.CLOSED_NOTE_MARKER, - iconSize: [25, 40], - iconAnchor: [12, 40] - }) - }; - noteLayer.on("add", () => { loadNotes(); map.on("moveend", loadNotes); @@ -41,7 +23,7 @@ OSM.initializeNotesLayer = function (map) { function updateMarker(old_marker, feature) { let marker = old_marker; if (marker) { - marker.setIcon(noteIcons[feature.properties.status]); + marker.setIcon(OSM.getMarker({ icon: `${feature.properties.status}_NOTE_MARKER`, shadow: false, height: 40 })); } else { let title; const description = feature.properties.comments[0]; @@ -51,7 +33,7 @@ OSM.initializeNotesLayer = function (map) { } marker = L.marker(feature.geometry.coordinates.reverse(), { - icon: noteIcons[feature.properties.status], + icon: OSM.getMarker({ icon: `${feature.properties.status}_NOTE_MARKER`, shadow: false, height: 40 }), title, opacity: 0.8, interactive: true diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js index b1457d10b..ff4a44126 100644 --- a/app/assets/javascripts/index/new_note.js +++ b/app/assets/javascripts/index/new_note.js @@ -6,24 +6,6 @@ OSM.NewNote = function (map) { let newNoteMarker, halo; - const noteIcons = { - "new": L.icon({ - iconUrl: OSM.NEW_NOTE_MARKER, - iconSize: [25, 40], - iconAnchor: [12, 40] - }), - "open": L.icon({ - iconUrl: OSM.OPEN_NOTE_MARKER, - iconSize: [25, 40], - iconAnchor: [12, 40] - }), - "closed": L.icon({ - iconUrl: OSM.CLOSED_NOTE_MARKER, - iconSize: [25, 40], - iconAnchor: [12, 40] - }) - }; - addNoteButton.on("click", function (e) { e.preventDefault(); e.stopPropagation(); @@ -49,7 +31,7 @@ OSM.NewNote = function (map) { function addCreatedNoteMarker(feature) { const marker = L.marker(feature.geometry.coordinates.reverse(), { - icon: noteIcons[feature.properties.status], + icon: OSM.getMarker({ icon: `${feature.properties.status}_NOTE_MARKER`, shadow: false, height: 40 }), opacity: 0.9, interactive: true }); @@ -79,7 +61,7 @@ OSM.NewNote = function (map) { if (newNoteMarker) map.removeLayer(newNoteMarker); newNoteMarker = L.marker(latlng, { - icon: noteIcons.new, + icon: OSM.getMarker({ icon: "NEW_NOTE_MARKER", shadow: false, height: 40 }), opacity: 0.9, draggable: true }); @@ -95,7 +77,7 @@ OSM.NewNote = function (map) { addHalo(newNoteMarker.getLatLng()); newNoteMarker.on("dragend", function () { - content.find("textarea").focus(); + content.find("textarea").trigger("focus"); }); } @@ -105,10 +87,10 @@ OSM.NewNote = function (map) { newNoteMarker = null; } - function moveNewNotMarkerToClick(e) { + function moveNewNoteMarkerToClick(e) { if (newNoteMarker) newNoteMarker.setLatLng(e.latlng); if (halo) halo.setLatLng(e.latlng); - content.find("textarea").focus(); + content.find("textarea").trigger("focus"); } function updateControls() { @@ -148,7 +130,9 @@ OSM.NewNote = function (map) { content.find("textarea") .on("input", updateControls) - .focus(); + .attr("readonly", "readonly") // avoid virtual keyboard popping up on focus + .trigger("focus") + .removeAttr("readonly"); content.find("input[type=submit]").on("click", function (e) { const location = newNoteMarker.getLatLng().wrap(); @@ -170,7 +154,7 @@ OSM.NewNote = function (map) { }); }); - map.on("click", moveNewNotMarkerToClick); + map.on("click", moveNewNoteMarkerToClick); addNoteButton.on("disabled enabled", updateControls); updateControls(); @@ -178,7 +162,7 @@ OSM.NewNote = function (map) { }; page.unload = function () { - map.off("click", moveNewNotMarkerToClick); + map.off("click", moveNewNoteMarkerToClick); addNoteButton.off("disabled enabled", updateControls); removeNewNoteMarker(); addNoteButton.removeClass("active"); diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js index f0b7dae27..a77735c95 100644 --- a/app/assets/javascripts/index/note.js +++ b/app/assets/javascripts/index/note.js @@ -2,24 +2,6 @@ OSM.Note = function (map) { const content = $("#sidebar_content"), page = {}; - const noteIcons = { - "new": L.icon({ - iconUrl: OSM.NEW_NOTE_MARKER, - iconSize: [25, 40], - iconAnchor: [12, 40] - }), - "open": L.icon({ - iconUrl: OSM.OPEN_NOTE_MARKER, - iconSize: [25, 40], - iconAnchor: [12, 40] - }), - "closed": L.icon({ - iconUrl: OSM.CLOSED_NOTE_MARKER, - iconSize: [25, 40], - iconAnchor: [12, 40] - }) - }; - page.pushstate = page.popstate = function (path, id) { OSM.loadSidebarContent(path, function () { const data = $(".details").data(); @@ -87,7 +69,7 @@ OSM.Note = function (map) { type: "note", id: parseInt(id, 10), latLng: L.latLng(data.coordinates.split(",")), - icon: noteIcons[data.status] + icon: OSM.getMarker({ icon: `${data.status}_NOTE_MARKER`, shadow: false, height: 40 }) }, function () { if (!hashParams.center && !skipMoveToNote) { const latLng = L.latLng(data.coordinates.split(",")); diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index b3ef3ceb3..05a4c449a 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -18,9 +18,15 @@ OSM.Search = function (map) { $(".search_form").on("submit", function (e) { e.preventDefault(); $("header").addClass("closed"); - const query = $(this).find("input[name=query]").val(); - let search = "/"; - if (query) search = "/search?" + new URLSearchParams({ query }); + const params = new URLSearchParams({ + query: this.elements.query.value, + zoom: map.getZoom(), + minlon: map.getBounds().getWest(), + minlat: map.getBounds().getSouth(), + maxlon: map.getBounds().getEast(), + maxlat: map.getBounds().getNorth() + }); + const search = params.get("query") ? `/search?${params}` : "/"; OSM.router.route(search + OSM.formatHash(map)); }); @@ -63,7 +69,7 @@ OSM.Search = function (map) { if (!marker) { const data = $(this).find("a.set_position").data(); - marker = L.marker([data.lat, data.lon], { icon: OSM.getUserIcon() }); + marker = L.marker([data.lat, data.lon], { icon: OSM.getMarker({}) }); $(this).data("marker", marker); } @@ -118,14 +124,7 @@ OSM.Search = function (map) { const entry = $(this); fetch(entry.data("href"), { method: "POST", - body: new URLSearchParams({ - zoom: map.getZoom(), - minlon: map.getBounds().getWest(), - minlat: map.getBounds().getSouth(), - maxlon: map.getBounds().getEast(), - maxlat: map.getBounds().getNorth(), - ...OSM.csrf - }) + body: new URLSearchParams(OSM.csrf) }) .then(response => response.text()) .then(function (html) { diff --git a/app/assets/javascripts/leaflet.locate.js b/app/assets/javascripts/leaflet.locate.js index d270d6499..8fc182f38 100644 --- a/app/assets/javascripts/leaflet.locate.js +++ b/app/assets/javascripts/leaflet.locate.js @@ -1,3 +1,5 @@ +//= require leaflet.locatecontrol/dist/L.Control.Locate.umd + L.OSM.locate = function (options) { const control = L.control.locate({ icon: "icon geolocate", diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index ac31f7941..2ea3352ab 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -43,7 +43,7 @@ L.OSM.Map = L.Map.extend({ this.noteLayer = new L.FeatureGroup(); this.noteLayer.options = { code: "N" }; - this.dataLayer = new L.OSM.DataLayer(null, { asynchronous: true }); + this.dataLayer = new L.OSM.DataLayer(null); this.dataLayer.options.code = "D"; this.gpsLayer = new L.OSM.GPS({ @@ -391,13 +391,17 @@ OSM.isDarkMap = function () { return window.matchMedia("(prefers-color-scheme: dark)").matches; }; -OSM.getUserIcon = function (url) { - return L.icon({ - iconUrl: url || OSM.MARKER_RED, - iconSize: [25, 41], - iconAnchor: [12, 41], - popupAnchor: [1, -34], - shadowUrl: OSM.MARKER_SHADOW, - shadowSize: [41, 41] - }); +OSM.getMarker = function ({ icon = "MARKER_RED", shadow = true, height = 41 }) { + const options = { + iconUrl: OSM[icon.toUpperCase()] || OSM.MARKER_RED, + iconSize: [25, height], + iconAnchor: [12, height], + popupAnchor: [1, -34] + }; + if (shadow) { + options.shadowUrl = OSM.MARKER_SHADOW; + options.shadowSize = [41, 41]; + options.shadowAnchor = [12, 41]; + } + return L.icon(options); }; diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 4f0bd8f77..d73d1c163 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -30,6 +30,7 @@ OSM = { LAYER_DEFINITIONS: <%= MapLayers::full_definitions("config/layers.yml").to_json %>, LAYERS_WITH_MAP_KEY: <%= YAML.load_file(Rails.root.join("config/key.yml")).keys.to_json %>, + MARKER_BLUE: <%= image_path("marker-blue.png").to_json %>, MARKER_GREEN: <%= image_path("marker-green.png").to_json %>, MARKER_RED: <%= image_path("marker-red.png").to_json %>, @@ -157,11 +158,11 @@ OSM = { layers = args.getLayersCode(); } else if (args instanceof URLSearchParams) { center = args.get("center") || L.latLng(args.get("lat"), args.get("lon")); - zoom = args.get("zoom"); + zoom = Number(args.get("zoom")); layers = args.get("layers") || ""; } else { center = args.center || L.latLng(args.lat, args.lon); - zoom = args.zoom; + zoom = Number(args.zoom); layers = args.layers || ""; } diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js index 77a71097b..5f8a931e3 100644 --- a/app/assets/javascripts/user.js +++ b/app/assets/javascripts/user.js @@ -1,4 +1,4 @@ -//= require leaflet.locatecontrol/dist/L.Control.Locate.umd +//= require leaflet.locate (function () { $(document).on("change", "#user_all", function () { @@ -18,30 +18,9 @@ $(function () { const position = $("html").attr("dir") === "rtl" ? "topleft" : "topright"; - L.OSM.zoom({ position: position }) - .addTo(map); - - const locate = L.control.locate({ - position: position, - icon: "icon geolocate", - iconLoading: "icon geolocate", - strings: { - title: OSM.i18n.t("javascripts.map.locate.title"), - popup: function (options) { - return OSM.i18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance }); - } - } - }).addTo(map); - - const locateContainer = locate.getContainer(); + L.OSM.zoom({ position }).addTo(map); - $(locateContainer) - .removeClass("leaflet-control-locate leaflet-bar") - .addClass("control-locate") - .children("a") - .attr("href", "#") - .removeClass("leaflet-bar-part leaflet-bar-part-single") - .addClass("control-button"); + L.OSM.locate({ position }).addTo(map); if (OSM.home) { map.setView([OSM.home.lat, OSM.home.lon], defaultHomeZoom); @@ -51,7 +30,7 @@ $(function () { if ($("#map").hasClass("set_location")) { marker = L.marker([0, 0], { - icon: OSM.getUserIcon(), + icon: OSM.getMarker({}), keyboard: false, interactive: false }); @@ -124,7 +103,7 @@ $(function () { $("[data-user]").each(function () { const user = $(this).data("user"); if (user.lon && user.lat) { - L.marker([user.lat, user.lon], { icon: OSM.getUserIcon(user.icon) }).addTo(map) + L.marker([user.lat, user.lon], { icon: OSM.getMarker({ icon: user.icon }) }).addTo(map) .bindPopup(user.description, { minWidth: 200 }); } }); diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js index 5ce6afdcc..dc269a310 100644 --- a/app/assets/javascripts/welcome.js +++ b/app/assets/javascripts/welcome.js @@ -15,10 +15,6 @@ $(function () { $(".start-mapping").addClass("loading"); if (navigator.geolocation) { - // handle firefox's weird implementation - // https://bugzilla.mozilla.org/show_bug.cgi?id=675533 - window.setTimeout(manualEdit, 4000); - navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit); } else { manualEdit(); diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 27d58f84e..9fff025d0 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -620,11 +620,6 @@ tr.turn { z-index: 2; /* needs to be higher than Bootstrap's stretched link ::after z-index */ } } - - .changeset_more .loader { - display: none; - width: 100%; - } } /* Rules for the browse sidebar */ @@ -679,12 +674,6 @@ tr.turn { > * { margin: -1px; } - #minlon { - /*rtl:ignore*/ float: left; - } - #maxlon { - /*rtl:ignore*/ float: right; - } } } diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index f23448bff..81c179a67 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -6,17 +6,22 @@ class GeocoderController < ApplicationController before_action :authorize_web before_action :set_locale before_action :require_oauth, :only => [:search] + authorize_resource :class => false + before_action :normalize_params, :only => [:search] + def search - @params = normalize_params @sources = [] - if @params[:lat] && @params[:lon] - @sources.push(:name => "latlon", :url => root_path) - @sources.push(:name => "osm_nominatim_reverse", :url => nominatim_reverse_url(:format => "html")) - elsif @params[:query] - @sources.push(:name => "osm_nominatim", :url => nominatim_url(:format => "html")) + if params[:lat] && params[:lon] + @sources.push(:name => "latlon", :url => root_path, + :fetch_url => url_for(params.permit(:lat, :lon, :latlon_digits, :zoom).merge(:action => "search_latlon"))) + @sources.push(:name => "osm_nominatim_reverse", :url => nominatim_reverse_url(:format => "html"), + :fetch_url => url_for(params.permit(:lat, :lon, :zoom).merge(:action => "search_osm_nominatim_reverse"))) + elsif params[:query] + @sources.push(:name => "osm_nominatim", :url => nominatim_url(:format => "html"), + :fetch_url => url_for(params.permit(:query, :minlat, :minlon, :maxlat, :maxlon).merge(:action => "search_osm_nominatim"))) end if @sources.empty? @@ -221,8 +226,6 @@ class GeocoderController < ApplicationController params[:latlon_digits] = true end end - - params.permit(:query, :lat, :lon, :latlon_digits, :zoom, :minlat, :minlon, :maxlat, :maxlon) end def dms_regexp(name_prefix) diff --git a/app/views/changesets/index.html.erb b/app/views/changesets/index.html.erb index 3f25cf134..cd59d14c8 100644 --- a/app/views/changesets/index.html.erb +++ b/app/views/changesets/index.html.erb @@ -1,11 +1,15 @@ <% if @newer_changesets_id %> -
- <%= link_to t(".load_more"), url_for(@params.merge(:before => nil, :after => @newer_changesets_id)), :class => "btn btn-primary" %> -
+
+ +
    +
  • + <%= link_to t(".newer_changesets"), url_for(:after => @newer_changesets_id), :class => "page-link" %> +
    • +
<% end %> <% if @changesets.present? %> @@ -20,12 +24,16 @@

<%= params[:before] ? t(".no_more") : t(".empty") %>

<% end %> <% if @older_changesets_id -%> -
- <%= link_to t(".load_more"), url_for(@params.merge(:before => @older_changesets_id, :after => nil)), :class => "btn btn-primary" %> -
+
+ +
    +
  • + <%= link_to t(".older_changesets"), url_for(:before => @older_changesets_id), :class => "page-link" %> +
    • +
<% end -%> diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb index 0dda0b354..cea6c2b29 100644 --- a/app/views/dashboards/_contact.html.erb +++ b/app/views/dashboards/_contact.html.erb @@ -1,10 +1,10 @@ <% user_data = { :lon => contact.home_lon, :lat => contact.home_lat, - :icon => image_path(type == "following" ? "marker-blue.png" : "marker-green.png"), + :icon => type == "following" ? "MARKER_BLUE" : "MARKER_GREEN", :description => render(:partial => "popup", :object => contact, :locals => { :type => type }) } %> -<%= tag.div :class => "clearfix row", :data => { :user => user_data } do %> +<%= tag.div :class => "row", :data => { :user => user_data } do %>
<%= user_thumbnail contact %>
@@ -32,7 +32,7 @@