From b23b216564fa73f6feed88dee417ec20b8f4e8c7 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 1 Dec 2024 22:24:56 +0100 Subject: [PATCH 1/7] Chore: drop openid-scope from login --- src/Logic/Osm/OsmConnection.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Logic/Osm/OsmConnection.ts b/src/Logic/Osm/OsmConnection.ts index 80e07277b..4ee3b73b7 100644 --- a/src/Logic/Osm/OsmConnection.ts +++ b/src/Logic/Osm/OsmConnection.ts @@ -532,7 +532,7 @@ export class OsmConnection { this.auth = new osmAuth({ client_id: this._oauth_config.oauth_client_id, url: this._oauth_config.url, - scope: "read_prefs write_prefs write_api write_gpx write_notes openid", + scope: "read_prefs write_prefs write_api write_gpx write_notes", redirect_uri: Utils.runningFromConsole ? "https://mapcomplete.org/land.html" : window.location.protocol + "//" + window.location.host + "/land.html", From a87e9e2e98f0a703e3b50570183edfa5ad858719 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 2 Dec 2024 14:01:08 +0100 Subject: [PATCH 2/7] Fix: attempt to add more EXIF-fields, see #2296 --- src/Logic/ImageProviders/Panoramax.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Logic/ImageProviders/Panoramax.ts b/src/Logic/ImageProviders/Panoramax.ts index f650c9a85..c02667adc 100644 --- a/src/Logic/ImageProviders/Panoramax.ts +++ b/src/Logic/ImageProviders/Panoramax.ts @@ -231,7 +231,7 @@ export class PanoramaxUploader implements ImageUploader { lat = exifLat lon = exifLon } - const [date, time] = tags.DateTime.value[0].split(" ") + const [date, time] =( tags.DateTime.value[0] ?? tags.DateTimeOriginal.value[0] ?? tags.GPSDateStamp ?? tags["Date Created"]).split(" ") const exifDatetime = new Date(date.replaceAll(":", "-") + "T" + time) if (exifDatetime.getFullYear() === 1970) { // The data probably got reset to the epoch From ceadd9fdefa9843cf766935368aa01b3c96dbe76 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 2 Dec 2024 15:37:49 +0100 Subject: [PATCH 3/7] Themes(etymology): add parks, fix #2292 --- assets/themes/etymology/etymology.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/assets/themes/etymology/etymology.json b/assets/themes/etymology/etymology.json index 15b41b59a..dbc4ecb15 100644 --- a/assets/themes/etymology/etymology.json +++ b/assets/themes/etymology/etymology.json @@ -301,6 +301,31 @@ } } } + }, + { + "builtin": "etymology", + "override": { + "id": "parks_without_etymology", + "=name": { + "en": "Parks without etymology information" + }, + "minzoom": 18, + "isCounted": false, + "source": { + "osmTags": { + "and": [ + "name~*", + { + "or": [ + "leisure=park", + "landuse=village_green", + "landuse=recreation_ground" + ] + } + ] + } + } + } } ] } From ec7b16638da2475e4cbca097ce08f566e46ba054 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 3 Dec 2024 00:58:51 +0100 Subject: [PATCH 4/7] Themes(note): don't show notes which have _no_ comments; these are probably redacted. Fix #2299 --- assets/layers/note/note.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json index 271336a11..b8262f8d4 100644 --- a/assets/layers/note/note.json +++ b/assets/layers/note/note.json @@ -28,6 +28,7 @@ "_is_import_note:=(() => {const lines = feat.properties['_first_comment'].split('\\n'); const matchesMapCompleteURL = lines.map(l => l.match(\".*https://mapcomplete.\\(osm.be|org\\)/\\([a-zA-Z_-]+\\)\\(.html\\).*#import\")); const matchedIndexes = matchesMapCompleteURL.map((doesMatch, i) => [doesMatch !== null, i]).filter(v => v[0]).map(v => v[1]); return matchedIndexes[0] })()" ], "minzoom": 7, + "isShown": "_total_comments>0", "title": { "render": { "en": "Note", From 82b8862e0759acb35cb928106dedf4e32ebb95d2 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 3 Dec 2024 01:32:57 +0100 Subject: [PATCH 5/7] Chore: allow to run on ubuntu-lts --- .github/workflows/deploy_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 21ee96e20..99a080abb 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: [ubuntu-latest, ubuntu-22.04] steps: - uses: actions/checkout@v3 From 958370fc8ee7c42a7c0e91d9740b234b29562961 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 3 Dec 2024 01:38:46 +0100 Subject: [PATCH 6/7] Chore: allow to run on ubuntu-lts --- .github/workflows/deploy_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 99a080abb..2f6c432b2 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: [ubuntu-latest, ubuntu-22.04] + runs-on: [ubuntu-22.04, ubuntu-latest] steps: - uses: actions/checkout@v3 From 40cfb36169dff813eff401351875cb3d42f0e63a Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 3 Dec 2024 01:39:29 +0100 Subject: [PATCH 7/7] Chore: allow to run on ubuntu-lts --- .github/workflows/deploy_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 2f6c432b2..df10fa0b6 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: [ubuntu-22.04, ubuntu-latest] + runs-on: [ubuntu-lts, ubuntu-latest] steps: - uses: actions/checkout@v3