From 9d4be5c276d9f8ec295d9ce0ddbf40abf7419e2d Mon Sep 17 00:00:00 2001 From: Timofey Date: Tue, 17 May 2016 15:58:10 +0300 Subject: [PATCH 1/2] Added labels for tracks (that were lost some time ago) --- data/styles/clear/include/labels.mapcss | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss index 17a7c72af4..c41e4cf50c 100644 --- a/data/styles/clear/include/labels.mapcss +++ b/data/styles/clear/include/labels.mapcss @@ -1159,7 +1159,8 @@ line|z16-17[highway=secondary] { line|z15-[highway=bridleway], line|z15-[highway=path], line|z15-[highway=footway], -line|z15-[highway=cycleway] { +line|z15-[highway=cycleway], +line|z15-[highway=track] { font-size: 8; text: name; text-color: @label_medium; @@ -1170,7 +1171,8 @@ line|z15-[highway=cycleway] { line|z16-17[highway=bridleway], line|z16-17[highway=path], line|z16-17[highway=footway], -line|z16-17[highway=cycleway] { +line|z16-17[highway=cycleway], +line|z16-17[highway=track] { font-size: 9; text: name; text-color: @label_medium; @@ -1181,7 +1183,8 @@ line|z16-17[highway=cycleway] { line|z18-[highway=bridleway], line|z18-[highway=path], line|z18-[highway=footway], -line|z18-[highway=cycleway] { +line|z18-[highway=cycleway], +line|z18-[highway=track] { font-size: 10; text: name; text-color: @label_medium; From e27ccbe8f778a732fa71f71d3b429c11fae9c87d Mon Sep 17 00:00:00 2001 From: Timofey Date: Mon, 23 May 2016 18:56:08 +0300 Subject: [PATCH 2/2] Ran the script --- data/drules_proto_clear.bin | Bin 218025 -> 219810 bytes data/drules_proto_clear.txt | 680 ++++++++++++++++++++++++++++++++++++ data/drules_proto_dark.bin | Bin 215392 -> 217177 bytes data/drules_proto_dark.txt | 680 ++++++++++++++++++++++++++++++++++++ 4 files changed, 1360 insertions(+) diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 3a0c51677eb425d5680ad037d0996603f9b9b9af..556a08b70cef0b123f8e10a1f3eaa3c96a76323b 100644 GIT binary patch delta 270 zcmZ3voOjVy-i9rVaPu7#v{ usWy`0M>=4|35?UV^kANu%RD_ypV13p;dBG2^V|0sG6FHv_I-xTuN48*Txi|^ delta 837 zcmZ3qm3QTG-i9rVa^2B3c>flZgHQm615zJ*gsmsi@ zj%oTK!h#K zT)UX2Pc&c@oqk1)(V7SitX#X9xa2_|5uIM6!DvO47P#N1D{2wt6NIz&YLn!p|`F;Cwp#c01-e@6)859sX?x>2hRFD*Rs3I#quZFHzLIX*$ xnI^L0S}myJ$<`-$rtj89-i9rV>!p}hGELto#c0o{JN=^+qb`$>?sP$2FgaN?0mL|pnQJ%G^!r+jqSLw67;T8rf$+M>^v&vw2E^!rIZ1T7pC+RI*Jh^a`G$<1#CU?4YYWqKK4V5N;uHfD>pBzS T5^KA=86yxgZFe_g7Lo!0aL?Sy diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 359b570763..34f6567afc 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -24017,6 +24017,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24031,6 +24039,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24045,6 +24061,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24059,6 +24083,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24073,6 +24105,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24104,6 +24144,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24118,6 +24166,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24132,6 +24188,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24146,6 +24210,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24160,6 +24232,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24191,6 +24271,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24205,6 +24293,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24219,6 +24315,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24233,6 +24337,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24247,6 +24359,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24278,6 +24398,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24292,6 +24420,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24306,6 +24442,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24320,6 +24464,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24334,6 +24486,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24365,6 +24525,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24379,6 +24547,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24393,6 +24569,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24407,6 +24591,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24421,6 +24613,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24452,6 +24652,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24466,6 +24674,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24480,6 +24696,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24494,6 +24718,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24508,6 +24740,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24539,6 +24779,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24553,6 +24801,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24567,6 +24823,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24581,6 +24845,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24595,6 +24867,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24626,6 +24906,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24640,6 +24928,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24654,6 +24950,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24668,6 +24972,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24682,6 +24994,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24713,6 +25033,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24727,6 +25055,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24741,6 +25077,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24755,6 +25099,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24769,6 +25121,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24800,6 +25160,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24814,6 +25182,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24828,6 +25204,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24842,6 +25226,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24856,6 +25248,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24887,6 +25287,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24901,6 +25309,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -24915,6 +25331,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -24929,6 +25353,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -24943,6 +25375,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -24974,6 +25414,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -24988,6 +25436,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -25002,6 +25458,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -25016,6 +25480,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -25030,6 +25502,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -25061,6 +25541,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -25075,6 +25563,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -25089,6 +25585,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -25103,6 +25607,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -25117,6 +25629,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -25148,6 +25668,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -25162,6 +25690,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -25176,6 +25712,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -25190,6 +25734,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -25204,6 +25756,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -25235,6 +25795,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -25249,6 +25817,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -25263,6 +25839,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -25277,6 +25861,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -25291,6 +25883,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -25322,6 +25922,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -25336,6 +25944,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -25350,6 +25966,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -25364,6 +25988,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -25378,6 +26010,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont { @@ -25409,6 +26049,14 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 16 @@ -25423,6 +26071,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 17 @@ -25437,6 +26093,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 18 @@ -25451,6 +26115,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } element { scale: 19 @@ -25465,6 +26137,14 @@ cont { join: ROUNDJOIN cap: ROUNDCAP } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 16452 + } } } cont {