From ab275212cf1d9f7d5398f3ea6176404b0d552f27 Mon Sep 17 00:00:00 2001
From: Constantin Shalnev <c.shalnev@corp.mail.ru>
Date: Mon, 4 Jan 2016 14:08:38 +0300
Subject: [PATCH 1/2] Process POI.mapcss first because it contains [amenity]
 which is common for natural.mapcss and transport.mapcss

---
 data/styles/clear/style-clear/style.mapcss | 2 +-
 data/styles/clear/style-night/style.mapcss | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/styles/clear/style-clear/style.mapcss b/data/styles/clear/style-clear/style.mapcss
index fe9e4dc513..5d9da47f73 100644
--- a/data/styles/clear/style-clear/style.mapcss
+++ b/data/styles/clear/style-clear/style.mapcss
@@ -2,12 +2,12 @@
 @import("../include/defaults.mapcss");
 @import("../include/roads.mapcss");
 /* @import("../include/roads_orange.mapcss"); */
+@import("../include/POI.mapcss");
 @import("../include/transport.mapcss");
 @import("../include/boundaries.mapcss");
 @import("../include/natural.mapcss");
 @import("../include/labels.mapcss");
 @import("../include/landuse.mapcss");
-@import("../include/POI.mapcss");
 @import("../include/other.mapcss");
 @import("../include/buildings.mapcss");
 
diff --git a/data/styles/clear/style-night/style.mapcss b/data/styles/clear/style-night/style.mapcss
index c54a756338..5d9da47f73 100644
--- a/data/styles/clear/style-night/style.mapcss
+++ b/data/styles/clear/style-night/style.mapcss
@@ -1,15 +1,15 @@
 @import("colors.mapcss");
 @import("../include/defaults.mapcss");
 @import("../include/roads.mapcss");
-/* @import("../include/roads_orange.mapcss");  */
+/* @import("../include/roads_orange.mapcss"); */
+@import("../include/POI.mapcss");
 @import("../include/transport.mapcss");
 @import("../include/boundaries.mapcss");
 @import("../include/natural.mapcss");
 @import("../include/labels.mapcss");
-@import("../include/buildings.mapcss");
 @import("../include/landuse.mapcss");
-@import("../include/POI.mapcss");
 @import("../include/other.mapcss");
+@import("../include/buildings.mapcss");
 
 canvas
 {

From 2b0f3ef6bbc772bde40a2ddbb64d9b2a6a330851 Mon Sep 17 00:00:00 2001
From: Constantin Shalnev <c.shalnev@corp.mail.ru>
Date: Mon, 4 Jan 2016 14:48:25 +0300
Subject: [PATCH 2/2] Styles were rebuilt

---
 data/drules_proto_clear.bin | Bin 193827 -> 193842 bytes
 data/drules_proto_clear.txt |  36 ++++++++++++++++++------------------
 data/drules_proto_dark.bin  | Bin 190541 -> 190556 bytes
 data/drules_proto_dark.txt  |  36 ++++++++++++++++++------------------
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index b597f710ddc9fc6c83b2d39d372a0af01ff27448..1a983e3c22204b7d76fbccad43dbf2bdba510638 100644
GIT binary patch
delta 183
zcmZ4dihI*5?hO|u8P`v~B>8^w|1?oH9)Zoz&M<DiE!D!x_-t~5!U0}24q+u8F1F%~
z%mUq<$+s1xHoGdGV`Th4Sw#8d^lgre7L1*f1ynABna!fA+eK9w|M>DgJ2R76gG=Id
zwU9Z7!1M{lj5;hJq3M3bjHVD)JDha@#@ha~m@z3}@=RHt>FGxpHNlKI5C(Vqg(HmH
KFC1YCHUI$L@<+M=

delta 253
zcmdn=ihJ=Z?hO|u8P`p|B>7&-o<mrPi;E>MKQC3{T{EMWJ{La+x4@B(iA<aCNVTvs
zKAD`Ta6n20O_c~jm964UM#i6$#g$Jo8ccquEGi2#ZF?i579STU)HDq)iSw0Q&66cn
zE<@A_VyJ7DRNXGA%E<0F-DW!@7qdBs!1VdWj5=W6^yFejeF$p~oOKn-;@r+#!WbJc
iJ?9`3&-Ah*jG7SEY9MQJPApIRgCmUF9~@x{G5`SfQcx=Z

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index f630018d2e..f9081382c6 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -2177,13 +2177,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "none"
+      name: "bus-l"
       priority: 16878
     }
     caption {
       primary {
-        height: 11
-        color: 4473924
+        height: 12
+        color: 3355443
         stroke_color: 452984831
         offset_y: 10
       }
@@ -2756,13 +2756,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "none"
+      name: "ship-l"
       priority: 16878
     }
     caption {
       primary {
-        height: 11
-        color: 4473924
+        height: 12
+        color: 3355443
         stroke_color: 452984831
         offset_y: 10
       }
@@ -3001,12 +3001,12 @@ cont {
       priority: -15433
     }
     symbol {
-      name: "none"
+      name: "cemetery-l"
       priority: 16567
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -3082,12 +3082,12 @@ cont {
       priority: -15433
     }
     symbol {
-      name: "none"
+      name: "cemetery-l"
       priority: 16567
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -30516,7 +30516,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 4473924
+        color: 6710886
         offset_y: 10
       }
       priority: 15851
@@ -30535,7 +30535,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 4473924
+        color: 6710886
         offset_y: 10
       }
       priority: 15851
@@ -30554,7 +30554,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 4473924
+        color: 6710886
         offset_y: 10
       }
       priority: 15851
@@ -30573,7 +30573,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 4473924
+        color: 6710886
         offset_y: 10
       }
       priority: 15851
@@ -30592,7 +30592,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 4473924
+        color: 6710886
         offset_y: 10
       }
       priority: 15851
@@ -37050,7 +37050,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -37069,7 +37069,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -37088,7 +37088,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 8b2ac79ab52beafcc64cc731dde1f642eb7dca6c..7bd2be8e67d441ede40eae7e698024d35e7bf06a 100644
GIT binary patch
delta 186
zcmX?mf&0z{?hO|u8P`v~B>8^w)HG2x9)V3yPqA*kE!D!x_-t~5!U0}24q+u8F1F%~
z%mUq<$+s1xHoGbwV`Tg_nMe8P^nQCrbEX!i$t)`8!0cvb)$PoxjNG0qGdDkDnJ$#a
zXaZq*0a?5tF%2$>*VRI1975Bj^BA=ulDlBawtvcFEcBiJb2lU3^uj%i>JZj4AZzkW
RS?=~5dl<Lh*uzw+4FHRqMtcAN

delta 279
zcmca}f&1(Q?hO|u8P`p|B>7&-o<mrPi;E>MKQC3{T{EMWJ{La+x4_j^SD7~7k!oRO
zd@?yv;eeD1nko^5DqF>ijEr9<^D7@U*5?qG;^$~Ml_Rme{XYaS!VTZv$f(7~#R)ZB
zgG=IkCD%X3$-FA()QHp9%&xkfU6oPHbGpt2Ca&q~d5n4xRy>?F9nLxrWpQq2%V*5-
joxCT2XL{WpMolndGmtUeW(yNf`-?q{+h6QqD$xc2h4W(H

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 4476fca5bd..3e3fa90325 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -2177,13 +2177,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "none"
+      name: "bus-l"
       priority: 16878
     }
     caption {
       primary {
-        height: 11
-        color: 5592405
+        height: 12
+        color: 11711154
         stroke_color: 437326080
         offset_y: 10
       }
@@ -2756,13 +2756,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "none"
+      name: "ship-l"
       priority: 16878
     }
     caption {
       primary {
-        height: 11
-        color: 5592405
+        height: 12
+        color: 11711154
         stroke_color: 437326080
         offset_y: 10
       }
@@ -3001,12 +3001,12 @@ cont {
       priority: -15433
     }
     symbol {
-      name: "none"
+      name: "cemetery-l"
       priority: 16567
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -3082,12 +3082,12 @@ cont {
       priority: -15433
     }
     symbol {
-      name: "none"
+      name: "cemetery-l"
       priority: 16567
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -30516,7 +30516,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 5592405
+        color: 10066329
         offset_y: 10
       }
       priority: 15851
@@ -30535,7 +30535,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 5592405
+        color: 10066329
         offset_y: 10
       }
       priority: 15851
@@ -30554,7 +30554,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 5592405
+        color: 10066329
         offset_y: 10
       }
       priority: 15851
@@ -30573,7 +30573,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 5592405
+        color: 10066329
         offset_y: 10
       }
       priority: 15851
@@ -30592,7 +30592,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 5592405
+        color: 10066329
         offset_y: 10
       }
       priority: 15851
@@ -37050,7 +37050,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -37069,7 +37069,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -37088,7 +37088,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }