Merge pull request #21 from Knowit-Objectnet/transportation

Transportation
Knowit-Objectnet · Aug 7, 2024 · 298da13 · 298da13
2 parents bfe17d8 + e10d65f
commit 298da13
Show file tree

Hide file tree

Showing 20 changed files with 14,605 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,9 +7,6 @@
 .AppleDouble
 .LSOverride
 
-# Icon must end with two \r
-Icon
-
 # Thumbnails
 ._*
 
@@ -241,3 +238,6 @@ Cargo.lock
 
 # End of https://www.toptal.com/developers/gitignore/api/macos,visualstudiocode,python,rust
 
+# Jetbrains IDEs
+.idea
+
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,6 +10,7 @@ selfie = []
 [dependencies]
 chrono = { version = "0.4.26", features = ["serde", "unstable-locales"] }
 image = "0.24.7"
+graphql_client = { version = "0.13.0" }
 reqwest = { version = "0.11.23", features = [
     "json",
     "rustls-tls",

diff --git a/README.md b/README.md
@@ -47,3 +47,11 @@ GUI-koden eksponerar også typar, som `Forecast`-structen i [weatherwidget.slint
 * Koderydding
 * Feilhåndtering
 * Fikse minnelekkasje?
+
+## Vedlikehold
+
+### Oppdater skjema-definisjoner fra EnTurs API.
+
+```shell
+graphql-client introspect-schema "https://api.entur.io/journey-planner/v3/graphql" --output "src/resources/journey-planner_schema.json"
+```
diff --git a/img/transport/bus.png b/img/transport/bus.png
diff --git a/img/transport/bus_alert.png b/img/transport/bus_alert.png
diff --git a/img/transport/rail.png b/img/transport/rail.png
diff --git a/img/transport/rail_alert.png b/img/transport/rail_alert.png
diff --git a/img/transport/train.png b/img/transport/train.png
diff --git a/img/transport/tram.png b/img/transport/tram.png
diff --git a/img/transport/walk.png b/img/transport/walk.png
diff --git a/img/transport/water.png b/img/transport/water.png
diff --git a/src/main.rs b/src/main.rs
@@ -9,6 +9,7 @@ mod food;
 mod forecast;
 mod selfie;
 mod xkcd;
+mod transportation;
 
 pub mod ui {
     slint::include_modules!();
@@ -28,6 +29,7 @@ fn main() -> Result<(), PlatformError> {
     xkcd::setup(&main_window);
     food::setup(&main_window);
     calendar::setup(&main_window);
+    transportation::setup(&main_window);
 
     //we need to store the timers in variables to prevent them from being dropped
     let _t = datetime::setup(&main_window);

diff --git a/src/transportation/journey-planner_query.graphql b/src/transportation/journey-planner_query.graphql
@@ -0,0 +1,39 @@
+query Query($id: String!, $numberOfDepartures: Int) {
+    stopPlace(id: $id) {
+        id
+        name
+        quays(filterByInUse: true) {
+            id
+            name
+            publicCode
+            estimatedCalls(numberOfDepartures: $numberOfDepartures) {
+                realtime
+                aimedArrivalTime
+                aimedDepartureTime
+                expectedArrivalTime
+                expectedDepartureTime
+                actualArrivalTime
+                actualDepartureTime
+                date
+                forBoarding
+                forAlighting
+                destinationDisplay {
+                    frontText
+                    via
+                }
+                serviceJourney {
+                    directionType
+                    publicCode
+                    journeyPattern {
+                        line {
+                            id
+                            name
+                            transportMode
+                            publicCode
+                        }
+                    }
+                }
+            }
+        }
+    }
+}