forked from MapComplete/MapComplete
		
	Chore: small cleanups, formatting
This commit is contained in:
		
							parent
							
								
									dce838b130
								
							
						
					
					
						commit
						35cbaa7c33
					
				
					 7 changed files with 24 additions and 43 deletions
				
			
		| 
						 | 
					@ -28,7 +28,6 @@ export class AllKnownLayoutsLazy {
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                const defaultLayer = AllSharedLayers.getSharedLayersConfigs().get(layerId)
 | 
					                const defaultLayer = AllSharedLayers.getSharedLayersConfigs().get(layerId)
 | 
				
			||||||
                if (defaultLayer === undefined) {
 | 
					                if (defaultLayer === undefined) {
 | 
				
			||||||
                    console.error("Could not find builtin layer", layerId)
 | 
					 | 
				
			||||||
                    continue
 | 
					                    continue
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                themeConfigJson.layers.push(defaultLayer)
 | 
					                themeConfigJson.layers.push(defaultLayer)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,39 +4,11 @@ export class ThemeMetaTagging {
 | 
				
			||||||
   public static readonly themeName = "usersettings"
 | 
					   public static readonly themeName = "usersettings"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   public metaTaggging_for_usersettings(feat: {properties: Record<string, string>}) {
 | 
					   public metaTaggging_for_usersettings(feat: {properties: Record<string, string>}) {
 | 
				
			||||||
        Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_md", () =>
 | 
					      Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_md', () => feat.properties._description.match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)?.at(1) ) 
 | 
				
			||||||
            feat.properties._description
 | 
					      Utils.AddLazyProperty(feat.properties, '_d', () => feat.properties._description?.replace(/</g,'<')?.replace(/>/g,'>') ?? '' ) 
 | 
				
			||||||
                .match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)
 | 
					      Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_a', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.href.match(/mastodon|en.osm.town/) !== null)[0]?.href   }) (feat)  ) 
 | 
				
			||||||
                ?.at(1)
 | 
					      Utils.AddLazyProperty(feat.properties, '_mastodon_link', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.getAttribute("rel")?.indexOf('me') >= 0)[0]?.href})(feat)  ) 
 | 
				
			||||||
        )
 | 
					      Utils.AddLazyProperty(feat.properties, '_mastodon_candidate', () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a ) 
 | 
				
			||||||
        Utils.AddLazyProperty(
 | 
					      feat.properties['__current_backgroun'] = 'initial_value'
 | 
				
			||||||
            feat.properties,
 | 
					 | 
				
			||||||
            "_d",
 | 
					 | 
				
			||||||
            () => feat.properties._description?.replace(/</g, "<")?.replace(/>/g, ">") ?? ""
 | 
					 | 
				
			||||||
        )
 | 
					 | 
				
			||||||
        Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_a", () =>
 | 
					 | 
				
			||||||
            ((feat) => {
 | 
					 | 
				
			||||||
                const e = document.createElement("div")
 | 
					 | 
				
			||||||
                e.innerHTML = feat.properties._d
 | 
					 | 
				
			||||||
                return Array.from(e.getElementsByTagName("a")).filter(
 | 
					 | 
				
			||||||
                    (a) => a.href.match(/mastodon|en.osm.town/) !== null
 | 
					 | 
				
			||||||
                )[0]?.href
 | 
					 | 
				
			||||||
            })(feat)
 | 
					 | 
				
			||||||
        )
 | 
					 | 
				
			||||||
        Utils.AddLazyProperty(feat.properties, "_mastodon_link", () =>
 | 
					 | 
				
			||||||
            ((feat) => {
 | 
					 | 
				
			||||||
                const e = document.createElement("div")
 | 
					 | 
				
			||||||
                e.innerHTML = feat.properties._d
 | 
					 | 
				
			||||||
                return Array.from(e.getElementsByTagName("a")).filter(
 | 
					 | 
				
			||||||
                    (a) => a.getAttribute("rel")?.indexOf("me") >= 0
 | 
					 | 
				
			||||||
                )[0]?.href
 | 
					 | 
				
			||||||
            })(feat)
 | 
					 | 
				
			||||||
        )
 | 
					 | 
				
			||||||
        Utils.AddLazyProperty(
 | 
					 | 
				
			||||||
            feat.properties,
 | 
					 | 
				
			||||||
            "_mastodon_candidate",
 | 
					 | 
				
			||||||
            () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a
 | 
					 | 
				
			||||||
        )
 | 
					 | 
				
			||||||
        feat.properties["__current_backgroun"] = "initial_value"
 | 
					 | 
				
			||||||
   }
 | 
					   }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -32,7 +32,7 @@ export abstract class Conversion<TIn, TOut> {
 | 
				
			||||||
        this.name = name
 | 
					        this.name = name
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public convertStrict(json: TIn, context?: ConversionContext): TOut {
 | 
					    public convertStrict(json: NonNullable<TIn>, context?: ConversionContext): TOut {
 | 
				
			||||||
        context ??= ConversionContext.construct([], [])
 | 
					        context ??= ConversionContext.construct([], [])
 | 
				
			||||||
        context = context.inOperation(this.name)
 | 
					        context = context.inOperation(this.name)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -276,7 +276,7 @@ export class Fuse<T> extends DesugaringStep<T> {
 | 
				
			||||||
                "This fused pipeline of the following steps: " +
 | 
					                "This fused pipeline of the following steps: " +
 | 
				
			||||||
                steps.map((s) => s.name).join(", "),
 | 
					                steps.map((s) => s.name).join(", "),
 | 
				
			||||||
            Utils.Dedup([].concat(...steps.map((step) => step.modifiedAttributes))),
 | 
					            Utils.Dedup([].concat(...steps.map((step) => step.modifiedAttributes))),
 | 
				
			||||||
            "Fuse(" + steps.map((s) => s.name).join(", ") + ")"
 | 
					            "Fuse"
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
        this.steps = Utils.NoNull(steps)
 | 
					        this.steps = Utils.NoNull(steps)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1000,4 +1000,11 @@ export class PrepareLayer extends Fuse<LayerConfigJson> {
 | 
				
			||||||
            new PruneFilters()
 | 
					            new PruneFilters()
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    convert(json: LayerConfigJson, context: ConversionContext): LayerConfigJson {
 | 
				
			||||||
 | 
					        if(json === undefined || json === null){
 | 
				
			||||||
 | 
					            throw "Error: prepareLayer got null"
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return super.convert(json, context)
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -472,7 +472,7 @@ class PreparePersonalTheme extends DesugaringStep<ThemeConfigJson> {
 | 
				
			||||||
class WarnForUnsubstitutedLayersInTheme extends DesugaringStep<ThemeConfigJson> {
 | 
					class WarnForUnsubstitutedLayersInTheme extends DesugaringStep<ThemeConfigJson> {
 | 
				
			||||||
    constructor() {
 | 
					    constructor() {
 | 
				
			||||||
        super(
 | 
					        super(
 | 
				
			||||||
            "Generates a warning if a theme uses an unsubstituted layer",
 | 
					            "Generates a warning if a theme uses an inline layer; we recommend splitting of all layers in separate files",
 | 
				
			||||||
            ["layers"],
 | 
					            ["layers"],
 | 
				
			||||||
            "WarnForUnsubstitutedLayersInTheme"
 | 
					            "WarnForUnsubstitutedLayersInTheme"
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,6 +41,9 @@ export interface AutoAction extends SpecialVisualization {
 | 
				
			||||||
    ): Promise<void>
 | 
					    ): Promise<void>
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * @deprecated
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
class ApplyButton extends UIElement {
 | 
					class ApplyButton extends UIElement {
 | 
				
			||||||
    private readonly icon: string
 | 
					    private readonly icon: string
 | 
				
			||||||
    private readonly text: string
 | 
					    private readonly text: string
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1 +1 @@
 | 
				
			||||||
{"properties":{"name":"Bing Maps Aerial","id":"Bing","url":"https://ecn.t0.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=14875&pr=odbl&n=f","type":"bing","category":"photo","min_zoom":1,"max_zoom":22},"type":"Feature","geometry":null}
 | 
					{"properties":{"name":"Bing Maps Aerial","id":"Bing","url":"https://ecn.t2.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=14880&pr=odbl&n=f","type":"bing","category":"photo","min_zoom":1,"max_zoom":22},"type":"Feature","geometry":null}
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue