Update style with fallback to public_transport value. Add tests cover…

…ing Point/Polygon. DC example has no line data, not adding at this time. #115

flex-config/run-no-tags.lua

@@ -8,6 +8,7 @@ require "style.leisure"
 require "style.natural"
 require "style.place"
 require "style.poi"
+require "style.public_transport"
 require "style.road"
 require "style.shop"
 require "style.traffic"

flex-config/run-no-tags.sql

@@ -9,6 +9,7 @@
 \i sql/traffic.sql
 \i sql/place.sql
 \i sql/poi.sql
+\i sql/public_transport.sql
 \i sql/road.sql
 \i sql/shop.sql
 \i sql/water.sql

flex-config/sql/public_transport.sql

@@ -30,9 +30,9 @@ COMMENT ON COLUMN osm.public_transport_point.geom IS 'Geometry loaded by osm2pgs
 COMMENT ON COLUMN osm.public_transport_line.geom IS 'Geometry loaded by osm2pgsql.';
 COMMENT ON COLUMN osm.public_transport_polygon.geom IS 'Geometry loaded by osm2pgsql.';
 
-COMMENT ON COLUMN osm.public_transport_point.osm_type IS 'Key indicating type of public transport feature, not the public_transport tag. e.g. highway, bus, train, etc';
-COMMENT ON COLUMN osm.public_transport_line.osm_type IS 'Key indicating type of public transport feature, not the public_transport tag. e.g. highway, bus, train, etc';
-COMMENT ON COLUMN osm.public_transport_polygon.osm_type IS 'Key indicating type of public transport feature, not the public_transport tag. e.g. highway, bus, train, etc';
+COMMENT ON COLUMN osm.public_transport_point.osm_type IS 'Key indicating type of public transport feature if detail exists, falls back to public_transport tag. e.g. highway, bus, train, etc';
+COMMENT ON COLUMN osm.public_transport_line.osm_type IS 'Key indicating type of public transport feature if detail exists, falls back to public_transport tag. e.g. highway, bus, train, etc';
+COMMENT ON COLUMN osm.public_transport_polygon.osm_type IS 'Key indicating type of public transport feature if detail exists, falls back to public_transport tag. e.g. highway, bus, train, etc';
 
 COMMENT ON COLUMN osm.public_transport_point.osm_subtype IS 'Value describing osm_type key, e.g. osm_type = "highway", osm_subtype = "bus_stop".';
 COMMENT ON COLUMN osm.public_transport_line.osm_subtype IS 'Value describing osm_type key, e.g. osm_type = "highway", osm_subtype = "bus_stop".';

flex-config/style/public_transport.lua

@@ -98,7 +98,7 @@ local function get_osm_type_subtype(object)
         osm_type_table['osm_type'] = 'train'
         osm_type_table['osm_subtype'] = object.tags.train
     else
-        osm_type_table['osm_type'] = 'unknown'
+        osm_type_table['osm_type'] = object.tags.public_transport
         osm_type_table['osm_subtype'] = nil
     end
 

tests/expected/public_transport_point_osm_type_count.out

@@ -0,0 +1,7 @@
+bus|Metro Bus 3Y 7Y 11Y 80 S1 16Y OmniRide G MTA Commuter Bus|2
+bus|yes|13
+highway|bus_stop|376
+platform||1
+station||50
+stop_position||106
+train|yes|24

tests/expected/public_transport_polygon_osm_type_count.out

@@ -0,0 +1,6 @@
+platform||20
+service_center||1
+station||1
+stop_area||1
+train|yes|13
+waiting_area||10

tests/sql/public_transport_point_osm_type_count.sql

@@ -0,0 +1,5 @@
+SELECT osm_type COLLATE "C", osm_subtype COLLATE "C", COUNT(*)
+    FROM osm.public_transport_point
+    GROUP BY osm_type COLLATE "C", osm_subtype COLLATE "C"
+    ORDER BY osm_type COLLATE "C", osm_subtype COLLATE "C"
+;

tests/sql/public_transport_polygon_osm_type_count.sql

@@ -0,0 +1,5 @@
+SELECT osm_type COLLATE "C", osm_subtype COLLATE "C", COUNT(*)
+    FROM osm.public_transport_polygon
+    GROUP BY osm_type COLLATE "C", osm_subtype COLLATE "C"
+    ORDER BY osm_type COLLATE "C", osm_subtype COLLATE "C"
+;