Skip to content

Commit

Permalink
Merge pull request #1697 from westnordost/patch-2
Browse files Browse the repository at this point in the history
Add turning circles and turning loops to pois.yaml
  • Loading branch information
nvkelso authored Nov 9, 2018
2 parents 38034e6 + 2c60ef0 commit 6d0facb
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
2 changes: 2 additions & 0 deletions docs/layers.md
Original file line number Diff line number Diff line change
Expand Up @@ -1160,6 +1160,8 @@ To resolve inconsistency in data tagging in OpenStreetMap we normalize several o
* `travel_agency`
* `travel_agent`
* `tree`
* `turning_circle`
* `turning_loop`
* `tyres` - A shop selling car tyres or tires.
* `university`
* `variety_store`
Expand Down
27 changes: 27 additions & 0 deletions integration-test/1695-turning-circles-turning-loops.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# -*- encoding: utf-8 -*-
import dsl
from . import FixtureTest


# test turning circles and loops
class TurningCirclesAndLoops(FixtureTest):

def turning_circle(self):
self.generate_fixtures(
dsl.point(106186562, (-0.3544854, 51.5785667),
{u'source': u'openstreetmap.org',
u'highway': u'turning_circle'}))

self.assert_has_feature(
16, 32703, 21771, 'pois',
{'id': 106186562, 'kind': 'turning_circle'})

def turning_loop(self):
self.generate_fixtures(
dsl.point(4260010359, (8.43452, 49.4596352),
{u'source': u'openstreetmap.org',
u'highway': u'turning_loop'}))

self.assert_has_feature(
16, 34303, 22378, 'pois',
{'id': 4260010359, 'kind': 'turning_loop'})
7 changes: 6 additions & 1 deletion yaml/pois.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ global:
- lifeguard_tower
- phone
- harbour: harbour_master
- highway: [ bus_stop, elevator, ford, mini_roundabout, motorway_junction, platform,
- highway: [ bus_stop, elevator, ford, turning_circle, turning_loop, mini_roundabout, motorway_junction, platform,
rest_area, street_lamp, traffic_signals, trailhead ]
- historic: [landmark, wayside_cross]
- landuse: quarry
Expand Down Expand Up @@ -1351,6 +1351,11 @@ filters:
output:
<<: *output_properties
kind: toll_booth
- filter: {highway: [turning_circle, turning_loop]}
min_zoom: 16
output:
<<: *output_properties
kind: { col: highway }
- filter: {highway: mini_roundabout}
min_zoom: 15
output:
Expand Down

0 comments on commit 6d0facb

Please sign in to comment.