Skip to content

Commit

Permalink
Merge branch 'master' of github.com:motis-project/motis
Browse files Browse the repository at this point in the history
  • Loading branch information
felixguendling committed Dec 21, 2024
2 parents 29778d4 + 4455ce9 commit abac709
Show file tree
Hide file tree
Showing 60 changed files with 3,473 additions and 745 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
@@ -1,23 +1,23 @@
[nigiri]
url=git@github.com:motis-project/nigiri.git
branch=master
commit=23e619793c9b33a8df9280c031511c5f5adada34
commit=0acb412fe0128b47b7b6fa104d601fc4430750dc
[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
[utl]
url=git@github.com:motis-project/utl.git
branch=master
commit=9c44a5abcb62c0463df87355e0cb29d90906f0d0
commit=368fdcb8326ced5bb151b60c09a07c2e5f09bf55
[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
13 changes: 7 additions & 6 deletions .pkg.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
6176226545254116619
cista 847b27100b7e730370b810ce62206a66b0bf2d79
12080228953055610555
cista 6362f3ad8c3133a0abf64e5d8c9ea3e21f531ee8
zlib-ng 68ab3e2d80253ec5dc3c83691d9ff70477b32cd3
boost 930f38eb0365ceb7853273e03da4d9e7787abfb9
googletest 7b64fca6ea0833628d6f86255a81424365f7cc0c
lz4 c4765545ebb14b0a56c663e21923166923f8280e
mimalloc e2f4fe647e8aff4603a7d5119b8639fd1a47c8a6
libressl 24acd9e710fbe842e863572da9d738715fbc74b8
fmt dc10f83be70ac2873d5f8d1ce317596f1fd318a2
utl 9c44a5abcb62c0463df87355e0cb29d90906f0d0
utl 368fdcb8326ced5bb151b60c09a07c2e5f09bf55
res b759b93316afeb529b6cb5b2548b24c41e382fb0
date ce88cc33b5551f66655614eeebb7c5b7189025fb
yaml-cpp 1d8ca1f35eb3a9c9142462b28282a848e5d29a91
openapi-cpp dac46d043f07a119d8b7d9ccb47e51049b259bfe
openapi-cpp 688d45bd96addb26eaccc5d264761030e5ef43f9
net 6a457f5eaa077078fcac4153c5a178657737eee8
PEGTL 1c1aa6e650e4d26f10fa398f148ec0cdc5f0808d
oh d21c30f40e52a83d6dc09bcffd0067598b5ec069
Expand All @@ -26,7 +27,7 @@ opentelemetry-cpp 60770dc9dc63e3543fc87d605b2e88fd53d7a414
pugixml 60175e80e2f5e97e027ac78f7e14c5acc009ce50
unordered_dense b33b037377ca966bbdd9cccc3417e46e88f83bfb
wyhash 1e012b57fc2227a9e583a57e2eacb3da99816d99
nigiri 23e619793c9b33a8df9280c031511c5f5adada34
nigiri 0acb412fe0128b47b7b6fa104d601fc4430750dc
conf f9bf4bd83bf55a2170725707e526cbacc45dcc66
expat 636c9861e8e7c119f3626d1e6c260603ab624516
libosmium 6e6d6b3081cc8bdf25dda89730e25c36eb995516
Expand All @@ -47,4 +48,4 @@ reflect-cpp c54fe66de4650b60c23aadd4a06d9db4ffeda22f
FTXUI dd6a5d371fd7a3e2937bb579955003c54b727233
tg 20c0f298b8ce58de29a790290f44dca7c4ecc364
utf8proc 779b780da3b99d123133eb99707b65c7e4324cc8
adr 9bf19dd88d7805d6bea1cebf5b09a394605fa3f6
adr d5036b92fed3867abb474440987343a8ae4cb3bf
3 changes: 2 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
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
38 changes: 38 additions & 0 deletions exe/flags.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#pragma once

#include <filesystem>

#include "boost/program_options.hpp"

namespace motis {

inline void add_data_path_opt(boost::program_options::options_description& desc,
std::filesystem::path& p) {
desc.add_options()(
"data,d", boost::program_options::value(&p)->default_value(p),
"The data path contains all preprocessed data as well as a `config.yml`. "
"It will be created by the `motis import` command. After the import has "
"finished, `motis server` only needs the `data` folder and can run "
"without the input files (such as OpenStreetMap file, GTFS datasets, "
"tiles-profiles, etc.)");
}

inline void add_config_path_opt(
boost::program_options::options_description& desc,
std::filesystem::path& p) {
desc.add_options()(
"config,c", boost::program_options::value(&p)->default_value(p),
"Configuration YAML file. Legacy INI files are still supported but this "
"support will be dropped in the future.");
}

inline boost::program_options::variables_map parse_opt(
int ac, char** av, boost::program_options::options_description& desc) {
namespace po = boost::program_options;
auto vm = po::variables_map{};
po::store(po::command_line_parser(ac, av).options(desc).run(), vm);
po::notify(vm);
return vm;
}

} // namespace motis
Loading

0 comments on commit abac709

Please # to comment.