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

Scripts: add error message in case of incorrect ID

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-05-23 18:03:07 +02:00
parent 29db2664c3
commit 55cc06db1a
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/generateLayerOverview.ts
View file

@ -203,6 +203,9 @@ class LayerBuilder extends Conversion<object, Map<string, LayerConfigJson>> {
context = context.inOperation("building Layer " + id).enters("layer", id) context = context.inOperation("building Layer " + id).enters("layer", id)
const config = this._layerConfigJsons.get(id) const config = this._layerConfigJsons.get(id)
if (config.id !== id) {
context.err("Invalid ID: expected", id, "but got", id)
}
const prepped = this.prepareLayer.convert(config, context) const prepped = this.prepareLayer.convert(config, context)
this._loadedIds.add(id) this._loadedIds.add(id)
this._desugaringState.sharedLayers.set(id, prepped) this._desugaringState.sharedLayers.set(id, prepped)
@ -760,11 +763,15 @@ class LayerOverviewUtils extends Script {
ScriptUtils.erasableLog( ScriptUtils.erasableLog(
`Parsing layerConfig ${i + 1}/${allPaths.length}: ${path} ` `Parsing layerConfig ${i + 1}/${allPaths.length}: ${path} `
) )
const expectedId = path.match(/.*\/([a-z_0-9]+).json/)[1]
try { try {
const data = JSON.parse(readFileSync(path, "utf8")) const data = JSON.parse(readFileSync(path, "utf8"))
results.push(data) results.push(data)
if (data.id !== expectedId) {
throw "Wrong ID or location for file " + path + "; expected " + expectedId + " but got " + data.id
}
} catch (e) { } catch (e) {
throw "Could not parse layer file " + path throw "Could not parse layer file " + path + " due to " + e
} }
} }