midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix: fix #2304

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-12-10 02:38:00 +01:00
parent b615c34879
commit 0a001d3c7d
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Logic/ImageProviders/Panoramax.ts
View file

@ -234,6 +234,12 @@ export class PanoramaxUploader implements ImageUploader {
) { ) {
lat = exifLat lat = exifLat
lon = exifLon lon = exifLon
if(tags?.GPSLatitudeRef?.value?.[0] === "S"){
lat *= -1
}
if(tags?.GPSLongitudeRef?.value?.[0] === "W"){
lon *= -1
}
} }
const [date, time] =( tags.DateTime.value[0] ?? tags.DateTimeOriginal.value[0] ?? tags.GPSDateStamp ?? tags["Date Created"]).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) const exifDatetime = new Date(date.replaceAll(":", "-") + "T" + time)

14
src/UI/Test.svelte
View file

@ -34,6 +34,9 @@
>tags?.GPSLongitude?.value >tags?.GPSLongitude?.value
const exifLat = latD + latM / 60 + latS / (3600 * latSDenom) const exifLat = latD + latM / 60 + latS / (3600 * latSDenom)
const exifLon = lonD + lonM / 60 + lonS / (3600 * lonSDenom) const exifLon = lonD + lonM / 60 + lonS / (3600 * lonSDenom)
const directValueLat = tags?.GPSLatitude?.description
const directValueLon = tags?.GPSLongitude?.description
if ( if (
typeof exifLat === "number" && typeof exifLat === "number" &&
!isNaN(exifLat) && !isNaN(exifLat) &&
@ -43,11 +46,22 @@
) { ) {
lat = exifLat lat = exifLat
lon = exifLon lon = exifLon
if(tags?.GPSLatitudeRef?.value?.[0] === "S"){
lat *= -1
}
if(tags?.GPSLongitudeRef?.value?.[0] === "W"){
lon *= -1
}
l("Using EXIFLAT + EXIFLON") l("Using EXIFLAT + EXIFLON")
} else { } else {
l("NOT using exifLat and exifLon: invalid value detected") l("NOT using exifLat and exifLon: invalid value detected")
} }
l("Lat and lon are", lat, lon) l("Lat and lon are", lat, lon)
l("ref lat is", tags?.GPSLatitudeRef?.description, JSON.stringify(tags?.GPSLatitudeRef?.value))
l("ref lon is", tags?.GPSLongitudeRef?.description, JSON.stringify(tags?.GPSLongitudeRef?.value))
l("Direct values are", directValueLat,directValueLon,"corrected:",lat,lon)
l("Datetime value is", JSON.stringify(tags.DateTime)) l("Datetime value is", JSON.stringify(tags.DateTime))
const [date, time] = tags.DateTime.value[0].split(" ") const [date, time] = tags.DateTime.value[0].split(" ")
datetime = new Date(date.replaceAll(":", "-") + "T" + time).toISOString() datetime = new Date(date.replaceAll(":", "-") + "T" + time).toISOString()