Skip to content

Commit

Permalink
chore: Bump MOTIS version to 2.0.14 (#37)
Browse files Browse the repository at this point in the history
* Use `maxTravelTime` to filter results (motis-project#668)

* Use 'maxTravelTime' to filter results

* Change unit to minutes

* Fix formatting

* Fix type for MSVC build

* Update nigiri dependency

* Set limit for maximum travel time

* GBFS: Performance/Memory Improvements + Vehicle Types (motis-project#670)

* gbfs: partition providers, faster updates, less memory usage

* fix vehicle_docks_available

* slightly faster geofencing zone mapping

* rename provider_cache -> provider_file_infos

* ts formatting

* formatting

* clang fixes

* clang fix

* clang fixes

* trying to fix apple clang

* static_cast all the things

* review changes

* fix include

* 65k gbfs providers should be enough

* remove obsolete comment

* sort vehicle status before diff

* fill cache during gbfs update

* cleanup

* partition vehicle types by form factor + propulsion type

* rental api changes (RENTAL mode + form factor + propulsion type)

* ui fix

* rename provider segment -> products

* vehicle type id -> idx

* rename more segment -> products

* one more r-tree to speed up geofencing zone mapping

* clang fix

* fix api descriptions

* api: add rental provider filter

* ui: fix direct connection display for rental connections

* return constraint support, allow roundtrip for direct connections

* ui formatting

* fix missing gbfs data after update

* http proxy support

* share decompressed bitvecs between routing requests

* fix missing initializer

---------

Co-authored-by: Felix Gündling <felix.guendling@gmail.com>

* replace wheelchair with pedestrianProfile and useRoutedTransfers params (motis-project#683)

* replace wheelchair with pedestrianProfile and useRoutedTransfers parameters

* fix test

* ui: debounce search requests

* increase trains limit to support big cities like Paris/London/..

* add timeout option

* cli changes (motis-project#685)

* cli changes

* wip

* update nigiri

* Update README.md: not beta anymore

* update nigiri: speedup ~8% by not finding 24h+ transfers

* basic benchmark and QA tooling (motis-project#686)

* bench

* wip

* wip

* wip

* wip

* fix command line flag handling

* full dataset test (motis-project#687)

* full dataset test

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* body size limit 128M

* cmake: Add option to pass flags not used for host tools (motis-project#689)

* update nigiri: rt update fixes time travel

* more rebostness against invalid delay update data

motis-project/nigiri#162

* update nigiri: trim stop time before empty check for interpolation

* motis config: fix crash with no parameters

* update nigiri: better trip names (motis-project#695)

* polish translation

* Detailed transfers flag + output exactly what nigiri routed (motis-project#698)

* wip

* output exactly what nigiri routed

* remove logging output

* remove unused variable

* fix eval

* wip

* wip

* Initial style guide docs/STYLE.md

* Fix missing closing tag (motis-project#700)

* Fix missing closing tag

* Add sections for important tools

This adds a section for `strong`, as well as `vector_map` and `vecvec`.

* Fix index out of range for stop_times last arrival of multi-section run (motis-project#704)

* fix index out of range for stop_times last arrival of multi-section run

* follow style guide

Co-authored-by: Felix Gündling <felix.guendling@gmail.com>

---------

Co-authored-by: Felix Gündling <felix.guendling@gmail.com>

* (Mobile) UI improvements (motis-project#705)

* ui: move components to lib

* ui: make components more responsive

* ui: more compact layout

* ui: i18n fixes

* ui: make toggle button state more visible

* ui: error handling, avoid repeated effect triggering

* ui: more small screen adjustments

* ui: url state handling

* ui: show backend error msgs, compact transfer display

* UI fixes (motis-project#710)

* ui: fall back to black routeTextColor (gtfs spec)

* update ui deps

* ui: workaround to avoid clickthrough

* ui: linting

* update nigiri: monotonicity enforcement on utc times (fixes interpolation for frequency expanded trips)

* ui changes

* Improve formatDuration (motis-project#713)

* Update formatDuration.ts

* fix formatting

* fix formatting

* Fix formatting

* osr_footpaths: add missing footpaths (motis-project#707)

* osr_footpaths: add missing footpaths

* update osr (ramp support)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* formatting

---------

Co-authored-by: Michael Kutzner <174690291+MichaelKutzner@users.noreply.github.com>
Co-authored-by: Pablo Hoch <pablohoch@users.noreply.github.com>
Co-authored-by: Felix Gündling <felix.guendling@gmail.com>
Co-authored-by: Felix Gündling <felixguendling@gmail.com>
Co-authored-by: Jonah Brüchert <jbb@kaidan.im>
Co-authored-by: Traines <git@traines.eu>
Co-authored-by: Altonss <66519591+Altonss@users.noreply.github.com>
  • Loading branch information
8 people authored Jan 30, 2025
1 parent 25b7e3f commit 699cef3
Show file tree
Hide file tree
Showing 92 changed files with 5,519 additions and 1,563 deletions.
17 changes: 16 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ jobs:
BUILDCACHE_DIRECT_MODE: true
BUILDCACHE_MAX_CACHE_SIZE: 26843545600
BUILDCACHE_LUA_PATH: ${{ github.workspace }}/tools
UBSAN_OPTIONS: halt_on_error=1:abort_on_error=1
ASAN_OPTIONS: alloc_dealloc_mismatch=0
steps:
- uses: actions/checkout@v4

Expand All @@ -291,6 +293,19 @@ jobs:
- name: Run Integration Tests
run: ${{ matrix.config.emulator }} build/motis-test

# ==== FULL DATASET TEST ====
- name: Test Full Dataset
if: matrix.config.preset != 'linux-debug'
run: |
ln -s deps/tiles/profile tiles-profiles
wget https://github.com/motis-project/test-data/raw/aachen/aachen.osm.pbf
wget https://github.com/motis-project/test-data/raw/aachen/AVV_GTFS_Masten_mit_SPNV.zip
${{ matrix.config.emulator }} ./build/motis config aachen.osm.pbf AVV_GTFS_Masten_mit_SPNV.zip
${{ matrix.config.emulator }} ./build/motis import
${{ matrix.config.emulator }} ./build/motis generate -n 10
${{ matrix.config.emulator }} ./build/motis batch
${{ matrix.config.emulator }} ./build/motis compare -q queries.txt -r responses.txt responses.txt
# ==== DISTRIBUTION ====
- name: Create Distribution
if: matrix.config.artifact
Expand Down Expand Up @@ -318,7 +333,7 @@ jobs:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ./motis-${{ matrix.config.artifact }}.tar.bz2
asset_name: motis-${{ matrix.config.artifact }}.tar.bz2
asset_content_type: application/x-tar
asset_content_type: application/x-

docker:
runs-on: ubuntu-20.04
Expand Down
14 changes: 9 additions & 5 deletions .pkg
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
[cista]
url=git@github.com:felixguendling/cista.git
branch=master
commit=950f96f4ded53a6b5753824b280550b722933e55
commit=6362f3ad8c3133a0abf64e5d8c9ea3e21f531ee8
[osr]
url=git@github.com:motis-project/osr.git
branch=master
commit=478bed28978461f0728c311899cc6bb22f0dd591
commit=650e05c5dc59598f84a5e9bae2db75d5cc3433b8
[utl]
url=git@github.com:motis-project/utl.git
branch=master
commit=368fdcb8326ced5bb151b60c09a07c2e5f09bf55
commit=07fb33df7b79b73e84e0d2c69c6ee445221f6e32
[adr]
url=git@github.com:triptix-tech/adr.git
branch=master
commit=9bf19dd88d7805d6bea1cebf5b09a394605fa3f6
commit=d5036b92fed3867abb474440987343a8ae4cb3bf
[googletest]
url=git@github.com:motis-project/googletest.git
branch=master
Expand All @@ -29,7 +29,7 @@
[openapi-cpp]
url=git@github.com:triptix-tech/openapi-cpp.git
branch=master
commit=dac46d043f07a119d8b7d9ccb47e51049b259bfe
commit=688d45bd96addb26eaccc5d264761030e5ef43f9
[unordered_dense]
url=git@github.com:motis-project/unordered_dense.git
branch=master
Expand All @@ -54,3 +54,7 @@
url=git@github.com:motis-project/mimalloc.git
branch=dev
commit=e2f4fe647e8aff4603a7d5119b8639fd1a47c8a6
[lz4]
url=git@github.com:motis-project/lz4.git
branch=dev
commit=c4765545ebb14b0a56c663e21923166923f8280e
4 changes: 2 additions & 2 deletions .pkg.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ sol2 40c7cbc7c5cfed1e8c7f1bbe6fcbe23d7a67fc75
variant 5aa73631dc969087c77433a5cdef246303051f69
tiles ab6c4b13544570f893c2d64434c613d8fd7d2ceb
rtree.c 6ed73a7dc4f1184f2b5b2acd8ac1c2b28a273057
osr 478bed28978461f0728c311899cc6bb22f0dd591
osr 650e05c5dc59598f84a5e9bae2db75d5cc3433b8
reflect-cpp c54fe66de4650b60c23aadd4a06d9db4ffeda22f
FTXUI dd6a5d371fd7a3e2937bb579955003c54b727233
tg 20c0f298b8ce58de29a790290f44dca7c4ecc364
utf8proc 779b780da3b99d123133eb99707b65c7e4324cc8
adr 9bf19dd88d7805d6bea1cebf5b09a394605fa3f6
adr d5036b92fed3867abb474440987343a8ae4cb3bf
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ target_link_libraries(motislib
pbf_sdf_fonts_res-res
ssl
crypto
tg
lz4_static
)


Expand All @@ -144,7 +146,6 @@ target_link_libraries(motis
rtree
geo
cista
tg
ianatzdb-res
pbf_sdf_fonts_res-res
tiles_server_res-res
Expand Down Expand Up @@ -197,3 +198,9 @@ add_custom_target(motis-web-ui
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ui"
VERBATIM
)

foreach(t mimalloc adr osr nigiri gtfsrt
geo tiles tiles-import-library
motis motis-api motislib)
target_compile_options(${t} PUBLIC ${MOTIS_TARGET_FLAGS})
endforeach()
16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<p align="center"><img src="logo.svg" width="196" height="196"></p>

> [!NOTE]
> This is the MOTIS 2 beta version.
> You can find the `0.x.y` legacy branch [here](https://github.com/motis-project/motis/tree/legacy).
> [!TIP]
> :sparkles: Join the international MOTIS community at [**motis:matrix.org**](https://matrix.to/#/#motis:matrix.org)
Expand Down Expand Up @@ -60,7 +56,9 @@ Features can be turned on and off as needed.
- Download one or more GTFS datasets and place them in the folder

```bash
./motis my.osm.pbf my.gtfs.zip
./motis config my.osm.pbf gtfs.zip # generates a minimal config.yml
./motis import # preprocesses data
./motis server # starts a HTTP server on port 8080
```

This will preprocess the input files and create a `data` folder.
Expand All @@ -81,7 +79,9 @@ wget https://github.com/motis-project/motis/releases/latest/download/motis-${TAR
tar xf motis-${TARGET}.tar.bz2
wget https://github.com/motis-project/test-data/raw/aachen/aachen.osm.pbf
wget https://opendata.avv.de/current_GTFS/AVV_GTFS_Masten_mit_SPNV.zip
./motis aachen.osm.pbf AVV_GTFS_Masten_mit_SPNV.zip
./motis config aachen.osm.pbf AVV_GTFS_Masten_mit_SPNV.zip
./motis import
./motis server
```

**Windows**
Expand All @@ -90,7 +90,9 @@ wget https://opendata.avv.de/current_GTFS/AVV_GTFS_Masten_mit_SPNV.zip
Invoke-WebRequest https://github.com/motis-project/motis/releases/latest/download/motis-windows.zip -OutFile motis-windows.zip
Expand-Archive motis-windows.zip
Invoke-WebRequest https://github.com/motis-project/test-data/archive/refs/heads/aachen.zip -OutFile aachen.zip
./motis aachen.osm.pbf AVV_GTFS_Masten_mit_SPNV.zip
./motis config aachen.osm.pbf AVV_GTFS_Masten_mit_SPNV.zip
./motis import
./motis server
```

# Documentation
Expand Down
Loading

0 comments on commit 699cef3

Please sign in to comment.