Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

wip

Browse Source
This commit is contained in:
Siarhei Fedartsou 2024-05-27 10:40:09 +02:00
parent 1190303cac
commit e7b1ee55e0
2 changed files with 222 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

440
.github/workflows/osrm-backend.yml vendored
View File

@ -24,246 +24,246 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
windows-release-node: # windows-release-node:
needs: format-taginfo-docs # needs: format-taginfo-docs
runs-on: windows-2022 # runs-on: windows-2022
continue-on-error: false # continue-on-error: false
env: # env:
BUILD_TYPE: Release # BUILD_TYPE: Release
steps: # steps:
- uses: actions/checkout@v4 # - uses: actions/checkout@v4
- run: pip install "conan<2.0.0" # - run: pip install "conan<2.0.0"
- run: conan --version # - run: conan --version
- run: cmake --version # - run: cmake --version
- uses: actions/setup-node@v4 # - uses: actions/setup-node@v4
with: # with:
node-version: 18 # node-version: 18
- run: node --version # - run: node --version
- run: npm --version # - run: npm --version
- name: Prepare environment # - name: Prepare environment
shell: bash # shell: bash
run: | # run: |
PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") # PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV # echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV
- run: npm install --ignore-scripts # - run: npm install --ignore-scripts
- run: npm link --ignore-scripts # - run: npm link --ignore-scripts
- uses: microsoft/setup-msbuild@v2 # - uses: microsoft/setup-msbuild@v2
- name: Build # - name: Build
run: | # run: |
.\scripts\ci\windows-build.bat # .\scripts\ci\windows-build.bat
- name: Run node tests # - name: Run node tests
shell: bash # shell: bash
run: | # run: |
./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm # ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm
node test/nodejs/index.js # node test/nodejs/index.js
- name: Build Node package # - name: Build Node package
shell: bash # shell: bash
run: ./scripts/ci/node_package.sh # run: ./scripts/ci/node_package.sh
- name: Publish Node package # - name: Publish Node package
if: ${{ env.PUBLISH == 'On' }} # if: ${{ env.PUBLISH == 'On' }}
uses: ncipollo/release-action@v1 # uses: ncipollo/release-action@v1
with: # with:
allowUpdates: true # allowUpdates: true
artifactErrorsFailBuild: true # artifactErrorsFailBuild: true
artifacts: build/stage/**/*.tar.gz # artifacts: build/stage/**/*.tar.gz
omitBody: true # omitBody: true
omitBodyDuringUpdate: true # omitBodyDuringUpdate: true
omitName: true # omitName: true
omitNameDuringUpdate: true # omitNameDuringUpdate: true
replacesArtifacts: true # replacesArtifacts: true
token: ${{ secrets.GITHUB_TOKEN }} # token: ${{ secrets.GITHUB_TOKEN }}
format-taginfo-docs: # format-taginfo-docs:
runs-on: ubuntu-22.04 # runs-on: ubuntu-22.04
steps: # steps:
- uses: actions/checkout@v4 # - uses: actions/checkout@v4
- name: Use Node.js # - name: Use Node.js
uses: actions/setup-node@v4 # uses: actions/setup-node@v4
with: # with:
node-version: 18 # node-version: 18
- name: Enable Node.js cache # - name: Enable Node.js cache
uses: actions/cache@v4 # uses: actions/cache@v4
with: # with:
path: ~/.npm # path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} # key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: | # restore-keys: |
${{ runner.os }}-node- # ${{ runner.os }}-node-
- name: Prepare environment # - name: Prepare environment
run: | # run: |
npm ci --ignore-scripts # npm ci --ignore-scripts
clang-format-15 --version # clang-format-15 --version
- name: Run checks # - name: Run checks
run: | # run: |
./scripts/check_taginfo.py taginfo.json profiles/car.lua # ./scripts/check_taginfo.py taginfo.json profiles/car.lua
./scripts/format.sh && ./scripts/error_on_dirty.sh # ./scripts/format.sh && ./scripts/error_on_dirty.sh
node ./scripts/validate_changelog.js # node ./scripts/validate_changelog.js
npm run docs && ./scripts/error_on_dirty.sh # npm run docs && ./scripts/error_on_dirty.sh
npm audit --production # npm audit --production
docker-image: # docker-image:
needs: format-taginfo-docs # needs: format-taginfo-docs
runs-on: ubuntu-22.04 # runs-on: ubuntu-22.04
continue-on-error: false # continue-on-error: false
steps: # steps:
- name: Check out the repo # - name: Check out the repo
uses: actions/checkout@v4 # uses: actions/checkout@v4
- name: Enable osm.pbf cache # - name: Enable osm.pbf cache
uses: actions/cache@v4 # uses: actions/cache@v4
with: # with:
path: berlin-latest.osm.pbf # path: berlin-latest.osm.pbf
key: v1-berlin-osm-pbf # key: v1-berlin-osm-pbf
restore-keys: | # restore-keys: |
v1-berlin-osm-pbf # v1-berlin-osm-pbf
- name: Docker build # - name: Docker build
run: | # run: |
docker build -t osrm-backend-local -f docker/Dockerfile . # docker build -t osrm-backend-local -f docker/Dockerfile .
- name: Test Docker image # - name: Test Docker image
run: | # run: |
if [ ! -f "${PWD}/berlin-latest.osm.pbf" ]; then # if [ ! -f "${PWD}/berlin-latest.osm.pbf" ]; then
wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf # wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf
fi # fi
TAG=osrm-backend-local # TAG=osrm-backend-local
# when `--memory-swap` value equals `--memory` it means container won't use swap # # when `--memory-swap` value equals `--memory` it means container won't use swap
# see https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details # # see https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details
MEMORY_ARGS="--memory=1g --memory-swap=1g" # MEMORY_ARGS="--memory=1g --memory-swap=1g"
docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-extract --dump-nbg-graph -p /opt/car.lua /data/berlin-latest.osm.pbf # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-extract --dump-nbg-graph -p /opt/car.lua /data/berlin-latest.osm.pbf
docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-components /data/berlin-latest.osrm.nbg /data/berlin-latest.geojson # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-components /data/berlin-latest.osrm.nbg /data/berlin-latest.geojson
if [ ! -s "${PWD}/berlin-latest.geojson" ] # if [ ! -s "${PWD}/berlin-latest.geojson" ]
then # then
>&2 echo "No berlin-latest.geojson found" # >&2 echo "No berlin-latest.geojson found"
exit 1 # exit 1
fi # fi
# removing `.osrm.nbg` to check that whole pipeline works without it # # removing `.osrm.nbg` to check that whole pipeline works without it
rm -rf "${PWD}/berlin-latest.osrm.nbg" # rm -rf "${PWD}/berlin-latest.osrm.nbg"
docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest.osrm # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest.osrm
docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest.osrm # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest.osrm
docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest.osrm & # docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest.osrm &
curl --retry-delay 3 --retry 10 --retry-all-errors "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true" # curl --retry-delay 3 --retry 10 --retry-all-errors "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true"
docker stop osrm-container # docker stop osrm-container
build-test-publish: build-test-publish:
# needs: format-taginfo-docs # needs: format-taginfo-docs
strategy: strategy:
matrix: matrix:
include: include:
- name: gcc-13-debug-cov # - name: gcc-13-debug-cov
continue-on-error: false # continue-on-error: false
node: 20 # node: 20
runs-on: ubuntu-24.04 # runs-on: ubuntu-24.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Debug # BUILD_TYPE: Debug
CCOMPILER: gcc-13 # CCOMPILER: gcc-13
CUCUMBER_TIMEOUT: 20000 # CUCUMBER_TIMEOUT: 20000
CXXCOMPILER: g++-13 # CXXCOMPILER: g++-13
ENABLE_COVERAGE: ON # ENABLE_COVERAGE: ON
- name: clang-15-debug-asan-ubsan # - name: clang-15-debug-asan-ubsan
continue-on-error: false # continue-on-error: false
node: 20 # node: 20
runs-on: ubuntu-22.04 # runs-on: ubuntu-22.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Debug # BUILD_TYPE: Debug
CCOMPILER: clang-15 # CCOMPILER: clang-15
CUCUMBER_TIMEOUT: 20000 # CUCUMBER_TIMEOUT: 20000
CXXCOMPILER: clang++-15 # CXXCOMPILER: clang++-15
ENABLE_SANITIZER: ON # ENABLE_SANITIZER: ON
TARGET_ARCH: x86_64-asan-ubsan # TARGET_ARCH: x86_64-asan-ubsan
OSRM_CONNECTION_RETRIES: 10 # OSRM_CONNECTION_RETRIES: 10
OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5 # OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5
- name: clang-15-release # - name: clang-15-release
continue-on-error: false # continue-on-error: false
node: 18 # node: 18
runs-on: ubuntu-22.04 # runs-on: ubuntu-22.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Release # BUILD_TYPE: Release
CCOMPILER: clang-15 # CCOMPILER: clang-15
CXXCOMPILER: clang++-15 # CXXCOMPILER: clang++-15
CUCUMBER_TIMEOUT: 60000 # CUCUMBER_TIMEOUT: 60000
- name: clang-15-debug # - name: clang-15-debug
continue-on-error: false # continue-on-error: false
node: 18 # node: 18
runs-on: ubuntu-22.04 # runs-on: ubuntu-22.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Debug # BUILD_TYPE: Debug
CCOMPILER: clang-15 # CCOMPILER: clang-15
CXXCOMPILER: clang++-15 # CXXCOMPILER: clang++-15
CUCUMBER_TIMEOUT: 60000 # CUCUMBER_TIMEOUT: 60000
- name: clang-15-debug-clang-tidy # - name: clang-15-debug-clang-tidy
continue-on-error: false # continue-on-error: false
node: 18 # node: 18
runs-on: ubuntu-22.04 # runs-on: ubuntu-22.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Debug # BUILD_TYPE: Debug
CCOMPILER: clang-15 # CCOMPILER: clang-15
CXXCOMPILER: clang++-15 # CXXCOMPILER: clang++-15
CUCUMBER_TIMEOUT: 60000 # CUCUMBER_TIMEOUT: 60000
ENABLE_CLANG_TIDY: ON # ENABLE_CLANG_TIDY: ON
- name: clang-14-release # - name: clang-14-release
continue-on-error: false # continue-on-error: false
node: 18 # node: 18
runs-on: ubuntu-22.04 # runs-on: ubuntu-22.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Release # BUILD_TYPE: Release
CCOMPILER: clang-14 # CCOMPILER: clang-14
CXXCOMPILER: clang++-14 # CXXCOMPILER: clang++-14
CUCUMBER_TIMEOUT: 60000 # CUCUMBER_TIMEOUT: 60000
- name: clang-13-release # - name: clang-13-release
continue-on-error: false # continue-on-error: false
node: 18 # node: 18
runs-on: ubuntu-22.04 # runs-on: ubuntu-22.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Release # BUILD_TYPE: Release
CCOMPILER: clang-13 # CCOMPILER: clang-13
CXXCOMPILER: clang++-13 # CXXCOMPILER: clang++-13
CUCUMBER_TIMEOUT: 60000 # CUCUMBER_TIMEOUT: 60000
- name: conan-linux-debug-asan-ubsan # - name: conan-linux-debug-asan-ubsan
continue-on-error: false # continue-on-error: false
node: 18 # node: 18
runs-on: ubuntu-22.04 # runs-on: ubuntu-22.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Release # BUILD_TYPE: Release
CCOMPILER: clang-15 # CCOMPILER: clang-15
CXXCOMPILER: clang++-15 # CXXCOMPILER: clang++-15
ENABLE_CONAN: ON # ENABLE_CONAN: ON
ENABLE_SANITIZER: ON # ENABLE_SANITIZER: ON
- name: conan-linux-release # - name: conan-linux-release
continue-on-error: false # continue-on-error: false
node: 18 # node: 18
runs-on: ubuntu-22.04 # runs-on: ubuntu-22.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Release # BUILD_TYPE: Release
CCOMPILER: clang-15 # CCOMPILER: clang-15
CXXCOMPILER: clang++-15 # CXXCOMPILER: clang++-15
ENABLE_CONAN: ON # ENABLE_CONAN: ON
- name: gcc-14-release # - name: gcc-14-release
continue-on-error: false # continue-on-error: false
node: 20 # node: 20
runs-on: ubuntu-24.04 # runs-on: ubuntu-24.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Release # BUILD_TYPE: Release
CCOMPILER: gcc-14 # CCOMPILER: gcc-14
CXXCOMPILER: g++-14 # CXXCOMPILER: g++-14
CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' # CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized'
- name: gcc-13-release # - name: gcc-13-release
continue-on-error: false # continue-on-error: false
node: 20 # node: 20
runs-on: ubuntu-24.04 # runs-on: ubuntu-24.04
BUILD_TOOLS: ON # BUILD_TOOLS: ON
BUILD_TYPE: Release # BUILD_TYPE: Release
CCOMPILER: gcc-13 # CCOMPILER: gcc-13
CXXCOMPILER: g++-13 # CXXCOMPILER: g++-13
CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' # CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized'
- name: gcc-12-release - name: gcc-12-release
continue-on-error: false continue-on-error: false

4
include/engine/api/table_api.hpp
View File

@ -420,9 +420,9 @@ class TableAPI final : public BaseAPI
[&](const auto &cell) [&](const auto &cell)
{ {
util::json::Array row; util::json::Array row;
row.values.emplace_back(util::json::Value{util::json::Number(cell.row)}); row.values.emplace_back(util::json::Value{util::json::Number(static_cast<double>(cell.row))});
row.values.emplace_back( row.values.emplace_back(
util::json::Value{util::json::Number(cell.column)}); util::json::Value{util::json::Number(static_cast<double>(cell.column))});
json_table.values.emplace_back(util::json::Value{std::move(row)}); json_table.values.emplace_back(util::json::Value{std::move(row)});
}); });
return json_table; return json_table;