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

Add picnic tables

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-02-26 17:22:24 +01:00
parent a91c3fde69
commit 3a944889b5
7 changed files with 523 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Customizations/SharedLayers.ts → Customizations/AllKnownLayers.ts
View file

@ -19,10 +19,13 @@ import * as surveillance_camera from "../assets/layers/surveillance_cameras/surv
import * as toilets from "../assets/layers/toilets/toilets.json"
import * as bookcases from "../assets/layers/public_bookcases/public_bookcases.json"
import * as tree_nodes from "../assets/layers/trees/tree_nodes.json"
import * as benches from "../assets/layers/benches/benches.json"
import * as benches_at_pt from "../assets/layers/benches/benches_at_pt.json"
import * as picnic_tables from "../assets/layers/benches/picnic_tables.json"
import LayerConfig from "./JSON/LayerConfig";
import {LayerConfigJson} from "./JSON/LayerConfigJson";
export default class SharedLayers {
export default class AllKnownLayers {
private static sharedLayersListRaw : LayerConfigJson[] = [
@ -46,17 +49,20 @@ export default class SharedLayers {
toilets,
bookcases,
surveillance_camera,
tree_nodes
tree_nodes,
benches,
benches_at_pt,
picnic_tables
];
// Must be below the list...
public static sharedLayers: Map<string, LayerConfig> = SharedLayers.getSharedLayers();
public static sharedLayersJson: Map<string, any> = SharedLayers.getSharedLayersJson();
public static sharedLayers: Map<string, LayerConfig> = AllKnownLayers.getSharedLayers();
public static sharedLayersJson: Map<string, any> = AllKnownLayers.getSharedLayersJson();
private static getSharedLayers(): Map<string, LayerConfig> {
const sharedLayers = new Map<string, LayerConfig>();
for (const layer of SharedLayers.sharedLayersListRaw) {
for (const layer of AllKnownLayers.sharedLayersListRaw) {
const parsed = new LayerConfig(layer, "shared_layers")
sharedLayers.set(layer.id, parsed);
sharedLayers[layer.id] = parsed;
@ -66,7 +72,7 @@ export default class SharedLayers {
private static getSharedLayersJson(): Map<string, any> {
const sharedLayers = new Map<string, any>();
for (const layer of SharedLayers.sharedLayersListRaw) {
for (const layer of AllKnownLayers.sharedLayersListRaw) {
sharedLayers.set(layer.id, layer);
sharedLayers[layer.id] = layer;
}

8
Customizations/AllKnownLayouts.ts
View file

@ -23,7 +23,7 @@ import * as playgrounds from "../assets/themes/playgrounds/playgrounds.json"
import * as bicycle_lib from "../assets/themes/bicycle_library/bicycle_library.json"
import LayerConfig from "./JSON/LayerConfig";
import LayoutConfig from "./JSON/LayoutConfig";
import SharedLayers from "./SharedLayers";
import AllKnownLayers from "./AllKnownLayers";
export class AllKnownLayouts {
@ -39,7 +39,7 @@ export class AllKnownLayouts {
console.log("The current date is ",date,", which means we remember our dead")
// Around Halloween/Fiesta de muerte/Allerzielen, we remember the dead
layout.layers.push(
SharedLayers.sharedLayers.get("ghost_bike")
AllKnownLayers.sharedLayers.get("ghost_bike")
);
}
@ -81,9 +81,9 @@ export class AllKnownLayouts {
for (let i = 0; i < layout.layers.length; i++) {
let layer = layout.layers[i];
if (typeof (layer) === "string") {
layer = layout.layers[i] = SharedLayers.sharedLayers.get(layer);
layer = layout.layers[i] = AllKnownLayers.sharedLayers.get(layer);
if(layer === undefined){
console.log("Defined layers are ", SharedLayers.sharedLayers.keys())
console.log("Defined layers are ", AllKnownLayers.sharedLayers.keys())
throw `Layer ${layer} was not found or defined - probably a type was made`
}
}

8
Customizations/JSON/LayoutConfig.ts
View file

@ -2,7 +2,7 @@ import {Translation} from "../../UI/i18n/Translation";
import TagRenderingConfig from "./TagRenderingConfig";
import LayerConfig from "./LayerConfig";
import {LayoutConfigJson} from "./LayoutConfigJson";
import SharedLayers from "../SharedLayers";
import AllKnownLayers from "../AllKnownLayers";
import SharedTagRenderings from "../SharedTagRenderings";
import {Utils} from "../../Utils";
@ -81,8 +81,8 @@ export default class LayoutConfig {
this.defaultBackgroundId = json.defaultBackgroundId;
this.layers = json.layers.map((layer, i) => {
if (typeof layer === "string") {
if (SharedLayers.sharedLayers[layer] !== undefined) {
return SharedLayers.sharedLayers[layer];
if (AllKnownLayers.sharedLayers[layer] !== undefined) {
return AllKnownLayers.sharedLayers[layer];
} else {
throw "Unkown fixed layer " + layer;
}
@ -91,7 +91,7 @@ export default class LayoutConfig {
if (layer.builtin !== undefined) {
// @ts-ignore
const name = layer.builtin;
const shared = SharedLayers.sharedLayersJson[name];
const shared = AllKnownLayers.sharedLayersJson[name];
if (shared === undefined) {
throw "Unkown fixed layer " + name;
}