[style] officess, litness

data/categories.txt

@@ -1554,8 +1554,8 @@ pl:4pole namiotowe
 
 tourism-alpine_hut
 en:mountains lodging|hotel|hostel|alpine hut
-ru:горный отель|отель|хостел
-uk:гірський готель|гірська хатинка|готель|хостел
+ru:горный отель|отель
+uk:гірський готель|гірська хатинка|готель
 de:4Berghütte|Almhütte|Berghotel|hotel
 fr:hôtel de montagne|refuge|chaumière alpine|hôtel
 it:hotel di montagna|baita|capanna|capanna di montagna|capanna alpina|hotel
@@ -1566,3 +1566,7 @@ cs:4horská chata|horský hotel|hotel
 nl:3berghut|alpenhut|hotel
 zh:1山上住宿|飯店|旅館|住宿|旅舍|2高山住宿
 pl:3schronisko|chata w górach|goście|hotel|nocleg|bacówka
+
+office
+en:3office|company
+ru:2офис|компания|контора

data/classificator.txt

@@ -398,6 +398,7 @@ world  +
         track  -
         water_park  -
         {}
+    lit  -
     man_made  +
         breakwater  -
         cairn  -
@@ -462,6 +463,13 @@ world  +
     noexit  +
         motor_vehicle  -
         {}
+    office  +
+        company  -
+        estate_agent  -
+        government  -
+        lawyer  -
+        telecommunication  -
+        {}
     oneway  -
     piste:lift  +
         j-bar  -

data/mapcss-mapping.csv

@@ -941,3 +941,10 @@ shop|beverages;[shop=beverages];;name;int_name;940;
 shop|toys;[shop=toys];;name;int_name;941;
 shop|confectionery;[shop=confectionery];;name;int_name;942;
 shop;[shop?];;name;int_name;943;
+lit;[lit?];;name;int_name;944;
+office|company;[office=company];;name;int_name;945;
+office|telecommunication;[office=telecommunication];;name;int_name;946;
+office|government;[office=government];;name;int_name;947;
+office|estate_agent;[office=estate_agent];;name;int_name;948;
+office|lawyer;[office=lawyer];;name;int_name;949;
+office;[office];;name;int_name;950;

data/normal.mapcss

@@ -35,11 +35,11 @@ area[natural=coastline]
 }
 
 area[landuse]::*,
-area[natural]::*,
+area[natural][natural!=water]::*,
 area[leisure]::*,
 area[place]::*,
 area[aeroway]::*,
-area[tourism]::*,
+area[tourism][tourism!=attraction]::*,
 {fill-position: background}
 
 /* area[waterway]::*, */
@@ -1033,8 +1033,7 @@ area|z13-[amenity=college],
 area|z13-[amenity=kindergarten],
 area|z13-[amenity=school],
 area|z13-[amenity=university],
-area|z12-[man_made=wastewater_plant],
-area|z12-[tourism=attraction]
+area|z12-[man_made=wastewater_plant]
 {
   fill-position:	background;
 }
@@ -1225,13 +1224,6 @@ area|z12-[natural=land]
 {
   fill-color:	#f8f8f8;
 }
-area|z14-16[leisure=golf_course]::d1p2,
-area|z12[tourism=zoo]::d1p2,
-area|z17-[leisure=golf_course]::d1p3,
-node|z17-[leisure=golf_course]::d1p3
-{
-  z-index:	48;
-}
 area|z12[natural=peak],
 area|z13[natural=peak]::d1p2,
 node|z12[natural=peak],
@@ -2123,11 +2115,6 @@ node|z15-[tourism=alpine_hut]
 {
   icon-image:	alpine_hut.svg;
 }
-area|z14[natural=wetland]::d1p2,
-area|z15[waterway=dock]::d1p2
-{
-  z-index:	110;
-}
 line|z14[boundary=national_park]
 {
   color:	#4ef94b;
@@ -3302,8 +3289,8 @@ line|z15[waterway=ditch]
   width:	0.6;
   z-index:	109;
 }
-line|z15-[highway=residential],
-line|z15-[highway=unclassified]
+line|z14-[highway=residential],
+line|z14-[highway=unclassified]
 {
   font-size:	12;
   text-halo-radius:	2;
@@ -3993,6 +3980,7 @@ area|z17-[historic=monument],
 area|z17-[historic=museum],
 area|z17-[historic=ruins],
 area|z17-[shop][shop!=no],
+area|z17-[office][office!=no],
 area|z17-[tourism=camp_site],
 area|z17-[tourism=guest_house],
 area|z17-[tourism=hostel],
@@ -4042,6 +4030,7 @@ node|z17-[historic=monument],
 node|z17-[historic=museum],
 node|z17-[historic=ruins],
 node|z17-[shop][shop!=no],
+node|z17-[office][office!=no],
 node|z17-[tourism=camp_site],
 node|z17-[tourism=guest_house],
 node|z17-[tourism=hostel],
@@ -7075,7 +7064,11 @@ line|z15-[marking=sport][colour?]
 {
     color: eval(tag("colour"));
 }
-
+line|z18-[lit]::lit
+{
+  width: 0.3;
+  color: yellow
+}
 
 *[highway][area?]
 {fill-color: eval(prop("color")); width: 0; casing-width: 0}

data/types.txt

@@ -941,3 +941,10 @@ shop|beverages
 shop|toys
 shop|confectionery
 shop
+lit
+office|company
+office|telecommunication
+office|government
+office|estate_agent
+office|lawyer
+office