Natuurpunt tweaks

Models/ThemeConfig/Conversion/Conversion.ts

@@ -10,10 +10,12 @@ export interface DesugaringContext {
 export abstract class Conversion<TIn, TOut> {
     public readonly modifiedAttributes: string[];
     protected readonly doc: string;
+    public readonly name: string
     
-    constructor(doc: string, modifiedAttributes: string[] = []) {
+    constructor(doc: string, modifiedAttributes: string[] = [], name?: string) {
         this.modifiedAttributes = modifiedAttributes;
         this.doc = doc + "\n\nModified attributes are\n" + modifiedAttributes.join(", ");
+        this.name = name ?? this.constructor.name
     }
 
     public static strict<T>(fixed: { errors: string[], warnings: string[], result?: T }): T {
@@ -83,7 +85,8 @@ export class OnEveryConcat<X, T> extends DesugaringStep<T> {
     private readonly step: Conversion<X, X[]>;
 
     constructor(key: string, step: Conversion<X, X[]>) {
-        super(`Applies ${step.constructor.name} onto every object of the list \`${key}\`. The results are concatenated and used as new list`, [key]);
+        super(`Applies ${step.constructor.name} onto every object of the list \`${key}\`. The results are concatenated and used as new list`, [key], 
+            "OnEveryConcat("+step.name+")");
         this.step = step;
         this.key = key;
     }
@@ -128,7 +131,7 @@ export class Fuse<T> extends DesugaringStep<T> {
         const warnings = []
         for (let i = 0; i < this.steps.length; i++) {
             const step = this.steps[i];
-            let r = step.convert(state, json, context + "(fusion " + this.constructor.name + "." + i + ")")
+            let r = step.convert(state, json, "While running step " +step.name + ": " + context)
             errors.push(...r.errors)
             warnings.push(...r.warnings)
             json = r.result

Models/ThemeConfig/Conversion/PrepareTheme.ts

@@ -43,7 +43,7 @@ class SubstituteLayer extends Conversion<(string | LayerConfigJson), LayerConfig
             for (const name of names) {
                 const found = Utils.Clone(state.sharedLayers.get(name))
                 if (found === undefined) {
-                    errors.push(context + ": The layer with name " + json + " was not found as a builtin layer")
+                    errors.push(context + ": The layer with name " + JSON.stringify(json) + " was not found as a builtin layer. Known builtin layers are "+Array.from(state.sharedLayers.keys()).join(",")+"\n    For more information, see https://github.com/pietervdvn/MapComplete/blob/develop/Docs/BuiltinLayers.md" )
                     continue
                 }
                 if (json["override"]["tagRenderings"] !== undefined && (found["tagRenderings"] ?? []).length > 0) {
@@ -81,6 +81,7 @@ class AddDefaultLayers extends DesugaringStep<LayoutConfigJson> {
         const errors = []
         const warnings = []
         json.layers = [...json.layers]
+        const alreadyLoaded = new Set(json.layers.map(l => l["id"]))
 
         if (json.id === "personal") {
             json.layers = []
@@ -105,6 +106,10 @@ class AddDefaultLayers extends DesugaringStep<LayoutConfigJson> {
             if (v === undefined) {
                 errors.push("Default layer " + layerName + " not found")
             }
+            if(alreadyLoaded.has(v.id)){
+                warnings.push("Layout "+context+" already has a layer with name "+v.id+"; skipping inclusion of this builtin layer")
+                continue
+            }
             json.layers.push(v)
         }
 
@@ -131,6 +136,7 @@ class AddImportLayers extends DesugaringStep<LayoutConfigJson> {
         json.layers = [...json.layers]
 
 
+        if(json.enableNoteImports ?? true) {
             const creator = new CreateNoteImportLayer()
             for (let i1 = 0; i1 < allLayers.length; i1++) {
                 const layer = allLayers[i1];
@@ -167,7 +173,7 @@ class AddImportLayers extends DesugaringStep<LayoutConfigJson> {
                     errors.push("Could not generate an import-layer for " + layer.id + " due to " + e)
                 }
             }
-
+        }
 
         return {
             errors,

Models/ThemeConfig/Json/LayoutConfigJson.ts

@@ -249,6 +249,7 @@ export interface LayoutConfigJson {
     enableDownload?: boolean;
     enablePdfDownload?: boolean;
     enableIframePopout?: true | boolean;
+    enableNoteImports?: true | boolean;
 
     /**
      * Set one or more overpass URLs to use for this theme..

Models/ThemeConfig/LayoutConfig.ts

@@ -73,6 +73,7 @@ export default class LayoutConfig {
         } else {
             this.language = json.language;
         }
+        this.language = json.mustHaveLanguage ?? this.language
         {
             if (this.language.length == 0) {
                 throw `No languages defined. Define at least one language. (${context}.languages)`

State.ts

@@ -12,6 +12,7 @@ export default class State extends FeaturePipelineState {
 
     constructor(layoutToUse: LayoutConfig) {
         super(layoutToUse)
+        window["mapcomplete_state"]= this;
     }
 
 

UI/BigComponents/FilterView.ts

@@ -166,7 +166,7 @@ export default class FilterView extends VariableUiElement {
         }
 
         return new Combine(toShow)
-            .SetClass("flex flex-col ml-8 bg-gray-300 rounded-xl p-2")
+            .SetClass("flex flex-col p-2 ml-0 pl-12 bg-gray-200 pt-0 border-b-2 border-detail mb-4")
 
     }
 
@@ -291,6 +291,8 @@ export default class FilterView extends VariableUiElement {
             return FilterView.createCheckboxFilter(filterConfig)
         }
 
-        return FilterView.createMultiFilter(filterConfig)
+        const filter = FilterView.createMultiFilter(filterConfig)
+        filter[0].SetClass("pl-2")
+        return filter
     }
 }

UI/BigComponents/LeftControls.ts

@@ -89,7 +89,7 @@ export default class LeftControls extends Combine {
 
         const toggledFilter = new Toggle(
             new ScrollableFullScreen(
-                () => Translations.t.general.layerSelection.title.Clone(),
+                () => Translations.t.general.layerSelection.title.Clone().SetClass("self-center"),
                 () =>
                     new FilterView(state.filteredLayers, state.overlayToggles).SetClass(
                         "block p-1"

assets/layers/gps_track/gps_track.json

@@ -25,7 +25,10 @@
       "render": "{clear_location_history()}"
     }
   ],
-  "name": "Your track",
+  "name": {
+    "en":"Your travelled track",
+    "nl": "Jouw afgelegde route"
+  },
   "mapRendering": [
     {
       "width": 3,

assets/themes/natuurpunt/bench.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs9" />
   <sodipodi:namedview
@@ -22,13 +22,13 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="4.1922078"
+     inkscape:zoom="2.42402"
-     inkscape:cx="120.93866"
+     inkscape:cx="123.76136"
-     inkscape:cy="60.707869"
+     inkscape:cy="81.269958"
      inkscape:current-layer="svg5" />
   <g
      id="surface1"
-     transform="translate(-71.5,55)">
+     transform="matrix(0.70668415,0,0,0.70668415,-13.133011,56.371481)">
     <path
        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="m 294.69141,64.351562 h 14.07812 V 19.46875 h 17.71094 V 7.148438 h -21.44922 v -11 h 10.23047 v -17.046876 h -10.23047 v -13.75 h 10.23047 V -55 H 82.5 v 20.351562 h 11 v 13.75 h -11 v 16.828126 h 11 v 11 h -22 V 19.46875 H 89.210938 V 64.351562 H 103.28906 V 19.46875 h 191.40235 z m -193.92969,-99 h 196.45703 v 13.75 H 100.76172 Z m 0,41.796876 v -11 h 196.45703 v 11 z m 0,0"

assets/themes/natuurpunt/birdhide.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs9" />
   <sodipodi:namedview
@@ -22,13 +22,13 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="4.4833333"
+     inkscape:zoom="1.1083646"
-     inkscape:cx="103.27138"
+     inkscape:cx="-45.111509"
-     inkscape:cy="68.141264"
+     inkscape:cy="231.87316"
      inkscape:current-layer="svg5" />
   <g
      id="surface1"
-     transform="translate(-76.823531,63.500601)">
+     transform="matrix(0.66705268,0,0,0.66705268,-15.994249,66.007095)">
     <path
        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="m 281.33984,5.308594 -1.26172,-1.886719 -33.65625,-50.402344 c -5.6914,-11.542969 -18.53515,-17.695312 -31.09375,-14.898437 -12.55859,2.800781 -21.57812,13.824218 -21.82812,26.6875 0.0234,1.996094 0.23437,3.984375 0.62891,5.941406 v 3.421875 -4.863281 l -6.30079,4.050781 v 5.402344 h -9.98828 V -27 l -6.30078,-4.050781 V -26.191406 -29.25 c 0.39844,-1.957031 0.60938,-3.945312 0.63281,-5.941406 0.19141,-13.238282 -8.94921,-24.792969 -21.8789,-27.648438 -12.9336,-2.859375 -26.08984,3.769532 -31.49219,15.859375 L 85.5,3.421875 84.238281,5.308594 c -10.625,16.757812 -9.765625,38.34375 2.15625,54.203125 11.921875,15.863281 32.417969,22.6875 51.464839,17.140625 19.05079,-5.550782 32.67969,-22.308594 34.21875,-42.09375 v -2.96875 c 0,0 0,-0.71875 0,-1.078125 0,-0.363281 0,-1.710938 0,-2.523438 v -14.9375 L 180,6.03125 v -9.542969 h 5.39844 V 6.03125 l 7.92187,7.019531 v 14.9375 c 0,0.8125 0,1.621094 0,2.523438 0,0.898437 0,0.71875 0,1.078125 v 2.96875 c 1.54297,19.785156 15.16797,36.542968 34.21875,42.09375 19.05078,5.546875 39.54688,-1.277344 51.46875,-17.140625 11.91797,-15.859375 12.77735,-37.445313 2.15235,-54.203125 z m -157.14062,54 C 112.67969,59.347656 102.27734,52.429688 97.851562,41.796875 93.425781,31.160156 95.855469,18.90625 104,10.761719 112.14453,2.613281 124.39844,0.1875 135.03516,4.613281 c 10.63671,4.425781 17.55078,14.828125 17.51562,26.347657 -0.14844,15.566406 -12.78516,28.121093 -28.35156,28.167968 z m 117,0 c -11.51172,0 -21.88672,-6.9375 -26.28125,-17.574219 -4.39844,-10.640625 -1.94922,-22.878906 6.20312,-31.007813 8.15235,-8.125 20.40235,-10.535156 31.02344,-6.105468 10.625,4.429687 17.53125,14.828125 17.49609,26.339844 -0.14843,15.671874 -12.94921,28.269531 -28.62109,28.167968 z m 0,0"

assets/themes/natuurpunt/drips.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs9" />
   <sodipodi:namedview
@@ -22,13 +22,13 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="4.1922078"
+     inkscape:zoom="0.83302372"
-     inkscape:cx="71.799876"
+     inkscape:cx="12.00446"
-     inkscape:cy="60.707869"
+     inkscape:cy="202.87538"
      inkscape:current-layer="svg5" />
   <g
      id="surface1"
-     transform="translate(-120.80792,55.001399)">
+     transform="matrix(0.66112463,0,0,0.66112463,-54.139365,64.320235)">
     <path
        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="m 258.71875,-55 h -123.75 c -4.14063,-0.05859 -8.09375,1.726562 -10.79297,4.871094 -2.69922,3.144531 -3.85937,7.324218 -3.17578,11.410156 l 23.53906,136.507812 c 0.92578,6.914068 6.77735,12.109378 13.75,12.210938 h 77 c 6.82422,-0.0508 12.64453,-4.94531 13.85938,-11.660156 L 272.46875,-38.71875 c 0.67969,-4.046875 -0.45703,-8.191406 -3.10547,-11.324219 -2.64453,-3.136719 -6.53906,-4.949219 -10.64453,-4.957031 z m -37.83984,92.179688 c 0,0 0,0.660156 0,0.992187 -0.22657,1.125 -0.5586,2.230469 -0.98829,3.296875 v 1.101562 c -0.44921,0.988282 -0.96093,1.941407 -1.53906,2.859376 -0.1914,0.441406 -0.45312,0.851562 -0.77344,1.210937 -0.55859,0.851563 -1.18359,1.660156 -1.86718,2.417969 L 214.5,50.269531 212.30078,52.140625 211.19922,52.910156 209,53.679688 c -3.67578,1.988281 -7.8125,2.972656 -11.98828,2.859374 -11.28516,-0.21875 -20.8086,-8.445312 -22.66016,-19.578124 -1.05469,-5.871094 0.25,-11.917969 3.62891,-16.832032 C 184.03125,11 190.07812,1.648438 196.23828,-7.589844 c 0.27734,-0.570312 0.85547,-0.929687 1.48828,-0.929687 0.63281,0 1.20703,0.359375 1.48438,0.929687 6.05078,9.128906 12.21093,18.371094 18.14843,27.5 l 0.87891,1.429688 c 0.39844,0.742187 0.73047,1.511718 0.99219,2.308594 v 0.992187 c 0.44531,1.136719 0.77734,2.316406 0.98828,3.519531 0.0508,0.292969 0.0508,0.589844 0,0.878906 0.10937,1.207032 0.10937,2.421876 0,3.632813 v 0.988281 c 0.33203,1.148438 0.55078,2.328125 0.66016,3.519532 z m 0,0"

assets/themes/natuurpunt/fonts/SIL Open Font License.txt

@@ -0,0 +1,41 @@
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

assets/themes/natuurpunt/information.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview12"
      pagecolor="#505050"
@@ -21,8 +21,8 @@
      inkscape:pagecheckerboard="0"
      showgrid="false"
      inkscape:zoom="40.35"
-     inkscape:cx="2.5030979"
+     inkscape:cx="0.89219331"
-     inkscape:cy="7.4969021"
+     inkscape:cy="9.2193309"
      inkscape:current-layer="svg10" />
   <defs
      id="defs4">
@@ -32,7 +32,7 @@
   <g
      id="Layer_2"
      data-name="Layer 2"
-     transform="translate(-17.5,7.0004586)">
+     transform="matrix(0.73723795,0,0,0.73723795,-16.663103,8.9711137)">
     <g
        id="Layer_1-2"
        data-name="Layer 1">

assets/themes/natuurpunt/information_board.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs11" />
   <sodipodi:namedview
@@ -22,13 +22,13 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="4.1922078"
+     inkscape:zoom="0.86940158"
-     inkscape:cx="98.993185"
+     inkscape:cx="-172.53247"
-     inkscape:cy="82.653346"
+     inkscape:cy="-94.317749"
      inkscape:current-layer="svg7" />
   <g
      id="surface1"
-     transform="translate(-93.5,77)">
+     transform="matrix(0.66792401,0,0,0.66792401,-29.31983,76.214562)">
     <path
        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="M 212.19141,40.371094 H 176.10937 V 35.96875 h 2.85938 c 0.89453,-0.128906 1.75391,-0.425781 2.53125,-0.878906 1.03125,-0.386719 1.88672,-1.128906 2.42187,-2.089844 0.57422,-1.039062 0.83985,-2.222656 0.76954,-3.410156 v -33 c 0.008,-1.230469 -0.29297,-2.441406 -0.88282,-3.519532 C 183.17578,-7.824219 182.39453,-8.605469 181.5,-9.238281 180.50781,-9.949219 179.4375,-10.539062 178.30859,-11 h -3.84765 v -4.398438 l 28.26953,-1.429687 0.76953,0.769531 v 45.097656 c -0.0117,1.195313 0.29297,2.371094 0.87891,3.410157 0.58984,0.917969 1.42968,1.644531 2.42187,2.089843 l 2.52734,0.882813 h 2.86329 z M 203.5,-37.839844 c -0.0117,2.867188 -1.25391,5.589844 -3.41016,7.480469 -4.48828,4.082031 -11.35156,4.082031 -15.83984,0 -1.91406,-2.003906 -2.90625,-4.714844 -2.75,-7.480469 0,-2.839844 1.24609,-5.53125 3.41016,-7.371094 2.07421,-2.148437 4.93359,-3.367187 7.91796,-3.367187 2.98829,0 5.84766,1.21875 7.92188,3.367187 1.91797,1.957032 2.91797,4.636719 2.75,7.371094 z m 0,0"

assets/themes/natuurpunt/nature_reserve.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs9" />
   <sodipodi:namedview
@@ -22,13 +22,13 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="4.4833333"
+     inkscape:zoom="0.65707935"
-     inkscape:cx="68.475836"
+     inkscape:cx="-350.03383"
-     inkscape:cy="76.171004"
+     inkscape:cy="126.31656"
      inkscape:current-layer="svg5" />
   <g
      id="surface1"
-     transform="translate(-111.57104,71.542969)">
+     transform="matrix(0.66600087,0,0,0.66600087,-50.299471,77.390563)">
     <path
        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="m 240.03125,-3.148438 c 1.08203,-3.1875 1.62891,-6.535156 1.61719,-9.902343 0.008,-15.003907 -10.77735,-27.839844 -25.5586,-30.417969 -1.49218,-15.910156 -14.84375,-28.074219 -30.82422,-28.074219 -15.98046,0 -29.33593,12.164063 -30.82421,28.074219 -16.1875,0.9375 -28.90625,14.207031 -29.16016,30.417969 -0.0117,3.367187 0.53516,6.714843 1.61719,9.902343 -10.14844,5.9375 -16.0625,17.113282 -15.25391,28.84375 0.80469,11.734376 8.1875,21.996094 19.05469,26.488282 10.86719,4.496094 23.34375,2.445312 32.19922,-5.292969 2.57812,2.648437 5.6289,4.785156 9,6.300781 v 53.367184 h 23.13281 V 54.71875 c 4,-1.378906 7.69922,-3.515625 10.89062,-6.296875 9.20313,6.824219 21.42188,8.011719 31.76563,3.078125 10.34766,-4.929688 17.12109,-15.171875 17.60937,-26.621094 0.49219,-11.449218 -5.38281,-22.230468 -15.26562,-28.027344 z m 0,0"

assets/themes/natuurpunt/natuurpunt.css

@@ -15,3 +15,32 @@
 
     --image-carousel-height: 350px;
 }
+
+@font-face{
+    font-family:"Open Sans Regular";
+    src:url("./assets/themes/natuurpunt/fonts/OpenSans-Regular.ttf");
+}
+
+@font-face{
+    font-family:"Amaranth";
+    src:url("./assets/themes/natuurpunt/fonts/Amaranth-Regular.otf");
+}
+
+body {
+    --non-active-tab-svg: #556c5c;
+	font-family: 'Open Sans Regular', sans-serif;
+}
+
+h1 h2 h3 h4 {
+    font-family: 'Amaranth', sans-serif;
+}
+
+.tab-non-active svg {
+    fill: white !important;
+    stroke: white !important;
+}
+
+.tab-non-active svg path {
+    fill: white !important;
+    stroke: white !important;
+}

assets/themes/natuurpunt/natuurpunt.json

@@ -319,11 +319,18 @@
           }
         ]
       }
+    },
+    {
+      "builtin": "gps_location_history",
+      "override": {
+        "name": null
+      }
     }
   ],
   "enableMoreQuests": false,
   "enableShareScreen": false,
   "enableIframePopout": false,
-  "enableBackgroundLayerSelection": false
+  "enableBackgroundLayerSelection": false,
+  "enableNoteImports": false
   
 }

assets/themes/natuurpunt/parking.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview12"
      pagecolor="#505050"
@@ -20,9 +20,9 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="46.114286"
+     inkscape:zoom="21.604036"
-     inkscape:cx="5.0092937"
+     inkscape:cx="14.580609"
-     inkscape:cy="7.5139405"
+     inkscape:cy="10.136995"
      inkscape:current-layer="svg10" />
   <defs
      id="defs4">
@@ -32,7 +32,7 @@
   <g
      id="Layer_2"
      data-name="Layer 2"
-     transform="translate(-12.49922,7.0026088)">
+     transform="matrix(0.77512281,0,0,0.77512281,-11.144413,8.801333)">
     <g
        id="Layer_1-2"
        data-name="Layer 1">

assets/themes/natuurpunt/parkingbike.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview26"
      pagecolor="#505050"
@@ -20,9 +20,9 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="44.833333"
+     inkscape:zoom="22.191126"
-     inkscape:cx="7.0037175"
+     inkscape:cx="6.2637652"
-     inkscape:cy="8.5092937"
+     inkscape:cy="11.671332"
      inkscape:current-layer="svg24" />
   <defs
      id="defs4">
@@ -32,7 +32,7 @@
   <g
      id="Layer_2"
      data-name="Layer 2"
-     transform="translate(-11,8.0028128)">
+     transform="matrix(0.69872292,0,0,0.69872292,-8.4797701,10.864705)">
     <g
        id="Layer_1-2"
        data-name="Layer 1">
@@ -65,7 +65,7 @@
          id="line16" />
       <polygon
          class="cls-1"
-         points="7.05,11.17 6.53,11.45 9.28,16.45 9.8,16.17 "
+         points="9.28,16.45 9.8,16.17 7.05,11.17 6.53,11.45 "
          id="polygon18" />
       <path
          class="cls-1"

assets/themes/natuurpunt/parkingmotor.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview13"
      pagecolor="#505050"
@@ -20,9 +20,9 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="26.9"
+     inkscape:zoom="8.9240743"
-     inkscape:cx="6.9888476"
+     inkscape:cx="-9.9730231"
-     inkscape:cy="6.4869888"
+     inkscape:cy="8.5162894"
      inkscape:current-layer="svg11" />
   <defs
      id="defs4">
@@ -32,7 +32,7 @@
   <g
      id="Layer_2"
      data-name="Layer 2"
-     transform="translate(-23,6.0028128)">
+     transform="matrix(0.65930198,0,0,0.65930198,-19.95766,9.0646872)">
     <g
        id="Layer_1-2"
        data-name="Layer 1">

assets/themes/natuurpunt/parkingwheels.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview14"
      pagecolor="#505050"
@@ -20,9 +20,9 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="26.9"
+     inkscape:zoom="4.3368678"
-     inkscape:cx="5.9851301"
+     inkscape:cx="-15.9101"
-     inkscape:cy="7.4907063"
+     inkscape:cy="-33.895431"
      inkscape:current-layer="svg12" />
   <defs
      id="defs4">
@@ -32,7 +32,7 @@
   <g
      id="Layer_2"
      data-name="Layer 2"
-     transform="translate(-24,7.0028128)">
+     transform="matrix(0.52597063,0,0,0.52597063,-20.85559,11.91111)">
     <g
        id="Layer_1-2"
        data-name="Layer 1">

assets/themes/natuurpunt/picnic_table.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview18"
      pagecolor="#505050"
@@ -20,9 +20,9 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="46.114286"
+     inkscape:zoom="11.294283"
-     inkscape:cx="1.9083024"
+     inkscape:cx="-8.8540368"
-     inkscape:cy="5.5188971"
+     inkscape:cy="12.307111"
      inkscape:current-layer="svg16" />
   <defs
      id="defs4">
@@ -32,7 +32,7 @@
   <g
      id="Layer_2"
      data-name="Layer 2"
-     transform="translate(-7,5)">
+     transform="matrix(0.69169793,0,0,0.69169793,-3.5978867,6.9885483)">
     <g
        id="Layer_1-2"
        data-name="Layer 1">
@@ -52,11 +52,11 @@
          x="0" />
       <polygon
          class="cls-1"
-         points="7.79,0.57 9.58,1.41 4.21,12.9 2,12.9 "
+         points="9.58,1.41 4.21,12.9 2,12.9 7.79,0.57 "
          id="polygon10" />
       <polygon
          class="cls-1"
-         points="14.28,0.57 20.11,12.9 17.85,12.9 12.49,1.41 "
+         points="20.11,12.9 17.85,12.9 12.49,1.41 14.28,0.57 "
          id="polygon12" />
     </g>
   </g>

assets/themes/natuurpunt/pushchair.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs842" />
   <sodipodi:namedview
@@ -22,13 +22,13 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="4.1922078"
+     inkscape:zoom="0.36448551"
-     inkscape:cx="20.991326"
+     inkscape:cx="-787.41127"
-     inkscape:cy="71.680607"
+     inkscape:cy="460.92367"
      inkscape:current-layer="svg838" />
   <g
      id="surface1"
-     transform="translate(-76.997323,65.973113)">
+     transform="matrix(0.67310139,0,0,0.67310139,-15.483114,75.614632)">
     <path
        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="m 173.25,-28.378906 c -0.0312,-5.320313 2.07031,-10.429688 5.83203,-14.191406 3.76172,-3.757813 8.87109,-5.859376 14.1875,-5.828126 10.80078,0.597657 19.42188,9.21875 20.01953,20.019532 0,11.054687 -8.96094,20.019531 -20.01953,20.019531 -11.05469,0 -20.01953,-8.964844 -20.01953,-20.019531 z M 247.28125,22 c 10.00781,-2.859375 13.85937,1.210938 13.85937,1.210938 l 34.98047,27.390624 c 1.88672,1.59375 3.04688,3.890626 3.21094,6.355469 0.16797,2.46875 -0.67578,4.898438 -2.33203,6.734375 -3.8125,4.042969 -10.04297,4.609375 -14.51953,1.320313 l -28.16016,-22 -22,-17.492188 z m 28.59766,78.42969 c 0,13.54687 -10.98047,24.53125 -24.52735,24.53125 -13.55078,0 -24.53125,-10.98438 -24.53125,-24.53125 0,-13.546878 10.98047,-24.531252 24.53125,-24.531252 1.70313,0.05859 3.39844,0.28125 5.0586,0.660156 0.98437,-2.363282 1.21484,-4.976563 0.66015,-7.480469 -0.66406,-2.789063 -2.20703,-5.296875 -4.39844,-7.148437 L 243.76172,55 198,69.410156 c -9.10938,2.980469 -18.91797,-1.925781 -22,-11 v -2.53125 l -10.23047,23.320313 c 7,4.578125 11.15234,12.429687 11,20.789062 0,13.550779 -10.98047,24.531249 -24.53125,24.531249 -13.54687,0 -24.52734,-10.98047 -24.52734,-24.531249 0,-13.546875 10.98047,-24.527343 24.52734,-24.527343 1.70703,0.05078 3.40234,0.269531 5.0625,0.660156 L 171.26953,44 l -22,-64.789062 L 106.14844,-55 c -2.26953,-1.753906 -5.05078,-2.71875 -7.917971,-2.75 -7.167969,0 -12.980469,5.8125 -12.980469,12.980469 -0.226562,4.300781 1.714844,8.429687 5.171875,11 1.753906,1.507812 1.996094,4.136719 0.546875,5.941406 -0.75,0.8125 -1.804688,1.277344 -2.914062,1.277344 -1.109376,0 -2.164063,-0.464844 -2.914063,-1.277344 C 79.910156,-31.878906 76.894531,-38.15625 77,-44.769531 c 0.01172,-8.042969 4.5625,-15.386719 11.761719,-18.972657 7.195312,-3.589843 15.800781,-2.800781 22.226561,2.03125 L 258.28125,55.550781 c 3.4375,2.839844 5.89844,6.6875 7.03906,11 0.82422,4.179688 0.36328,8.515625 -1.32031,12.429688 7.38672,4.417969 11.89844,12.402343 11.87891,21.007812 z m -24.52735,11 c 6.07422,0 11,-4.92578 11,-11 0,-6.074221 -4.92578,-11.000002 -11,-11.000002 -6.07812,0 -11,4.925781 -11,11.000002 0.45703,5.73047 5.25,10.14062 11,10.12109 z m -99,0 c 6.07422,0 11,-4.92578 11,-11 0,-6.074221 -4.92578,-11.000002 -11,-11.000002 -6.07812,0 -11,4.925781 -11,11.000002 0.46485,5.85937 5.45313,10.3164 11.32813,10.12109 z m 0,0"

assets/themes/natuurpunt/toilets.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs11" />
   <sodipodi:namedview
@@ -22,13 +22,13 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="2.387605"
+     inkscape:zoom="0.38619125"
-     inkscape:cx="77.483502"
+     inkscape:cx="-515.28873"
-     inkscape:cy="39.99824"
+     inkscape:cy="334.03139"
      inkscape:current-layer="svg7" />
   <g
      id="surface1"
-     transform="translate(-78,39.038983)">
+     transform="matrix(0.72891393,0,0,0.72891393,-23.376157,43.848582)">
     <path
        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="M 104,72.800781 78,-37.179688 h 22.75 L 117,39 137.41016,-37.179688 h 26 l 19.6289,76.828126 16.90235,-76.828126 h 22.35937 l -26,109.980469 h -24.3125 L 150.14844,-9.359375 128.30859,72.800781 Z m 0,0"

assets/themes/natuurpunt/trail.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview16"
      pagecolor="#505050"
@@ -20,9 +20,9 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="53.8"
+     inkscape:zoom="9.4858416"
-     inkscape:cx="5"
+     inkscape:cx="-6.4306366"
-     inkscape:cy="8.5037175"
+     inkscape:cy="27.830952"
      inkscape:current-layer="svg14" />
   <defs
      id="defs4">
@@ -32,7 +32,7 @@
   <g
      id="Layer_2"
      data-name="Layer 2"
-     transform="translate(-10.00033,8.0094408)">
+     transform="matrix(0.68595019,0,0,0.68595019,-8.1195823,10.768456)">
     <g
        id="Layer_1-2"
        data-name="Layer 1">

assets/themes/natuurpunt/urinal.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs908" />
   <sodipodi:namedview
@@ -22,13 +22,13 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="4.1922078"
+     inkscape:zoom="0.58637133"
-     inkscape:cx="-17.413259"
+     inkscape:cx="114.26207"
-     inkscape:cy="77.644052"
+     inkscape:cy="240.46196"
      inkscape:current-layer="svg904" />
   <g
      id="surface1"
-     transform="translate(-115.5,71.941895)">
+     transform="matrix(0.67441705,0,0,0.67441705,-52.287943,81.718843)">
     <path
        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="m 258.5,-31.128906 c -3.19141,-22.660156 -14.96094,-40.921875 -40.03906,-40.8125 h -48.73047 c -24.96875,0 -36.85156,18.152344 -39.92969,40.8125 L 115.5,88 c 0.42188,24.42578 20.34375,44.00391 44.76953,44 h 67.76172 c 24.42578,0.004 44.34766,-19.57422 44.76953,-44 z M 218.46094,103.73047 H 169.73047 C 151.92969,103.73047 137.5,89.300781 137.5,71.5 l 10.33984,-85.46875 c 2.19922,-16.28125 11,-29.480469 28.71094,-29.371094 h 35.08984 c 18.03907,0 26.50782,13.089844 28.82032,29.371094 L 250.69141,71.5 c 0,17.800781 -14.42969,32.23047 -32.23047,32.23047 z m 0,0"

assets/themes/natuurpunt/walk_wheelchair.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview987"
      pagecolor="#505050"
@@ -20,9 +20,9 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="40.35"
+     inkscape:zoom="12.842909"
-     inkscape:cx="2.1561338"
+     inkscape:cx="-0.46718386"
-     inkscape:cy="8.5130112"
+     inkscape:cy="7.0077579"
      inkscape:current-layer="svg985" />
   <defs
      id="defs969">
@@ -32,7 +32,7 @@
   <g
      id="Layer_2"
      data-name="Layer 2"
-     transform="translate(-8.0003301,8.0094408)">
+     transform="matrix(0.6918258,0,0,0.6918258,-4.0884781,10.718378)">
     <g
        id="Layer_1-2"
        data-name="Layer 1">

assets/themes/natuurpunt/watermill.svg

@@ -10,7 +10,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
->
+   xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview1056"
      pagecolor="#505050"
@@ -20,9 +20,9 @@
      inkscape:pageopacity="0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="46.114286"
+     inkscape:zoom="6.0407534"
-     inkscape:cx="7.5030979"
+     inkscape:cx="-31.949657"
-     inkscape:cy="8.5114622"
+     inkscape:cy="10.594705"
      inkscape:current-layer="svg1054" />
   <defs
      id="defs1048">
@@ -32,7 +32,7 @@
   <g
      id="Layer_2"
      data-name="Layer 2"
-     transform="translate(-10,8)">
+     transform="matrix(0.58392824,0,0,0.58392824,-6.8420153,12.106628)">
     <g
        id="Layer_1-2"
        data-name="Layer 1">

assets/themes/natuurpunt/wheelchair.svg

@@ -1,15 +1,53 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-11.5 11 35 1">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    <defs>
+<svg
-        <style>.cls-1{fill:#fff;}</style>
+   viewBox="-11.5 11 14.09847 23.802593"
+   version="1.1"
+   id="svg1490"
+   sodipodi:docname="wheelchair.svg"
+   width="14.09847"
+   height="23.802593"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1492"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="15.534994"
+     inkscape:cx="-5.8577429"
+     inkscape:cy="9.0119122"
+     inkscape:current-layer="svg1490" />
+  <defs
+     id="defs1480">
+    <style
+       id="style1478">.cls-1{fill:#fff;}</style>
   </defs>
-    <g id="Layer_2" data-name="Layer 2">
+  <g
-        <g id="Layer_1-2" data-name="Layer 1">
+     id="Layer_2"
-            <path class="cls-1"
+     data-name="Layer 2"
-                  d="M2.52,23.73l-1-4.07h.84L3,22.45l.75-2.79h1l.71,2.84.63-2.84h.82l-1,4.07H5l-.81-3-.81,3Z"/>
+     transform="matrix(0.59969098,0,0,0.59969098,-8.686888,15.764196)">
-            <path class="cls-1"
+    <g
-                  d="M9.9,22.23l.79.26a1.75,1.75,0,0,1-.6,1A1.74,1.74,0,0,1,9,23.8a1.75,1.75,0,0,1-1.33-.56,2.1,2.1,0,0,1-.52-1.51,2.2,2.2,0,0,1,.52-1.57,1.78,1.78,0,0,1,1.38-.56,1.67,1.67,0,0,1,1.21.44,1.59,1.59,0,0,1,.41.74l-.81.2a.88.88,0,0,0-.3-.5A.87.87,0,0,0,9,20.3a.91.91,0,0,0-.74.32A1.65,1.65,0,0,0,8,21.67a1.69,1.69,0,0,0,.28,1.1.88.88,0,0,0,.72.32.8.8,0,0,0,.56-.2A1.22,1.22,0,0,0,9.9,22.23Z"/>
+       id="Layer_1-2"
-            <path class="cls-1"
+       data-name="Layer 1">
-                  d="M4.8,3.08A1.54,1.54,0,1,1,6.34,1.54,1.54,1.54,0,0,1,4.8,3.08ZM10.25,11h-5a1.54,1.54,0,0,1-1.57-1.4L3.42,4.94a1.49,1.49,0,1,1,3-.17l.1,1.61H9.37a.7.7,0,0,1,.7.7.71.71,0,0,1-.7.69H6.57l0,.88h3.85a.92.92,0,0,1,.75.44L14,13.8A.9.9,0,0,1,13.69,15a.91.91,0,0,1-1.23-.31Zm.06,1.39.86,1.44a5.78,5.78,0,1,1-8.3-7.11l.07,1.41a4.58,4.58,0,1,0,7.37,4.26Z"/>
+      <path
+         class="cls-1"
+         d="m 2.52,23.73 -1,-4.07 H 2.36 L 3,22.45 3.75,19.66 h 1 l 0.71,2.84 0.63,-2.84 h 0.82 l -1,4.07 H 5 l -0.81,-3 -0.81,3 z"
+         id="path1482" />
+      <path
+         class="cls-1"
+         d="m 9.9,22.23 0.79,0.26 a 1.75,1.75 0 0 1 -0.6,1 A 1.74,1.74 0 0 1 9,23.8 1.75,1.75 0 0 1 7.67,23.24 2.1,2.1 0 0 1 7.15,21.73 2.2,2.2 0 0 1 7.67,20.16 1.78,1.78 0 0 1 9.05,19.6 a 1.67,1.67 0 0 1 1.21,0.44 1.59,1.59 0 0 1 0.41,0.74 l -0.81,0.2 A 0.88,0.88 0 0 0 9.56,20.48 0.87,0.87 0 0 0 9,20.3 0.91,0.91 0 0 0 8.26,20.62 1.65,1.65 0 0 0 8,21.67 1.69,1.69 0 0 0 8.28,22.77 0.88,0.88 0 0 0 9,23.09 0.8,0.8 0 0 0 9.56,22.89 1.22,1.22 0 0 0 9.9,22.23 Z"
+         id="path1484" />
+      <path
+         class="cls-1"
+         d="M 4.8,3.08 A 1.54,1.54 0 1 1 6.34,1.54 1.54,1.54 0 0 1 4.8,3.08 Z M 10.25,11 h -5 A 1.54,1.54 0 0 1 3.68,9.6 L 3.42,4.94 a 1.5024064,1.5024064 0 1 1 3,-0.17 l 0.1,1.61 h 2.85 a 0.7,0.7 0 0 1 0.7,0.7 0.71,0.71 0 0 1 -0.7,0.69 h -2.8 v 0.88 h 3.85 a 0.92,0.92 0 0 1 0.75,0.44 L 14,13.8 A 0.9,0.9 0 0 1 13.69,15 0.91,0.91 0 0 1 12.46,14.69 Z m 0.06,1.39 0.86,1.44 A 5.78,5.78 0 1 1 2.87,6.72 l 0.07,1.41 a 4.58,4.58 0 1 0 7.37,4.26 z"
+         id="path1486" />
     </g>
   </g>
 </svg>

css/index-tailwind-output.css

@@ -68,8 +68,10 @@ Improve consistency of default fonts in all browsers. (https://github.com/sindre
 */
 
 body {
-    font-family: system-ui,
+  font-family:
-    -apple-system, /* Firefox supports this but not yet `system-ui` */ 'Segoe UI',
+		system-ui,
+		-apple-system, /* Firefox supports this but not yet `system-ui` */
+		'Segoe UI',
 		Roboto,
 		Helvetica,
 		Arial,
@@ -127,7 +129,8 @@ code,
 kbd,
 samp,
 pre {
-    font-family: ui-monospace,
+  font-family:
+		ui-monospace,
 		SFMono-Regular,
 		Consolas,
 		'Liberation Mono',
@@ -617,22 +620,22 @@ video {
   --tw-ring-offset-shadow: 0 0 #0000;
   --tw-ring-shadow: 0 0 #0000;
   --tw-shadow: 0 0 #0000;
-    --tw-ring-inset: var(--tw-empty, /*!*/ /*!*/);
+  --tw-ring-inset: var(--tw-empty,/*!*/ /*!*/);
   --tw-ring-offset-width: 0px;
   --tw-ring-offset-color: #fff;
   --tw-ring-color: rgba(59, 130, 246, 0.5);
   --tw-ring-offset-shadow: 0 0 #0000;
   --tw-ring-shadow: 0 0 #0000;
   --tw-shadow: 0 0 #0000;
-    --tw-blur: var(--tw-empty, /*!*/ /*!*/);
+  --tw-blur: var(--tw-empty,/*!*/ /*!*/);
-    --tw-brightness: var(--tw-empty, /*!*/ /*!*/);
+  --tw-brightness: var(--tw-empty,/*!*/ /*!*/);
-    --tw-contrast: var(--tw-empty, /*!*/ /*!*/);
+  --tw-contrast: var(--tw-empty,/*!*/ /*!*/);
-    --tw-grayscale: var(--tw-empty, /*!*/ /*!*/);
+  --tw-grayscale: var(--tw-empty,/*!*/ /*!*/);
-    --tw-hue-rotate: var(--tw-empty, /*!*/ /*!*/);
+  --tw-hue-rotate: var(--tw-empty,/*!*/ /*!*/);
-    --tw-invert: var(--tw-empty, /*!*/ /*!*/);
+  --tw-invert: var(--tw-empty,/*!*/ /*!*/);
-    --tw-saturate: var(--tw-empty, /*!*/ /*!*/);
+  --tw-saturate: var(--tw-empty,/*!*/ /*!*/);
-    --tw-sepia: var(--tw-empty, /*!*/ /*!*/);
+  --tw-sepia: var(--tw-empty,/*!*/ /*!*/);
-    --tw-drop-shadow: var(--tw-empty, /*!*/ /*!*/);
+  --tw-drop-shadow: var(--tw-empty,/*!*/ /*!*/);
   --tw-filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
 
@@ -897,8 +900,8 @@ video {
   margin-top: 0.75rem;
 }
 
-.ml-8 {
+.ml-0 {
-    margin-left: 2rem;
+  margin-left: 0px;
 }
 
 .mb-10 {
@@ -917,14 +920,14 @@ video {
   margin-left: 0.25rem;
 }
 
-.mr-0 {
-    margin-right: 0px;
-}
-
 .mb-1 {
   margin-bottom: 0.25rem;
 }
 
+.mr-0 {
+  margin-right: 0px;
+}
+
 .mr-3 {
   margin-right: 0.75rem;
 }
@@ -1253,10 +1256,6 @@ video {
   flex-wrap: wrap;
 }
 
-.content-around {
-    align-content: space-around;
-}
-
 .items-end {
   align-items: flex-end;
 }
@@ -1391,6 +1390,10 @@ video {
   border-bottom-width: 1px;
 }
 
+.border-b-2 {
+  border-bottom-width: 2px;
+}
+
 .border-gray-500 {
   --tw-border-opacity: 1;
   border-color: rgba(107, 114, 128, var(--tw-border-opacity));
@@ -1445,9 +1448,9 @@ video {
   background-color: rgba(224, 231, 255, var(--tw-bg-opacity));
 }
 
-.bg-gray-300 {
+.bg-gray-200 {
   --tw-bg-opacity: 1;
-    background-color: rgba(209, 213, 219, var(--tw-bg-opacity));
+  background-color: rgba(229, 231, 235, var(--tw-bg-opacity));
 }
 
 .bg-black {
@@ -1455,16 +1458,16 @@ video {
   background-color: rgba(0, 0, 0, var(--tw-bg-opacity));
 }
 
-.bg-gray-200 {
-    --tw-bg-opacity: 1;
-    background-color: rgba(229, 231, 235, var(--tw-bg-opacity));
-}
-
 .bg-gray-100 {
   --tw-bg-opacity: 1;
   background-color: rgba(243, 244, 246, var(--tw-bg-opacity));
 }
 
+.bg-gray-300 {
+  --tw-bg-opacity: 1;
+  background-color: rgba(209, 213, 219, var(--tw-bg-opacity));
+}
+
 .bg-red-500 {
   --tw-bg-opacity: 1;
   background-color: rgba(239, 68, 68, var(--tw-bg-opacity));
@@ -1539,6 +1542,14 @@ video {
   padding-right: 0.25rem;
 }
 
+.pl-12 {
+  padding-left: 3rem;
+}
+
+.pt-0 {
+  padding-top: 0px;
+}
+
 .pl-5 {
   padding-left: 1.25rem;
 }
@@ -1555,10 +1566,6 @@ video {
   padding-left: 0.75rem;
 }
 
-.pr-2 {
-    padding-right: 0.5rem;
-}
-
 .pr-0 {
   padding-right: 0px;
 }
@@ -1567,14 +1574,14 @@ video {
   padding-top: 0.125rem;
 }
 
-.pt-0 {
-    padding-top: 0px;
-}
-
 .pb-2 {
   padding-bottom: 0.5rem;
 }
 
+.pr-2 {
+  padding-right: 0.5rem;
+}
+
 .pl-6 {
   padding-left: 1.5rem;
 }
@@ -1663,11 +1670,11 @@ video {
 }
 
 .ordinal, .slashed-zero, .lining-nums, .oldstyle-nums, .proportional-nums, .tabular-nums, .diagonal-fractions, .stacked-fractions {
-    --tw-ordinal: var(--tw-empty, /*!*/ /*!*/);
+  --tw-ordinal: var(--tw-empty,/*!*/ /*!*/);
-    --tw-slashed-zero: var(--tw-empty, /*!*/ /*!*/);
+  --tw-slashed-zero: var(--tw-empty,/*!*/ /*!*/);
-    --tw-numeric-figure: var(--tw-empty, /*!*/ /*!*/);
+  --tw-numeric-figure: var(--tw-empty,/*!*/ /*!*/);
-    --tw-numeric-spacing: var(--tw-empty, /*!*/ /*!*/);
+  --tw-numeric-spacing: var(--tw-empty,/*!*/ /*!*/);
-    --tw-numeric-fraction: var(--tw-empty, /*!*/ /*!*/);
+  --tw-numeric-fraction: var(--tw-empty,/*!*/ /*!*/);
   font-variant-numeric: var(--tw-ordinal) var(--tw-slashed-zero) var(--tw-numeric-figure) var(--tw-numeric-spacing) var(--tw-numeric-fraction);
 }
 
@@ -1895,6 +1902,7 @@ video {
   --background-color: white;
   --foreground-color: black;
   --popup-border: white;
+  --non-active-tab-svg: var(--foreground-color);
   --shadow-color: #00000066;
   --variable-title-height: 0px;
   /* Set by javascript */
@@ -1973,6 +1981,10 @@ btn {
   height: min-content;
 }
 
+.border-detail {
+  border-color: var(--foreground-color);
+}
+
 .w-min {
   width: -webkit-min-content;
   width: -moz-min-content;

css/tabbedComponent.css

@@ -64,11 +64,11 @@
 }
 
 .tab-non-active svg {
-    fill: var(--foreground-color) !important;
+    fill: var(--non-active-tab-svg) !important;
-    stroke: var(--foreground-color) !important;
+    stroke: var(--non-active-tab-svg) !important;
 }
 
 .tab-non-active svg path {
-    fill: var(--foreground-color) !important;
+    fill: var(--non-active-tab-svg) !important;
-    stroke: var(--foreground-color) !important;
+    stroke: var(--non-active-tab-svg) !important;
 }

index.css

@@ -62,6 +62,7 @@
     --background-color: white;
     --foreground-color: black;
     --popup-border: white;
+    --non-active-tab-svg: var(--foreground-color);
     --shadow-color: #00000066;
     --variable-title-height: 0px; /* Set by javascript */
     --return-to-the-map-height: 2em;
@@ -138,6 +139,11 @@ btn {
     height: min-content;
 }
 
+
+.border-detail {
+    border-color: var(--foreground-color);
+}
+
 .w-min {
     width: min-content;
 }

package.json

@@ -11,7 +11,7 @@
     "start": "npm run start:prepare && npm-run-all --parallel start:parallel:*",
     "strt": "npm run start:prepare && npm run start:parallel:parcel",
     "start:prepare": "ts-node scripts/generateLayerOverview.ts --no-fail && npm run increase-memory",
-    "start:parallel:parcel": "parcel serve *.html UI/** Logic/** assets/*.json assets/svg/* assets/generated/* assets/layers/*/*.svg assets/layers/*/*.jpg assets/layers/*/*.png assets/layers/*/*.css assets/tagRenderings/*.json assets/themes/*/*.svg assets/themes/*/*.css assets/themes/*/*.jpg assets/themes/*/*.png vendor/* vendor/*/*",
+    "start:parallel:parcel": "parcel serve *.html UI/** Logic/** assets/*.json assets/svg/* assets/generated/* assets/layers/*/*.svg assets/layers/*/*.jpg assets/layers/*/*.png assets/layers/*/*.css assets/tagRenderings/*.json assets/themes/*/*.svg assets/themes/*/*.ttf assets/themes/*/*/*.ttf aassets/themes/*/*.otf assets/themes/*/*/*.otf ssets/themes/*/*.css assets/themes/*/*.jpg assets/themes/*/*.png vendor/* vendor/*/*",
     "start:parallel:tailwindcli": "tailwindcss -i index.css -o css/index-tailwind-output.css --watch",
     "generate:css": "tailwindcss -i index.css -o css/index-tailwind-output.css",
     "test": "ts-node test/TestAll.ts",

scripts/build.sh

@@ -47,7 +47,6 @@ do
     echo -e "\n\n  $theme"
     echo -e " ------------ \n\n"
     # Builds the necessary files for just one theme, e.g. 'bookcases.html' + 'index_bookcases.ts' + supporting file
-    # npm run generate && node --max_old_space_size=12000 $(which parcel)  build 
     parcel build --public-url './' $SRC_MAPS "$theme.html" 
 done
 # At last: a workaround; parcel 1.x borks the link to social images; the public-URL (./) is setup incorrectly, so we fix those

theme.html

@@ -36,7 +36,6 @@
     <link href="./assets/generated/svg_mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
     <link href="./assets/generated/svg_mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
 
-
     <!-- THEME-SPECIFIC-END-->
 
     <style>