From 8b717a7797dc9cc7e38e72d6b5eb27327c1ddb7f Mon Sep 17 00:00:00 2001 From: Sean Date: Wed, 18 Aug 2021 12:59:54 -0400 Subject: [PATCH] add farmland color similar to openstreetmap.org's color Signed-off-by: Sean Connelly --- data/colors.txt | 2 ++ data/drules_proto.bin | Bin 208783 -> 208811 bytes data/drules_proto.txt | 30 +++++++++++++----- data/drules_proto_clear.bin | Bin 209525 -> 209553 bytes data/drules_proto_clear.txt | 30 +++++++++++++----- data/drules_proto_dark.bin | Bin 208297 -> 208323 bytes data/drules_proto_dark.txt | 30 +++++++++++++----- data/drules_proto_vehicle_clear.bin | Bin 129290 -> 129241 bytes data/drules_proto_vehicle_clear.txt | 24 +++++++------- data/drules_proto_vehicle_dark.bin | Bin 129074 -> 129025 bytes data/drules_proto_vehicle_dark.txt | 24 +++++++------- data/styles/clear/include/Basemap.mapcss | 9 ++++-- data/styles/clear/style-clear/colors.mapcss | 1 + data/styles/clear/style-night/colors.mapcss | 1 + data/styles/vehicle/include/Basemap.mapcss | 9 ++++-- data/styles/vehicle/style-clear/colors.mapcss | 1 + data/styles/vehicle/style-night/colors.mapcss | 1 + 17 files changed, 108 insertions(+), 54 deletions(-) diff --git a/data/colors.txt b/data/colors.txt index c195f18752..59e15f05bf 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -37,6 +37,7 @@ 1272880 1317888 1359565 +1381632 1512724 1643545 1643785 @@ -245,6 +246,7 @@ 15263452 15591638 15592411 +15592899 15658734 15690752 15754290 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 192ce265269db9485bd2fd2c9d49a5044c7142ed..c616f2f6c463506c9acd4e1cacb2fe13b1025a00 100644 GIT binary patch delta 207 zcmeCb&$IeIPs0{Q!>sxxOk4sviFqld#i_b!iAA{}wh#{omlOxb;oIBUB{p*adE7`m z5e^ML@KU{SBz* VLP(MdaB<0Y>ukpD*4a!UM*z{pQk?(* delta 57 zcmZ2|pQrymPs0{Q!z_^wCN6=T#JrT!;#A$V#G+gfdwOC$qw{pB7RD{pJyRKZ+EcO_ Lx2I$?xgP-lYO563 diff --git a/data/drules_proto.txt b/data/drules_proto.txt index a0664206c1..9db75aa95d 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -31082,31 +31082,45 @@ cont { } cont { name: "landuse-farmland" + element { + scale: 10 + area { + color: 15592899 + priority: 1075 + } + } + element { + scale: 11 + area { + color: 15592899 + priority: 1075 + } + } element { scale: 12 area { - color: 13620648 + color: 15592899 priority: -15926 } } element { scale: 13 area { - color: 13620648 + color: 15592899 priority: -15926 } } element { scale: 14 area { - color: 13029267 + color: 15592899 priority: -15926 } } element { scale: 15 area { - color: 13029267 + color: 15592899 priority: -15926 } caption { @@ -31120,7 +31134,7 @@ cont { element { scale: 16 area { - color: 13029267 + color: 15592899 priority: -15926 } caption { @@ -31134,7 +31148,7 @@ cont { element { scale: 17 area { - color: 13029267 + color: 15592899 priority: -15926 } caption { @@ -31148,7 +31162,7 @@ cont { element { scale: 18 area { - color: 13029267 + color: 15592899 priority: -15926 } caption { @@ -31162,7 +31176,7 @@ cont { element { scale: 19 area { - color: 13029267 + color: 15592899 priority: -15926 } caption { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index abc253d5a1a50b687df2d95008b77ad5ef7ed05e..6ff8daa86defaffeb159354963bcf76e78b9102e 100644 GIT binary patch delta 206 zcmezRglFPYo`x-quhZ+7FmVawB<7`*7N_c_B^Kp^*g`xUTv8kyhi`9Zm)Oh!WjF+pcnT~aS3tyt Sk;En2zh*FQ|C+(na1sFR(NX{a delta 45 zcmbREl;`Uco`x-quhWG(n79OT67y0@i&J&e5{q(k5~ue!GX88A%4FOwl*v?o5&*Wq B5>WsE diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 08baadc960..4bdcb44e1a 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -30874,31 +30874,45 @@ cont { } cont { name: "landuse-farmland" + element { + scale: 10 + area { + color: 15592899 + priority: 1075 + } + } + element { + scale: 11 + area { + color: 15592899 + priority: 1075 + } + } element { scale: 12 area { - color: 13620648 + color: 15592899 priority: -15926 } } element { scale: 13 area { - color: 13620648 + color: 15592899 priority: -15926 } } element { scale: 14 area { - color: 13029267 + color: 15592899 priority: -15926 } } element { scale: 15 area { - color: 13029267 + color: 15592899 priority: -15926 } caption { @@ -30912,7 +30926,7 @@ cont { element { scale: 16 area { - color: 13029267 + color: 15592899 priority: -15926 } caption { @@ -30926,7 +30940,7 @@ cont { element { scale: 17 area { - color: 13029267 + color: 15592899 priority: -15926 } caption { @@ -30940,7 +30954,7 @@ cont { element { scale: 18 area { - color: 13029267 + color: 15592899 priority: -15926 } caption { @@ -30954,7 +30968,7 @@ cont { element { scale: 19 area { - color: 13029267 + color: 15592899 priority: -15926 } caption { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 7cb8b077870c20678b930d84fb64285cad460726..83a174b8fd9aa9a23ae000c7b6ef95ccfee77fd2 100644 GIT binary patch delta 201 zcmZ2^o9FOto`x-qELruln79OT67y0@i&J&e5{q&{Y$0wAE-7}7hE*XFn>m0SZUje| zgGY)VEOV;)KLjue33Kpb6Xe4bROH}C6`Y=##VE;v diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index a12ceaf985..9cddf8e96f 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -31025,31 +31025,45 @@ cont { } cont { name: "landuse-farmland" + element { + scale: 10 + area { + color: 1381632 + priority: 1075 + } + } + element { + scale: 11 + area { + color: 1381632 + priority: 1075 + } + } element { scale: 12 area { - color: 988160 + color: 1381632 priority: -15926 } } element { scale: 13 area { - color: 988160 + color: 1381632 priority: -15926 } } element { scale: 14 area { - color: 1251584 + color: 1381632 priority: -15926 } } element { scale: 15 area { - color: 1251584 + color: 1381632 priority: -15926 } caption { @@ -31063,7 +31077,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1381632 priority: -15926 } caption { @@ -31077,7 +31091,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1381632 priority: -15926 } caption { @@ -31091,7 +31105,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1381632 priority: -15926 } caption { @@ -31105,7 +31119,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1381632 priority: -15926 } caption { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index e97a9cd1d9e7fec2de00f923d533e05fc88eaadc..9109364aeffd217d8443c386141a601e973979df 100644 GIT binary patch delta 122 zcmeDB#D4Q5`-aUo)6=*FauV}WN{dr<(-MnvL2Mx&4n8Rkj>EUNvrF9L0P^@zcmgOq WK@^@43QripYxcgi-TM~femMZ;oF|t6 delta 43 xcmcclk-h5^`-aUoMW!)w3FIW^rIZ$@>ZTp!N5iTRiF+JC4nHzS0GT6* V%n?H72*Wwer|xe*b)PXq0ss~bB2EAR delta 33 rcmV++0N($B@CUN+2e3HblL*}m24-P$ZERtatMY+^n%}pY-vMVB6Z;TD diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 1ba20c6f02..58d5aa150c 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -19246,43 +19246,43 @@ cont { element { scale: 14 area { - color: 593674 - priority: -15883 + color: 1381632 + priority: 1118 } } element { scale: 15 area { - color: 593674 - priority: -15883 + color: 1381632 + priority: 1118 } } element { scale: 16 area { - color: 593674 - priority: -15883 + color: 1381632 + priority: 1118 } } element { scale: 17 area { - color: 593674 - priority: -15883 + color: 1381632 + priority: 1118 } } element { scale: 18 area { - color: 593674 - priority: -15883 + color: 1381632 + priority: 1118 } } element { scale: 19 area { - color: 593674 - priority: -15883 + color: 1381632 + priority: 1118 } } } diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index 0ff070b56c..5ac6afce23 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -16,7 +16,8 @@ 7.3 University & Sport 7.4 Cemetry 7.5 Pedestrian areas - 7.6 Airports + 7.6 Airports + 7.7 Agricultural 8.BUILDINGS 8.1 Pier 8.2 Building @@ -263,7 +264,6 @@ area|z14-[landuse=grass], area|z14-[natural=grassland], area|z14-[leisure=golf_course], area|z14-[natural=heath], -area|z14-[landuse=farmland], area|z14-[landuse=allotments], area|z14-[natural=scrub], area|z14-[landuse=orchard], @@ -288,7 +288,6 @@ area|z12-13[landuse=grass], area|z12-13[natural=grassland], area|z12-13[leisure=golf_course], area|z12-13[natural=heath], -area|z12-13[landuse=farmland], area|z12-13[landuse=allotments], area|z12-13[natural=scrub], area|z12-13[landuse=orchard], @@ -569,6 +568,10 @@ area|z15-19[aeroway=aerodrome] area|z15-[landuse=churchyard] {fill-color: @background;} +/* 7.8 Agricultural */ +area|z10-[landuse=farmland], +{fill-color: @farmland;fill-opacity: 1;} + /* Parking */ area|z15-[amenity=parking] diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index c9dd55e341..55cd66dcfa 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -65,6 +65,7 @@ @sport: #D1CDA7; @parking: #F2F2CE; @military: #E53935; +@farmland: #ededc3; /*4.2 Aerodrome*/ diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss index 9f3968ea7c..21fba254b6 100644 --- a/data/styles/clear/style-night/colors.mapcss +++ b/data/styles/clear/style-night/colors.mapcss @@ -65,6 +65,7 @@ @sport: #21211B; @parking: #1F1B1B; @military: #B71C1C; +@farmland: #151500; /*4.2 Aerodrome*/ diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 36363f243f..206e617549 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -16,7 +16,8 @@ 7.3 University & Sport 7.4 Cemetry 7.5 Pedestrian areas - 7.6 Airports + 7.6 Airports + 7.7 Agricultural 8.BUILDINGS 8.1 Pier 8.2 Building @@ -233,7 +234,6 @@ area|z14-[landuse=grass], area|z14-[natural=grassland], area|z14-[leisure=golf_course], area|z14-[natural=heath], -area|z14-[landuse=farmland], area|z14-[landuse=allotments], area|z14-[natural=scrub], area|z14-[landuse=orchard], @@ -255,7 +255,7 @@ area|z14-[landuse=grass], area|z14-[natural=grassland], area|z14-[leisure=golf_course], area|z14-[natural=heath], -area|z14-[landuse=farmland], + area|z14-[landuse=allotments], area|z14-[natural=scrub], area|z14-[landuse=orchard], @@ -514,6 +514,9 @@ area|z15-19[aeroway=aerodrome] area|z15-[landuse=churchyard] {fill-color: @background; fill-opacity: 1;} +/* 7.8 Agricultural */ +area|z14-[landuse=farmland], +{fill-color: @farmland;fill-opacity: 1;} /* Parking */ diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss index 7356464a99..a8b5a67fbe 100644 --- a/data/styles/vehicle/style-clear/colors.mapcss +++ b/data/styles/vehicle/style-clear/colors.mapcss @@ -126,6 +126,7 @@ @parking: #F2F2CE; @parking_l: #FCFCC2;/*#F0EBC5;DCDCB9; #F2F2CE;*/ @military: #E53935; +@farmland: #ededc3; /* BARRIERS */ @fence: #999999; diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss index 3c55ac6c4a..dfb845f63b 100644 --- a/data/styles/vehicle/style-night/colors.mapcss +++ b/data/styles/vehicle/style-night/colors.mapcss @@ -66,6 +66,7 @@ @military: #B71C1C; @parking: #191509; @parking_l: #1F190A; +@farmland: #151500; /*4.2 Aerodrome*/