Merge branch 'develop' into RobinLinde-patch-1

assets/layers/sport_pitch/sport_pitch.json

@@ -315,6 +315,14 @@
             "cs": "Toto je skatepark",
             "es": "Este es un skatepark"
           }
+        },
+        {
+          "if": "sport=equestrian",
+          "then": {
+            "en": "This is a horse riding arena",
+            "de": "Dies ist ein Reitplatz",
+            "es": "Esta es una pista ecuestre"
+          }
         }
       ],
       "id": "sport_pitch-sport",

assets/layers/toilet/toilet.json

@@ -186,6 +186,19 @@
   ],
   "tagRenderings": [
     "images",
+    {
+      "id": "toilet-reviews",
+      "render": {
+        "special": {
+          "type": "reviews",
+          "fallback": "toilet",
+          "question": {
+            "en": "How would you rate this toilet?",
+            "nl": "Hoe goed is deze toilet?"
+          }
+        }
+      }
+    },
     "level",
     {
       "question": {

package-lock.json

@@ -60,7 +60,7 @@
         "marked": "^12.0.2",
         "monaco-editor": "^0.46.0",
         "mvt-to-geojson": "^0.0.5",
-        "name-suggestion-index": "^6.0.20240422",
+        "name-suggestion-index": "^6.0.20250105",
         "npm": "^10.7.0",
         "opening_hours": "^3.6.0",
         "osm-auth": "^2.5.0",
@@ -13323,16 +13323,16 @@
       }
     },
     "node_modules/name-suggestion-index": {
-      "version": "6.0.20240422",
-      "resolved": "https://registry.npmjs.org/name-suggestion-index/-/name-suggestion-index-6.0.20240422.tgz",
-      "integrity": "sha512-NP0QJfCGKkpduNruS6dM8U7uA//EjyH4Kw+lavUWuQxOl0QxhFVF9caMh3UPvDZgqdMOMpyi/z195rjieAAPyQ==",
+      "version": "6.0.20250105",
+      "resolved": "https://registry.npmjs.org/name-suggestion-index/-/name-suggestion-index-6.0.20250105.tgz",
+      "integrity": "sha512-L6QzLGxgLDKH4tcaHjwUxHm1V7tIWWTec9hzWz7THZwYvtJcK7GMU//JQMt2RcghrmTXRlXyWoSXyPaFaqUc1w==",
       "dependencies": {
         "diacritics": "^1.3.0",
         "run-s": "^0.0.0",
         "which-polygon": "^2.2.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^18.20 || >=20.10"
       }
     },
     "node_modules/nanoid": {
@@ -30521,9 +30521,9 @@
       }
     },
     "name-suggestion-index": {
-      "version": "6.0.20240422",
-      "resolved": "https://registry.npmjs.org/name-suggestion-index/-/name-suggestion-index-6.0.20240422.tgz",
-      "integrity": "sha512-NP0QJfCGKkpduNruS6dM8U7uA//EjyH4Kw+lavUWuQxOl0QxhFVF9caMh3UPvDZgqdMOMpyi/z195rjieAAPyQ==",
+      "version": "6.0.20250105",
+      "resolved": "https://registry.npmjs.org/name-suggestion-index/-/name-suggestion-index-6.0.20250105.tgz",
+      "integrity": "sha512-L6QzLGxgLDKH4tcaHjwUxHm1V7tIWWTec9hzWz7THZwYvtJcK7GMU//JQMt2RcghrmTXRlXyWoSXyPaFaqUc1w==",
       "requires": {
         "diacritics": "^1.3.0",
         "run-s": "^0.0.0",

package.json

@@ -114,7 +114,8 @@
     "velopark:compare": "vite-node scripts/velopark/compare.ts -- velopark_nonsynced_.geojson ~/Projecten/OSM/Fietsberaad/2024-02-02\\ Fietsenstallingen_OSM_met_velopark_ref.geojson\n",
     "velopark:download": "vite-node scripts/velopark/veloParkToGeojson.ts ",
     "### 1": "CODE AND DATA MAINTAINENCE",
-    "download:nsi-logos": "vite-node scripts/downloadNsiLogos.ts || npm run downloadNsiLogos # This script crashes often without the possibility to correct - hence the auto retry with OR",
+    "download:nsi-logos": "vite-node scripts/downloadNsiLogos.ts || npm run download:nsi-logos # This script crashes often without the possibility to correct - hence the auto retry with OR",
+    "download:nsi": "npm i name-suggestion-index && vite-node scripts/generateStats.ts && npm run download:nsi-logos",
     "download:editor-layer-index": "vite-node scripts/downloadEli.ts",
     "download:stats": "vite-node scripts/GenerateSeries.ts",
     "download:images": "vite-node scripts/generateImageAnalysis.ts -- ~/data/imgur-image-backup/",
@@ -130,7 +131,7 @@
     "optimize-images-scaledown-jpg": "cd assets/ &&  find . -regextype sed -regex \".*/.*.\\(jpg\\|JPG\\|JPEG\\|jpeg\\)\" -exec mogrify -resize 640x640\\> '{}' \\; && echo 'JPGs are optimized'",
     "generate:schemas": "export NODE_OPTIONS=\"--max-old-space-size=8192\" && ts2json-schema -p src/Models/ThemeConfig/Json/ -o Docs/Schemas/ -t tsconfig.json -R . -m \".*ConfigJson\" && echo 'tsjson is done' && vite-node scripts/fixSchemas.ts ",
     "reuse-compliance": "reuse lint",
-    "housekeeping": "export NODE_OPTIONS=\"--max-old-space-size=1200\" && git pull && npx update-browserslist-db@latest && npm run generate && npm run generate:docs && npm run generate:schemas && npm run generate:contributor-list && vite-node scripts/fetchLanguages.ts && vite-node scripts/generateSunnyUnlabeled.ts && npm run format && git add assets/ langs/ Docs/ **/*.ts Docs/* src/* && git commit -m 'chore: automated housekeeping...'",
+    "housekeeping": "export NODE_OPTIONS=\"--max-old-space-size=1200\" && git pull && npx update-browserslist-db@latest && npm run generate && npm run generate:docs && npm run generate:schemas && npm run generate:contributor-list && vite-node scripts/fetchLanguages.ts && download:nsi && vite-node scripts/generateSunnyUnlabeled.ts && npm run format && git add assets/ langs/ Docs/ **/*.ts Docs/* src/* && git commit -m 'chore: automated housekeeping...'",
     "###": "MICROSERVICES AND SERVER MAINTAINENCE",
     "release": "standard-version && git push --follow-tags",
     "release:minor": "standard-version --release-as minor",
@@ -210,7 +211,7 @@
     "marked": "^12.0.2",
     "monaco-editor": "^0.46.0",
     "mvt-to-geojson": "^0.0.5",
-    "name-suggestion-index": "^6.0.20240422",
+    "name-suggestion-index": "^6.0.20250105",
     "npm": "^10.7.0",
     "opening_hours": "^3.6.0",
     "osm-auth": "^2.5.0",

public/assets/data/nsi/logos/184e0b-394562.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="536" height="490" version="1.0" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1.2179 299.5 161.65-0.51173 105.44 74.759 105.19-74.778 161.32 0.53085-265.58 190.5-1.3696-0.0466zm-1.2179-299.5h103.26l164.83 116.06 164.89-116.06h103.02v250h-102v-139.35l-165.36 118.42-1.3431-0.51538-164.79-116.54-0.51369 137.98h-101.99z" fill="#0e6abc"/>
+</svg>

public/assets/data/nsi/logos/abowind-e6c8aa.svg

@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850.39 566.93"><defs><style>.cls-1{fill:#706f6f;}.cls-2{fill:#f39200;}</style></defs><title>Zeichenfläche 1</title><path class="cls-1" d="M328.17,298.66H295.81l-39.74,81.46c-4.54,9.37-9.93,21.29-13.91,30.65h-.28c-.57-10.5-1.42-21.86-2.55-30.09l-11.07-82H195.05l-42,83.16a260,260,0,0,0-13.06,29h-.57a276,276,0,0,0-2-29.23l-8.8-82.88H96l16.75,147.59h36.33l39.74-78.62c5.68-11.64,11.07-23.84,15.33-33.49h.28c.57,10.78,1.42,23,2.84,34.34l10.22,77.77h37.46l73.23-147.59Z"/><polygon class="cls-1" points="382.38 298.66 352.58 298.66 324.48 446.25 354.28 446.25 382.38 298.66 382.38 298.66"/><path class="cls-1" d="M553.93,298.66H524.7l-12.2,65.56c-3.69,19-6,33.21-7.1,42.57h-.28a291.23,291.23,0,0,0-11.07-29l-33.77-79.19H421.1L393,446.25H422l14.76-77.77c2.55-13.91,4-22.71,5.11-31.22h.28a276.87,276.87,0,0,0,9.93,28.1l34.63,80.89h39.17l28.1-147.59Z"/><path class="cls-1" d="M708,352.3c0-33.21-20.72-54.21-67.55-54.21-15.61,0-38.88.57-51.37.57L561,446.25c12.2.28,26.68.85,48.82.85,64.14,0,98.2-44.28,98.2-94.8Zm-32.64,4.82c0,21.29-11.64,64.43-62.72,64.43-5.39,0-13.06-.57-16.75-.85l18.45-97.35c5.68-.28,13.06-.57,21-.57,29.8,0,40,15.33,40,34.34Z"/><path class="cls-2" d="M452.32,270.07l-26.4-147.59H390.44L307.57,270.07h31.22l15.89-28.67h60.46L420,270.07ZM412,219.27H366.6l23.27-41.15c4.26-7.66,7.95-15,11.64-23h.28a215.84,215.84,0,0,0,2.84,22.71L412,219.27Z"/><path class="cls-2" d="M596.8,152.85c0-20.43-15-30.94-45.7-30.94-19.3,0-39.74.57-53.08.57l-28.1,147.59c19.3.28,36.61.57,46.55.57,51.09,0,70.1-28.38,70.1-52.79,0-11.92-6.53-22.42-19.87-25.83v-.28c15.89-6.24,30.09-19,30.09-38.88Zm-84.58,51.37c3.69-.28,9.93-.28,13.34-.28,19,0,29.23,4.82,29.23,16.74,0,15.89-12.49,27.82-34.06,27.82-7.09,0-12.77-.28-16.74-1.14l8.23-43.14Zm51.94-46c0,17.6-16.75,26.11-36.9,26.11-2,0-6.53,0-11.07-.28l7.38-40.3c5.39,0,11.92-.28,17.31-.28,18.45,0,23.27,6,23.27,14.76Z"/><path class="cls-2" d="M752.64,177.26c0-34.91-19.58-57.33-59-57.33-52.22,0-90,44-90,97.07,0,34.63,19.58,55.63,59.32,55.63,50,0,89.69-42,89.69-95.37Zm-31.79,2.84c0,31.79-19.3,65.56-54.21,65.56-21.85,0-31.51-12.77-31.51-32.36,0-40.87,25-66.7,53.64-66.7,21.85,0,32.07,13.62,32.07,33.49Z"/></svg>