Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-05-31 04:05:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove natural earth countries enity (#17445)

Browse Source
This commit is contained in:
Jason Rasmussen 2025-04-08 00:15:16 -04:00 committed by GitHub
parent 96ed9a8c4a
commit b352cf3336
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/entities/natural-earth-countries.entity.ts
View File

@ -1,7 +0,0 @@
export class NaturalEarthCountriesTempEntity {
id!: number;
admin!: string;
admin_a3!: string;
type!: string;
coordinates!: string;
}

7
server/src/repositories/map.repository.ts
View File

@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { getName } from 'i18n-iso-countries'; import { getName } from 'i18n-iso-countries';
import { Expression, Kysely, sql, SqlBool } from 'kysely'; import { Expression, Insertable, Kysely, sql, SqlBool } from 'kysely';
import { InjectKysely } from 'nestjs-kysely'; import { InjectKysely } from 'nestjs-kysely';
import { createReadStream, existsSync } from 'node:fs'; import { createReadStream, existsSync } from 'node:fs';
import { readFile } from 'node:fs/promises'; import { readFile } from 'node:fs/promises';
@ -8,7 +8,6 @@ import readLine from 'node:readline';
import { citiesFile } from 'src/constants'; import { citiesFile } from 'src/constants';
import { DB, GeodataPlaces, NaturalearthCountries } from 'src/db'; import { DB, GeodataPlaces, NaturalearthCountries } from 'src/db';
import { DummyValue, GenerateSql } from 'src/decorators'; import { DummyValue, GenerateSql } from 'src/decorators';
import { NaturalEarthCountriesTempEntity } from 'src/entities/natural-earth-countries.entity';
import { SystemMetadataKey } from 'src/enum'; import { SystemMetadataKey } from 'src/enum';
import { ConfigRepository } from 'src/repositories/config.repository'; import { ConfigRepository } from 'src/repositories/config.repository';
import { LoggingRepository } from 'src/repositories/logging.repository'; import { LoggingRepository } from 'src/repositories/logging.repository';
@ -182,11 +181,11 @@ export class MapRepository {
return; return;
} }
const entities: Omit<NaturalEarthCountriesTempEntity, 'id'>[] = []; const entities: Insertable<NaturalearthCountries>[] = [];
for (const feature of geoJSONData.features) { for (const feature of geoJSONData.features) {
for (const entry of feature.geometry.coordinates) { for (const entry of feature.geometry.coordinates) {
const coordinates: number[][][] = feature.geometry.type === 'MultiPolygon' ? entry[0] : entry; const coordinates: number[][][] = feature.geometry.type === 'MultiPolygon' ? entry[0] : entry;
const featureRecord: Omit<NaturalEarthCountriesTempEntity, 'id'> = { const featureRecord: Insertable<NaturalearthCountries> = {
admin: feature.properties.ADMIN, admin: feature.properties.ADMIN,
admin_a3: feature.properties.ADM0_A3, admin_a3: feature.properties.ADM0_A3,
type: feature.properties.TYPE, type: feature.properties.TYPE,