Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:mapbox/osm-bright

  • Loading branch information...
commit 47e4a3c8b8cbc24dc7668a6f895c83a4adec5cb3 2 parents 586fc39 + 53178d2
AJ Ashton authored
View
6 osm-bright/osm-bright.imposm.mml
@@ -244,7 +244,7 @@
"extent": "-20037508.34 -20037508.34 20037508.34 20037508.34",
"geometry_field": "geometry",
"key_field": "",
- "table": "( SELECT geometry, type, 0 as bridge, access, render, layer, tunnel,\n CASE\n WHEN type IN ('motorway', 'trunk') THEN 'motorway'\n WHEN type IN ('primary', 'secondary') THEN 'mainroad'\n WHEN type IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN type IN ('service', 'track') THEN 'service'\n WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN type IN ('light_rail', 'subway', 'narrow_guage', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM (\n SELECT *, '1_outline' AS render FROM osm_roads WHERE tunnel = 1\n UNION\n SELECT *, '2_line' AS render FROM osm_roads WHERE tunnel = 1\n UNION\n SELECT *, '3_inline' AS render FROM osm_roads WHERE tunnel = 1\n ) AS tunnels\n ORDER BY layer ASC, render ASC\n) AS data",
+ "table": "( SELECT geometry, type, 0 as bridge, access, render, layer, tunnel,\n CASE\n WHEN type IN ('motorway', 'trunk') THEN 'motorway'\n WHEN type IN ('primary', 'secondary') THEN 'mainroad'\n WHEN type IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN type IN ('service', 'track') THEN 'service'\n WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN type IN ('light_rail', 'subway', 'narrow_gauge', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM (\n SELECT *, '1_outline' AS render FROM osm_roads WHERE tunnel = 1\n UNION\n SELECT *, '2_line' AS render FROM osm_roads WHERE tunnel = 1\n UNION\n SELECT *, '3_inline' AS render FROM osm_roads WHERE tunnel = 1\n ) AS tunnels\n ORDER BY layer ASC, render ASC\n) AS data",
"type": "postgis"
},
"class": "",
@@ -279,7 +279,7 @@
"key_field": "",
"project": "osm-bright",
"srs": null,
- "table": "( SELECT geometry, type, tunnel, bridge, access, 'fill' AS render,\n CASE\n WHEN type IN ('motorway', 'trunk') THEN 'motorway'\n WHEN type IN ('primary', 'secondary') THEN 'mainroad'\n WHEN type IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN type IN ('service', 'track') THEN 'service'\n WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN type IN ('light_rail', 'subway', 'narrow_guage', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM osm_roads\n WHERE bridge = 0\n AND tunnel = 0\n ORDER BY z_order\n) AS data",
+ "table": "( SELECT geometry, type, tunnel, bridge, access, 'fill' AS render,\n CASE\n WHEN type IN ('motorway', 'trunk') THEN 'motorway'\n WHEN type IN ('primary', 'secondary') THEN 'mainroad'\n WHEN type IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN type IN ('service', 'track') THEN 'service'\n WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN type IN ('light_rail', 'subway', 'narrow_gauge', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM osm_roads\n WHERE bridge = 0\n AND tunnel = 0\n ORDER BY z_order\n) AS data",
"type": "postgis"
},
"class": "",
@@ -347,7 +347,7 @@
"key_field": "",
"project": "osm-bright-imposm",
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
- "table": "( SELECT geometry, type, bridge, access, render, layer, 0 as tunnel,\n CASE\n WHEN type IN ('motorway', 'trunk') THEN 'motorway'\n WHEN type IN ('primary', 'secondary') THEN 'mainroad'\n WHEN type IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN type IN ('service', 'track') THEN 'service'\n WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN type IN ('light_rail', 'subway', 'narrow_guage', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM (\n SELECT *, '1_outline' AS render FROM osm_roads WHERE bridge = 1\n UNION\n SELECT *, '2_line' AS render FROM osm_roads WHERE bridge = 1\n UNION\n SELECT *, '3_inline' AS render FROM osm_roads WHERE bridge = 1\n ) as bridges\n ORDER BY layer ASC, render ASC\n) AS data",
+ "table": "( SELECT geometry, type, bridge, access, render, layer, 0 as tunnel,\n CASE\n WHEN type IN ('motorway', 'trunk') THEN 'motorway'\n WHEN type IN ('primary', 'secondary') THEN 'mainroad'\n WHEN type IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN type IN ('service', 'track') THEN 'service'\n WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN type IN ('light_rail', 'subway', 'narrow_gauge', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM (\n SELECT *, '1_outline' AS render FROM osm_roads WHERE bridge = 1\n UNION\n SELECT *, '2_line' AS render FROM osm_roads WHERE bridge = 1\n UNION\n SELECT *, '3_inline' AS render FROM osm_roads WHERE bridge = 1\n ) as bridges\n ORDER BY layer ASC, render ASC\n) AS data",
"type": "postgis"
},
"class": "",
View
6 osm-bright/osm-bright.osm2pgsql.mml
@@ -261,7 +261,7 @@
"key_field": "",
"project": "osm-bright-master",
"srs": null,
- "table": "( SELECT way, COALESCE(highway, railway) AS type, 0 AS bridge, access, render, layer, 1 as tunnel,\n CASE\n WHEN highway IN ('motorway', 'trunk') THEN 'motorway'\n WHEN highway IN ('primary', 'secondary') THEN 'mainroad'\n WHEN highway IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN highway IN ('service', 'track') THEN 'service'\n WHEN highway IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN railway IN ('light_rail', 'subway', 'narrow_guage', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM (\n SELECT *, '1_outline' AS render FROM planet_osm_line\n WHERE tunnel NOT IN ('', '0', 'no')\n UNION\n SELECT *, '2_line' AS render FROM planet_osm_line\n WHERE tunnel NOT IN ('', '0', 'no')\n UNION\n SELECT *, '3_inline' AS render FROM planet_osm_line\n WHERE tunnel NOT IN ('', '0', 'no')\n ) AS tunnels\n ORDER BY layer ASC, render ASC\n) AS data",
+ "table": "( SELECT way, COALESCE(highway, railway) AS type, 0 AS bridge, access, render, layer, 1 as tunnel,\n CASE\n WHEN highway IN ('motorway', 'trunk') THEN 'motorway'\n WHEN highway IN ('primary', 'secondary') THEN 'mainroad'\n WHEN highway IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN highway IN ('service', 'track') THEN 'service'\n WHEN highway IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN railway IN ('light_rail', 'subway', 'narrow_gauge', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM (\n SELECT *, '1_outline' AS render FROM planet_osm_line\n WHERE tunnel NOT IN ('', '0', 'no')\n UNION\n SELECT *, '2_line' AS render FROM planet_osm_line\n WHERE tunnel NOT IN ('', '0', 'no')\n UNION\n SELECT *, '3_inline' AS render FROM planet_osm_line\n WHERE tunnel NOT IN ('', '0', 'no')\n ) AS tunnels\n ORDER BY layer ASC, render ASC\n) AS data",
"type": "postgis"
},
"class": "",
@@ -299,7 +299,7 @@
"key_field": "",
"project": "osm-bright-master",
"srs": null,
- "table": "( SELECT way, COALESCE(highway, railway) AS type, 0 AS tunnel, 0 AS bridge, access, 'fill' AS render,\n CASE\n WHEN highway IN ('motorway', 'trunk') THEN 'motorway'\n WHEN highway IN ('primary', 'secondary') THEN 'mainroad'\n WHEN highway IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN highway IN ('service', 'track') THEN 'service'\n WHEN highway IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN railway IN ('light_rail', 'subway', 'narrow_guage', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM planet_osm_line\n WHERE (highway IS NOT NULL OR railway IS NOT NULL)\n AND (tunnel IS NULL OR tunnel = 'no')\n AND (bridge IS NULL OR bridge = 'no')\n ORDER BY z_order\n) AS data",
+ "table": "( SELECT way, COALESCE(highway, railway) AS type, 0 AS tunnel, 0 AS bridge, access, 'fill' AS render,\n CASE\n WHEN highway IN ('motorway', 'trunk') THEN 'motorway'\n WHEN highway IN ('primary', 'secondary') THEN 'mainroad'\n WHEN highway IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN highway IN ('service', 'track') THEN 'service'\n WHEN highway IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN railway IN ('light_rail', 'subway', 'narrow_gauge', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM planet_osm_line\n WHERE (highway IS NOT NULL OR railway IS NOT NULL)\n AND (tunnel IS NULL OR tunnel = 'no')\n AND (bridge IS NULL OR bridge = 'no')\n ORDER BY z_order\n) AS data",
"type": "postgis"
},
"class": "",
@@ -367,7 +367,7 @@
"key_field": "",
"project": "osm-bright-master",
"srs": null,
- "table": "( SELECT way, COALESCE(highway, railway) AS type, 1 AS bridge, access, render, layer, 0 as tunnel,\n CASE\n WHEN highway IN ('motorway', 'trunk') THEN 'motorway'\n WHEN highway IN ('primary', 'secondary') THEN 'mainroad'\n WHEN highway IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN highway IN ('service', 'track') THEN 'service'\n WHEN highway IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN railway IN ('light_rail', 'subway', 'narrow_guage', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM (\n SELECT *, '1_outline' AS render FROM planet_osm_line\n WHERE bridge NOT IN ('', '0', 'no')\n UNION\n SELECT *, '2_line' AS render FROM planet_osm_line\n WHERE bridge NOT IN ('', '0', 'no')\n UNION\n SELECT *, '3_inline' AS render FROM planet_osm_line\n WHERE bridge NOT IN ('', '0', 'no')\n ) AS bridges\n ORDER BY layer ASC, render ASC\n) AS data",
+ "table": "( SELECT way, COALESCE(highway, railway) AS type, 1 AS bridge, access, render, layer, 0 as tunnel,\n CASE\n WHEN highway IN ('motorway', 'trunk') THEN 'motorway'\n WHEN highway IN ('primary', 'secondary') THEN 'mainroad'\n WHEN highway IN ('motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'living_street') THEN 'minorroad'\n WHEN highway IN ('service', 'track') THEN 'service'\n WHEN highway IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'\n WHEN railway IN ('light_rail', 'subway', 'narrow_gauge', 'rail', 'tram') THEN 'railway'\n ELSE 'other' END AS stylegroup\n FROM (\n SELECT *, '1_outline' AS render FROM planet_osm_line\n WHERE bridge NOT IN ('', '0', 'no')\n UNION\n SELECT *, '2_line' AS render FROM planet_osm_line\n WHERE bridge NOT IN ('', '0', 'no')\n UNION\n SELECT *, '3_inline' AS render FROM planet_osm_line\n WHERE bridge NOT IN ('', '0', 'no')\n ) AS bridges\n ORDER BY layer ASC, render ASC\n) AS data",
"type": "postgis"
},
"class": "",

0 comments on commit 47e4a3c

Please sign in to comment.
Something went wrong with that request. Please try again.