diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 1c3abcbb2..fb29e5cb8 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -29,7 +29,7 @@ jobs: ENABLE_APPLE_SILICON: "OFF" steps: - uses: actions/checkout@v3 - - run: pip install conan==1.53.0 + - run: pip install "conan<2.0.0" - run: conan --version - run: cmake --version - uses: actions/setup-node@v3 @@ -400,7 +400,7 @@ jobs: - name: Install dev dependencies run: | - python3 -m pip install conan==1.53.0 + python3 -m pip install "conan<2.0.0" # workaround for issue that GitHub Actions seems to not adding it to PATH after https://github.com/actions/runner-images/pull/6499 # and that's why CI cannot find conan executable installed above diff --git a/docs/nodejs/api.md b/docs/nodejs/api.md index ef52ed790..c4d389023 100644 --- a/docs/nodejs/api.md +++ b/docs/nodejs/api.md @@ -248,7 +248,7 @@ osrm.match(options, function(err, response) { Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `tracepoints` and `matchings`. **`tracepoints`** Array of [`Ẁaypoint`](#waypoint) objects representing all points of the trace in order. - If the trace point was ommited by map matching because it is an outlier, the entry will be null. + If the trace point was omitted by map matching because it is an outlier, the entry will be null. Each `Waypoint` object has the following additional properties, 1) `matchings_index`: Index to the [`Route`](#route) object in matchings the sub-trace was matched to, diff --git a/src/nodejs/node_osrm.cpp b/src/nodejs/node_osrm.cpp index 6471b7697..1537ab4d5 100644 --- a/src/nodejs/node_osrm.cpp +++ b/src/nodejs/node_osrm.cpp @@ -491,7 +491,7 @@ Napi::Value Engine::tile(const Napi::CallbackInfo &info) * * @returns {Object} containing `tracepoints` and `matchings`. * **`tracepoints`** Array of [`Ẁaypoint`](#waypoint) objects representing all points of the trace in order. - * If the trace point was ommited by map matching because it is an outlier, the entry will be null. + * If the trace point was omitted by map matching because it is an outlier, the entry will be null. * Each `Waypoint` object has the following additional properties, * 1) `matchings_index`: Index to the * [`Route`](#route) object in matchings the sub-trace was matched to,