Skip to content

High performance self-hosted photo and video management solution.

feat(server): include reason in null reverse geocoding logs (#20347)

Sergey Katsubod34670bae6bc
diff --git a/server/src/constants.ts b/server/src/constants.ts
index 2d803c2e95..67d50a65f8 100644
--- a/server/src/constants.ts
+++ b/server/src/constants.ts
@@ -55,6 +55,7 @@ export const MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME = Number(
);
export const citiesFile = 'cities500.txt';
+export const reverseGeocodeMaxDistance = 25_000;
export const MOBILE_REDIRECT = 'app.immich:///oauth-callback';
export const LOGIN_URL = '/auth/login?autoLaunch=0';
diff --git a/server/src/repositories/map.repository.ts b/server/src/repositories/map.repository.ts
index d1f60791c3..7f6e2a967a 100644
--- a/server/src/repositories/map.repository.ts
+++ b/server/src/repositories/map.repository.ts
@@ -5,7 +5,7 @@ import { InjectKysely } from 'nestjs-kysely';
import { createReadStream, existsSync } from 'node:fs';
import { readFile } from 'node:fs/promises';
import readLine from 'node:readline';
-import { citiesFile } from 'src/constants';
+import { citiesFile, reverseGeocodeMaxDistance } from 'src/constants';
import { DummyValue, GenerateSql } from 'src/decorators';
import { AssetVisibility, SystemMetadataKey } from 'src/enum';
import { ConfigRepository } from 'src/repositories/config.repository';
@@ -145,7 +145,7 @@ export class MapRepository {
.selectFrom('geodata_places')
.selectAll()
.where(
- sql`earth_box(ll_to_earth_public(${point.latitude}, ${point.longitude}), 25000)`,
+ sql`earth_box(ll_to_earth_public(${point.latitude}, ${point.longitude}), ${reverseGeocodeMaxDistance})`,
'@>',
sql`ll_to_earth_public(latitude, longitude)`,
)
@@ -165,8 +165,8 @@ export class MapRepository {
return { country, state, city };
}
- this.logger.warn(
- `Response from database for reverse geocoding latitude: ${point.latitude}, longitude: ${point.longitude} was null`,
+ this.logger.log(
+ `Empty response from database for city reverse geocoding lat: ${point.latitude}, lon: ${point.longitude}. Likely cause: no nearby large populated place (500+ within ${reverseGeocodeMaxDistance / 1000}km). Falling back to country boundaries.`,
);
const ne_response = await this.db
@@ -177,8 +177,8 @@ export class MapRepository {
.executeTakeFirst();
if (!ne_response) {
- this.logger.warn(
- `Response from database for natural earth reverse geocoding latitude: ${point.latitude}, longitude: ${point.longitude} was null`,
+ this.logger.log(
+ `Empty response from database for natural earth country reverse geocoding lat: ${point.latitude}, lon: ${point.longitude}`,
);
return { country: null, state: null, city: null };