Use direction as type for oneway, support oneway-opposite #376

This commit is contained in:
Frédéric Rodrigo 2017-12-29 14:22:25 +01:00 committed by Jiri Kozel
parent a9adaf00c5
commit b211beafe2
3 changed files with 15 additions and 14 deletions

View File

@ -41,7 +41,7 @@ indoor INT) AS $$
NULL AS public_transport, NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::int AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor, NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order z_order
FROM osm_transportation_merge_linestring_gen7 FROM osm_transportation_merge_linestring_gen7
@ -55,7 +55,7 @@ indoor INT) AS $$
NULL AS public_transport, NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::int AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor, NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order z_order
FROM osm_transportation_merge_linestring_gen6 FROM osm_transportation_merge_linestring_gen6
@ -69,7 +69,7 @@ indoor INT) AS $$
NULL AS public_transport, NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::int AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor, NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order z_order
FROM osm_transportation_merge_linestring_gen5 FROM osm_transportation_merge_linestring_gen5
@ -83,7 +83,7 @@ indoor INT) AS $$
NULL AS public_transport, NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::int AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor, NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order z_order
FROM osm_transportation_merge_linestring_gen4 FROM osm_transportation_merge_linestring_gen4
@ -97,7 +97,7 @@ indoor INT) AS $$
NULL AS public_transport, NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::int AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor, NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order z_order
FROM osm_transportation_merge_linestring_gen3 FROM osm_transportation_merge_linestring_gen3
@ -112,7 +112,7 @@ indoor INT) AS $$
NULL AS public_transport, NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::int AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor, NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order z_order
FROM osm_highway_linestring_gen2 FROM osm_highway_linestring_gen2
@ -127,7 +127,7 @@ indoor INT) AS $$
NULL AS public_transport, NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::int AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor, NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order z_order
FROM osm_highway_linestring_gen1 FROM osm_highway_linestring_gen1
@ -172,7 +172,7 @@ indoor INT) AS $$
NULL AS public_transport, service_value(service) AS service, NULL AS public_transport, service_value(service) AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::int AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor, NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order z_order
FROM osm_railway_linestring_gen5 FROM osm_railway_linestring_gen5
@ -187,7 +187,7 @@ indoor INT) AS $$
NULL AS public_transport, service_value(service) AS service, NULL AS public_transport, service_value(service) AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::int AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor, NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order z_order
FROM osm_railway_linestring_gen4 FROM osm_railway_linestring_gen4
@ -322,7 +322,7 @@ indoor INT) AS $$
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
public_transport, NULL AS service, public_transport, NULL AS service,
FALSE AS is_bridge, FALSE AS is_tunnel, FALSE AS is_ford, FALSE AS is_bridge, FALSE AS is_tunnel, FALSE AS is_ford,
FALSE AS is_ramp, FALSE AS is_oneway, FALSE AS is_ramp, FALSE::int AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor, NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order z_order
FROM osm_highway_polygon FROM osm_highway_polygon

View File

@ -87,7 +87,7 @@ ford_field: &ford
oneway_field: &oneway oneway_field: &oneway
key: oneway key: oneway
name: is_oneway name: is_oneway
type: bool type: direction
area_field: &area area_field: &area
name: is_area name: is_area
key: area key: area

View File

@ -69,9 +69,10 @@ layer:
- ford - ford
oneway: oneway:
description: | description: |
Mark with `1` whether way is a oneway (in the direction of the way) Mark with `1` whether way is a oneway in the direction of the way,
or not with `0`. with `-1` whether way is a oneway in the opposite direction of the way
values: [0, 1] or not a oneway with `0`.
values: [0, 1, -1]
ramp: ramp:
description: | description: |
Mark with `1` whether way is a ramp (link or steps) Mark with `1` whether way is a ramp (link or steps)