Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Releasing is documented in RELEASE.md
## [unreleased]

### Added
- accept [`sac_scale=strolling`](https://wiki.openstreetmap.org/wiki/Key:sac_scale) ([#2149](https://github.com/GIScience/openrouteservice/pull/2149))
- show export endpoint in status ([#2105](https://github.com/GIScience/openrouteservice/issue/2105))

### Changed
Expand Down Expand Up @@ -1022,4 +1023,4 @@ are attached to roads. ([Issue #162](https://github.com/GIScience/openrouteservi
[4.5.0]: https://github.com/GIScience/openrouteservice/compare/4.4.2...4.5.0
[4.4.2]: https://github.com/GIScience/openrouteservice/compare/4.4.1...4.4.2
[4.4.1]: https://github.com/GIScience/openrouteservice/compare/4.4.0...4.4.1
[4.4.0]: https://github.com/GIScience/openrouteservice/compare/4.3.0...4.4.0
[4.4.0]: https://github.com/GIScience/openrouteservice/compare/4.3.0...4.4.0
8 changes: 4 additions & 4 deletions docs/technical-details/tag-filtering.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ _intendedValues_ = `[yes, designated, permissive, official]`

| Tag combination | Reject | Accept | Conditional |
|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------------------:|:------:|:------------------:|
| `sac_scale != hiking` | :heavy_check_mark: | | |
| `sac_scale != [hiking,strolling]` | :heavy_check_mark: | | |
| `foot = ` _intendedValues_ | | | :heavy_check_mark: |
| _restrictions_ = _restrictedValues_ | | | :heavy_check_mark: |
| `sidewalk = [yes, both, left, right]` | | | :heavy_check_mark: |
Expand All @@ -116,9 +116,9 @@ The following are applicable only when no highway tag has been provided for the

Same as [Foot](#foot) except for different `sac_scale` check with existing `highway` tag.

| Tag combination | Reject | Accept | Conditional |
|------------------------------------------------------------------------------------|:------------------:|:------:|:-----------:|
| `sac_scale != [hiking, mountain_hiking, demanding_mountain_hiking, alpine_hiking]` | :heavy_check_mark: | | |
| Tag combination | Reject | Accept | Conditional |
|-----------------------------------------------------------------------------------------------|:------------------:|:------:|:-----------:|
| `sac_scale != [strolling, hiking, mountain_hiking, demanding_mountain_hiking, alpine_hiking]` | :heavy_check_mark: | | |


## Wheelchair
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ private HikingFlagEncoder(int speedBits, double speedFactor) {
routeMap.put(LOCAL, VERY_NICE.getValue());

suitableSacScales.addAll(Arrays.asList(
"strolling",
"hiking",
"mountain_hiking",
"demanding_mountain_hiking",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public PedestrianFlagEncoder(PMap properties) {
private PedestrianFlagEncoder(int speedBits, double speedFactor) {
super(speedBits, speedFactor);

suitableSacScales.add("strolling");
suitableSacScales.add("hiking");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ void acceptDifficultSacScale() {
assertTrue(flagEncoder.getAccess(way).isWay());
}

@Test
void acceptSimpleSacScale() {
way = generateHikeWay();
way.setTag("sac_scale", "strolling");
assertTrue(flagEncoder.getAccess(way).isWay());
}

@Test
void testAddPriorityFromRelation() {
way = generateHikeWay();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@ void rejectDifficultSacScale(String name, String value) {
assertTrue(flagEncoder.getAccess(way).canSkip());
}

@Test
void acceptSimpleSacScale() {
way = generatePedestrianWay();
way.setTag("sac_scale", "strolling");
assertTrue(flagEncoder.getAccess(way).isWay());
}

@Test
void testRejectWay() {
assertTrue(flagEncoder.getAccess(way).canSkip());
Expand Down
Loading