From 82ed42ba1041475b81e93b61a610c0149ea2e5eb Mon Sep 17 00:00:00 2001
From: Darafei Praliaskouski <komzpa@gmail.com>
Date: Thu, 28 Mar 2013 18:41:07 +0300
Subject: [PATCH] [style] Added hotel buildings

---
 data/drules_proto.bin | Bin 104615 -> 104495 bytes
 data/drules_proto.txt | 386 +++++++++++++++++++-----------------------
 data/normal.mapcss    |  72 ++++----
 3 files changed, 209 insertions(+), 249 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 28cdb31932abeb64ab72c0c8acde9ff1e5cbd88c..8406c2b7ba367eeb52fd7939923b03faa0396e09 100644
GIT binary patch
delta 797
zcmZ3!k!}43whfOI85<@)Rt#m<<`A45sH`-(K#7B~W^$EM09=GgSzRQPi#I8;s3<eF
zNH-%jB|TM0n?nGoTnna%MZiI!d-8T=TiGHmF__At)RM%^yv)4x`0~V@9H<smj*Wa4
zj6e?9I*`8Uo4Zx`Rn-JJjln?LL14!8^K1$)*oA~RXUzlwT?c{x|NpZquv;*0KH&M1
ziCDGgeY8awTQ~nsILT;l!yyPXj{yu!9Ryl_JY-c+2RcL$DrV>)&@kZ;yFx#Ql^_=n
zhmgR60}YH4AR&q6wOn^Lvn2mu)Jh@Rkjej3L?`#G;h5}_D$m%mIVF{cNvnc1-99ZG
zn|GwUF-|Vdl$b1*DFmcNC);LL3BsJL0dw-?k4p?D_e|rOydjfSSP<?dO!<(k8mzj-
zCNG$7F<C#G9k=Y}so6_XCMR8#XG=~jF3Cxqyirhc@|_F3n_DjYkz;h;-1y$MXR;Hw
z#B{zEMt0Wh%>3ePkdo==s~9=9GuJSFW{1i0PTnLaG2OU@aT{D@dQvl^@^-^k#&A}~
zXVW{o7*!ZwPhZ!?SOfG6Bvm}N7kG7gJDb8ej_Loc7)7TCb~765KC2aq2ZpI2G?~1F
zs=3SoPdSQ+lrw!}H=_yT>+R3F8TptPUu^%{%gD|+{YWpP%5;ZLM(61dx*1u4!kPVy
GcANk$Huoa{

delta 878
zcmZ3#fo=IlwhfOI87EJEtQab0#~~;r$jJZ(AM6D-JUqmzFo%Eg2W8dC2}-O?{fv{-
zlmf7-ngCICPf10ipOK3<DY2+1Gqp%JBQ+&GRmhG*0BG#2nILczYU~s~ps`AN3=Rr2
z`79WLN-%Bi<`+_j>UwD}u;4%g<0KVP#=gm!%C?3x7`en?mK3FyBxdGi=B3A%C+6fp
zZA10M3wDrgazNWQ;<9Zz*awWWHjAn7t8xlKE!Ler(TY)+OWHwT#`N=S3NP3<dwafQ
z!Xq8!qb<VNwz)0gBqOga&{M+D;541=kRl>)=pfKA;SjsR18yrpE*=gcu&*RQLK4es
zx$bW6OZvgcoXR0Mc|(dQCyG`sgx1MNQZyJ_H@{8cVPdW%pmwu)x<BJ&)l9L;b23DL
zwCLoc8C8>mGDYC=tO0e>S?<Y=D^%H**9rvy%?!*G#i3&Ioy;0s1{|Db2{IrBw*f#E
zn`N_?q%by2X5<!|yoZ~UJ+ZhXCshK(7vKE<Jf}Qk@@CHWwmnc4aTht*vorIHvmq+B
zH&-+MW=F_PpU}d{2Ih)S-`&i(4Xe!dbuElZtka)QX5^nP-^D1#*f8C!i?L>UhZUpz
z^u1k-9MccjFse^KFrATadhT>ab`?lcRdf*e|NlR`0y{8$!jdmAA-+1jolW5~$8^hX
tMia({?Rnjdd`v*PwwIBek?rgm5SYC1jL7t^K9K2sjK)C8k9~}GoB#&U5t{%2

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index b2cd8ab3c9..378efa7d70 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -150,6 +150,11 @@ cont {
   }
   element {
     scale: 17
+    circle {
+      radius: 3.2
+      color: 0x3050D8
+      priority: 16000
+    }
     caption {
       primary {
         height: 12
@@ -158,11 +163,6 @@ cont {
       }
       priority: 15000
     }
-    circle {
-      radius: 3.2
-      color: 0x3050D8
-      priority: 16000
-    }
   }
 }
 cont {
@@ -2840,11 +2840,6 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 1
-      color: 0xB0B0B0
-      priority: 1948
-    }
     lines {
       width: 1
       color: 0xB0B0B0
@@ -2879,11 +2874,6 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 1
-      color: 0xB0B0B0
-      priority: 1936
-    }
     lines {
       width: 1
       color: 0xB0B0B0
@@ -2910,11 +2900,6 @@ cont {
   name: "barrier-hedge"
   element {
     scale: 16
-    lines {
-      width: 0.4
-      color: 0xB0B0B0
-      priority: 1812
-    }
     lines {
       width: 1
       color: 0xB0B0B0
@@ -2931,17 +2916,12 @@ cont {
     lines {
       width: 1
       color: 0xB0B0B0
-      priority: 1931
-    }
-    lines {
-      width: 0.8
-      color: 0x202020
       dashdot {
         dd: 0
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1934
+      priority: 1931
     }
   }
 }
@@ -2966,11 +2946,6 @@ cont {
   name: "barrier-retaining_wall"
   element {
     scale: 16
-    lines {
-      width: 1
-      color: 0xB0B0B0
-      priority: 1000
-    }
     lines {
       width: 1
       color: 0xB0B0B0
@@ -2984,11 +2959,6 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 1
-      color: 0xB0B0B0
-      priority: 1943
-    }
     lines {
       width: 1
       color: 0xB0B0B0
@@ -2997,7 +2967,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1946
+      priority: 1943
     }
   }
 }
@@ -5366,6 +5336,11 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 6.8
+      color: 0xD3CB98
+      priority: 1000
+    }
     path_text {
       primary {
         height: 12
@@ -5374,11 +5349,6 @@ cont {
       }
       priority: 16000
     }
-    lines {
-      width: 6.8
-      color: 0xD3CB98
-      priority: 1000
-    }
   }
 }
 cont {
@@ -5447,6 +5417,11 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 6.8
+      color: 0xD3CB98
+      priority: 1000
+    }
     path_text {
       primary {
         height: 12
@@ -5461,11 +5436,6 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
-    lines {
-      width: 6.8
-      color: 0xD3CB98
-      priority: 1000
-    }
     lines {
       width: 16.8
       color: 0x707070
@@ -5528,6 +5498,11 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 6.8
+      color: 0xD3CB98
+      priority: 1000
+    }
     path_text {
       primary {
         height: 12
@@ -5536,11 +5511,6 @@ cont {
       }
       priority: 16000
     }
-    lines {
-      width: 6.8
-      color: 0xD3CB98
-      priority: 1000
-    }
   }
 }
 cont {
@@ -5597,6 +5567,11 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 6.8
+      color: 0xD3CB98
+      priority: 1000
+    }
     path_text {
       primary {
         height: 12
@@ -5605,11 +5580,6 @@ cont {
       }
       priority: 16000
     }
-    lines {
-      width: 6.8
-      color: 0xD3CB98
-      priority: 1000
-    }
   }
 }
 cont {
@@ -5682,6 +5652,11 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 6.8
+      color: 0xD3CB98
+      priority: 1000
+    }
     path_text {
       primary {
         height: 12
@@ -5696,11 +5671,6 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
-    lines {
-      width: 6.8
-      color: 0xD3CB98
-      priority: 1000
-    }
     lines {
       width: 16.8
       color: 0x707070
@@ -7427,6 +7397,17 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 21
+      color: 0xB87C04
+      priority: 39
+      cap: BUTTCAP
+    }
+    lines {
+      width: 17
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 18
@@ -7435,17 +7416,6 @@ cont {
       }
       priority: 16039
     }
-    lines {
-      width: 21
-      color: 0xB87C04
-      priority: 504
-      cap: BUTTCAP
-    }
-    lines {
-      width: 17
-      color: 0xF08800
-      priority: 1504
-    }
   }
 }
 cont {
@@ -7616,6 +7586,17 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 21
+      color: 0xB87C04
+      priority: 39
+      cap: BUTTCAP
+    }
+    lines {
+      width: 17
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 18
@@ -7630,17 +7611,6 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
-    lines {
-      width: 21
-      color: 0xB87C04
-      priority: 504
-      cap: BUTTCAP
-    }
-    lines {
-      width: 17
-      color: 0xF08800
-      priority: 1504
-    }
     lines {
       width: 27
       color: 0x707070
@@ -7821,6 +7791,17 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 21
+      color: 0xB87C04
+      priority: 39
+      cap: BUTTCAP
+    }
+    lines {
+      width: 17
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 18
@@ -7835,17 +7816,6 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
-    lines {
-      width: 21
-      color: 0xB87C04
-      priority: 504
-      cap: BUTTCAP
-    }
-    lines {
-      width: 17
-      color: 0xF08800
-      priority: 1504
-    }
     lines {
       width: 27
       color: 0x707070
@@ -7952,6 +7922,11 @@ cont {
   }
   element {
     scale: 16
+    lines {
+      width: 12
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 12
@@ -7960,14 +7935,14 @@ cont {
       }
       priority: 16039
     }
-    lines {
-      width: 12
-      color: 0xF08800
-      priority: 1485
-    }
   }
   element {
     scale: 17
+    lines {
+      width: 12
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 12
@@ -7976,11 +7951,6 @@ cont {
       }
       priority: 16039
     }
-    lines {
-      width: 12
-      color: 0xF08800
-      priority: 1485
-    }
   }
 }
 cont {
@@ -8019,6 +7989,11 @@ cont {
   }
   element {
     scale: 16
+    lines {
+      width: 12
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 12
@@ -8033,11 +8008,6 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
-    lines {
-      width: 12
-      color: 0xF08800
-      priority: 1485
-    }
     lines {
       width: 22
       color: 0x707070
@@ -8047,6 +8017,11 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 12
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 12
@@ -8061,11 +8036,6 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
-    lines {
-      width: 12
-      color: 0xF08800
-      priority: 1485
-    }
     lines {
       width: 22
       color: 0x707070
@@ -8110,6 +8080,11 @@ cont {
   }
   element {
     scale: 16
+    lines {
+      width: 12
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 12
@@ -8124,11 +8099,6 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
-    lines {
-      width: 12
-      color: 0xF08800
-      priority: 1485
-    }
     lines {
       width: 22
       color: 0x707070
@@ -8142,6 +8112,11 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 12
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 12
@@ -8156,11 +8131,6 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
-    lines {
-      width: 12
-      color: 0xF08800
-      priority: 1485
-    }
     lines {
       width: 22
       color: 0x707070
@@ -16319,6 +16289,10 @@ cont {
   name: "historic-castle"
   element {
     scale: 16
+    symbol {
+      name: "castle"
+      priority: 16004
+    }
     caption {
       primary {
         height: 12
@@ -16328,13 +16302,13 @@ cont {
       }
       priority: 15004
     }
-    symbol {
-      name: "castle"
-      priority: 16000
-    }
   }
   element {
     scale: 17
+    symbol {
+      name: "castle"
+      priority: 16004
+    }
     caption {
       primary {
         height: 12
@@ -16344,10 +16318,6 @@ cont {
       }
       priority: 15004
     }
-    symbol {
-      name: "castle"
-      priority: 16000
-    }
   }
 }
 cont {
@@ -18949,14 +18919,14 @@ cont {
   }
   element {
     scale: 17
+    symbol {
+      name: "golfCourse"
+      priority: 16000
+    }
     area {
       color: 0xCFECB7
       priority: -16275
     }
-    symbol {
-      name: "golfcourse"
-      priority: 16000
-    }
   }
 }
 cont {
@@ -19448,14 +19418,14 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 0xCFECB7
-      priority: -16317
-    }
     symbol {
       name: "playground"
       priority: 16000
     }
+    area {
+      color: 0xCFECB7
+      priority: -16317
+    }
   }
 }
 cont {
@@ -29768,6 +29738,10 @@ cont {
   name: "shop-kiosk"
   element {
     scale: 16
+    symbol {
+      name: "kiosk"
+      priority: 16004
+    }
     caption {
       primary {
         height: 12
@@ -29777,13 +29751,13 @@ cont {
       }
       priority: 15004
     }
-    symbol {
-      name: "kiosk"
-      priority: 16000
-    }
   }
   element {
     scale: 17
+    symbol {
+      name: "kiosk"
+      priority: 16004
+    }
     caption {
       primary {
         height: 12
@@ -29793,10 +29767,6 @@ cont {
       }
       priority: 15004
     }
-    symbol {
-      name: "kiosk"
-      priority: 16000
-    }
   }
 }
 cont {
@@ -30323,6 +30293,10 @@ cont {
   name: "tourism-hotel"
   element {
     scale: 16
+    symbol {
+      name: "hotel"
+      priority: 16004
+    }
     caption {
       primary {
         height: 12
@@ -30332,13 +30306,13 @@ cont {
       }
       priority: 15004
     }
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
   }
   element {
     scale: 17
+    symbol {
+      name: "hotel"
+      priority: 16004
+    }
     caption {
       primary {
         height: 12
@@ -30348,10 +30322,6 @@ cont {
       }
       priority: 15004
     }
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
   }
 }
 cont {
@@ -30388,6 +30358,10 @@ cont {
   name: "tourism-motel"
   element {
     scale: 16
+    symbol {
+      name: "hotel"
+      priority: 16004
+    }
     caption {
       primary {
         height: 12
@@ -30397,13 +30371,13 @@ cont {
       }
       priority: 15004
     }
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
   }
   element {
     scale: 17
+    symbol {
+      name: "hotel"
+      priority: 16004
+    }
     caption {
       primary {
         height: 12
@@ -30413,10 +30387,6 @@ cont {
       }
       priority: 15004
     }
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
   }
 }
 cont {
@@ -30862,33 +30832,33 @@ cont {
   }
   element {
     scale: 16
-    path_text {
-      primary {
-        height: 12
-        color: 0xFFFFFF
-      }
-      priority: 16000
-    }
     lines {
       width: 0.6
       color: 0xCDE5EA
       priority: 1102
     }
-  }
-  element {
-    scale: 17
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16000
+      priority: 16102
     }
+  }
+  element {
+    scale: 17
     lines {
       width: 0.8
       color: 0xCDE5EA
       priority: 1107
     }
+    path_text {
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
+      priority: 16107
+    }
   }
 }
 cont {
@@ -30927,12 +30897,17 @@ cont {
   }
   element {
     scale: 16
+    lines {
+      width: 0.6
+      color: 0xCDE5EA
+      priority: 1102
+    }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16000
+      priority: 16102
     }
     lines {
       width: 8.6
@@ -30940,11 +30915,6 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
-    lines {
-      width: 0.6
-      color: 0xCDE5EA
-      priority: 1102
-    }
     lines {
       width: 10.6
       color: 0x707070
@@ -30958,12 +30928,17 @@ cont {
   }
   element {
     scale: 17
+    lines {
+      width: 0.8
+      color: 0xCDE5EA
+      priority: 1107
+    }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16000
+      priority: 16107
     }
     lines {
       width: 8.8
@@ -30971,11 +30946,6 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
-    lines {
-      width: 0.8
-      color: 0xCDE5EA
-      priority: 1107
-    }
     lines {
       width: 10.8
       color: 0x707070
@@ -31138,13 +31108,6 @@ cont {
   }
   element {
     scale: 17
-    path_text {
-      primary {
-        height: 12
-        color: 0xFFFFFF
-      }
-      priority: 16000
-    }
     lines {
       width: 8
       color: 0xB0B0B0
@@ -31156,6 +31119,13 @@ cont {
       color: 0xCDE5EA
       priority: 1104
     }
+    path_text {
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
+      priority: 16104
+    }
   }
 }
 cont {
@@ -31237,19 +31207,6 @@ cont {
   }
   element {
     scale: 17
-    path_text {
-      primary {
-        height: 12
-        color: 0xFFFFFF
-      }
-      priority: 16000
-    }
-    lines {
-      width: 14.4
-      color: 0xFFFFFF
-      priority: 7
-      cap: BUTTCAP
-    }
     lines {
       width: 8
       color: 0xB0B0B0
@@ -31261,6 +31218,19 @@ cont {
       color: 0xCDE5EA
       priority: 1104
     }
+    path_text {
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
+      priority: 16104
+    }
+    lines {
+      width: 14.4
+      color: 0xFFFFFF
+      priority: 7
+      cap: BUTTCAP
+    }
     lines {
       width: 16.4
       color: 0x707070
diff --git a/data/normal.mapcss b/data/normal.mapcss
index 2a0c5eba0c..1bf910fadc 100644
--- a/data/normal.mapcss
+++ b/data/normal.mapcss
@@ -34,7 +34,6 @@ area[natural=coastline]
 	fill-color: #f1eee8;
 }
 
-
 area[landuse]::*,
 area[natural]::*,
 area[leisure]::*,
@@ -4537,10 +4536,10 @@ line|z16[highway=path][sac_scale=mountain_hiking]
   dashes:	2,2;
   linecap:	butt;
 }
-area|z16-[tourism=hotel]::d1p2,
-area|z16-[tourism=motel]::d1p2,
-node|z16-[tourism=hotel]::d1p2,
-node|z16-[tourism=motel]::d1p2
+area|z16-[tourism=hotel],
+area|z16-[tourism=motel],
+node|z16-[tourism=hotel],
+node|z16-[tourism=motel]
 {
   icon-image:	hotel.svg;
 }
@@ -4630,8 +4629,8 @@ line|z16[boundary=administrative][admin_level=8]
   z-index:	929;
   dashes:	12,4,4,4;
 }
-area|z16-[shop=kiosk]::d1p2,
-node|z16-[shop=kiosk]::d1p2
+area|z16-[shop=kiosk],
+node|z16-[shop=kiosk]
 {
   icon-image:	kiosk.svg;
 }
@@ -5191,7 +5190,7 @@ line|z16[highway=track][tracktype=grade2]
   width:	3;
   z-index:	605;
 }
-line|z16-[highway=motorway_link]::d1p2
+line|z16-[highway=motorway_link]
 {
   color:	#f08800;
   width:	12;
@@ -5263,8 +5262,8 @@ line|z16[highway=footway][sac_scale=difficult_alpine_hiking]
   dashes:	0.16,2.4;
   linecap:	butt;
 }
-area|z16-[historic=castle]::d1p2,
-node|z16-[historic=castle]::d1p2
+area|z16-[historic=castle],
+node|z16-[historic=castle]
 {
   icon-image:	castle.svg;
 }
@@ -5281,7 +5280,7 @@ line|z16[highway=raceway]::d2p2
   dashes:	0.8,0.8;
   linecap:	butt;
 }
-line|z16[barrier=hedge]::d1p2
+line|z16[barrier=hedge]
 {
   color:	#b0b0b0;
   width:	1;
@@ -5328,7 +5327,7 @@ node|z16-[amenity=hospital]
 {
   icon-image:	hospital.svg;
 }
-line|z16[waterway=ditch]::d1p2
+line|z16[waterway=ditch]
 {
   color:	#cde5ea;
   width:	0.6;
@@ -5425,7 +5424,7 @@ node|z16-[tourism=museum]
 {
   icon-image:	museum.svg;
 }
-line|z16[barrier=retaining_wall]::d1p2
+line|z16[barrier=retaining_wall]
 {
   color:	#b0b0b0;
   width:	1;
@@ -5627,8 +5626,8 @@ line|z17-[communication=line]::d1p2
   dashes:	8,4;
   linecap:	butt;
 }
-area|z17-[leisure=playground]::d1p2,
-node|z17-[leisure=playground]::d1p2
+area|z17-[leisure=playground],
+node|z17-[leisure=playground]
 {
   icon-image:	playground.svg;
 }
@@ -5667,7 +5666,7 @@ line|z17-[waterway=canal]
   casing-width:	0.8;
   casing-color:	#b0b0b0;
 }
-line|z17-[barrier=retaining_wall]::d1p2
+line|z17-[barrier=retaining_wall]
 {
   color:	#b0b0b0;
   width:	1;
@@ -5865,7 +5864,7 @@ line|z17-[boundary=administrative][type=nation]
   z-index:	976;
   -x-kot-layer:	top;
 }
-line|z17-[barrier=hedge]::d1p2
+line|z17-[barrier=hedge]
 {
   color:	#202020;
   width:	0.8;
@@ -6180,13 +6179,13 @@ line|z17-[route=ferry]
   dashes:	12,8;
   linecap:	butt;
 }
-line|z17-[waterway=ditch]::d1p2
+line|z17-[waterway=ditch]
 {
   color:	#cde5ea;
   width:	0.8;
   z-index:	113;
 }
-line|z17-[highway=bridleway]::d1p2
+line|z17-[highway=bridleway]
 {
   color:	#d3cb98;
   width:	6.8;
@@ -6305,7 +6304,7 @@ line|z17-[barrier=retaining_wall]
   width:	1;
   z-index:	957;
 }
-line|z17-[highway=byway]::d1p2
+line|z17-[highway=byway]
 {
   color:	#c0a87c;
   width:	6;
@@ -6380,7 +6379,7 @@ line|z17-[railway=siding]
   width:	2.4;
   z-index:	578;
 }
-line|z17-[barrier=fence]::d1p2
+line|z17-[barrier=fence]
 {
   color:	#b0b0b0;
   width:	1;
@@ -6513,6 +6512,7 @@ line|z17-[man_made=pier]::d1p2
   width:	3.2;
   z-index:	915;
 }
+
 line|z17-[railway=abandoned]::d1p3
 {
   opacity:	0.4;
@@ -6522,7 +6522,8 @@ line|z17-[railway=abandoned]::d1p3
   z-index:	679;
   dashes:	12,12;
 }
-line|z17-[barrier=city_wall]::d1p2
+
+line|z17-[barrier=city_wall]
 {
   color:	#b0b0b0;
   width:	1;
@@ -6545,8 +6546,8 @@ line|z17-[power=minor_line]::d1p2
   linecap:	butt;
 }
 
-area|z17-[aerialway=station]::d1p2,
-node|z17-[aerialway=station]::d1p2
+area|z17-[aerialway=station],
+node|z17-[aerialway=station]
 {
   symbol-shape:	circle;
   symbol-fill-color:	#3050d8;
@@ -6630,7 +6631,7 @@ node|z17-[landuse=construction]
   text-color:	#404040;
 }
 
-line|z17-[highway=motorway]::d1p2
+line|z17-[highway=motorway]
 {
   color:	#f08800;
   width:	17;
@@ -6660,7 +6661,7 @@ line|z17-[highway=steps]
   color:	#a0a090;
   width:	6;
 }
-line|z17-[waterway=drain]::d1p2
+line|z17-[waterway=drain]
 {
   width:	6.4;
   z-index:	112;
@@ -6890,7 +6891,6 @@ node|z13-[railway=station][transport=subway]
   z-index: 150;
 }
 
-
 /* POI icons */
 
 area|z17-[tourism=information][office],
@@ -6945,7 +6945,6 @@ node|z17-[tourism=information]
   icon-image:	information.svg;
 }
 
-
 area|z17-[amenity=post_box],
 node|z17-[amenity=post_box]
 {
@@ -6972,24 +6971,19 @@ node|z16-[amenity=telephone]
   icon-image:	telephone.svg;
 }
 
-
-
-
 area|z17-[sport=handball],
 node|z17-[sport=handball]
 {
   icon-image:	handball-borderless.svg;
 }
 area|z17-[sport=golf],
-node|z17-[sport=golf]
+node|z17-[sport=golf],
+area|z17-[leisure=golf_course],
+node|z17-[leisure=golf_course]
 {
   icon-image:	golfCourse.svg;
 }
-area|z17-[leisure=golf_course]::d1p2,
-node|z17-[leisure=golf_course]::d1p2
-{
-  icon-image:	golfcourse.svg;
-}
+
 area|z17-[sport=baseball],
 node|z17-[sport=baseball]
 {
@@ -7021,7 +7015,6 @@ node|z17-[amenity=school]
   icon-image:	school.svg;
 }
 
-
 area|z14-16[railway=halt],
 area|z14-15[railway=station],
 node|z14-16[railway=halt],
@@ -7057,9 +7050,6 @@ node|z16-[railway=station][transport=subway]
   icon-image:	subway-station-l.svg;
 }
 
-
-
-
 /* Eval magic */
 
 line|z16-[bridge?]::bridgewhite,