Merge branch 'develop' into theme/insect-hotels

.github/workflows/deploy_dev.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: [ubuntu-lts, ubuntu-latest]
     steps:
       - uses: actions/checkout@v3
 

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",

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"
+                ]
+              }
+            ]
+          }
+        }
+      }
     }
   ]
 }

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

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",