Skip to content

Commit

Permalink
Merge remote-tracking branch 'pnorman/sql_cleanup'
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthijsmelissen
matthijsmelissen committed Mar 9, 2015
2 parents 2c019e9 + 292c882 commit a9d6b3d
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 57 deletions.
20 changes: 10 additions & 10 deletions project.mml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, building, amenity, aeroway\n FROM planet_osm_polygon\n WHERE (building IS NOT NULL)\n AND building != 'no'\n AND (aeroway = 'terminal' OR amenity = 'place_of_worship')\n ORDER BY z_order,way_area DESC)\nAS buildings_major",
"table": "(SELECT\n way,\n building,\n amenity,\n aeroway\n FROM planet_osm_polygon\n WHERE (building IS NOT NULL)\n AND building != 'no'\n AND (aeroway = 'terminal' OR amenity = 'place_of_worship')\n ORDER BY z_order, way_area DESC)\nAS buildings_major",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand Down Expand Up @@ -878,7 +878,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, aerialway FROM planet_osm_line WHERE aerialway IS NOT NULL) AS aerialways",
"table": "(SELECT\n way,\n aerialway\n FROM planet_osm_line\n WHERE aerialway IS NOT NULL\n) AS aerialways",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand Down Expand Up @@ -1009,7 +1009,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, admin_level\n FROM planet_osm_roads\n WHERE \"boundary\" = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4')\n ORDER BY admin_level DESC\n ) AS admin_low_zoom",
"table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE \"boundary\" = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4')\n ORDER BY admin_level DESC\n) AS admin_low_zoom",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand All @@ -1036,7 +1036,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, admin_level\n FROM planet_osm_roads\n WHERE \"boundary\" = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')\n ORDER BY admin_level DESC\n ) AS admin_mid_zoom",
"table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE \"boundary\" = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')\n ORDER BY admin_level DESC\n) AS admin_mid_zoom",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand All @@ -1063,7 +1063,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, admin_level\n FROM planet_osm_roads\n WHERE \"boundary\" = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')\n ORDER BY admin_level DESC\n ) AS admin_high_zoom",
"table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE \"boundary\" = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')\n ORDER BY admin_level::integer DESC -- With 10 as a valid value, we need to do a numeric ordering, not a text ordering\n) AS admin_high_zoom",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand Down Expand Up @@ -1193,7 +1193,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels, name, ref, admin_level\n FROM planet_osm_polygon\n WHERE boundary = 'administrative' AND admin_level IN ('2', '4')\n ) AS placenames_large",
"table": "(SELECT\n way,\n way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n name,\n ref,\n admin_level\n FROM planet_osm_polygon\n WHERE boundary = 'administrative'\n AND admin_level IN ('2', '4')\n) AS placenames_large",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand Down Expand Up @@ -1324,7 +1324,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": " (SELECT way, name, railway, aerialway, disused\n FROM planet_osm_point\n WHERE railway IN ('station', 'halt', 'tram_stop', 'subway_entrance')\n OR aerialway = 'station'\n ) AS stations",
"table": "(SELECT\n way,\n name,\n railway,\n aerialway,\n disused\n FROM planet_osm_point\n WHERE railway IN ('station', 'halt', 'tram_stop', 'subway_entrance')\n OR aerialway = 'station'\n) AS stations",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand All @@ -1350,7 +1350,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": " (SELECT way, name, railway, aerialway, disused\n FROM planet_osm_polygon\n WHERE railway IN ('station', 'halt', 'tram_stop')\n OR aerialway = 'station'\n ) AS stations_poly",
"table": "(SELECT\n way,\n name,\n railway,\n aerialway,\n disused\nFROM planet_osm_polygon\nWHERE railway IN ('station', 'halt', 'tram_stop')\n OR aerialway = 'station'\n) AS stations_poly",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand Down Expand Up @@ -1559,7 +1559,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, highway, height, width, refs FROM\n (SELECT\n way, highway,\n array_length(refs,1) AS height,\n (SELECT MAX(char_length(ref)) FROM unnest(refs) AS u(ref)) AS width,\n array_to_string(refs, E'\\n') AS refs\n FROM (\n SELECT\n way,\n COALESCE(highway, aeroway) AS highway,\n string_to_array(ref, ';') AS refs\n FROM planet_osm_line\n WHERE (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified', 'residential') OR aeroway IN ('runway', 'taxiway'))\n AND ref IS NOT NULL\n ) AS p) AS q\n WHERE height <= 4 AND width <= 11) AS roads_text_ref",
"table": "(SELECT way, highway, height, width, refs FROM\n (SELECT\n way, highway,\n array_length(refs,1) AS height,\n (SELECT MAX(char_length(ref)) FROM unnest(refs) AS u(ref)) AS width,\n array_to_string(refs, E'\\n') AS refs\n FROM (\n SELECT\n way,\n COALESCE(highway, aeroway) AS highway,\n string_to_array(ref, ';') AS refs\n FROM planet_osm_line\n WHERE (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified', 'residential') OR aeroway IN ('runway', 'taxiway'))\n AND ref IS NOT NULL\n ) AS p) AS q\n WHERE height <= 4 AND width <= 11) AS roads_text_ref",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand Down Expand Up @@ -1898,7 +1898,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, name, admin_level FROM planet_osm_polygon WHERE \"boundary\" = 'administrative' AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')) AS admin_text",
"table": "(SELECT\n way,\n name,\n admin_level\n FROM planet_osm_polygon\n WHERE \"boundary\" = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')\n) AS admin_text",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand Down
132 changes: 85 additions & 47 deletions project.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,12 +384,16 @@ Layer:
Datasource:
<<: *osm2pgsql
table: |-
(SELECT way, building, amenity, aeroway
(SELECT
way,
building,
amenity,
aeroway
FROM planet_osm_polygon
WHERE (building IS NOT NULL)
AND building != 'no'
AND (aeroway = 'terminal' OR amenity = 'place_of_worship')
ORDER BY z_order,way_area DESC)
ORDER BY z_order, way_area DESC)
AS buildings_major
properties:
minzoom: 12
Expand Down Expand Up @@ -943,8 +947,13 @@ Layer:
<<: *extents
Datasource:
<<: *osm2pgsql
table: |2-
(SELECT way, aerialway FROM planet_osm_line WHERE aerialway IS NOT NULL) AS aerialways
table: |-
(SELECT
way,
aerialway
FROM planet_osm_line
WHERE aerialway IS NOT NULL
) AS aerialways
properties:
minzoom: 12
advanced: {}
Expand Down Expand Up @@ -1101,13 +1110,15 @@ Layer:
<<: *extents
Datasource:
<<: *osm2pgsql
table: |2-
(SELECT way, admin_level
FROM planet_osm_roads
WHERE "boundary" = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4')
ORDER BY admin_level DESC
) AS admin_low_zoom
table: |-
(SELECT
way,
admin_level
FROM planet_osm_roads
WHERE "boundary" = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4')
ORDER BY admin_level DESC
) AS admin_low_zoom
properties:
maxzoom: 10
advanced: {}
Expand All @@ -1118,13 +1129,15 @@ Layer:
<<: *extents
Datasource:
<<: *osm2pgsql
table: |2-
(SELECT way, admin_level
FROM planet_osm_roads
WHERE "boundary" = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')
ORDER BY admin_level DESC
) AS admin_mid_zoom
table: |-
(SELECT
way,
admin_level
FROM planet_osm_roads
WHERE "boundary" = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')
ORDER BY admin_level DESC
) AS admin_mid_zoom
properties:
minzoom: 11
maxzoom: 12
Expand All @@ -1136,13 +1149,15 @@ Layer:
<<: *extents
Datasource:
<<: *osm2pgsql
table: |2-
(SELECT way, admin_level
FROM planet_osm_roads
WHERE "boundary" = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')
ORDER BY admin_level DESC
) AS admin_high_zoom
table: |-
(SELECT
way,
admin_level
FROM planet_osm_roads
WHERE "boundary" = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')
ORDER BY admin_level::integer DESC -- With 10 as a valid value, we need to do a numeric ordering, not a text ordering
) AS admin_high_zoom
properties:
minzoom: 13
advanced: {}
Expand Down Expand Up @@ -1201,11 +1216,17 @@ Layer:
<<: *extents
Datasource:
<<: *osm2pgsql
table: |2-
(SELECT way, way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels, name, ref, admin_level
FROM planet_osm_polygon
WHERE boundary = 'administrative' AND admin_level IN ('2', '4')
) AS placenames_large
table: |-
(SELECT
way,
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,
name,
ref,
admin_level
FROM planet_osm_polygon
WHERE boundary = 'administrative'
AND admin_level IN ('2', '4')
) AS placenames_large
properties:
minzoom: 2
advanced: {}
Expand Down Expand Up @@ -1277,12 +1298,17 @@ Layer:
<<: *extents
Datasource:
<<: *osm2pgsql
table: |2-
(SELECT way, name, railway, aerialway, disused
FROM planet_osm_point
WHERE railway IN ('station', 'halt', 'tram_stop', 'subway_entrance')
OR aerialway = 'station'
) AS stations
table: |-
(SELECT
way,
name,
railway,
aerialway,
disused
FROM planet_osm_point
WHERE railway IN ('station', 'halt', 'tram_stop', 'subway_entrance')
OR aerialway = 'station'
) AS stations
properties:
minzoom: 12
advanced: {}
Expand All @@ -1293,12 +1319,17 @@ Layer:
<<: *extents
Datasource:
<<: *osm2pgsql
table: |2-
(SELECT way, name, railway, aerialway, disused
FROM planet_osm_polygon
WHERE railway IN ('station', 'halt', 'tram_stop')
OR aerialway = 'station'
) AS stations_poly
table: |-
(SELECT
way,
name,
railway,
aerialway,
disused
FROM planet_osm_polygon
WHERE railway IN ('station', 'halt', 'tram_stop')
OR aerialway = 'station'
) AS stations_poly
properties:
minzoom: 12
advanced: {}
Expand Down Expand Up @@ -1506,9 +1537,9 @@ Layer:
way,
COALESCE(highway, aeroway) AS highway,
string_to_array(ref, ';') AS refs
FROM planet_osm_line
WHERE (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified', 'residential') OR aeroway IN ('runway', 'taxiway'))
AND ref IS NOT NULL
FROM planet_osm_line
WHERE (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified', 'residential') OR aeroway IN ('runway', 'taxiway'))
AND ref IS NOT NULL
) AS p) AS q
WHERE height <= 4 AND width <= 11) AS roads_text_ref
properties:
Expand Down Expand Up @@ -1822,8 +1853,15 @@ Layer:
<<: *extents
Datasource:
<<: *osm2pgsql
table: |2-
(SELECT way, name, admin_level FROM planet_osm_polygon WHERE "boundary" = 'administrative' AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')) AS admin_text
table: |-
(SELECT
way,
name,
admin_level
FROM planet_osm_polygon
WHERE "boundary" = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')
) AS admin_text
properties:
minzoom: 16
advanced: {}
Expand Down

0 comments on commit a9d6b3d

Please sign in to comment.