From 84ab32d06a85dee0ad0648fb58268c6eb93dbf86 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 25 Apr 2022 19:11:05 +0200
Subject: [PATCH 1/4] =?UTF-8?q?readme:=20link=20to=20published=20feed=20?=
 =?UTF-8?q?=F0=9F=93=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 3cde02a..c809977 100644
--- a/readme.md
+++ b/readme.md
@@ -12,7 +12,7 @@
 
 ## Obtaining the feed
 
-If you want to use this feed, download it from the [latest release](https://github.com/bbnavi/gtfs-flex/releases/latest).
+If you want to use this feed, download it [from bbnavi's open data portal](https://opendata.bbnavi.de/vbb-gtfs-flex/index.html).
 
 
 ## Building the feed

From 27db5ec9664c642aeb8d33a83599198eeb07fc86 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 25 Apr 2022 19:08:10 +0200
Subject: [PATCH 2/4] generate index.html from index.template.html

---
 .gitignore                        | 1 +
 build.sh                          | 5 +++++
 index.html => index.template.html | 0
 3 files changed, 6 insertions(+)
 rename index.html => index.template.html (100%)

diff --git a/.gitignore b/.gitignore
index af063cc..86a910a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ Thumbs.db
 /gtfs
 
 /gtfs-flex.zip
+/index.html
diff --git a/build.sh b/build.sh
index fc72387..1511ad6 100755
--- a/build.sh
+++ b/build.sh
@@ -109,3 +109,8 @@ ls -lh gtfs-flex.zip
 # GTFSVTOR doesn't support GTFS-Flex v2.
 # todo
 # docker run -it --rm -v $PWD:/gtfs mfdz/gtfsvtor -o /gtfs/validation-results.html /gtfs
+
+
+echo_heading 'generating index.html'
+cat index.template.html \
+	>index.html
diff --git a/index.html b/index.template.html
similarity index 100%
rename from index.html
rename to index.template.html

From 4ba4babebf0e38813d7b8463ef644aae8309ae9f Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 25 Apr 2022 19:08:54 +0200
Subject: [PATCH 3/4] index.html: embed schma.org Dataset as JSON-LD

---
 build.sh            |  2 ++
 index.template.html | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/build.sh b/build.sh
index 1511ad6..88b4826 100755
--- a/build.sh
+++ b/build.sh
@@ -112,5 +112,7 @@ ls -lh gtfs-flex.zip
 
 
 echo_heading 'generating index.html'
+dataset_version="$(date "+%Y-%m-%d")"
 cat index.template.html \
+	| sed "s/{{dataset_version}}/$dataset_version/" \
 	>index.html
diff --git a/index.template.html b/index.template.html
index 13c7639..dcbae36 100644
--- a/index.template.html
+++ b/index.template.html
@@ -7,6 +7,47 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>experimenteller GTFS-Flex-Feed des VBB</title>
+	<!-- todo: add spatialCoverage.geo: {@type: GeoShape, box: …} -->
+	<!-- todo: spatialCoverage: add metadata like ISO code, Wikidata ID -->
+	<script type="application/ld+json">
+		{
+			"@context": "http://schema.org",
+			"@type": "Dataset",
+			"name": "experimenteller GTFS-Flex-Feed des VBB",
+			"description": "GTFS-Flex-Datensatz für den Verkehrsverbund Berlin-Brandenburg.",
+			"keywords": [
+				"GTFS",
+				"GTFS-Flex",
+				"demand responsive",
+				"transit",
+				"mobility"
+			],
+			"creator": {
+				"@type": "Organization",
+				"name": "DigitalAgentur Brandenburg GmbH",
+				"url": "https://www.digital-agentur.de"
+			},
+			"publisher": {
+				"@type": "Organization",
+				"name": "DigitalAgentur Brandenburg GmbH",
+				"url": "https://www.digital-agentur.de"
+			},
+			"license": "https://creativecommons.org/publicdomain/zero/1.0/",
+			"spatialCoverage": {
+				"@type": "Place",
+				"name": "Brandenburg"
+			},
+			"version": "{{dataset_version}}",
+			"distribution": [
+				{
+					"@type": "DataDownload",
+					"name": "GTFS-Flex",
+					"contentUrl": "gtfs-flex.zip",
+					"encodingFormat": "application/zip"
+				}
+			]
+		}
+	</script>
 	<style type="text/css">
 		body {
 			margin: 1rem;

From aa293934a23889a47e4adee3d57008502a0ea08e Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 25 Apr 2022 19:49:44 +0200
Subject: [PATCH 4/4] tweak publishing CI workflow

---
 .github/workflows/build-and-publish.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index a1d0075..b0c9edc 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -4,10 +4,6 @@ on:
   schedule:
     # every day at 2:40
     - cron:  '40 2 * * *'
-  # todo: remove
-  push:
-    branches:
-      - 'publish'
 
 jobs:
   # todo: DRY with build.yml
@@ -21,7 +17,7 @@ jobs:
       run: ./ci/install-qsv.sh
 
     - run: ./build.sh
-    - name: store gtfs-flex.zip as artifact
+    - name: build feed & store as artifact
       uses: actions/upload-artifact@v3
       with:
         name: gtfs-flex
@@ -37,8 +33,7 @@ jobs:
     env:
       MC_IMAGE:
     steps:
-      # todo
-      - name: restore gtfs-flex.zip
+      - name: restore built feed
         uses: actions/download-artifact@v3
         with:
           name: gtfs-flex