ilja_space/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Chore: housekeeping

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-06-19 21:55:28 +02:00
parent 4c001d718e
commit 6f7d94890a
29 changed files with 430 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/generateIncludedImages.ts
View file

@ -41,18 +41,19 @@ function genImages(dryrun = false) {
const svgBody = svg
.replace(
"<svg ",
"<svg {...$$$$restProps} on:click on:mouseover on:mouseenter on:mouseleave on:keydown on:focus ",
"<svg {...$$$$restProps} on:click on:mouseover on:mouseenter on:mouseleave on:keydown on:focus "
)
.replace(/\\"/g, "\"")
.replace(/\\"/g, '"')
.replace(/(rgb\(0%,0%,0%\)|#000000|#000)/g, "{color}")
const hasColor = svgBody.indexOf("{color}") >= 0
const svelteCode =
["<script>",
"export " + (hasColor ? "let" : "const") + " color = \"#000000\"",
"</script>",
svgBody].join("\n")
const svelteCode = [
"<script>",
"export " + (hasColor ? "let" : "const") + ' color = "#000000"',
"</script>",
svgBody,
].join("\n")
fs.writeFileSync("./src/assets/svg/" + nameUC + ".svelte", svelteCode, "utf8")
}

58
scripts/generateLayouts.ts
View file

@ -300,37 +300,37 @@ class GenerateLayouts extends Script {
if (url.endsWith(".pmtiles")) {
continue
}
try{
console.log("Downloading ", url)
const styleSpec = await Utils.downloadJsonCached(url, 1000 * 120, {
Origin: "https://mapcomplete.org",
})
for (const key of Object.keys(styleSpec?.["sources"] ?? {})) {
const url = styleSpec["sources"][key].url
if (!url) {
continue
}
let urlClipped = url
if (url.indexOf("?") > 0) {
urlClipped = url?.substring(0, url.indexOf("?"))
}
console.log("Source url ", key, url)
urls.push(url)
if (urlClipped.endsWith(".json")) {
const tileInfo = await Utils.downloadJsonCached(url, 1000 * 120, {
Origin: "https://mapcomplete.org",
})
urls.push(tileInfo["tiles"] ?? [])
try {
console.log("Downloading ", url)
const styleSpec = await Utils.downloadJsonCached(url, 1000 * 120, {
Origin: "https://mapcomplete.org",
})
for (const key of Object.keys(styleSpec?.["sources"] ?? {})) {
const url = styleSpec["sources"][key].url
if (!url) {
continue
}
let urlClipped = url
if (url.indexOf("?") > 0) {
urlClipped = url?.substring(0, url.indexOf("?"))
}
console.log("Source url ", key, url)
urls.push(url)
if (urlClipped.endsWith(".json")) {
const tileInfo = await Utils.downloadJsonCached(url, 1000 * 120, {
Origin: "https://mapcomplete.org",
})
urls.push(tileInfo["tiles"] ?? [])
}
}
urls.push(...(styleSpec["tiles"] ?? []))
urls.push(styleSpec["sprite"])
urls.push(styleSpec["glyphs"])
} catch (e) {
console.error(
"ERROR: could not download a resource, some sprites might not be whitelisted and thus not load"
)
}
urls.push(...(styleSpec["tiles"] ?? []))
urls.push(styleSpec["sprite"])
urls.push(styleSpec["glyphs"])
}catch (e) {
console.error("ERROR: could not download a resource, some sprites might not be whitelisted and thus not load")
}
}
}
this.eliUrlsCached = urls

4
scripts/osm2pgsql/osmPoiDatabase.ts
View file

@ -130,9 +130,9 @@ export class OsmPoiDatabase {
}
async deleteAllButLatest() {
const dbs = await this.findSuitableDatabases() ?? []
const dbs = (await this.findSuitableDatabases()) ?? []
console.log(["Found databases:", ...dbs].join("\n "))
console.log("Database ",dbs.at(-1)," is the latest database and will be preserved")
console.log("Database ", dbs.at(-1), " is the latest database and will be preserved")
for (let i = 0; i < dbs.length - 1; i++) {
await this.deleteDatabase(dbs[i])
}