Skip to content

Commit 0ec59d9

Browse files
wip
1 parent e9d1058 commit 0ec59d9

File tree

4 files changed

+36
-28
lines changed

4 files changed

+36
-28
lines changed

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
# Changelog
2+
13
# Unreleased
24
- Changes from 6.0.0
5+
- Features
6+
- ADDED: Pedestrian area routing [#7161](https://github.com/Project-OSRM/osrm-backend/pull/7161)
37

48
# 6.0.0
59
- Changes from 6.0.0 RC2: None
@@ -182,7 +186,7 @@
182186
- CHANGED: Docker build, enabled arm64 build layer [#6172](https://github.com/Project-OSRM/osrm-backend/pull/6172)
183187
- CHANGED: Docker build, enabled apt-get update/install caching in separate layer for build phase [#6175](https://github.com/Project-OSRM/osrm-backend/pull/6175)
184188
- FIXED: Bump CI complete meta job to ubuntu-20.04 [#6323](https://github.com/Project-OSRM/osrm-backend/pull/6323)
185-
- CHANGED: Node packages are now scoped by @project-osrm [#6386](https://github.com/Project-OSRM/osrm-backend/issues/6386)
189+
- CHANGED: Node packages are now scoped by \@project-osrm [#6386](https://github.com/Project-OSRM/osrm-backend/issues/6386)
186190
- Routing:
187191
- CHANGED: Lazily generate optional route path data [#6045](https://github.com/Project-OSRM/osrm-backend/pull/6045)
188192
- FIXED: Completed support for no_entry and no_exit turn restrictions. [#5988](https://github.com/Project-OSRM/osrm-backend/pull/5988)
@@ -217,7 +221,7 @@
217221
- Build:
218222
- CHANGED: Node binaries now use Github Releases for hosting [#6030](https://github.com/Project-OSRM/osrm-backend/pull/6030)
219223
- Misc:
220-
- FIXED: Upgrade to @mapbox/node-pre-gyp fix various bugs with Node 12/14 [#5991](https://github.com/Project-OSRM/osrm-backend/pull/5991)
224+
- FIXED: Upgrade to \@mapbox/node-pre-gyp fix various bugs with Node 12/14 [#5991](https://github.com/Project-OSRM/osrm-backend/pull/5991)
221225
- FIXED: `valid` type in documentation examples [#5990](https://github.com/Project-OSRM/osrm-backend/issues/5990)
222226
- FIXED: Remove redundant loading of .osrm.cell_metrics [#6019](https://github.com/Project-OSRM/osrm-backend/issues/6019)
223227
- CHANGED: Increase PackedOSMIDs size to 34 bits. This breaks the **data format** [#6020](https://github.com/Project-OSRM/osrm-backend/issues/6020)

CONTRIBUTING.md

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
# Everyone
1+
# Contributing
2+
3+
## Everyone
24

35
Please take some time to review our [code of conduct](CODE-OF-CONDUCT.md) to help guide your interactions with others on this project.
46

5-
# User
7+
## User
68

79
Before you open a new issue, please search for older ones that cover the same issue.
810
In general "me too" comments/issues are frowned upon.
911
You can add a :+1: emoji reaction to the issue if you want to express interest in this.
1012

11-
# Developer
13+
## Developer
1214

1315
We use `clang-format` version `15` to consistently format the code base. There is a helper script under `scripts/format.sh`.
1416
The format is automatically checked by the `mason-linux-release` job of a Travis CI build.
1517
To save development time a local hook `.git/hooks/pre-push`
18+
1619
```
1720
#!/bin/sh
1821
@@ -28,16 +31,16 @@ if [ x"$remote" = xorigin ] ; then
2831
fi
2932
fi
3033
```
34+
3135
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`.
36+
Also `pre-push` hook rejects direct pushes to `origin/master`.
3337

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

36-
3740
In general changes that affect the API and/or increase the memory consumption need to be discussed first.
3841
Often we don't include changes that would increase the memory consumption a lot if they are not generally usable (e.g. elevation data is a good example).
3942

40-
## Pull Request
43+
### Pull Request
4144

4245
Every pull-request that changes the API needs to update the docs in `docs/http.md` and add an entry to `CHANGELOG.md`.
4346
Breaking changes need to have a BREAKING prefix. See the [releasing documentation](docs/releasing.md) on how this affects the version.
@@ -57,25 +60,25 @@ If you do have commit access there are in general two accepted styles to merging
5760

5861
1. Make sure the branch is up to date with `master`. Run `git rebase master` to find out.
5962
2. Once that is ensured you can either:
60-
- Click the nice green merge button (for a non-fast-forward merge)
61-
- Merge by hand using a fast-forward merge
63+
64+
- Click the nice green merge button (for a non-fast-forward merge)
65+
- Merge by hand using a fast-forward merge
6266

6367
Which merge you prefer is up to personal preference. In general it is recommended to use fast-forward merges because it creates a history that is sequential and easier to understand.
6468

65-
# Maintainer
69+
## Maintainer
6670

67-
## Doing a release
71+
### Doing a release
6872

6973
There is an in-depth guide around how to push out a release once it is ready [here](docs/releasing.md).
7074

71-
## The API
75+
### The API
7276

7377
Changes to the API need to be discussed and signed off by the team. Breaking changes even more so than additive changes.
7478

75-
## Milestones
79+
### Milestones
7680

7781
If a pull request or an issue is applicable for the current or next milestone, depends on the target version number.
7882
Since we use semantic versioning we restrict breaking changes to major releases.
7983
After a Release Candidate is released we usually don't change the API anymore if it is not critical.
8084
Bigger code changes after a RC was released should also be avoided.
81-

README.md

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

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
@@ -40,6 +41,7 @@ Related [Project-OSRM](https://github.com/Project-OSRM) repositories:
4041
The easiest and quickest way to setup your own routing engine is to use Docker images we provide.
4142

4243
There are two pre-processing pipelines available:
44+
4345
- Contraction Hierarchies (CH)
4446
- Multi-Level Dijkstra (MLD)
4547

@@ -85,13 +87,13 @@ After adding yourself to the `docker` group make sure to log out and back in aga
8587

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

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

9698
### Building from Source
9799

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

166168
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).
167169

168-
169170
## References in publications
170171

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

docs/areas.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page pedestrian_areas Pedestrian Areas
1+
# Pedestrian Areas {#pedestrian_areas}
22

33
@sa AreaManager
44

@@ -45,7 +45,7 @@ function setup()
4545
end
4646
```
4747

48-
### process_relation(profile, relation, relations)
48+
## process_relation(profile, relation, relations)
4949

5050
The @ref process_relation function is called for every relation in the input file. If
5151
you want a relation to be meshed, you must call [area_manager:relation()](@ref AreaManager::relation()).
@@ -61,7 +61,7 @@ function process_relation(profile, relation, relations)
6161
end
6262
```
6363

64-
### process_way(profile, way, result, relations)
64+
## process_way(profile, way, result, relations)
6565

6666
The @ref process_way function is called for every way in the input file. If you want a
6767
closed way to be meshed, call [area_manager:way()](@ref AreaManager::way()). (Note that

0 commit comments

Comments
 (0)