From b480b2c16182acf960cc2a96f2cfdc16427ed199 Mon Sep 17 00:00:00 2001 From: Hartmut Holzgraefe Date: Wed, 28 Feb 2018 21:06:55 +0000 Subject: [PATCH 1/3] render missing living_streets like pedestrian zones etc. --- sql/functions/highroad.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/functions/highroad.sql b/sql/functions/highroad.sql index 5675863..548db14 100755 --- a/sql/functions/highroad.sql +++ b/sql/functions/highroad.sql @@ -132,7 +132,7 @@ CREATE VIEW highroad_z15plus AS railway, (CASE WHEN highway IN ('motorway', 'motorway_link') THEN 'highway' WHEN highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link') THEN 'major_road' - WHEN highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'path', 'cycleway') THEN 'path' + WHEN highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'living_street', 'path', 'cycleway') THEN 'path' WHEN railway IN ('rail', 'tram', 'light_rail', 'narrow_gauge', 'monorail') THEN 'rail' ELSE 'minor_road' END) AS kind, (CASE WHEN highway IN ('motorway_link','trunk_link','primary_link','secondary_link','tertiary_link') THEN 'yes' @@ -164,7 +164,7 @@ CREATE VIEW highroad_z15plus AS WHERE highway IN ('motorway', 'motorway_link') OR highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link') OR highway IN ('residential', 'unclassified', 'road', 'unclassified', 'service', 'minor') - OR highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'path', 'cycleway') + OR highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'living_street', 'path', 'cycleway') OR railway IN ('rail', 'tram', 'light_rail', 'narrow_gauge', 'monorail') ORDER BY explicit_layer ASC, implied_layer ASC, priority DESC); From 5eb8e194d69df24eab4c9da1cd8daa178c5ff750 Mon Sep 17 00:00:00 2001 From: Hartmut Holzgraefe Date: Tue, 5 Dec 2023 14:02:53 +0100 Subject: [PATCH 2/3] some shapefile attributes need to be upper case (Issue #6) --- map.mss | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/map.mss b/map.mss index f8b80b2..bbd5dc7 100644 --- a/map.mss +++ b/map.mss @@ -45,12 +45,12 @@ Map { line-color: @color_administrative_lowzoom; } -.country-boundary[scalerank<6] { +.country-boundary[SCALERANK<6] { line-color: @color_administrative_dark; line-width: 0.5; } -.country-boundary-10m[scalerank<6] { +.country-boundary-10m[SCALERANK<6] { ::whiteout { [zoom>=7] { line-color: @color_administrative_bright; @@ -80,40 +80,40 @@ Map { #admin1-lines-10m, #admin0-map-units-10m { - [zoom>=4][adm0_a3='CAN'], - [zoom>=4][adm0_a3='USA'], - [zoom>=4][adm0_a3='AUS'] { + [zoom>=4][ADM0_A3='CAN'], + [zoom>=4][ADM0_A3='USA'], + [zoom>=4][ADM0_A3='AUS'] { line-width: 0.6; line-color: @color_administrative_dark; } - [zoom>=5][scalerank<=2], - [zoom>=5][featurecla='Map unit boundary'][adm0_a3='GBR'] { + [zoom>=5][SCALERANK<=2], + [zoom>=5][FEATURECLA='Map unit boundary'][ADM0_A3='GBR'] { line-width: 0.6; line-color: @color_administrative_dark; } - [zoom>=6][scalerank<=4], - [zoom>=6][featurecla='Map unit boundary'][adm0_a3='GBR'] { + [zoom>=6][SCALERANK<=4], + [zoom>=6][FEATURECLA='Map unit boundary'][ADM0_A3='GBR'] { line-width: 0.8; line-color: @color_administrative_dark; } - [zoom>=7][scalerank<=5] { + [zoom>=7][SCALERANK<=5] { line-width: 1; line-color: @color_administrative_medium_low; line-dasharray: 1,5; line-cap: round; } - [zoom>=8][scalerank<=6] { + [zoom>=8][SCALERANK<=6] { line-width: 1.2; line-color: @color_administrative_medium_high; line-dasharray: 1,5; line-cap: round; } - [zoom>=9][scalerank<=8] { + [zoom>=9][SCALERANK<=8] { line-width: 1.2; line-color: @color_administrative_medium_high2; line-dasharray: 1,5; @@ -121,10 +121,10 @@ Map { } } -#lakes-50m[zoom<3][scalerank<1], -#lakes-50m[zoom=3][scalerank<2], -#lakes-50m[zoom=4][scalerank<3], -#lakes-50m[zoom=5][scalerank<5], +#lakes-50m[zoom<3][SCALERANK<1], +#lakes-50m[zoom=3][SCALERANK<2], +#lakes-50m[zoom=4][SCALERANK<3], +#lakes-50m[zoom=5][SCALERANK<5], #lakes-50m[zoom=6], #lakes-10m, { @@ -138,11 +138,11 @@ Map { line-opacity: 0.5; line-width: 0; - [zoom=7][scalerank<=7] { + [zoom=7][SCALERANK<=7] { line-width: 2.25; } - [zoom=8][scalerank<=8] { + [zoom=8][SCALERANK<=8] { line-width: 3.25; } } @@ -150,31 +150,31 @@ Map { line-color: @color_transport; line-width: 0; - [zoom=6][scalerank>=3][scalerank<=6] { + [zoom=6][SCALERANK>=3][SCALERANK<=6] { line-width: 0.1; } [zoom=7] { - [scalerank<=6], - [scalerank<=7][expressway=1], - [scalerank<=7][type='Major Highway'], - [scalerank<=7][type='Secondary Highway'], + [SCALERANK<=6], + [SCALERANK<=7][expressway=1], + [SCALERANK<=7][type='Major Highway'], + [SCALERANK<=7][type='Secondary Highway'], { line-width: 0.1; } - [scalerank>=3][scalerank<=5] { + [SCALERANK>=3][SCALERANK<=5] { line-width: 1.5; } } [zoom=8] { - [scalerank<=8] { + [SCALERANK<=8] { line-width: 0.1; } [type='Beltway'], - [scalerank<=8][expressway=1], + [SCALERANK<=8][expressway=1], { line-width: 1.5; } From 2d823b82124c3acf210870d653eade19f7440d45 Mon Sep 17 00:00:00 2001 From: Hartmut Holzgraefe Date: Sat, 13 Jan 2024 14:35:08 +0100 Subject: [PATCH 3/3] ne-10m-roads shape file flipped back to lower case attribute names --- map.mss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/map.mss b/map.mss index bbd5dc7..6576c90 100644 --- a/map.mss +++ b/map.mss @@ -138,11 +138,11 @@ Map { line-opacity: 0.5; line-width: 0; - [zoom=7][SCALERANK<=7] { + [zoom=7][scalerank<=7] { line-width: 2.25; } - [zoom=8][SCALERANK<=8] { + [zoom=8][scalerank<=8] { line-width: 3.25; } } @@ -150,31 +150,31 @@ Map { line-color: @color_transport; line-width: 0; - [zoom=6][SCALERANK>=3][SCALERANK<=6] { + [zoom=6][scalerank>=3][scalerank<=6] { line-width: 0.1; } [zoom=7] { - [SCALERANK<=6], - [SCALERANK<=7][expressway=1], - [SCALERANK<=7][type='Major Highway'], - [SCALERANK<=7][type='Secondary Highway'], + [scalerank<=6], + [scalerank<=7][expressway=1], + [scalerank<=7][type='Major Highway'], + [scalerank<=7][type='Secondary Highway'], { line-width: 0.1; } - [SCALERANK>=3][SCALERANK<=5] { + [scalerank>=3][scalerank<=5] { line-width: 1.5; } } [zoom=8] { - [SCALERANK<=8] { + [scalerank<=8] { line-width: 0.1; } [type='Beltway'], - [SCALERANK<=8][expressway=1], + [scalerank<=8][expressway=1], { line-width: 1.5; }