From ec88d57c66a1b0ccd4e68032a01346e2e935f378 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Tue, 28 Jan 2020 16:16:06 +0300 Subject: [PATCH] [index][styles] Added isoline type and styles for it. Conflicts: data/mapcss-mapping.csv --- data/mapcss-mapping.csv | 8 ++- data/styles/clear/include/Basemap.mapcss | 67 +++++++++++++++++-- .../styles/clear/include/Basemap_label.mapcss | 21 ++++++ data/styles/clear/style-clear/colors.mapcss | 14 ++++ data/styles/clear/style-night/colors.mapcss | 14 ++++ 5 files changed, 119 insertions(+), 5 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 389fcb48e1..e38924a1bd 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1328,4 +1328,10 @@ amenity|parking_space|underground;[amenity=parking_space][parking=underground];; amenity|parking_space|private;[amenity=parking_space][access=private];;name;int_name;1328; amenity|parking_space|permissive;[amenity=parking_space][access=permissive];;name;int_name;1329; landuse|churchyard;1330; -complex_entry;[complex_entry];;name;int_name;1331; +isoline|step_1000;1331; +isoline|step_500;1332; +isoline|step_100;1333; +isoline|step_50;1334; +isoline|step_10;1335; +isoline|zero;1336; +complex_entry;[complex_entry];;name;int_name;1337; diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index cc63938453..cb6c2e53c5 100755 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -83,14 +83,22 @@ area[landuse=village_green], area[landuse=field], {z-index: 41;} +line[isoline=step_1000], +line[isoline=step_500], +line[isoline=step_100], +line[isoline=step_50], +line[isoline=step_10], +line[isoline=zero], +{z-index: 42;} + area[natural=wetland], area[leisure=marina], line[waterway=stream][intermittent=yes] -{z-index: 42;} +{z-index: 43;} area[landuse=cemetery], area[amenity=grave_yard] -{z-index: 43;} +{z-index: 44;} area[highway=pedestrian][area?], area[area:highway=pedestrian], @@ -99,13 +107,13 @@ area[area:highway=footway], area[area:highway=living_street], area[public_transport=platform], area[railway=platform] -{z-index: 44;} +{z-index: 45;} area[landuse=grass], area[natural=grassland], area[leisure=golf_course], area[natural=heath] -{z-index: 45;} +{z-index: 46;} line[waterway=river], line[waterway=riverbank], @@ -637,3 +645,54 @@ line|z18-[barrier=fence], line|z18-[barrier=hedge], line|z18-[historic=citywalls], {width: 1.4;dashes: 0.3,0.3;} + +/* 9. ISOLINES */ + +line|z11-[isoline=step_1000], +{color: @isoline1000;} +line|z11-[isoline=step_500], +{color: @isoline500;} + +line|z12-[isoline=step_100], +{color: @isoline100;} + +line|z15-[isoline=step_50], +line|z15-[isoline=zero], +{color: @isoline50;} + +line|z17-[isoline=step_10], +{color: @isoline10;} + +line|z11-[isoline=step_1000], +{width: 1.0;opacity: 0.5;} +line|z11[isoline=step_500], +{width: 0.5;opacity: 0.3;} + +line|z12[isoline=step_500], +{width: 0.5;opacity: 0.5;} +line|z12-13[isoline=step_100], +{width: 0.5;opacity: 0.3;} + +line|z13-[isoline=step_500], +{width: 1.0;opacity: 0.5;} + +line|z14-16[isoline=step_100], +{width: 0.5;opacity: 0.5;} + +line|z15-16[isoline=step_50], +line|z15-16[isoline=zero], +{width: 0.5;opacity: 0.35;} + +line|z17-[isoline=step_100], +{width: 1.0;opacity: 0.5;} +line|z17[isoline=step_50], +line|z17[isoline=zero], +{width: 0.5;opacity: 0.5;} +line|z17[isoline=step_10], +{width: 0.5;opacity: 0.35;} + +line|z18-[isoline=step_50], +line|z18-[isoline=zero], +{width: 1.0;opacity: 0.5;} +line|z18-[isoline=step_10], +{width: 0.5;opacity: 0.5;} diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss index 903d0d7586..6afe11a9ea 100755 --- a/data/styles/clear/include/Basemap_label.mapcss +++ b/data/styles/clear/include/Basemap_label.mapcss @@ -46,6 +46,9 @@ area[amenity=grave_yard], node[amenity=grave_yard], {z-index: 800;} +line[isoline], +{z-index: 801;} + node[place=continent] {z-index: 999;} @@ -720,3 +723,21 @@ area|z15[aeroway=terminal] { text: name; font-size: 9; fill-opacity: 0.8; text-color: @building_label; text-position: center;} area|z16-[aeroway=terminal] {text: name; font-size: 9; fill-opacity: 1; text-color: @building_label; text-position: center;} + +/* 9. ISOLINES */ + +line[isoline] +{text-position: line;} + +line|z11-[isoline=step_1000], +{text:name;font-size: 7;fill-opacity: 0.5;text-color: @label_isoline1000;} + +line|z12-[isoline=step_500], +{text:name;font-size: 7;fill-opacity: 0.5;text-color: @label_isoline500;} + +line|z15-[isoline=step_100], +{text:name;font-size: 7;fill-opacity: 0.7;text-color: @label_isoline100;} + +line|z17-[isoline=step_50], +line|z17-[isoline=zero], +{text:name;font-size: 7;fill-opacity: 0.6;text-color: @label_isoline50;} diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index 3b7ce378a5..2cc81fb653 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -175,3 +175,17 @@ @shield: #FFFFFF; @shield_outline: #000000; /* blue - #2E89B0; #687E94; #598DBE; */ + +/* 7.ISOLINES COLORS */ + +@isoline1000: #6c6960; +@isoline500: #6c6960; +@isoline100: #6c6960; +@isoline50: #7a7666; +@isoline10: #7a7666; + +@label_isoline1000: #6c6960; +@label_isoline500: #6c6960; +@label_isoline100: #6c6960; +@label_isoline50: #7a7666; +@label_isoline10: #7a7666; diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss index b4be580d82..7f54909dd5 100644 --- a/data/styles/clear/style-night/colors.mapcss +++ b/data/styles/clear/style-night/colors.mapcss @@ -175,3 +175,17 @@ @shield_text_halo: #000000; @shield: #000000; @shield_outline: #b2b2b2; + +/* 7.ISOLINES COLORS */ + +@isoline1000: #6c6960; +@isoline500: #6c6960; +@isoline100: #6c6960; +@isoline50: #7a7666; +@isoline10: #7a7666; + +@label_isoline1000: #6c6960; +@label_isoline500: #6c6960; +@label_isoline100: #6c6960; +@label_isoline50: #7a7666; +@label_isoline10: #7a7666;