Remove support for unknown XXX_link highway (fix #257)

diff --git a/hdm.mml b/hdm.mml
index 2f465371f9e73b6129b91bf815f9875c87588a84..f2c3b6a67694afc410dde50413f13d63b37069b1 100644 (file)
--- a/hdm.mml
+++ b/hdm.mml
@@ -642,7 +642,7 @@
         "port": "5432",
         "project": "hdm",
         "srs": null,
-        "table": "( SELECT way, name, CASE WHEN smoothness in ('bad', 'very_bad', 'horrible', 'very_horrible') THEN 'bad' ELSE 'good' END as condition, CASE WHEN surface IN ('paved', 'paving_stones', 'asphalt', 'concrete') THEN 'paved' WHEN (surface IS NULL AND type IN ('trunk', 'trunk_link', 'motorway', 'motorway_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')) THEN 'paved' ELSE 'unpaved' END as surface, type, tunnel, CASE WHEN bridge IS NOT NULL AND bridge!='no' THEN 1 ELSE 0 END as bridge, access, CASE WHEN type IN ('service', 'track') or narrow='yes' THEN 'narrow' WHEN type IN ('motorway', 'trunk') THEN 'motorway' WHEN type IN ('primary', 'secondary') THEN 'main' WHEN type='tertiary' THEN 'inter' WHEN type IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link', 'unclassified', 'road') THEN 'minor' WHEN type IN ('residential', 'living_street') THEN 'urban' WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto' ELSE 'other' END AS width, CASE WHEN type IN ('motorway', 'trunk', 'trunk_link') THEN 'motorway' WHEN type ~ E'\\\\w+_link$' THEN regexp_replace(type, '_link', '') WHEN type IN ('unclassified', 'road', 'service') THEN 'standard' WHEN type IN ('residential', 'living_street') THEN 'urban' WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto' ELSE type END AS style, ford, CASE WHEN layer ~ E'^-?\\\\d{1,4}$' THEN layer::integer ELSE 0 END AS layer, construction FROM (SELECT way, name, bridge, access, surface, tunnel, tags->'smoothness' AS smoothness, tags->'ford' AS ford, layer, tags->'narrow' AS narrow, CASE WHEN highway='construction' AND construction IS NOT NULL THEN construction ELSE highway END AS type, construction FROM planet_osm_line WHERE highway IS NOT NULL ORDER BY layer, z_order) as a WHERE a.type!='construction' and (a.construction!='yes' OR a.construction IS NULL)) AS data",
+        "table": "( SELECT way, name, CASE WHEN smoothness in ('bad', 'very_bad', 'horrible', 'very_horrible') THEN 'bad' ELSE 'good' END as condition, CASE WHEN surface IN ('paved', 'paving_stones', 'asphalt', 'concrete') THEN 'paved' WHEN (surface IS NULL AND type IN ('trunk', 'trunk_link', 'motorway', 'motorway_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')) THEN 'paved' ELSE 'unpaved' END as surface, type, tunnel, CASE WHEN bridge IS NOT NULL AND bridge!='no' THEN 1 ELSE 0 END as bridge, access, CASE WHEN type IN ('service', 'track') or narrow='yes' THEN 'narrow' WHEN type IN ('motorway', 'trunk') THEN 'motorway' WHEN type IN ('primary', 'secondary') THEN 'main' WHEN type='tertiary' THEN 'inter' WHEN type IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link', 'unclassified', 'road') THEN 'minor' WHEN type IN ('residential', 'living_street') THEN 'urban' WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto' ELSE 'other' END AS width, CASE WHEN type IN ('motorway', 'trunk', 'trunk_link') THEN 'motorway' WHEN type IN ('unclassified', 'road', 'service') THEN 'standard' WHEN type IN ('residential', 'living_street') THEN 'urban' WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto' ELSE type END AS style, ford, CASE WHEN layer ~ E'^-?\\\\d{1,4}$' THEN layer::integer ELSE 0 END AS layer, construction FROM (SELECT way, name, bridge, access, surface, tunnel, tags->'smoothness' AS smoothness, tags->'ford' AS ford, layer, tags->'narrow' AS narrow, CASE WHEN highway='construction' AND construction IS NOT NULL THEN construction ELSE highway END AS type, construction FROM planet_osm_line WHERE highway IS NOT NULL ORDER BY layer, z_order) as a WHERE a.type!='construction' and (a.construction!='yes' OR a.construction IS NULL)) AS data",
         "type": "postgis",
         "extent": "-20037508,-19929239,20037508,19929239",
         "user": "osm"