Merge master

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -48,7 +48,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -62,4 +62,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/deploy_pietervdvn.yml

@@ -5,9 +5,11 @@ on:
       - develop
       - feature/*
       - theme/*
+      - refactoring/*
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: ${{ github.actor != 'weblate' }}
     steps:
       - uses: actions/checkout@v2
 

.github/workflows/validate_translations.yml

@@ -0,0 +1,37 @@
+name: Deployment on pietervdvn
+on:
+  pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'weblate' }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+          cache: "npm"
+          cache-dependency-path: package-lock.json
+
+      - name: install deps
+        run: npm ci
+        shell: bash
+
+      - name: create generated dir
+        run: mkdir ./assets/generated
+        shell: bash
+
+      - name: sync translations
+        run: npm run generate:translations
+        shell: bash
+
+      - name: generate layeroverview
+        run: npm run reset:layeroverview
+        shell: bash
+
+      - name: run tests
+        run: npm run test
+        shell: bash

.gitignore

@@ -5,7 +5,7 @@ node_modules
 scratch
 assets/editor-layer-index.json
 assets/generated/*
-assets/generated/images/*
+src/assets/generated/
 public/*.webmanifest
 /*.html
 !/index.html

.vscode/settings.json

@@ -17,5 +17,6 @@
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "[svelte]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
+  },
+  "editor.formatOnSave": true
 }

404.html

@@ -49,7 +49,7 @@
     Not found...
 </div>
 
-<script type="module" src="./notfound.ts"></script>
+<script type="module" src="./src/notfound.ts"></script>
 <script async data-goatcounter="https://pietervdvn.goatcounter.com/count" src="//gc.zgo.at/count.js"></script>
 
 </body>

Docs/BuiltinIndex.md

@@ -33,6 +33,7 @@
     + [internet-fee](#internet-fee)
     + [internet-ssid](#internet-ssid)
     + [reviews](#reviews)
+    + [questions](#questions)
     + [climbing.website](#climbingwebsite)
     + [climbing.fee](#climbingfee)
     + [climbing.bouldering](#climbingbouldering)
@@ -45,7 +46,6 @@
     + [opening_hours_by_appointment](#opening_hours_by_appointment)
     + [multilevels](#multilevels)
     + [induction-loop](#induction-loop)
-    + [questions](#questions)
     + [all_tags](#all_tags)
     + [export_as_gpx](#export_as_gpx)
     + [export_as_geojson](#export_as_geojson)
@@ -145,6 +145,7 @@
   - reception_desk
   - recycling
   - shops
+  - shower
   - slow_roads
   - sport_pitch
   - sports_centre
@@ -158,6 +159,7 @@
   - trail
   - transit_stops
   - tree_node
+  - vending_machine
   - viewpoint
   - village_green
   - waste_basket
@@ -224,7 +226,10 @@
   - kindergarten_childcare
   - pharmacy
   - postoffices
+  - questions
+  - questions
   - shops
+  - shower
   - sports_centre
   - toilet_at_amenity
   - veterinary
@@ -377,6 +382,8 @@
   - climbing_gym
   - food
   - observation_tower
+  - questions
+  - questions
   - shops
   - ticket_validator
 
@@ -409,6 +416,7 @@
   - parcel_lockers
   - recycling
   - toilet
+  - vending_machine
 
 
 
@@ -428,13 +436,16 @@
   - hackerspace
   - parking
   - picnic_table
+  - questions
   - railway_platforms
   - reception_desk
   - shops
+  - shower
   - ticket_machine
   - ticket_validator
   - toilet
   - toilet_at_amenity
+  - vending_machine
 
 
 
@@ -578,6 +589,23 @@
 
 
 
+### questions 
+
+
+
+
+
+  - charging_station
+  - etymology
+  - hackerspace
+  - play_forest
+  - playground
+  - shops
+  - sport_pitch
+
+
+
+
 ### climbing.website 
 
 
@@ -715,22 +743,6 @@
 
 
 
-### questions 
-
-
-
-
-
-  - etymology
-  - hackerspace
-  - play_forest
-  - playground
-  - shops
-  - sport_pitch
-
-
-
-
 ### all_tags 
 
 
@@ -793,8 +805,10 @@
 
 
   - parking_ticket_machine
+  - shower
   - ticket_machine
   - toilet
+  - vending_machine
 
 
 
@@ -807,6 +821,7 @@
 
   - parking_ticket_machine
   - ticket_machine
+  - vending_machine
 
 
 
@@ -819,6 +834,7 @@
 
   - parking_ticket_machine
   - ticket_machine
+  - vending_machine