diff -r 959dc869b765 -r 8d4148a8ded4 project.mml --- a/project.mml Tue Sep 15 15:06:57 2020 +0300 +++ b/project.mml Tue Sep 15 17:36:45 2020 +0300 @@ -63,7 +63,10 @@ THEN 'religious' ELSE CASE WHEN ("landuse" = 'railway') THEN 'industrial' - ELSE "landuse" + ELSE CASE WHEN ("natural" = 'wetland') + THEN 'wetland' + ELSE "landuse" + END END END END @@ -214,6 +217,31 @@ properties: minzoom: 4 maxzoom: 9 + - id: foot-routes-layer-n1 + geometry: linestring + <<: *extents + Datasource: + <<: *osm2pgsql + table: &foot_routes_sql |- + (SELECT + way, + osm_way_id, + route, + COALESCE(layer::integer, 0) AS layer + FROM planet_osm_routes + WHERE "route" IN ('hiking', 'foot', 'bicycle_lcn', 'bicycle_rcn', 'bicycle_ncn', 'bicycle_icn') + ORDER BY + CASE + WHEN route = 'bicycle_icn' THEN 30 + WHEN route = 'bicycle_ncn' THEN 31 + WHEN route = 'bicycle_rcn' THEN 32 + WHEN route = 'bicycle_lcn' THEN 33 + WHEN route = 'foot' THEN 34 + WHEN route = 'hiking' THEN 35 + END DESC NULLS LAST + ) AS foot_routes + properties: + minzoom: 14 - id: road-casing-layer-n1 geometry: line Datasource: @@ -300,6 +328,14 @@ table: *road_sql properties: minzoom: 12 + - id: foot-routes + geometry: linestring + <<: *extents + Datasource: + <<: *osm2pgsql + table: *foot_routes_sql + properties: + minzoom: 14 - id: road geometry: line Datasource: @@ -327,6 +363,14 @@ ) AS bridge_area properties: minzoom: 12 + - id: foot-routes-layer-1 + geometry: linestring + <<: *extents + Datasource: + <<: *osm2pgsql + table: *foot_routes_sql + properties: + minzoom: 14 - id: road-casing-layer-1 geometry: line Datasource: @@ -669,6 +713,31 @@ table: *road_sql properties: minzoom: 14 + - id: foot-routes-text + geometry: linestring + <<: *extents + Datasource: + <<: *osm2pgsql + table: |- + (SELECT + way, + name, + ref, + route + FROM planet_osm_routes + WHERE "route" IN ('hiking', 'foot', 'bicycle_lcn', 'bicycle_rcn', 'bicycle_ncn', 'bicycle_icn') + ORDER BY + CASE + WHEN route = 'bicycle_icn' THEN 30 + WHEN route = 'bicycle_ncn' THEN 31 + WHEN route = 'bicycle_rcn' THEN 32 + WHEN route = 'bicycle_lcn' THEN 33 + WHEN route = 'foot' THEN 34 + WHEN route = 'hiking' THEN 35 + END DESC NULLS LAST + ) AS foot_routes + properties: + minzoom: 15 - id: roads-text-ref geometry: linestring <<: *extents