From d42f27d38ed92f4f966eea8c85ae474d598c12b4 Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Mon, 25 Jan 2016 14:07:06 +0300 Subject: [PATCH] Road styles source update. --- data/mapcss-mapping.csv | 2 ++ data/styles/clear/include/Z-INDEXES | 2 ++ data/styles/clear/include/roads.mapcss | 31 +++++++++++++++++++++ data/styles/clear/style-clear/colors.mapcss | 2 ++ data/styles/clear/style-night/colors.mapcss | 2 ++ 5 files changed, 39 insertions(+) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index de34f8f784..b2a2a0a6ea 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1049,3 +1049,5 @@ amenity|place_of_worship|shinto;[amenity=place_of_worship][religion=shinto];;nam amenity|place_of_worship|jewish;[amenity=place_of_worship][religion=jewish];;name;int_name;1049; amenity|place_of_worship|taoist;[amenity=place_of_worship][religion=taoist];;name;int_name;1050; man_made|water_tower;[man_made=water_tower];;name;int_name;1051; +highway|world_level;[highway=world_level];;name;int_name;1052; +highway|world_towns_level;[highway=world_towns_level];;name;int_name;1053; diff --git a/data/styles/clear/include/Z-INDEXES b/data/styles/clear/include/Z-INDEXES index d51a5fa6e3..fe3d4b9c43 100644 --- a/data/styles/clear/include/Z-INDEXES +++ b/data/styles/clear/include/Z-INDEXES @@ -141,6 +141,8 @@ area|z14[aeroway=terminal] line|z13[highway=cycleway], line|z16[highway=steps]{z-index: 1000;} +line|z7-[highway=world_level], +line|z7-[highway=world_towns_level], line|z7-[highway=trunk], line|z7-[highway=motorway] {z-index: 900;} diff --git a/data/styles/clear/include/roads.mapcss b/data/styles/clear/include/roads.mapcss index 9c4f0a5102..f40ac5f3cd 100644 --- a/data/styles/clear/include/roads.mapcss +++ b/data/styles/clear/include/roads.mapcss @@ -73,6 +73,37 @@ line|z7-[highway=residential_link], */ +line|z7-[highway=world_level] +{ + color: @trunk_orange_world; + width: 1.2; + opacity: 0; + z-index: 900; +} + +line|z1-[highway=world_level] +{ + color: @trunk_orange_world; + width: 1.2; + opacity: 1; + z-index: 900; +} + +line|z7-[highway=world_towns_level] +{ + color: @trunk_yellow_world; + width: 0.9; + opacity: 0; + z-index: 900; +} + +line|z1-[highway=world_towns_level] +{ + color: @trunk_yellow_world; + width: 0.9; + opacity: 1; + z-index: 900; +} /* ZOOM 7 */ diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index ee1c3d8392..9d74adb41c 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -27,6 +27,8 @@ @trunk_orange_hard: #FF5E1F; @trunk_orange_medium: #FF7326; /*FF6626*/ @trunk_orange_light: #FF7A26;/*F57A45*/ + @trunk_orange_world: #FF5E1F; + @trunk_yellow_world: #FF8800; @trunk_orange_case: #DDDDCC; @primary_orange: #FF8726; @primary_orange_medium: #FF9440; diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss index 24a4df3a06..568538f067 100644 --- a/data/styles/clear/style-night/colors.mapcss +++ b/data/styles/clear/style-night/colors.mapcss @@ -28,6 +28,8 @@ @trunk_orange_hard: #331C12; @trunk_orange_medium: #381F14; @trunk_orange_light: #381F11; +@trunk_orange_world: #F7632C; +@trunk_yellow_world: #372400; @trunk_orange_case: black; @primary_orange: #422518; @primary_orange_medium: #422518;