KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-10-29 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): reverse geocoding crash loop (#2489)

Browse Source
This commit is contained in:
Jason Rasmussen
2023-05-20 22:39:12 -04:00
committed by GitHub
parent f984be8ea0
commit e028cf9002
5 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/libs/domain/src/metadata/geocoding.repository.ts
View File

@@ -14,4 +14,5 @@ export interface ReverseGeocodeResult {
export interface IGeocodingRepository {
init(): Promise<void>;
reverseGeocode(point: GeoPoint): Promise<ReverseGeocodeResult>;
deleteCache(): Promise<void>;
}

18
server/libs/infra/src/repositories/geocoding.repository.ts
View File

@@ -1,8 +1,9 @@
import { GeoPoint, ReverseGeocodeResult } from '@app/domain';
import { GeoPoint, IGeocodingRepository, ReverseGeocodeResult } from '@app/domain';
import { localGeocodingConfig } from '@app/infra';
import { Injectable, Logger } from '@nestjs/common';
import { rm } from 'fs/promises';
import { getName } from 'i18n-iso-countries';
import geocoder, { AddressObject, InitOptions } from 'local-reverse-geocoder';
import geocoder, { AddressObject } from 'local-reverse-geocoder';
import { promisify } from 'util';
export interface AdminCode {
@@ -16,15 +17,22 @@ export type GeoData = AddressObject & {
admin2Code?: AdminCode | string;
};
const init = (options: InitOptions): Promise<void> => new Promise<void>((resolve) => geocoder.init(options, resolve));
const init = (): Promise<void> => new Promise<void>((resolve) => geocoder.init(localGeocodingConfig, resolve));
const lookup = promisify<GeoPoint[], number, AddressObject[][]>(geocoder.lookUp).bind(geocoder);
@Injectable()
export class GeocodingRepository {
export class GeocodingRepository implements IGeocodingRepository {
private logger = new Logger(GeocodingRepository.name);
async init(): Promise<void> {
await init(localGeocodingConfig);
await init();
}
async deleteCache() {
const dumpDirectory = localGeocodingConfig.dumpDirectory;
if (dumpDirectory) {
await rm(dumpDirectory, { recursive: true, force: true });
}
}
async reverseGeocode(point: GeoPoint): Promise<ReverseGeocodeResult> {