From c4b4eef8f3c29e5aadf317f516c0e52df4fe80be Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 28 Mar 2025 23:32:47 +0100 Subject: [PATCH 01/11] Theme(transit): Test with mobility_hub layer --- assets/layers/mobility_hub/hub-gd.svg | 60 ++++++++ assets/layers/mobility_hub/hub-gd.svg.license | 2 + assets/layers/mobility_hub/license_info.json | 21 +++ assets/layers/mobility_hub/logo-hub.svg | 61 ++++++++ .../layers/mobility_hub/logo-hub.svg.license | 2 + assets/layers/mobility_hub/mobility_hub.json | 137 ++++++++++++++++++ assets/themes/transit/transit.json | 3 +- 7 files changed, 285 insertions(+), 1 deletion(-) create mode 100644 assets/layers/mobility_hub/hub-gd.svg create mode 100644 assets/layers/mobility_hub/hub-gd.svg.license create mode 100644 assets/layers/mobility_hub/license_info.json create mode 100644 assets/layers/mobility_hub/logo-hub.svg create mode 100644 assets/layers/mobility_hub/logo-hub.svg.license create mode 100644 assets/layers/mobility_hub/mobility_hub.json diff --git a/assets/layers/mobility_hub/hub-gd.svg b/assets/layers/mobility_hub/hub-gd.svg new file mode 100644 index 0000000000..6e69e0e4ab --- /dev/null +++ b/assets/layers/mobility_hub/hub-gd.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + diff --git a/assets/layers/mobility_hub/hub-gd.svg.license b/assets/layers/mobility_hub/hub-gd.svg.license new file mode 100644 index 0000000000..ae08271017 --- /dev/null +++ b/assets/layers/mobility_hub/hub-gd.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Provincie Groningen; Provincie Drenthe +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/mobility_hub/license_info.json b/assets/layers/mobility_hub/license_info.json new file mode 100644 index 0000000000..ff5c60df55 --- /dev/null +++ b/assets/layers/mobility_hub/license_info.json @@ -0,0 +1,21 @@ +[ + { + "path": "hub-gd.svg", + "license": "ALL-RIGHTS-RESERVED", + "authors": [ + "Provincie Groningen", + "Provincie Drenthe" + ], + "sources": [ + "https://www.reisviahub.nl/" + ] + }, + { + "path": "logo-hub.svg", + "license": "ALL-RIGHTS-RESERVED", + "authors": [ + "Mijksenaar" + ], + "sources": [] + } +] \ No newline at end of file diff --git a/assets/layers/mobility_hub/logo-hub.svg b/assets/layers/mobility_hub/logo-hub.svg new file mode 100644 index 0000000000..ea9f6c8072 --- /dev/null +++ b/assets/layers/mobility_hub/logo-hub.svg @@ -0,0 +1,61 @@ + + + + + + + + + + hub + + + diff --git a/assets/layers/mobility_hub/logo-hub.svg.license b/assets/layers/mobility_hub/logo-hub.svg.license new file mode 100644 index 0000000000..8681106e95 --- /dev/null +++ b/assets/layers/mobility_hub/logo-hub.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Mijksenaar +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/mobility_hub/mobility_hub.json b/assets/layers/mobility_hub/mobility_hub.json new file mode 100644 index 0000000000..5b168c864b --- /dev/null +++ b/assets/layers/mobility_hub/mobility_hub.json @@ -0,0 +1,137 @@ +{ + "credits": "Robin van der Linde", + "minzoom": 8, + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": { + "mappings": [ + { + "if": "network=Groningen-Drenthe", + "then": "./assets/layers/mobility_hub/hub-gd.svg" + } + ], + "render": "./assets/layers/mobility_hub/logo-hub.svg" + } + } + ], + "anchor": { + "render": "bottom", + "mappings": [ + { + "if": "network=Groningen-Drenthe", + "then": "center" + } + ] + } + } + ], + "tagRenderings": [ + "images", + { + "question": { + "en": "What is the name of this mobility hub?", + "nl": "Wat is de naam van deze mobiliteitshub?" + }, + "id": "name", + "render": { + "en": "This mobility hub is called {name}", + "nl": "Deze mobiliteitshub heet {name}" + }, + "freeform": { + "key": "name", + "type": "string", + "placeholder": { + "en": "Name of the mobility hub", + "nl": "Naam van de mobiliteitshub" + } + } + }, + { + "question": { + "en": "To which network does this mobility hub belong to?", + "nl": "Bij welk netwerk hoort deze mobiliteitshub?" + }, + "id": "network", + "freeform": { + "key": "network", + "type": "string", + "placeholder": { + "en": "Network for this mobility hub", + "nl": "Netwerk van deze mobiliteitshub" + } + }, + "render": { + "en": "This mobility hub belongs to the network {network}", + "nl": "Deze mobiliteitshub hoort bij het netwerk {network}" + } + }, + "website" + ], + "lineRendering": [ + { + "width": 1, + "color": { + "render": "#00b26b", + "mappings": [ + { + "if": "network=Groningen-Drenthe", + "then": "#0077db" + }, + { + "if": "network=Jelbi", + "then": "#f0d722" + } + ] + } + } + ], + "credits:uid": 5093765, + "id": "mobility_hub", + "name": { + "en": "Mobility Hubs", + "nl": "Mobiliteitshubs" + }, + "source": { + "osmTags": "amenity=mobility_hub" + }, + "description": { + "en": "Mobility hubs are places where different kinds of transit meet, making it easy to switch between them", + "nl": "Mobiliteitshubs zijn plaatsen waar verschillende soorten vervoer bij elkaar komen, waardoor het makkelijk is om te wisselen van vervoer" + }, + "title": { + "render": { + "en": "Mobility hub", + "nl": "Mobiliteitshub" + }, + "mappings": [ + { + "if": "name~.*", + "then": { + "en": "Mobility hub {name}", + "nl": "Mobiliteitshub {name}" + } + } + ] + }, + "presets": [ + { + "title": { + "en": "a mobility hub", + "nl": "een mobiliteitshub" + }, + "tags": [ + "amenity=mobility_hub" + ] + } + ], + "allowMove": { + "enableImproveAccuracy": true, + "enableRelocation": false + } +} \ No newline at end of file diff --git a/assets/themes/transit/transit.json b/assets/themes/transit/transit.json index 313a6fb06e..ca501b050c 100644 --- a/assets/themes/transit/transit.json +++ b/assets/themes/transit/transit.json @@ -41,6 +41,7 @@ "Robin van der Linde" ], "layers": [ + "mobility_hub", "transit_stops", "transit_routes", { @@ -74,4 +75,4 @@ ] } ] -} +} \ No newline at end of file From 85ba6a2c9c60b8ec7a8deeef00ab66fa37881207 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Mar 2025 12:50:08 +0200 Subject: [PATCH 02/11] Scripts: Removed extra brackets and whitespace --- .forgejo/workflows/deploy_hosted.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/deploy_hosted.yml b/.forgejo/workflows/deploy_hosted.yml index dbf219bdff..a82e25dfc4 100644 --- a/.forgejo/workflows/deploy_hosted.yml +++ b/.forgejo/workflows/deploy_hosted.yml @@ -47,16 +47,15 @@ jobs: vitest --run test && npm run clean:tests shell: bash - - name: Build files run: npm run build - name: Zipping dist file run: | BRANCH=$(echo ${{ github.ref_name }} | sed 's/\//-/g') - mv dist /tmp/${{ BRANCH }} + mv dist /tmp/${BRANCH} cd /tmp - zip ${{ BRANCH }}.zip -r ${{ BRANCH }}/* + zip ${BRANCH}.zip -r ${BRANCH}/* cd - - name: uploading file @@ -91,5 +90,3 @@ jobs: fi env: FORGEJO_TOKEN: ${{ secrets.FORGEJO_TOKEN }} - - From 341a6fec5501d5c234fadd5b8beb32c4aaf01466 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 10 Apr 2025 11:49:00 +0200 Subject: [PATCH 03/11] Chore: Update licenses --- assets/layers/mobility_hub/hub-gd.svg.license | 2 +- assets/layers/mobility_hub/license_info.json | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/assets/layers/mobility_hub/hub-gd.svg.license b/assets/layers/mobility_hub/hub-gd.svg.license index ae08271017..b02bde3d7d 100644 --- a/assets/layers/mobility_hub/hub-gd.svg.license +++ b/assets/layers/mobility_hub/hub-gd.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Provincie Groningen; Provincie Drenthe +SPDX-FileCopyrightText: OV-Bureau Groningen Drenthe SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/mobility_hub/license_info.json b/assets/layers/mobility_hub/license_info.json index ff5c60df55..adbbfec8e2 100644 --- a/assets/layers/mobility_hub/license_info.json +++ b/assets/layers/mobility_hub/license_info.json @@ -3,11 +3,11 @@ "path": "hub-gd.svg", "license": "ALL-RIGHTS-RESERVED", "authors": [ - "Provincie Groningen", - "Provincie Drenthe" + "OV-Bureau Groningen Drenthe" ], "sources": [ - "https://www.reisviahub.nl/" + "https://www.reisviahub.nl/", + "https://ovbureau.nl/" ] }, { @@ -16,6 +16,9 @@ "authors": [ "Mijksenaar" ], - "sources": [] + "sources": [ + "https://www.mobiliteitshubs.nl/documenten/211-de-identiteit-voor-hubs", + "https://www.zeeland.nl/sites/default/files/2022-07/2022-07-11%20Handboek%20identiteit%20hubs%20V1.pdf" + ] } ] \ No newline at end of file From 9e93cce8a6989286ed4e7b4a5b6840aa0c5d777b Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 10 Apr 2025 20:52:16 +0200 Subject: [PATCH 04/11] Add Hoppin logo, generic logo --- assets/layers/mobility_hub/hub.svg | 55 +++++++++++++ assets/layers/mobility_hub/hub.svg.license | 2 + assets/layers/mobility_hub/license_info.json | 18 +++++ assets/layers/mobility_hub/logo-hoppin.svg | 79 +++++++++++++++++++ .../mobility_hub/logo-hoppin.svg.license | 2 + assets/layers/mobility_hub/mobility_hub.json | 56 ++++++++++++- 6 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 assets/layers/mobility_hub/hub.svg create mode 100644 assets/layers/mobility_hub/hub.svg.license create mode 100644 assets/layers/mobility_hub/logo-hoppin.svg create mode 100644 assets/layers/mobility_hub/logo-hoppin.svg.license diff --git a/assets/layers/mobility_hub/hub.svg b/assets/layers/mobility_hub/hub.svg new file mode 100644 index 0000000000..5b68cc05b8 --- /dev/null +++ b/assets/layers/mobility_hub/hub.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + diff --git a/assets/layers/mobility_hub/hub.svg.license b/assets/layers/mobility_hub/hub.svg.license new file mode 100644 index 0000000000..75299f8845 --- /dev/null +++ b/assets/layers/mobility_hub/hub.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/mobility_hub/license_info.json b/assets/layers/mobility_hub/license_info.json index adbbfec8e2..084bb73cfd 100644 --- a/assets/layers/mobility_hub/license_info.json +++ b/assets/layers/mobility_hub/license_info.json @@ -10,6 +10,24 @@ "https://ovbureau.nl/" ] }, + { + "path": "hub.svg", + "license": "CC0-1.0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + }, + { + "path": "logo-hoppin.svg", + "license": "CC0-1.0", + "authors": [ + "original unknown; traced by M!dgard" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Hoppin_logo.svg" + ] + }, { "path": "logo-hub.svg", "license": "ALL-RIGHTS-RESERVED", diff --git a/assets/layers/mobility_hub/logo-hoppin.svg b/assets/layers/mobility_hub/logo-hoppin.svg new file mode 100644 index 0000000000..8c060c239c --- /dev/null +++ b/assets/layers/mobility_hub/logo-hoppin.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + +