support for car sharing

.github/workflows/gpu.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    runs-on: [self-hosted, linux, x64, gpu]
+    runs-on: [ self-hosted, linux, x64, gpu ]
     env:
       DEBIAN_FRONTEND: noninteractive
       BUILDCACHE_COMPRESS: true
@@ -20,7 +20,7 @@ jobs:
       UBSAN_OPTIONS: halt_on_error=1:abort_on_error=1
       CUDACXX: /usr/local/cuda/bin/nvcc
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get deps
         run: mkdir -p ~/deps && mv ~/deps .
@@ -53,4 +53,4 @@ jobs:
         run: ${{ matrix.config.emulator }} ./build/motis-test
 
       - name: Run Integration Tests
-        run: ${{ matrix.config.emulator }} ./build/motis-itest
+        run: ${{ matrix.config.emulator }} ./build/motis-itest

.github/workflows/unix.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/motis-project/docker-cpp-build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Format files
         run: |
@@ -24,6 +24,7 @@ jobs:
 
       - name: Check for differences
         run: |
+          git config --global --add safe.directory `pwd`
           git status --porcelain
           git status --porcelain | xargs -I {} -0 test -z \"{}\"
 
@@ -33,7 +34,7 @@ jobs:
       run:
         working-directory: ui/rsl
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: pnpm Cache
         uses: actions/cache@v2
@@ -76,7 +77,7 @@ jobs:
       UBSAN_OPTIONS: halt_on_error=1:abort_on_error=1
       ASAN_OPTIONS: alloc_dealloc_mismatch=0
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: seanmiddleditch/gha-setup-ninja@master
 
       # ==== CACHE ====
@@ -116,7 +117,7 @@ jobs:
             --dataset.begin 20151004 \
             --dataset.write_serialized false \
             --ris.db_max_size 1048576 \
-            --exclude_modules address osrm parking path ppr tiles tripbased
+            --exclude_modules address osrm parking path ppr tiles tripbased gbfs
 
       - name: Run Tests
         if: matrix.config.tests == 'On'
@@ -219,7 +220,7 @@ jobs:
       BUILDCACHE_MAX_CACHE_SIZE: 26843545600
       BUILDCACHE_LUA_PATH: ${{ github.workspace }}/tools
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get deps
         run: ln -s /deps deps
@@ -242,7 +243,7 @@ jobs:
             --dataset.begin 20151004 \
             --dataset.write_serialized false \
             --ris.db_max_size 1048576 \
-            --exclude_modules address osrm parking path ppr tiles tripbased
+            --exclude_modules address osrm parking path ppr tiles tripbased gbfs
 
       - name: Run Tests
         run: ${{ matrix.config.emulator }} build/motis-test
@@ -339,7 +340,7 @@ jobs:
           sudo apt-get install -y --no-install-recommends ${{ matrix.config.packages }}
 
       - name: Download timetable and OSM dataset
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: motis-project/test-data
           ref: aachen
@@ -377,7 +378,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs: full-data-set-test
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Download artifacts
         uses: actions/download-artifact@v2

.github/workflows/windows.yml

@@ -32,7 +32,7 @@ jobs:
       BUILDCACHE_LUA_PATH: ${{ github.workspace }}/tools
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: seanmiddleditch/gha-setup-ninja@master
 
       - name: buildcache Cache
@@ -80,7 +80,7 @@ jobs:
           --import.paths schedule:base/loader/test_resources/hrd_schedules/single-ice
           --dataset.begin 20151004
           --dataset.write_serialized false
-          --exclude_modules address osrm parking path ppr tiles
+          --exclude_modules address osrm parking path ppr tiles gbfs
 
       - name: Run Tests
         run: .\build\motis-test.exe

CMakePresets.json

@@ -143,7 +143,7 @@
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_C_FLAGS": "-fsanitize=address,undefined -fno-omit-frame-pointer",
         "CMAKE_CXX_FLAGS": "-fsanitize=address,undefined -fno-omit-frame-pointer",
-        "CMAKE_EXE_LINKER_FLAGS": "-B/opt",
+        "CMAKE_EXE_LINKER_FLAGS": "-B/opt/mold",
         "CTX_ASAN": "ON"
       },
       "environment": {
@@ -159,7 +159,7 @@
       "binaryDir": "${sourceDir}/build/debug",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_EXE_LINKER_FLAGS": "-B/opt",
+        "CMAKE_EXE_LINKER_FLAGS": "-B/opt/mold",
         "CTX_VALGRIND": "ON"
       },
       "environment": {
@@ -174,7 +174,8 @@
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/relwithdebinfo",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "CMAKE_EXE_LINKER_FLAGS": "-B/opt/mold"
       },
       "environment": {
         "PATH": "/opt:/opt/cmake-3.23.0-rc3-linux-x86_64/bin:/opt/buildcache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",

modules/gbfs/include/motis/gbfs/gbfs.h

@@ -25,6 +25,7 @@ struct gbfs : public motis::module::module {
 
   void init(motis::module::registry&) override;
   void import(motis::module::import_dispatcher&) override;
+  bool import_successful() const override { return import_successful_; }
 
 private:
   bool import_successful_{false};

modules/gbfs/include/motis/gbfs/system_information.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <string>
+#include <string_view>
+
+namespace motis::gbfs {
+
+struct system_information {
+  std::string name_;
+  std::string name_short_;
+  std::string operator_;
+  std::string url_;
+  std::string purchase_url_;
+  std::string mail_;
+};
+
+system_information read_system_information(std::string_view);
+
+}  // namespace motis::gbfs

modules/gbfs/include/motis/gbfs/system_status.h

@@ -15,6 +15,7 @@ struct urls {
   std::optional<std::string> free_bike_url_;
   std::optional<std::string> station_info_url_;
   std::optional<std::string> station_status_url_;
+  std::optional<std::string> system_information_url_;
 };
 
 std::vector<urls> read_system_status(std::string_view);