From 6c51fe243e5c08b028b2b0ce2453f0e07639b672 Mon Sep 17 00:00:00 2001 From: vng Date: Mon, 16 Jun 2014 15:54:08 +0300 Subject: [PATCH] [classificator] Added some historic types. --- data/classificator.txt | 5 + data/drules_proto-bw.bin | Bin 153242 -> 153841 bytes data/drules_proto-bw.txt | 433 ++++++++++++++++++++++++++++++-------- data/drules_proto.bin | Bin 187686 -> 188277 bytes data/drules_proto.txt | 226 ++++++++++++++++++++ data/mapcss-mapping.csv | 5 + data/styles/normal.mapcss | 3 +- data/types.txt | 5 + 8 files changed, 587 insertions(+), 90 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index d023b9f3fc..2024f7ee4e 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -311,12 +311,17 @@ world + historic + archaeological_site - battlefield - + boundary_stone - castle - + citywalls - memorial - monument - museum - ruins - ship - + tomb - + wayside_cross - + wayside_shrine - {} landuse + allotments - diff --git a/data/drules_proto-bw.bin b/data/drules_proto-bw.bin index 46b124b26812b64771bdb185eb96c82f18e53860..177176fc9bf2ce9ea3a593d86cc57e0d7926de83 100644 GIT binary patch delta 1154 zcmbQWmhmw24Y?HElgZO8JX!B z<%yNL1*s{i#U(|ViFrbL9Q;C}oD2})AOJF0p^3wQ!GZy1R5OPaCl?C`mjHvrtXiOY z0l0b&qSOn5)z^b;kReKg5ZnSKqSOn+)f?hgKe>Llwi!6sQ2is02v2kgSkO*>uv;_% zt5#?Lvq_+6<@(6XC5ai-x=BTuDe0*~F<3)(q9)m5+CmSRi>)=uk33JpS zpUn8oNE4R^j4+?bFhT?^hRz*+3D*!7{$D>+QD^|1#6&`l;-87<_Hzw3>2Bk z`e|A?TvC7|U}Pu%Pt(E?I0YOy0!L>00xm`^93fP|fh~mOr(fV_#O*j7!Q{?`2%*h? z_bbnnisll}$Sf|&FUm~TP0BCLOGzxMj0f`bQYR-$I8RrIW9$Ur3ab z0Sq`C1m4}<%|1CWOL($gIS;!4f-kJXAqZC|gCZ^j7gs`vPhMBT#se|c5G*?RK#9oY zUAvW7z&1SCEm{v^NHlX;adNS6a0xI-%&HX<=Ma?Q;J_*&giAsgs|446W-dug@9HKM zWu~O33Izdu4R#_`Mv{?+Y=CivgV%ge43d_L@#U z7tRTCeGmu2OlVLjG)>>g%xDAAEDX015+v-C9S+EYE%4=J6la-L%e8p2$39unG|VUg zyG?fT|1{&t*J_a5=RJADPHy2etnQMZte?g){XIXUHpp>l*c>-`;ZNDg4_+FB+?U3I o&3&Ge7sPUIo^wEI-gM1GM&9WP@r;ezf5tPuX4?KCnUV1;0JPY(5dZ)H diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt index 758ed566d8..adaebdccbd 100644 --- a/data/drules_proto-bw.txt +++ b/data/drules_proto-bw.txt @@ -4583,35 +4583,35 @@ cont { element { scale: 15 area { - color: 14535867 + color: 13421738 priority: 1368 } } element { scale: 16 area { - color: 14535867 + color: 13421738 priority: 1368 } } element { scale: 17 area { - color: 14535867 + color: 13421738 priority: 1368 } } element { scale: 18 area { - color: 14535867 + color: 13421738 priority: 1368 } } element { scale: 19 area { - color: 14535867 + color: 13421738 priority: 1368 } } @@ -16086,12 +16086,16 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 15658734 + width: 2.0 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16103,12 +16107,16 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 15658734 + width: 3.0 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16121,11 +16129,15 @@ cont { scale: 17 lines { width: 7.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16138,11 +16150,15 @@ cont { scale: 18 lines { width: 9.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16155,11 +16171,15 @@ cont { scale: 19 lines { width: 17.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16174,7 +16194,7 @@ cont { element { scale: 15 area { - color: 15658734 + color: 13421738 priority: 1027 } path_text { @@ -16188,7 +16208,7 @@ cont { element { scale: 16 area { - color: 15658734 + color: 13421738 priority: 1027 } path_text { @@ -16202,7 +16222,7 @@ cont { element { scale: 17 area { - color: 15658734 + color: 13421738 priority: 1027 } path_text { @@ -16216,7 +16236,7 @@ cont { element { scale: 18 area { - color: 15658734 + color: 13421738 priority: 1027 } path_text { @@ -16230,7 +16250,7 @@ cont { element { scale: 19 area { - color: 15658734 + color: 13421738 priority: 1027 } path_text { @@ -16246,9 +16266,44 @@ cont { name: "highway-pedestrian-bridge" element { scale: 15 + lines { + width: 2.0 + color: 13421738 + priority: 1026 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 10.0 + color: 16777215 + priority: 1007 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 12.0 + color: 7829367 + priority: 1004 + join: ROUNDJOIN + cap: BUTTCAP + } + area { + color: 13421738 + priority: 1027 + } + path_text { + primary { + height: 10 + color: 0 + } + priority: 16026 + } + } + element { + scale: 16 lines { width: 3.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16267,36 +16322,9 @@ cont { join: ROUNDJOIN cap: BUTTCAP } - path_text { - primary { - height: 10 - color: 0 - } - priority: 16026 - } - } - element { - scale: 16 - lines { - width: 4.0 - color: 15658734 - priority: 1026 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 12.0 - color: 16777215 - priority: 1007 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 14.0 - color: 7829367 - priority: 1004 - join: ROUNDJOIN - cap: BUTTCAP + area { + color: 13421738 + priority: 1027 } path_text { primary { @@ -16310,7 +16338,7 @@ cont { scale: 17 lines { width: 7.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16329,6 +16357,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16341,7 +16373,7 @@ cont { scale: 18 lines { width: 9.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16360,6 +16392,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16372,7 +16408,7 @@ cont { scale: 19 lines { width: 17.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16391,6 +16427,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16404,9 +16444,48 @@ cont { name: "highway-pedestrian-tunnel" element { scale: 15 + lines { + width: 2.0 + color: 13421738 + priority: 1026 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 10.0 + color: 16777215 + priority: 1007 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 12.0 + color: 7829367 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 1004 + join: ROUNDJOIN + cap: BUTTCAP + } + area { + color: 13421738 + priority: 1027 + } + path_text { + primary { + height: 10 + color: 0 + } + priority: 16026 + } + } + element { + scale: 16 lines { width: 3.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16429,40 +16508,9 @@ cont { join: ROUNDJOIN cap: BUTTCAP } - path_text { - primary { - height: 10 - color: 0 - } - priority: 16026 - } - } - element { - scale: 16 - lines { - width: 4.0 - color: 15658734 - priority: 1026 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 12.0 - color: 16777215 - priority: 1007 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 14.0 - color: 7829367 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1004 - join: ROUNDJOIN - cap: BUTTCAP + area { + color: 13421738 + priority: 1027 } path_text { primary { @@ -16476,7 +16524,7 @@ cont { scale: 17 lines { width: 7.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16499,6 +16547,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16511,7 +16563,7 @@ cont { scale: 18 lines { width: 9.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16534,6 +16586,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16546,7 +16602,7 @@ cont { scale: 19 lines { width: 17.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16569,6 +16625,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -30705,6 +30765,45 @@ cont { } } } +cont { + name: "historic-boundary_stone" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} cont { name: "historic-castle" element { @@ -30763,6 +30862,45 @@ cont { } } } +cont { + name: "historic-citywalls" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} cont { name: "historic-memorial" element { @@ -31074,6 +31212,123 @@ cont { } } } +cont { + name: "historic-tomb" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { + name: "historic-wayside_cross" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { + name: "historic-wayside_shrine" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} cont { name: "landuse-basin" element { diff --git a/data/drules_proto.bin b/data/drules_proto.bin index bc141cc1c9f8f9d91e973fcacf49240a0d92596a..d187e69333edbd690615b0a18b941bb3d4402c0e 100644 GIT binary patch delta 279 zcmZ3si~H+7?uIRl;%!nXT;ds-#U=SgnaR3I`K5U&iA9z1Kz?58WJg|~=^xq|d8ezi zF?LDqXXFxst4z);sVq;-$tf0+1QvR)tsW1`HMq zlLb}8fYL(vrG;@x2MUNy_itz9+rFobk&9U%ii;QSijw@?B#