From b211beafe23072387b973fdb219438b5cf1693c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Fri, 29 Dec 2017 14:22:25 +0100 Subject: [PATCH] Use direction as type for oneway, support oneway-opposite #376 --- layers/transportation/layer.sql | 20 ++++++++++---------- layers/transportation/mapping.yaml | 2 +- layers/transportation/transportation.yaml | 7 ++++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/layers/transportation/layer.sql b/layers/transportation/layer.sql index 16ccda8..81e02e1 100644 --- a/layers/transportation/layer.sql +++ b/layers/transportation/layer.sql @@ -41,7 +41,7 @@ indoor INT) AS $$ NULL AS public_transport, NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, 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, z_order FROM osm_transportation_merge_linestring_gen7 @@ -55,7 +55,7 @@ indoor INT) AS $$ NULL AS public_transport, NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, 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, z_order FROM osm_transportation_merge_linestring_gen6 @@ -69,7 +69,7 @@ indoor INT) AS $$ NULL AS public_transport, NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, 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, z_order FROM osm_transportation_merge_linestring_gen5 @@ -83,7 +83,7 @@ indoor INT) AS $$ NULL AS public_transport, NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, 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, z_order FROM osm_transportation_merge_linestring_gen4 @@ -97,7 +97,7 @@ indoor INT) AS $$ NULL AS public_transport, NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, 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, z_order FROM osm_transportation_merge_linestring_gen3 @@ -112,7 +112,7 @@ indoor INT) AS $$ NULL AS public_transport, NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, 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, z_order FROM osm_highway_linestring_gen2 @@ -127,7 +127,7 @@ indoor INT) AS $$ NULL AS public_transport, NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, 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, z_order FROM osm_highway_linestring_gen1 @@ -172,7 +172,7 @@ indoor INT) AS $$ NULL AS public_transport, service_value(service) AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, 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, z_order FROM osm_railway_linestring_gen5 @@ -187,7 +187,7 @@ indoor INT) AS $$ NULL AS public_transport, service_value(service) AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, 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, z_order FROM osm_railway_linestring_gen4 @@ -322,7 +322,7 @@ indoor INT) AS $$ highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, public_transport, NULL AS service, 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, z_order FROM osm_highway_polygon diff --git a/layers/transportation/mapping.yaml b/layers/transportation/mapping.yaml index f816ee4..ba8c2b2 100644 --- a/layers/transportation/mapping.yaml +++ b/layers/transportation/mapping.yaml @@ -87,7 +87,7 @@ ford_field: &ford oneway_field: &oneway key: oneway name: is_oneway - type: bool + type: direction area_field: &area name: is_area key: area diff --git a/layers/transportation/transportation.yaml b/layers/transportation/transportation.yaml index c1ee7cc..c1922f4 100644 --- a/layers/transportation/transportation.yaml +++ b/layers/transportation/transportation.yaml @@ -69,9 +69,10 @@ layer: - ford oneway: description: | - Mark with `1` whether way is a oneway (in the direction of the way) - or not with `0`. - values: [0, 1] + Mark with `1` whether way is a oneway in the direction of the way, + with `-1` whether way is a oneway in the opposite direction of the way + or not a oneway with `0`. + values: [0, 1, -1] ramp: description: | Mark with `1` whether way is a ramp (link or steps)