clones/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-09-22 02:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): Does not assign lat/lon if they are at 0,0 #2991 (#3669)

Browse Source 
* fix(server): Does not assign lat/lon if they are at 0,0 #2991

* Adds migration file to fix null island rows

* Removed down migration

* Leave empty down function
This commit is contained in:
Russell Tan 2023-08-14 18:37:17 -07:00 committed by GitHub
parent 079aa13edb
commit f1b8a7ab54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/infra/migrations/1692057328660-fixGPSNullIsland.ts Normal file
View File

@ -0,0 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm"
export class FixGPSNullIsland1692057328660 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`UPDATE "exif" SET latitude = NULL, longitude = NULL WHERE latitude = 0 AND longitude = 0;`);
}
public async down(): Promise<void> {
// Setting lat,lon to 0 not necessary
}
}

12
server/src/microservices/processors/metadata-extraction.processor.ts
View File

@ -308,8 +308,16 @@ export class MetadataExtractionProcessor {
const latitude = getExifProperty('GPSLatitude');
const longitude = getExifProperty('GPSLongitude');
newExif.latitude = latitude !== null ? parseLatitude(latitude) : null;
newExif.longitude = longitude !== null ? parseLongitude(longitude) : null;
const lat = parseLatitude(latitude);
const lon = parseLongitude(longitude);
if (lat === 0 && lon === 0) {
this.logger.warn(`Latitude & Longitude were on Null Island (${lat},${lon}), not assigning coordinates`);
} else {
newExif.latitude = lat;
newExif.longitude = lon;
}
if (getExifProperty('MotionPhoto')) {
// Seen on more recent Pixel phones: starting as early as Pixel 4a, possibly earlier.
const rawDirectory = getExifProperty('Directory');

12
server/src/microservices/utils/exif/coordinates.spec.ts
View File

@ -23,6 +23,12 @@ describe('parsing latitude from string input', () => {
});
});
describe('parsing latitude from null input', () => {
it('returns null for null input', () => {
expect(parseLatitude(null)).toBeNull();
});
});
describe('parsing longitude from string input', () => {
it('returns null for invalid inputs', () => {
expect(parseLongitude('')).toBeNull();
@ -44,3 +50,9 @@ describe('parsing longitude from string input', () => {
expect(parseLongitude('-0.0')).toBeCloseTo(-0.0);
});
});
describe('parsing longitude from null input', () => {
it('returns null for null input', () => {
expect(parseLongitude(null)).toBeNull();
});
});

11
server/src/microservices/utils/exif/coordinates.ts
View File

@ -1,6 +1,9 @@
import { isNumberInRange } from '../numbers';
export function parseLatitude(input: string | number): number | null {
export function parseLatitude(input: string | number | null): number | null {
if (input === null) {
return null;
}
const latitude = typeof input === 'string' ? Number.parseFloat(input) : input;
if (isNumberInRange(latitude, -90, 90)) {
@ -9,7 +12,11 @@ export function parseLatitude(input: string | number): number | null {
return null;
}
export function parseLongitude(input: string | number): number | null {
export function parseLongitude(input: string | number | null): number | null {
if (input === null) {
return null;
}
const longitude = typeof input === 'string' ? Number.parseFloat(input) : input;
if (isNumberInRange(longitude, -180, 180)) {