Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/backend/model/fileaccess/MetadataLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,22 @@ export class MetadataLoader {
metadata.creationDate;
}
}
if ((sidecarData as SideCar).exif !== undefined) {
if (
(sidecarData as SideCar).exif.GPSLatitude !== undefined &&
(sidecarData as SideCar).exif.GPSLongitude !== undefined
) {
metadata.positionData = metadata.positionData || {};
metadata.positionData.GPSData = {};

metadata.positionData.GPSData.longitude = Utils.xmpExifGpsCoordinateToDecimalDegrees(
(sidecarData as SideCar).exif.GPSLongitude
);
metadata.positionData.GPSData.latitude = Utils.xmpExifGpsCoordinateToDecimalDegrees(
(sidecarData as SideCar).exif.GPSLatitude
);
}
}
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions src/common/Utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,14 @@ export class Utils {
}
return ret;
}

public static xmpExifGpsCoordinateToDecimalDegrees(text: string): number {
const parts = text.match(/^([0-9]+),([0-9.]+)([EWNS])$/);
const degrees: number = parseInt(parts[1], 10);
const minutes: number = parseFloat(parts[2]);
const sign = (parts[3] === "N" || parts[3] === "E") ? 1 : -1;
return sign * (degrees + (minutes / 60.0))
}
}

export class LRU<V> {
Expand Down
6 changes: 6 additions & 0 deletions src/common/entities/MediaDTO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,17 @@ export interface MediaDimension {
}

export interface SideCar {
exif?: SideCarExif;
dc?: SideCarDc;
xmp?: SideCarXmp;
photoshop?: SideCarPhotoshop;
}

export interface SideCarExif {
GPSLatitude?: string;
GPSLongitude?: string;
}

export interface SideCarDc {
subject?: string[];
}
Expand Down
6 changes: 6 additions & 0 deletions test/backend/assets/sidecar/20240107_110258.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,11 @@
"Výlet",
"Travel"
],
"positionData": {
"GPSData": {
"latitude": 50.08958748333333,
"longitude": 14.397409516666666
}
},
"rating": 3
}
6 changes: 6 additions & 0 deletions test/backend/assets/sidecar/20240121_102400.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@
"Výlet",
"Travel"
],
"positionData": {
"GPSData": {
"latitude": 50.08958748333333,
"longitude": 14.397409516666666
}
},
"rating": 3
}
6 changes: 6 additions & 0 deletions test/backend/assets/sidecar/20240128_185808.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@
"Výlet",
"Travel"
],
"positionData": {
"GPSData": {
"latitude": 50.08958748333333,
"longitude": 14.397409516666666
}
},
"rating": 3
}