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

Various fixes for bot

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-05-21 01:02:03 +02:00
parent 25c33d557d
commit bd03a5a76a
3 changed files with 84 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Customizations/AllKnownLayouts.ts
View file

@ -17,33 +17,39 @@ export class AllKnownLayouts {
// Must be below the list...
private static sharedLayers: Map<string, LayerConfig> = AllKnownLayouts.getSharedLayers();
public static AllPublicLayers() {
public static AllPublicLayers(options?: {
includeInlineLayers:true | boolean
}) {
const allLayers: LayerConfig[] = []
const seendIds = new Set<string>()
AllKnownLayouts.sharedLayers.forEach((layer, key) => {
seendIds.add(key)
allLayers.push(layer)
})
const publicLayouts = AllKnownLayouts.layoutsList.filter(l => !l.hideFromOverview)
for (const layout of publicLayouts) {
if (layout.hideFromOverview) {
continue
}
for (const layer of layout.layers) {
if (seendIds.has(layer.id)) {
if (options?.includeInlineLayers ?? true) {
const publicLayouts = AllKnownLayouts.layoutsList.filter(l => !l.hideFromOverview)
for (const layout of publicLayouts) {
if (layout.hideFromOverview) {
continue
}
seendIds.add(layer.id)
allLayers.push(layer)
}
for (const layer of layout.layers) {
if (seendIds.has(layer.id)) {
continue
}
seendIds.add(layer.id)
allLayers.push(layer)
}
}
}
return allLayers
}
public static themesUsingLayer(id: string, publicOnly = true): LayoutConfig[] {
return AllKnownLayouts.layoutsList.filter(l => !(publicOnly && l.hideFromOverview) && l.id !== "personal" && l.layers.some(layer => layer.id === id))
}
/**
* Generates documentation for the layers.
* Inline layers are included (if the theme is public)
@ -70,7 +76,7 @@ export class AllKnownLayouts {
if (builtinLayerIds.has(layer.id)) {
continue
}
if(layer.source.geojsonSource !== undefined){
if (layer.source.geojsonSource !== undefined) {
// Not an OSM-source
continue
}
@ -184,6 +190,17 @@ export class AllKnownLayouts {
}
public static GenerateDocumentationForTheme(theme: LayoutConfig): BaseUIElement {
return new Combine([
new Title(new Combine([theme.title, "(", theme.id + ")"]), 2),
theme.description,
"This theme contains the following layers:",
new List(theme.layers.map(l => l.id)),
"Available languages:",
new List(theme.language)
])
}
private static getSharedLayers(): Map<string, LayerConfig> {
const sharedLayers = new Map<string, LayerConfig>();
for (const layer of known_themes.layers) {
@ -229,16 +246,5 @@ export class AllKnownLayouts {
}
return dict;
}
public static GenerateDocumentationForTheme(theme: LayoutConfig): BaseUIElement{
return new Combine([
new Title(new Combine([theme.title, "(",theme.id+")"]), 2),
theme.description,
"This theme contains the following layers:",
new List(theme.layers.map(l => l.id)),
"Available languages:",
new List(theme.language)
])
}
}