From 478d638a619676e458cb93d755ecb67e057445be Mon Sep 17 00:00:00 2001
From: Constantin Shalnev <c.shalnev@corp.mail.ru>
Date: Tue, 22 Dec 2015 18:22:18 +0300
Subject: [PATCH 1/2] Styles were updated

---
 data/styles/clear/include/labels.mapcss    |  1 +
 data/styles/clear/include/transport.mapcss | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss
index 833385c3bf..b4890ab5a9 100644
--- a/data/styles/clear/include/labels.mapcss
+++ b/data/styles/clear/include/labels.mapcss
@@ -2019,6 +2019,7 @@ node|z17-[man_made=breakwater]
   text-color:@poi_label;
   fill-opacity: 1;
   z-index: 1000;
+  -x-me-area-priority:16000;
 }
 
 area|z15-[waterway=dam],
diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss
index 37b898f2c3..558e154500 100644
--- a/data/styles/clear/include/transport.mapcss
+++ b/data/styles/clear/include/transport.mapcss
@@ -461,14 +461,8 @@ node|z17-[railway=halt]::int_name {
   text-halo-color: @label_halo_light;
 }
 
-/* node|z16-[railway=level_crossing]	 { icon-image: railway-crossing.svg; } */
-/* SUBWAY STATIONS - GENERIC STYLES  */
 
-/*
-node|z13[railway=station][transport=subway] {
-	icon-image: subway-xs.svg;
-}
-*/
+/* SUBWAY STATIONS - GENERIC STYLES  */
 
 
 node|z14[railway=station][transport=subway] {
@@ -1505,4 +1499,4 @@ node|z18[aerialway=mixed_lift] {
 }
 
 
-node|z17-[railway=crossing] { icon-image: railway-crossing.svg; z-index: 2600;}
+node|z17-[railway=level_crossing]{ icon-image: railway-crossing.svg; z-index: 2600;}

From 765a553ed5712d7c6fb9fc015058a8dcae9a1821 Mon Sep 17 00:00:00 2001
From: Constantin Shalnev <c.shalnev@corp.mail.ru>
Date: Tue, 22 Dec 2015 18:24:34 +0300
Subject: [PATCH 2/2] Styles were rebuilt

---
 data/drules_proto_clear.bin | Bin 193795 -> 193753 bytes
 data/drules_proto_clear.txt |  66 ++++++++++++++++++------------------
 data/drules_proto_dark.bin  | Bin 190509 -> 190467 bytes
 data/drules_proto_dark.txt  |  66 ++++++++++++++++++------------------
 4 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index b29312ac11177ac732ac2b42f7eaa8713a8a5caf..3052f73f491470bac70a51139a76d705b913c7ba 100644
GIT binary patch
delta 244
zcmZpE#eMT7cf%IOdAk`OPM^P<@f5Qmhv0OD1B?=q92}Pp_p?hh)N1i?v2$<<9O;<I
zB(bha$Z)#c0Y)i2(t`UKg{Rl<VPxlo8?l{xFQX6><L&8k`x%eW$cmN&jOFdyGd-9r
jSp|!@#EKF#bIKDdb#qe7Qgh;`vw1KjZ(rogl(-xKh8s=y

delta 212
zcmccllDqj8cf%IOdAk{ZPM^P<@f5Qqhv2jWj1rsz9G4FFvrA0tnC@uLD8jO?O2~5h
zzx|9-SS1V(U`TBLzlV{HiShGvw*8DpsAp=z0mkfh?i?<GqQuOc^2AEr>7u?&$=gr6
OGg-23ukd9`Tn+$WnMou7

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index f08aca1a1b..9eedb09488 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -36355,7 +36355,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36376,7 +36376,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36397,7 +36397,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36642,7 +36642,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36663,7 +36663,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36684,7 +36684,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -48110,33 +48110,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-crossing"
-  element {
-    scale: 17
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-}
 cont {
   name: "railway-disused"
   element {
@@ -48582,6 +48555,33 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-level_crossing"
+  element {
+    scale: 17
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+}
 cont {
   name: "railway-light_rail"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 289cfba2e2f5b1f634b5bba71ce24738e4893868..008bb8c1443a6bf60c8b3337c567358364e1584b 100644
GIT binary patch
delta 246
zcmZ2`fxGzvcf%G&i!F@Xr(14e+@z<?At)ro$p8id4gw4ce|ZcTEEuI&IT$1wYPEQ{
z*g3cauCBVuB(bhaNPD{CRz`6#9CD327{%Eja@(u7GQMME+&DdJJL4K!*|BT~qgcy!
nEn6l_R>2}Jv7*Gxobtp<-JI02)SUR~$8DIBw<kL>omvV2v6ew2

delta 200
zcmZp^z`gbYcf%G&i!F@jr(14e+{9=+{r`4GaW-BK28n4M(=S#sim<J#5;Eoxn$Ea`
zQ4~{L7(;w}{#M3EjEpCz2W@9uLk;tqb}(|aaOZFd6eVWnlqXi|PQT{Jl)SyihRKq3
KyQLG;sigoQi$6O6

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 25d89f750f..628d197038 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -36355,7 +36355,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36376,7 +36376,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36397,7 +36397,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36642,7 +36642,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36663,7 +36663,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36684,7 +36684,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -48110,33 +48110,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-crossing"
-  element {
-    scale: 17
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-}
 cont {
   name: "railway-disused"
   element {
@@ -48582,6 +48555,33 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-level_crossing"
+  element {
+    scale: 17
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+}
 cont {
   name: "railway-light_rail"
   element {