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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-19 03:02:08 +02:00
commit 2c480eb9d8
28 changed files with 984 additions and 1324 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/generateLayerOverview.ts
View file

@ -118,6 +118,9 @@ class LayerOverviewUtils {
if (themeFile["units"] !== undefined) {
themeErrorCount.push("The theme " + themeFile.id + " has units defined - these should be defined on the layer instead. (Hint: use overrideAll: { '+units': ... }) ")
}
if (themeFile["roamingRenderings"] !== undefined) {
themeErrorCount.push("Theme " + themeFile.id + " contains an old 'roamingRenderings'. Use an 'overrideAll' instead")
}
for (const layer of themeFile.layers) {
if (typeof layer === "string") {
if (!knownLayerIds.has(layer)) {
@ -213,4 +216,4 @@ class LayerOverviewUtils {
}
}
new LayerOverviewUtils().main(process.argv)
new LayerOverviewUtils().main(process.argv)

7
scripts/lint.ts
View file

@ -63,6 +63,11 @@ for (const themeFile of themeFiles) {
// @ts-ignore
fixLayerConfig(layerConfig)
}
if(themeFile.parsed["roamingRenderings"] !== undefined && themeFile.parsed["roamingRenderings"].length == 0){
delete themeFile.parsed["roamingRenderings"]
}
writeFileSync(themeFile.path, JSON.stringify(themeFile.parsed, null, " "))
}
//*/
//*/