diff --git a/Customizations/AllKnownLayouts.ts b/Customizations/AllKnownLayouts.ts
index c58a235..2d6c975 100644
--- a/Customizations/AllKnownLayouts.ts
+++ b/Customizations/AllKnownLayouts.ts
@@ -1,7 +1,6 @@
import {LayerDefinition} from "./LayerDefinition";
import {Layout} from "./Layout";
import {StreetWidth} from "./Layouts/StreetWidth";
-import {MetaMap} from "./Layouts/MetaMap";
import {FromJSON} from "./JSON/FromJSON";
import * as bookcases from "../assets/themes/bookcases/Bookcases.json";
import * as aed from "../assets/themes/aed/aed.json";
@@ -11,7 +10,8 @@ import * as cyclestreets from "../assets/themes/cyclestreets/cyclestreets.json";
import * as ghostbikes from "../assets/themes/ghostbikes/ghostbikes.json"
import * as cyclofix from "../assets/themes/cyclofix/cyclofix.json"
import * as buurtnatuur from "../assets/themes/buurtnatuur/buurtnatuur.json"
-
+import * as nature from "../assets/themes/nature/nature.json"
+import * as maps from "../assets/themes/maps/maps.json"
import {PersonalLayout} from "../Logic/PersonalLayout";
export class AllKnownLayouts {
@@ -45,6 +45,7 @@ export class AllKnownLayouts {
public static layoutsList: Layout[] = [
new PersonalLayout(),
// new Natuurpunt(),
+ AllKnownLayouts.GenerateCycloFix(),
AllKnownLayouts.GenerateBuurtNatuur(),
FromJSON.LayoutFromJSON(bookcases),
FromJSON.LayoutFromJSON(aed),
@@ -52,9 +53,9 @@ export class AllKnownLayouts {
FromJSON.LayoutFromJSON(artworks),
FromJSON.LayoutFromJSON(cyclestreets),
FromJSON.LayoutFromJSON(ghostbikes),
- AllKnownLayouts.GenerateCycloFix(),
+ FromJSON.LayoutFromJSON(nature),
+ FromJSON.LayoutFromJSON(maps),
- new MetaMap(),
new StreetWidth(),
];
diff --git a/Customizations/JSON/FromJSON.ts b/Customizations/JSON/FromJSON.ts
index cdeb066..03a427a 100644
--- a/Customizations/JSON/FromJSON.ts
+++ b/Customizations/JSON/FromJSON.ts
@@ -19,6 +19,7 @@ import * as nature_reserve from "../../assets/layers/nature_reserve/nature_reser
import * as bike_cafes from "../../assets/layers/bike_cafe/bike_cafes.json"
import * as cycling_themed_objects from "../../assets/layers/cycling_themed_object/cycling_themed_objects.json"
import * as bike_shops from "../../assets/layers/bike_shop/bike_shop.json"
+import * as maps from "../../assets/layers/maps/maps.json"
import {Utils} from "../../Utils";
import ImageCarouselWithUploadConstructor from "../../UI/Image/ImageCarouselWithUpload";
import {ImageCarouselConstructor} from "../../UI/Image/ImageCarousel";
@@ -45,7 +46,8 @@ export class FromJSON {
FromJSON.Layer(nature_reserve),
FromJSON.Layer(bike_cafes),
FromJSON.Layer(cycling_themed_objects),
- FromJSON.Layer(bike_shops)
+ FromJSON.Layer(bike_shops),
+ FromJSON.Layer(maps)
];
for (const layer of sharedLayersList) {
diff --git a/Customizations/Layers/Map.ts b/Customizations/Layers/Map.ts
deleted file mode 100644
index 91afd7a..0000000
--- a/Customizations/Layers/Map.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import {LayerDefinition} from "../LayerDefinition";
-import FixedText from "../Questions/FixedText";
-import ImageCarouselWithUploadConstructor from "../../UI/Image/ImageCarouselWithUpload";
-import {Tag} from "../../Logic/Tags";
-import {TagRenderingOptions} from "../TagRenderingOptions";
-
-export class Map extends LayerDefinition {
- constructor() {
- super("map");
- this.name = "Map";
- this.title = new FixedText("Map");
- this.minzoom = 12;
-
- this.overpassFilter = new Tag("information", "map");
- this.presets = [{
- title: "Map",
- tags: [new Tag("tourism", "information"), new Tag("information", "map")]
- }];
-
-
- const isOsmSource = new Tag("map_source", "OpenStreetMap");
-
-
- this.style = (properties) => {
- let icon = "assets/map.svg";
- if (isOsmSource.matchesProperties(properties)) {
- icon = "assets/osm-logo-white-bg.svg";
-
- const attr = properties["map_source:attribution"];
- if(attr == "sticker"){
- icon = "assets/map-stickered.svg"
- }else if(attr == "no"){
- icon = "assets/osm-logo-buggy-attr.svg"
- }
-
- }
-
- return {
- color: "#000000",
- icon: {
- iconUrl: icon,
- iconSize: [50, 50]
- }
- };
- }
-
-
- this.elementsToShow = [
-
- new ImageCarouselWithUploadConstructor(),
-
- new TagRenderingOptions({
- question: "Is this map based on OpenStreetMap?",
- mappings: [
- {
- k: isOsmSource,
- txt: "This map is based on OpenStreetMap"
- },
- ],
- freeform: {
- key: "map_source",
- renderTemplate: "The map data is based on {map_source}",
- template: "The map data is based on $$$"
- }
- }),
- new TagRenderingOptions({
- question: "Is the attribution present?",
- mappings: [
- {
- k: new Tag("map_source:attribution", "yes"),
- txt: "OpenStreetMap is clearly attributed, including the ODBL-license"
- },
- {
- k: new Tag("map_source:attribution", "incomplete"),
- txt: "OpenStreetMap is clearly attributed, but the license is not mentioned"
- },
- {
- k: new Tag("map_source:attribution", "sticker"),
- txt: "OpenStreetMap wasn't mentioned, but someone put an OpenStreetMap-sticker on it"
- },
- {
- k: new Tag("map_source:attribution", "no"),
- txt: "There is no attribution at all"
- },
- {
- k: new Tag("map_source:attribution", "none"),
- txt: "There is no attribution at all"
- }
- ]
- }).OnlyShowIf(new Tag("map_source", "OpenStreetMap"))
- ]
-
-
- }
-}
\ No newline at end of file
diff --git a/Customizations/Layouts/MetaMap.ts b/Customizations/Layouts/MetaMap.ts
deleted file mode 100644
index 6a4b7d3..0000000
--- a/Customizations/Layouts/MetaMap.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {Layout} from "../Layout";
-import {Map} from "../Layers/Map";
-
-export class MetaMap extends Layout{
- constructor() {
- super( "metamap",
- ["en"],
- "Open Map Map",
- [new Map()],
- 1,
- 0,
- 0,
-
-
- " Open Map Map
\n" +
- "This map is a map of physical maps, as known by OpenStreetMap.");
- this.icon = "./assets/osm-logo-buggy-attr.svg"
- }
-}
\ No newline at end of file
diff --git a/Customizations/Questions/DescriptionQuestion.ts b/Customizations/Questions/DescriptionQuestion.ts
deleted file mode 100644
index 2abd9e9..0000000
--- a/Customizations/Questions/DescriptionQuestion.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {TagRenderingOptions} from "../TagRenderingOptions";
-
-
-export class DescriptionQuestion extends TagRenderingOptions{
-
- constructor(category: string) {
- super({
- question: "Zijn er bijzonderheden die we moeten weten over dit "+category+"?
" +
- "Je hoeft niet te herhalen wat je net hebt aangeduid.
" +
- "Een naam wordt in de volgende stap gevraagd.
" +
- "Voel je vrij om dit veld over te slaan.",
- freeform:{
- key:"description:0",
- renderTemplate: "{description:0}",
- template: "$$$"
- },
- priority: 14
- });
- }
-
-}
\ No newline at end of file
diff --git a/Customizations/Questions/NameQuestion.ts b/Customizations/Questions/NameQuestion.ts
deleted file mode 100644
index a8301a4..0000000
--- a/Customizations/Questions/NameQuestion.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * There are two ways to ask for names:
- * One is a big 'name-question', the other is the 'edit name' in the title.
- * THis one is the big question
- */
-import {And, Tag} from "../../Logic/Tags";
-import {TagRenderingOptions} from "../TagRenderingOptions";
-
-export class NameQuestion extends TagRenderingOptions {
-
- constructor() {
- super({
- priority: 10, // Move this last on the priority list, in order to prevent ppl to enter access restrictions and descriptions
- question: "Wat is de officiële naam van dit gebied?
" +
- "Zelf een naam bedenken wordt afgeraden.
" +
- "Een beschrijving van het gebied geven kan in een volgende stap.
" +
- "",
- freeform: {
- key: "name",
- template: "De naam is $$$",
- renderTemplate: "Dit gebied heet {name}",
- placeholder: "",
- extraTags: new Tag("noname", "")
- },
- mappings: [
- {k: new And([new Tag("name", ""), new Tag("noname", "yes")]), txt: "Dit gebied heeft geen naam"},
- ]
- });
- }
-
-}
\ No newline at end of file
diff --git a/Customizations/Questions/OperatorTag.ts b/Customizations/Questions/OperatorTag.ts
deleted file mode 100644
index b3fcb75..0000000
--- a/Customizations/Questions/OperatorTag.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {Tag} from "../../Logic/Tags";
-import {TagRenderingOptions} from "../TagRenderingOptions";
-
-
-export class OperatorTag extends TagRenderingOptions {
-
-
- constructor() {
- super({
- question: "Wie beheert dit gebied?",
- freeform: {
- key: "operator",
- template: "Beheer door $$$",
- renderTemplate: "Beheer door {operator}",
- placeholder: "organisatie"
- },
- mappings: [
- {k: new Tag("operator", "Natuurpunt"), txt: "Natuurpunt"},
- {k: new Tag("operator", "Agentschap Natuur en Bos"), txt: "het Agentschap Natuur en Bos (ANB)"},
- {k: new Tag("operator", "private"), txt: "Beheer door een privépersoon"}
- ]
- });
- }
-
-}
\ No newline at end of file
diff --git a/UI/i18n/Translation.ts b/UI/i18n/Translation.ts
index 7980825..ed15631 100644
--- a/UI/i18n/Translation.ts
+++ b/UI/i18n/Translation.ts
@@ -93,7 +93,6 @@ export default class Translation extends UIElement {
const tr = {};
for (const lng in this.translations) {
let txt = this.translations[lng];
- console.log(txt)
txt = txt.replace(/\..*/, "");
txt = Utils.EllipsesAfter(txt, 255);
tr[lng] = txt;
diff --git a/assets/camera-centered.svg b/assets/camera-centered.svg
deleted file mode 100644
index 2ead819..0000000
--- a/assets/camera-centered.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/layers/maps/maps.json b/assets/layers/maps/maps.json
new file mode 100644
index 0000000..e2e5f87
--- /dev/null
+++ b/assets/layers/maps/maps.json
@@ -0,0 +1,181 @@
+{
+ "id": "maps",
+ "name": {
+ "en": "Maps",
+ "nl": "Kaarten"
+ },
+ "minzoom": 12,
+ "overpassTags": {
+ "or": [
+ "tourism=map",
+ "information=map"
+ ]
+ },
+ "title": {
+ "render": {
+ "en": "Map",
+ "nl": "Kaart"
+ }
+ },
+ "description": {
+ "en": "",
+ "nl": ""
+ },
+ "tagRenderings": [
+ {
+ "question": {
+ "en": "On which data is this map based?",
+ "nl": "Op welke data is deze kaart gebaseerd?"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "map_source=OpenStreetMap",
+ "not:map_source="
+ ]
+ },
+ "then": {
+ "en": "This map is based on OpenStreetMap",
+ "nl": "Deze kaart is gebaseerd op OpenStreetMap"
+ }
+ }
+ ],
+ "freeform": {
+ "key": "map_source"
+ },
+ "render": {
+ "en": "This map is based on {map_source}",
+ "nl": "Deze kaart is gebaseerd op {map_source}"
+ }
+ },
+ {
+ "question": {
+ "en": "Is the OpenStreetMap-attribution given?",
+ "nl": "Is de attributie voor OpenStreetMap aanwezig?"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "map_source:attribution=yes"
+ ]
+ },
+ "then": {
+ "en": "OpenStreetMap is clearly attributed, including the ODBL-license",
+ "nl": "De OpenStreetMap-attributie is duidelijk aangegeven, zelf met vermelding van \"ODBL\" "
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "map_source:attribution=incomplete"
+ ]
+ },
+ "then": {
+ "en": "OpenStreetMap is clearly attributed, but the license is not mentioned",
+ "nl": "OpenStreetMap is duidelijk aangegeven, maar de licentievermelding ontbreekt"
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "map_source:attribution=sticker"
+ ]
+ },
+ "then": {
+ "en": "OpenStreetMap wasn't mentioned, but someone put an OpenStreetMap-sticker on it",
+ "nl": "OpenStreetMap was oorspronkelijk niet aangeduid, maar iemand plaatste er een sticker"
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "map_source:attribution=none"
+ ]
+ },
+ "then": {
+ "en": "There is no attribution at all",
+ "nl": "Er is geen attributie"
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "map_source:attribution=no"
+ ]
+ },
+ "then": {
+ "nl": "Er is geen attributie",
+ "en": "There is no attribution at all"
+ },
+ "hideInAnswer": true
+ }
+ ],
+ "condition": {
+ "or": [
+ "map_source~(O|)pen(S|s)treet(M|m)ap",
+ "map_source=osm",
+ "map_source=OSM"
+ ]
+ }
+ }
+ ],
+ "hideUnderlayingFeaturesMinPercentage": 0,
+ "icon": {
+ "render": "./assets/layers/maps/map.svg",
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "map_source=OpenStreetMap",
+ "map_source:attribution=sticker"
+ ]
+ },
+ "then": "./assets/layers/maps/map-stickered.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "map_source=OpenStreetMap",
+ "map_source:attribution=yes"
+ ]
+ },
+ "then": "./assets/layers/maps/osm-logo-white-bg.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "map_source=OpenStreetMap"
+ ]
+ },
+ "then": "./assets/layers/maps/osm-logo-buggy-attr.svg"
+ }
+ ]
+ },
+ "width": {
+ "render": "8"
+ },
+ "iconSize": {
+ "render": "50,50,center"
+ },
+ "color": {
+ "render": "#00f"
+ },
+ "presets": [
+ {
+ "tags": [
+ "tourism=map"
+ ],
+ "title": {
+ "en": "Map",
+ "nl": "Kaart"
+ },
+ "description": {
+ "en": "Add a missing map",
+ "nl": "Voeg een ontbrekende kaart toe"
+ }
+ }
+ ],
+ "wayHandling": 2
+}
\ No newline at end of file
diff --git a/assets/nature/ANB.jpg b/assets/layers/nature_reserve/ANB.jpg
similarity index 100%
rename from assets/nature/ANB.jpg
rename to assets/layers/nature_reserve/ANB.jpg
diff --git a/assets/nature/Natuurpunt.jpg b/assets/layers/nature_reserve/Natuurpunt.jpg
similarity index 100%
rename from assets/nature/Natuurpunt.jpg
rename to assets/layers/nature_reserve/Natuurpunt.jpg
diff --git a/assets/layers/nature_reserve/groen_logo.svg b/assets/layers/nature_reserve/groen_logo.svg
new file mode 100644
index 0000000..542370e
--- /dev/null
+++ b/assets/layers/nature_reserve/groen_logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json
index ff3e077..62f72c7 100644
--- a/assets/layers/nature_reserve/nature_reserve.json
+++ b/assets/layers/nature_reserve/nature_reserve.json
@@ -1,9 +1,9 @@
{
- "id": "nature_reserve_simple",
+ "id": "nature_reserves",
"name": {
- "nl": "Layer"
+ "nl": "Natuurgebied"
},
- "minzoom": 10,
+ "minzoom": 12,
"overpassTags": {
"or": [
"leisure=nature_reserve",
@@ -11,7 +11,20 @@
]
},
"title": {
+ "render": {
+ "nl": "Natuurgebied"
+ },
"mappings": [
+ {
+ "if": {
+ "and": [
+ "name:nl~"
+ ]
+ },
+ "then": {
+ "nl": "{name:nl}"
+ }
+ },
{
"if": {
"and": [
@@ -19,228 +32,33 @@
]
},
"then": {
- "nl": "Natuurgebied {name}"
+ "nl": "{name}"
}
}
- ],
- "render": {
- "nl": "Natuurgebied"
- }
- },
- "description": {
- "nl": "Een natuurreservaat is een gebied dat wordt beheerd door Natuurpunt, ANB of een privépersoon zodat deze biodiversiteit bevordert. "
- },
- "tagRenderings": [
- {
- "question": {
- "nl": "Is dit gebied vrij toegankelijk?"
- },
- "freeform": {
- "key": "access:description",
- "addExtraTags": []
- },
- "render": {
- "nl": "De toegankelijkheid van dit gebied is {access:description}"
- },
- "mappings": [
- {
- "if": {
- "and": [
- "access=yes",
- "fee="
- ]
- },
- "then": {
- "nl": "Publiek toegankelijk"
- }
- },
- {
- "if": {
- "and": [
- "access=no",
- "fee="
- ]
- },
- "then": {
- "nl": "Niet publiek toegankelijk"
- }
- },
- {
- "if": {
- "and": [
- "access=guided",
- "fee="
- ]
- },
- "then": {
- "nl": "Enkel met gids of op activiteit"
- }
- },
- {
- "if": {
- "and": [
- "access=private",
- "fee="
- ]
- },
- "then": {
- "nl": "Niet toegankelijk privégebied"
- }
- },
- {
- "if": {
- "and": [
- "access=permissive",
- "fee="
- ]
- },
- "then": {
- "nl": "Toegankelijk, maar het is privégebied"
- }
- },
- {
- "if": {
- "and": [
- "access=yes",
- "fee=yes"
- ]
- },
- "then": {
- "nl": "Toegankelijk mits betaling"
- }
- }
- ]
- },
- {
- "render": {
- "nl": "Beheer door {operator}"
- },
- "question": {
- "nl": "Wie beheert dit natuurgebied?"
- },
- "freeform": {
- "key": "operator"
- },
- "mappings": [
- {
- "if": {
- "and": [
- "operator=Natuurpunt"
- ]
- },
- "then": {
- "nl": "Beheer door Natuurpunt"
- }
- },
- {
- "if": {
- "and": [
- "operator=Agenstchap Natuur en Bos"
- ]
- },
- "then": {
- "nl": "Beheer door het Agentschap Natuur en Bos (ANB)"
- }
- }
- ]
- },
- {
- "question": {
- "nl": "Wat is de officiële naam van dit natuurgebied?
Sommige gebieden hebben geen naam"
- },
- "freeform": {
- "key": "name",
- "addExtraTags": [
- "noname="
- ]
- },
- "render": {
- "nl": "Dit gebied heet {name}"
- },
- "mappings": [
- {
- "if": {
- "and": [
- "noname=yes",
- "name="
- ]
- },
- "then": {
- "nl": "Dit gebied heeft geen naam"
- }
- }
- ],
- "condition": {
- "and": [
- "name:nl="
- ]
- }
- },
- {
- "render": {
- "nl": "De naam van dit gebied is {name:nl}"
- },
- "freeform": {
- "key": "name:nl"
- },
- "question": {
- "nl": "Wat is de Nederlandstalige naam van dit gebied?"
- },
- "condition": {
- "and": [
- "name:nl~*"
- ]
- }
- },
- {
- "render": {
- "nl": "Meer uitleg:
{description:0}"
- },
- "question": {
- "nl": "Zijn er nog opmerkingen of vermeldenswaardigheden?"
- },
- "freeform": {
- "key": "description:0"
- }
- }
- ],
- "icon": {
- "render": "$circle"
- },
- "width": {
- "render": "3"
- },
- "iconSize": {
- "render": "40,40,center"
- },
- "color": {
- "render": "#c90014",
- "mappings": [
- {
- "if": {
- "and": [
- "name~*",
- "operator~*",
- "access~*"
- ]
- },
- "then": "#37c65b"
- },
- {
- "if": {
- "and": [
- "name~*",
- "access~*"
- ]
- },
- "then": "#c98d00"
- }
]
},
+ "description": {
+ "nl": "Een natuurgebied is een gebied waar actief ruimte gemaakt word voor de natuur. Typisch zijn deze in beheer van Natuurpunt of het Agentschap Natuur en Bos of zijn deze erkend door de overheid."
+ },
+ "tagRenderings": [],
+ "hideUnderlayingFeaturesMinPercentage": 10,
+ "icon": {
+ "render": "./assets/themes/buurtnatuur/nature_reserve.svg"
+ },
+ "width": {
+ "render": "5"
+ },
+ "iconSize": {
+ "render": "50,50,center"
+ },
+ "color": {
+ "render": "#3c3"
+ },
"presets": [
{
"tags": [
- "leisure=nature_reserve"
+ "leisure=nature_reserve",
+ "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
],
"title": {
"nl": "Natuurreservaat"
@@ -249,6 +67,6 @@
"nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt"
}
}
- ],
- "hideUnderlayingFeaturesMinPercentage": 10
-}
\ No newline at end of file
+ ]
+}
+
\ No newline at end of file
diff --git a/assets/layers/nature_reserve/nature_reserve.svg b/assets/layers/nature_reserve/nature_reserve.svg
new file mode 100644
index 0000000..298bdf6
--- /dev/null
+++ b/assets/layers/nature_reserve/nature_reserve.svg
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/assets/nature/info.png b/assets/layers/tourism_information/info.png
similarity index 100%
rename from assets/nature/info.png
rename to assets/layers/tourism_information/info.png
diff --git a/assets/map-stickered.svg b/assets/map-stickered.svg
deleted file mode 100644
index ecb56ec..0000000
--- a/assets/map-stickered.svg
+++ /dev/null
@@ -1,13030 +0,0 @@
-
-
-
-
diff --git a/assets/nature/birdhideMapnik.svg b/assets/nature/birdhideMapnik.svg
deleted file mode 100644
index 5f1c248..0000000
--- a/assets/nature/birdhideMapnik.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/nature/birdshelter.inkscape.svg b/assets/nature/birdshelter.inkscape.svg
deleted file mode 100644
index 03bd90c..0000000
--- a/assets/nature/birdshelter.inkscape.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
diff --git a/assets/nature/natuurpunt_logo_zwart.png b/assets/nature/natuurpunt_logo_zwart.png
deleted file mode 100644
index 41dfab4..0000000
Binary files a/assets/nature/natuurpunt_logo_zwart.png and /dev/null differ
diff --git a/assets/nature/shelter.svg b/assets/nature/shelter.svg
deleted file mode 100644
index 57eb695..0000000
--- a/assets/nature/shelter.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/osm-logo-buggy-attr.svg b/assets/osm-logo-buggy-attr.svg
deleted file mode 100644
index 26fc478..0000000
--- a/assets/osm-logo-buggy-attr.svg
+++ /dev/null
@@ -1,3293 +0,0 @@
-
-
-
-
diff --git a/assets/osm-logo-white-bg.svg b/assets/osm-logo-white-bg.svg
deleted file mode 100644
index 5bdad17..0000000
--- a/assets/osm-logo-white-bg.svg
+++ /dev/null
@@ -1,3282 +0,0 @@
-
-
-
-
diff --git a/assets/map.svg b/assets/themes/maps/logo.svg
similarity index 100%
rename from assets/map.svg
rename to assets/themes/maps/logo.svg
diff --git a/assets/themes/maps/maps.json b/assets/themes/maps/maps.json
new file mode 100644
index 0000000..f7be086
--- /dev/null
+++ b/assets/themes/maps/maps.json
@@ -0,0 +1,31 @@
+{
+ "id": "maps",
+ "title": {
+ "en": "Information boards",
+ "nl": "Informatieborden en kaarten"
+ },
+ "shortDescription": {
+ "en": "A map of maps and information boards",
+ "nl": "Een kaart met kaarten en informatieborden"
+ },
+ "description": {
+ "en": "On this map you can find all maps OpenStreetMap knows.
If a map is missing, you can easily map this map on OpenStreetMap.",
+ "nl": "Op deze kaart kan je alle kaarten zien die OpenStreetMap kent.
Ontbreekt er een kaart, dan kan je die kaart hier ook gemakelijk aan deze kaart toevoegen."
+ },
+ "language": [
+ "en",
+ "nl"
+ ],
+ "maintainer": "MapComplete",
+ "icon": "./assets/themes/maps/logo.svg",
+ "version": "0",
+ "startLat": 0,
+ "startLon": 0,
+ "startZoom": 1,
+ "widenFactor": 0.05,
+ "socialImage": "",
+ "layers": [
+ "maps"
+ ],
+ "roamingRenderings": []
+}
\ No newline at end of file
diff --git a/assets/themes/nature/logo.svg b/assets/themes/nature/logo.svg
new file mode 100644
index 0000000..0489c2e
--- /dev/null
+++ b/assets/themes/nature/logo.svg
@@ -0,0 +1,65 @@
+
+
diff --git a/assets/themes/nature/nature.json b/assets/themes/nature/nature.json
new file mode 100644
index 0000000..31169b1
--- /dev/null
+++ b/assets/themes/nature/nature.json
@@ -0,0 +1,30 @@
+{
+ "id": "nature",
+ "title": {
+ "nl": "De Natuur in"
+ },
+ "shortDescription": {
+ "nl": "Deze kaart bevat informatie voor natuurliefhebbers"
+ },
+ "description": {
+ "nl": "Op deze kaart vind je informatie voor natuurliefhebbers, zoals info over het natuurgebied waar je inzit, vogelkijkhutten, informatieborden, ..."
+ },
+ "language": [
+ "nl"
+ ],
+ "maintainer": "",
+ "icon": "./assets/themes/nature/logo.svg",
+ "version": "0",
+ "startLat": 51.20875,
+ "startLon": 3.22435,
+ "startZoom": 12,
+ "widenFactor": 0.05,
+ "socialImage": "",
+ "layers": [
+ "drinking_water",
+ "birdhides",
+ "maps",
+ "nature_reserves"
+ ],
+ "roamingRenderings": []
+}
\ No newline at end of file
diff --git a/assets/wikimedia-commons.svg b/assets/wikimedia-commons.svg
deleted file mode 100644
index 6496dec..0000000
--- a/assets/wikimedia-commons.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
\ No newline at end of file
diff --git a/wikiIndex b/wikiIndex
index d1a8bd1..4975257 100644
--- a/wikiIndex
+++ b/wikiIndex
@@ -20,6 +20,26 @@
|
}}
+{{Software
+|name = cyclofix
+|author = MapComplete
+|web = https://pietervdvn.github.io/MapComplete/cyclofix.html
+|repo = https://github.com/pietervdvn/MapComplete
+|platform = web
+|code = Typescript;HTML;CSS
+|languages = en;nl;fr;gl;de
+|genre = display;editor
+|screenshot = MapComplete_Screenshot.png
+|description = A MapComplete theme: The goal of this map is to present cyclists with an easy-to-use solution to find the appropriate infrastructure for their needs
+|map = yes
+|findLocation = yes
+|findNearbyPOI = yes
+|addPOI = yes
+|editPOI = yes
+|editTags = yes
+|
+}}
+
{{Software
|name = buurtnatuur
|author = Pieter Vander Vennet
@@ -161,16 +181,16 @@
}}
{{Software
-|name = cyclofix
-|author = MapComplete
-|web = https://pietervdvn.github.io/MapComplete/cyclofix.html
+|name = nature
+|author =
+|web = https://pietervdvn.github.io/MapComplete/nature.html
|repo = https://github.com/pietervdvn/MapComplete
|platform = web
|code = Typescript;HTML;CSS
-|languages = en;nl;fr;gl;de
+|languages = nl
|genre = display;editor
|screenshot = MapComplete_Screenshot.png
-|description = A MapComplete theme: The goal of this map is to present cyclists with an easy-to-use solution to find the appropriate infrastructure for their needs
+|description = A MapComplete theme: Deze kaart bevat informatie voor natuurliefhebbers
|map = yes
|findLocation = yes
|findNearbyPOI = yes
@@ -181,16 +201,16 @@
}}
{{Software
-|name = metamap
-|author = MapComplete builtin
-|web = https://pietervdvn.github.io/MapComplete/metamap.html
+|name = maps
+|author = MapComplete
+|web = https://pietervdvn.github.io/MapComplete/maps.html
|repo = https://github.com/pietervdvn/MapComplete
|platform = web
|code = Typescript;HTML;CSS
-|languages = en
+|languages = en;nl
|genre = display;editor
|screenshot = MapComplete_Screenshot.png
-|description = A MapComplete theme:
+|description = A MapComplete theme: A map of maps and information boards
|map = yes
|findLocation = yes
|findNearbyPOI = yes