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

Add check: layer and theme ids must be lowercase and match [a-z_-]*

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-12-30 22:36:34 +01:00
parent 9916371122
commit 444f0bc47c
7 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Models/ThemeConfig/LayerConfig.ts
View file

@ -73,7 +73,13 @@ export default class LayerConfig extends WithContextLoader {
if (json.source.osmTags === undefined) {
throw "Layer " + this.id + " does not define a osmTags in the source section - these should always be present, even for geojson layers (" + context + ")"
}
if(json.id.toLowerCase() !== json.id){
throw `${context}: The id of a layer should be lowercase: ${json.id}`
}
if(json.id.match(/[a-z0-9-_]/) == null){
throw `${context}: The id of a layer should match [a-z0-9-_]*: ${json.id}`
}
this.maxAgeOfCache = json.source.maxCacheAge ?? 24 * 60 * 60 * 30

6
Models/ThemeConfig/LayoutConfig.ts
View file

@ -58,6 +58,12 @@ export default class LayoutConfig {
constructor(json: LayoutConfigJson, official = true, context?: string) {
this.official = official;
this.id = json.id;
if(json.id.toLowerCase() !== json.id){
throw "The id of a theme should be lowercase: "+json.id
}
if(json.id.match(/[a-z0-9-_]/) == null){
throw "The id of a theme should match [a-z0-9-_]*: "+json.id
}
context = (context ?? "") + "." + this.id;
this.maintainer = json.maintainer;
this.credits = json.credits;