Merge branch 'develop' into RobinLinde-patch-1

This commit is contained in:
Robin van der Linde 2024-12-03 16:52:47 +01:00
commit 05bd76fa01
Signed by untrusted user who does not match committer: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
4 changed files with 28 additions and 2 deletions

View file

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

View file

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

View file

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

View file

@ -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