From c1c2390694ab145524dae96cd7dff5a866e4b865 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 22 Oct 2024 14:21:27 +0200 Subject: [PATCH] Fix: don't index 'all_streets' --- assets/themes/street_lighting/street_lighting.json | 1 + scripts/osm2pgsql/osmPoiDatabase.ts | 2 -- scripts/osm2pgsql/tilecountServer.ts | 5 ++++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/themes/street_lighting/street_lighting.json b/assets/themes/street_lighting/street_lighting.json index b752665758..cf30292943 100644 --- a/assets/themes/street_lighting/street_lighting.json +++ b/assets/themes/street_lighting/street_lighting.json @@ -201,6 +201,7 @@ }, { "id": "all_streets", + "isCounted": false, "name": { "en": "All streets", "nl": "Alle straten", diff --git a/scripts/osm2pgsql/osmPoiDatabase.ts b/scripts/osm2pgsql/osmPoiDatabase.ts index d03406ae3f..4789f75876 100644 --- a/scripts/osm2pgsql/osmPoiDatabase.ts +++ b/scripts/osm2pgsql/osmPoiDatabase.ts @@ -69,8 +69,6 @@ export class OsmPoiDatabase { await metaclient.connect() try { const meta = await metaclient.query("SELECT datname FROM pg_database") - let latest: string = undefined - let latestDate: Date = new Date(0) const dbs: string[] = [] for (const row of meta.rows) { const name: string = row["datname"] diff --git a/scripts/osm2pgsql/tilecountServer.ts b/scripts/osm2pgsql/tilecountServer.ts index 15a35c86c5..5e0b24c69c 100644 --- a/scripts/osm2pgsql/tilecountServer.ts +++ b/scripts/osm2pgsql/tilecountServer.ts @@ -64,7 +64,10 @@ class TileCountServer extends Script { handle: async () => { const layers = await tcs.getLayers() const meta = await tcs.getMeta() - return JSON.stringify({ meta, layers: Array.from(layers) }) + const mostSuitable = await tcs.findSuitableDatabases() + return JSON.stringify({ meta, + suitableDatabases: mostSuitable, + layers: Array.from(layers) }) }, }, {