Skip to content

Commit c467cdf

Browse files
authored
Improve spelling and wording in source code, comments and documentation (#7215)
1 parent 560ed5c commit c467cdf

22 files changed

+66
-63
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Unreleased
22
- Changes from 6.0.0
3+
- Misc:
4+
- FIXED: Minor misspellings found in source code, comments and documents [#7215](https://github.com/Project-OSRM/osrm-backend/pull/7215)
35

46
# 6.0.0
57
- Changes from 6.0.0 RC2: None

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ if [ x"$remote" = xorigin ] ; then
2828
fi
2929
fi
3030
```
31-
could check code format, modify a local repository and reject push due to unstaged formatting changes.
32-
Also `pre-push` hook rejects direct pushes to `origin/master`.
31+
could check code format, modify a local repository and reject the push due to unstaged formatting changes.
32+
Also the `pre-push` hook rejects direct pushes to `origin/master`.
3333

3434
⚠️ `scripts/format.sh` checks all local files that match `*.cpp` or `*.hpp` patterns.
3535

@@ -49,7 +49,7 @@ If your work is going in entirely the wrong direction, there is a good chance so
4949
Everyone is encouraged to read PRs of other people and give feedback.
5050

5151
For every significant code change we require a pull request review before it is merged.
52-
If your pull request modifies the API this need to be signed of by a team discussion.
52+
If your pull request modifies the API this needs to be signed off by a team discussion.
5353
This means you will need to find another member of the team with commit access and request a review of your pull request.
5454

5555
Once your pull request is reviewed you can merge it! If you don't have commit access, ping someone that has commit access.

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
## Open Source Routing Machine
22

3-
43
[![osrm-backend CI](https://github.com/Project-OSRM/osrm-backend/actions/workflows/osrm-backend.yml/badge.svg)](https://github.com/Project-OSRM/osrm-backend/actions/workflows/osrm-backend.yml) [![Discord](https://img.shields.io/discord/1034487840219860992)](https://discord.gg/es9CdcCXcb)
54

65
High performance routing engine written in C++ designed to run on OpenStreetMap data.
76

87
The following services are available via HTTP API, C++ library interface and NodeJs wrapper:
8+
99
- Nearest - Snaps coordinates to the street network and returns the nearest matches
1010
- Route - Finds the fastest route between coordinates
1111
- Table - Computes the duration or distances of the fastest route between all pairs of supplied coordinates
@@ -18,6 +18,7 @@ To quickly try OSRM use our [demo server](http://map.project-osrm.org) which com
1818
For a quick introduction about how the road network is represented in OpenStreetMap and how to map specific road network features have a look at [the OSM wiki on routing](https://wiki.openstreetmap.org/wiki/Routing) or [this guide about mapping for navigation](https://web.archive.org/web/20221206013651/https://labs.mapbox.com/mapping/mapping-for-navigation/).
1919

2020
Related [Project-OSRM](https://github.com/Project-OSRM) repositories:
21+
2122
- [osrm-frontend](https://github.com/Project-OSRM/osrm-frontend) - User-facing frontend with map. The demo server runs this on top of the backend
2223
- [osrm-text-instructions](https://github.com/Project-OSRM/osrm-text-instructions) - Text instructions from OSRM route response
2324
- [osrm-backend-docker](https://github.com/project-osrm/osrm-backend/pkgs/container/osrm-backend) - Ready to use Docker images
@@ -41,10 +42,11 @@ Related [Project-OSRM](https://github.com/Project-OSRM) repositories:
4142
The easiest and quickest way to setup your own routing engine is to use Docker images we provide.
4243

4344
There are two pre-processing pipelines available:
45+
4446
- Contraction Hierarchies (CH)
4547
- Multi-Level Dijkstra (MLD)
4648

47-
we recommend using MLD by default except for special use-cases such as very large distance matrices where CH is still a better fit for the time being.
49+
We recommend using MLD by default except for special use cases such as very large distance matrices where CH is still a better fit for the time being.
4850
In the following we explain the MLD pipeline.
4951
If you want to use the CH pipeline instead replace `osrm-partition` and `osrm-customize` with a single `osrm-contract` and change the algorithm option for `osrm-routed` to `--algorithm ch`.
5052

@@ -65,7 +67,7 @@ The flag `-v "${PWD}:/data"` creates the directory `/data` inside the docker con
6567
docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-partition /data/berlin-latest.osrm || echo "osrm-partition failed"
6668
docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-customize /data/berlin-latest.osrm || echo "osrm-customize failed"
6769

68-
Note there is no `berlin-latest.osrm` file, but multiple `berlin-latest.osrm.*` files, i.e. `berlin-latest.osrm` is not file path, but "base" path referring to set of files and there is an option to omit this `.osrm` suffix completely(e.g. `osrm-partition /data/berlin-latest`).
70+
Note there is no `berlin-latest.osrm` file, but multiple `berlin-latest.osrm.*` files, i.e. `berlin-latest.osrm` is not a file path, but a "base" path referring to a set of files and there is an option to omit this `.osrm` suffix completely (e.g. `osrm-partition /data/berlin-latest`).
6971

7072
docker run -t -i -p 5000:5000 -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-routed --algorithm mld /data/berlin-latest.osrm
7173

@@ -86,13 +88,13 @@ After adding yourself to the `docker` group make sure to log out and back in aga
8688

8789
We support the following images in the Container Registry:
8890

89-
Name | Description
90-
-----|------
91-
`latest` | `master` compiled with release flag
92-
`latest-assertions` | `master` compiled with with release flag, assertions enabled and debug symbols
93-
`latest-debug` | `master` compiled with debug flag
94-
`<tag>` | specific tag compiled with release flag
95-
`<tag>-debug` | specific tag compiled with debug flag
91+
| Name | Description |
92+
| ------------------- | ------------------------------------------------------------------------------ |
93+
| `latest` | `master` compiled with release flag |
94+
| `latest-assertions` | `master` compiled with with release flag, assertions enabled and debug symbols |
95+
| `latest-debug` | `master` compiled with debug flag |
96+
| `<tag>` | specific tag compiled with release flag |
97+
| `<tag>-debug` | specific tag compiled with debug flag |
9698

9799
### Building from Source
98100

@@ -166,7 +168,6 @@ For usage details have a look [these API docs](docs/nodejs/api.md).
166168

167169
An exemplary implementation by a 3rd party with Docker and Node.js can be found [here](https://github.com/door2door-io/osrm-express-server-demo).
168170

169-
170171
## References in publications
171172

172173
When using the code in a (scientific) publication, please cite

docs/developing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ For outputting data into our file (debug.geojson), we simply need to call the ma
3030
(or `guard.Write(list_of_node_ids)` if you created an instance).
3131

3232
### Possible Scopeguard Location
33-
Think of the scopeguard as you would do of any reference. If you wan't to access to logging during a call, the guard object must be alive and valid.
33+
Think of the scopeguard as you would do of any reference. If you want to access logging during a call, the guard object must be alive and valid.
3434

3535
As an example: a good location to create a scopeguard to log decisions in the edge-based-graph-factory would be right before we run it ([here](https://github.com/Project-OSRM/osrm-backend/blob/a933b5d94943bf3edaf42c84a614a99650d23cba/src/extractor/extractor.cpp#L497)). If you put `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug.geojson", node_coordinate_vector);` at that location, you can then print `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString>::Write(list_of_node_ids);` anywhere within the `edge-based-graph-factory`.
3636

@@ -47,7 +47,7 @@ For each set of template parameters, only the most recent guard will actually pr
4747

4848
Will not provide a way to write into two files, but only `debug-2` will actually contain features.
4949

50-
We cannot nest-these calls.
50+
We cannot nest these calls.
5151

5252
If we want to use the same policy for multiple files, we need to use different template parameters both for the logger and the guard.
5353

docs/http.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Every response object has a `code` property containing one of the strings below
9494
| `TooBig` | The request size violates one of the service-specific request size restrictions. |
9595
| `DisabledDataset` | The request tried to access a disabled dataset. |
9696

97-
- `message` is a **optional** human-readable error message. All other status types are service-dependent.
97+
- `message` is an **optional** human-readable error message. All other status types are service-dependent.
9898
- In case of an error the HTTP status code will be `400`. Otherwise, the HTTP status code will be `200` and `code` will be `Ok`.
9999

100100
#### Data version
@@ -130,7 +130,7 @@ In addition to the [general options](#general-options) the following options are
130130
|------------|------------------------------|----------------------------------------------------|
131131
|number |`integer >= 1` (default `1`) |Number of nearest segments that should be returned. |
132132

133-
As `waypoints` is a single thing, returned by that service, using it with the option `skip_waypoints` set to `true` is quite useless, but still
133+
As `waypoints` is a single thing returned by that service, using it with the option `skip_waypoints` set to `true` is quite useless, but still
134134
possible. In that case, only the `code` field will be returned.
135135

136136
**Response**
@@ -211,7 +211,7 @@ In addition to the [general options](#general-options) the following options are
211211
|steps |`true`, `false` (default) |Returned route steps for each route leg |
212212
|annotations |`true`, `false` (default), `nodes`, `distance`, `duration`, `datasources`, `weight`, `speed` |Returns additional metadata for each coordinate along the route geometry. |
213213
|geometries |`polyline` (default), `polyline6`, `geojson` |Returned route geometry format (influences overview and per step) |
214-
|overview |`simplified` (default), `full`, `false` |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
214+
|overview |`simplified` (default), `full`, `false` |Add overview geometry either full, simplified according to highest zoom level it could be displayed on, or not at all.|
215215
|continue\_straight |`default` (default), `true`, `false` |Forces the route to keep going straight at waypoints constraining uturns there even if it would be faster. Default value depends on the profile. |
216216
|waypoints | `{index};{index};{index}...` |Treats input coordinates indicated by given indices as waypoints in returned Match object. Default is to treat all input coordinates as waypoints. |
217217

@@ -432,7 +432,7 @@ In addition to the [general options](#general-options) the following options are
432432
|steps |`true`, `false` (default) |Returned route steps for each route |
433433
|geometries |`polyline` (default), `polyline6`, `geojson` |Returned route geometry format (influences overview and per step) |
434434
|annotations |`true`, `false` (default), `nodes`, `distance`, `duration`, `datasources`, `weight`, `speed` |Returns additional metadata for each coordinate along the route geometry. |
435-
|overview |`simplified` (default), `full`, `false` |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
435+
|overview |`simplified` (default), `full`, `false` |Add overview geometry either full, simplified according to highest zoom level it could be displayed on, or not at all.|
436436
|timestamps |`{timestamp};{timestamp}[;{timestamp} ...]` |Timestamps for the input locations in seconds since UNIX epoch. Timestamps need to be monotonically increasing. |
437437
|radiuses |`{radius};{radius}[;{radius} ...]` |Standard deviation of GPS precision used for map matching. If applicable use GPS accuracy.|
438438
|gaps |`split` (default), `ignore` |Allows the input track splitting based on huge timestamp gaps between points. |
@@ -489,7 +489,7 @@ In addition to the [general options](#general-options) the following options are
489489
|steps |`true`, `false` (default) |Returned route instructions for each trip |
490490
|annotations |`true`, `false` (default), `nodes`, `distance`, `duration`, `datasources`, `weight`, `speed` |Returns additional metadata for each coordinate along the route geometry. |
491491
|geometries |`polyline` (default), `polyline6`, `geojson` |Returned route geometry format (influences overview and per step) |
492-
|overview |`simplified` (default), `full`, `false` |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
492+
|overview |`simplified` (default), `full`, `false` |Add overview geometry either full, simplified according to highest zoom level it could be displayed on, or not at all.|
493493

494494
**Fixing Start and End Points**
495495

@@ -1036,7 +1036,7 @@ Almost the same as `json` Step object. The following properties differ:
10361036
| `ExitRoundabout` | Describes a maneuver exiting a roundabout (usually preceded by a `roundabout` instruction) |
10371037
| `ExitRotary` | Describes the maneuver exiting a rotary (large named roundabout) |
10381038

1039-
- `driving_side`: `bool` Ttrue stands for the left side driving.
1039+
- `driving_side`: `bool` True stands for left side driving.
10401040
- `intersections`: `[Intersection]` Same as `json` intersections field, but different format.
10411041

10421042
### Intersection object
@@ -1102,7 +1102,7 @@ Exactly the same as `json` annotation object.
11021102
A point on Earth.
11031103

11041104
***Properties***
1105-
- `longitute`: `float` Point's longitude
1105+
- `longitude`: `float` Point's longitude
11061106
- `latitude`: `float` Point's latitude
11071107

11081108
### Uint64Pair

0 commit comments

Comments
 (0)