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

Add the possibility to snap onto another layer with imports, add location confirm on input, add metalayer exporting all nodes, various fixes

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-31 02:08:39 +01:00
parent f5d6441b70
commit 23ae9d39c8
24 changed files with 807 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Models/ThemeConfig/LayerConfig.ts
View file

@ -15,6 +15,8 @@ import LineRenderingConfig from "./LineRenderingConfig";
import PointRenderingConfigJson from "./Json/PointRenderingConfigJson";
import LineRenderingConfigJson from "./Json/LineRenderingConfigJson";
import {TagRenderingConfigJson} from "./Json/TagRenderingConfigJson";
import {UIEventSource} from "../../Logic/UIEventSource";
import BaseUIElement from "../../UI/BaseUIElement";
export default class LayerConfig extends WithContextLoader {
@ -59,11 +61,11 @@ export default class LayerConfig extends WithContextLoader {
this.id = json.id;
if (json.source === undefined) {
throw "Layer " + this.id + " does not define a source section ("+context+")"
throw "Layer " + this.id + " does not define a source section (" + context + ")"
}
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+")"
throw "Layer " + this.id + " does not define a osmTags in the source section - these should always be present, even for geojson layers (" + context + ")"
}
@ -262,6 +264,15 @@ export default class LayerConfig extends WithContextLoader {
}
}
public defaultIcon() : BaseUIElement | undefined{
const mapRendering = this.mapRendering.filter(r => r.location.has("point"))[0]
if (mapRendering === undefined) {
return undefined
}
const defaultTags = new UIEventSource(TagUtils.changeAsProperties(this.source.osmTags.asChange({id: "node/-1"})))
return mapRendering.GenerateLeafletStyle(defaultTags, false, {noSize: true}).html
}
public ExtractLayerTagRenderings(json: LayerConfigJson): TagRenderingConfig[] {
if (json.tagRenderings === undefined) {
@ -358,7 +369,6 @@ export default class LayerConfig extends WithContextLoader {
}
public CustomCodeSnippets(): string[] {
if (this.calculatedTags === undefined) {
return [];
@ -366,7 +376,6 @@ export default class LayerConfig extends WithContextLoader {
return this.calculatedTags.map((code) => code[1]);
}
public ExtractImages(): Set<string> {
const parts: Set<string>[] = [];
parts.push(...this.tagRenderings?.map((tr) => tr.ExtractImages(false)));