Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Make tilecountserver accept arguments

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-03-19 00:12:12 +01:00
parent da1eca797c
commit caaaff45da
1 changed files with 66 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

118
scripts/osm2pgsql/tilecountServer.ts
View file

@ -1,6 +1,7 @@
import { Client } from "pg" import { Client } from "pg"
import { Tiles } from "../../src/Models/TileRange" import { Tiles } from "../../src/Models/TileRange"
import { Server } from "../server" import { Server } from "../server"
import Script from "../Script"
/** /**
* Just the OSM2PGSL default database * Just the OSM2PGSL default database
@ -114,7 +115,7 @@ class OsmPoiDatabase {
meta[property] = value meta[property] = value
} }
this.metaCacheDate = now this.metaCacheDate = now
this.metaCache = <any>meta this.metaCache = <PoiDatabaseMeta> meta
return this.metaCache return this.metaCache
} }
} }
@ -160,58 +161,71 @@ class CachedSqlCount {
} }
} }
const connectionString = "postgresql://user:password@localhost:5444/osm-poi"
const tcs = new OsmPoiDatabase(connectionString)
const withCache = new CachedSqlCount(tcs, 14 * 60 * 60 * 24)
new Server(2345, { ignorePathPrefix: ["summary"] }, [
{
mustMatch: "status.json",
mimetype: "application/json",
handle: async (path: string) => {
const layers = await tcs.getLayers()
const meta = await tcs.getMeta()
return JSON.stringify({ meta, layers: Array.from(layers) })
},
},
{
mustMatch: /[a-zA-Z0-9+_-]+\/[0-9]+\/[0-9]+\/[0-9]+\.json/,
mimetype: "application/json", // "application/vnd.geo+json",
async handle(path) {
const [layers, z, x, y] = path.split(".")[0].split("/")
let sum = 0 class TileCountServer extends Script {
let properties: Record<string, number> = {} constructor() {
const availableLayers = await tcs.getLayers() super("Starts the tilecount server which calculates summary for a given tile, based on the database. Usage: [db-connection-string] [port=2345]")
let latSum = 0 }
let lonSum = 0
for (const layer of layers.split("+")) {
if (!availableLayers.has(layer)) {
continue
}
const count = await withCache.getCount(
layer,
Tiles.tile_index(Number(z), Number(x), Number(y))
)
properties[layer] = count.count async main(args: string[]): Promise<void> {
if (count.count !== 0) { const connectionString = args[0] ?? "postgresql://user:password@localhost:5444/osm-poi"
latSum += count.lat * count.count const port = Number(args[1] ?? 2345)
lonSum += count.lon * count.count const tcs = new OsmPoiDatabase(connectionString)
sum += count.count const withCache = new CachedSqlCount(tcs, 14 * 60 * 60 * 24)
} new Server(port, { ignorePathPrefix: ["summary"] }, [
} {
mustMatch: "status.json",
mimetype: "application/json",
handle: async () => {
const layers = await tcs.getLayers()
const meta = await tcs.getMeta()
return JSON.stringify({ meta, layers: Array.from(layers) })
},
},
{
mustMatch: /[a-zA-Z0-9+_-]+\/[0-9]+\/[0-9]+\/[0-9]+\.json/,
mimetype: "application/json", // "application/vnd.geo+json",
async handle(path) {
const [layers, z, x, y] = path.split(".")[0].split("/")
properties["lon"] = lonSum / sum let sum = 0
properties["lat"] = latSum / sum const properties: Record<string, number> = {}
const availableLayers = await tcs.getLayers()
let latSum = 0
let lonSum = 0
for (const layer of layers.split("+")) {
if (!availableLayers.has(layer)) {
continue
}
const count = await withCache.getCount(
layer,
Tiles.tile_index(Number(z), Number(x), Number(y))
)
return JSON.stringify({ ...properties, total: sum }) properties[layer] = count.count
}, if (count.count !== 0) {
}, latSum += count.lat * count.count
]) lonSum += count.lon * count.count
console.log( sum += count.count
">>>", }
await tcs.getCount("drinking_water", [ }
[3.194358020772171, 51.228073636083394],
[3.2839964396059145, 51.172701162680994], properties["lon"] = lonSum / sum
]) properties["lat"] = latSum / sum
)
return JSON.stringify({ ...properties, total: sum })
},
},
])
console.log(
">>>",
await tcs.getCount("drinking_water", [
[3.194358020772171, 51.228073636083394],
[3.2839964396059145, 51.172701162680994],
])
)
}
}
new TileCountServer().run()