[Maposmatic-dev] [PATCH 02/14] [B&W stylesheet] Remove some details. Put all roads in white

[David MENTRE]

* Update .gitignore file to ignore generated inc/*.inc files.

* In landcover layer, remove colored polygons to avoid grey zones in
  urban areas.

* In landcover layer, display townhall, police, etc. amenities names on
  the map.

* Remove building and power layers.
---
 .gitignore                                         |    3 +
 .../black-and-white/inc/layer-landcover.xml.inc    |  167 +++----------------
 stylesheet/black-and-white/inc/layers.xml.inc      |    4 +-
 stylesheet/black-and-white/osm.xml                 |   24 ++--
 4 files changed, 44 insertions(+), 154 deletions(-)

diff --git a/.gitignore b/.gitignore
index da1c44d..3a90959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 /ocitysmap.conf.mine
 /support/planet-update-daily.sh
 /support/shoreline-update.sh
+/stylesheet/black-and-white/inc/datasource-settings.xml.inc
+/stylesheet/black-and-white/inc/fontset-settings.xml.inc
+/stylesheet/black-and-white/inc/settings.xml.inc
diff --git a/stylesheet/black-and-white/inc/layer-landcover.xml.inc 
b/stylesheet/black-and-white/inc/layer-landcover.xml.inc
index 2abe83b..2aa59e5 100644
--- a/stylesheet/black-and-white/inc/layer-landcover.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-landcover.xml.inc
@@ -1,92 +1,17 @@
 <Style name="landcover">
-     <Rule>
-      <Filter>[leisure] = 'swimming_pool'</Filter>
-      &maxscale_zoom14;
-      <PolygonSymbolizer fill="#b5d0d0"/>
-      <LineSymbolizer stroke="blue" stroke-width="0.5"/>
-    </Rule>
-    <Rule>
-      <Filter>[leisure] = 'playground'</Filter>
-      &maxscale_zoom13;
-      <PolygonSymbolizer fill="#ccfff1"/>
-      <LineSymbolizer stroke="#666" stroke-width="0.3"/>
-    </Rule>
-    <Rule>
-      <Filter>[tourism] = 'camp_site' or [tourism]='caravan_site' or [tourism] 
= 'picnic_site'</Filter>
-      &maxscale_zoom13;
-      <PolygonSymbolizer fill-opacity="0.5" fill="#ccff99"/>
-      <LineSymbolizer stroke="#666" stroke-width="0.3"/>
-    </Rule>        
-    <Rule>
-      <Filter>[tourism] = 'attraction'</Filter>
-      &maxscale_zoom10;
-      <PolygonSymbolizer fill="#f2caea"/>
-    </Rule>
-    <Rule>
-      <Filter>[landuse] = 'quarry'</Filter>
-      &maxscale_zoom11;
-      <PolygonPatternSymbolizer file="&symbols;/quarry2.png" />
-      <LineSymbolizer stroke="grey" stroke-width="0.5"/>
-    </Rule>
-    <Rule>
-      <Filter>[landuse] = 'vineyard'</Filter>
-      &maxscale_zoom10;
-      &minscale_zoom12;
-      <PolygonSymbolizer fill="#abdf96"/>
-    </Rule>
-    <Rule>
-      <Filter>[landuse] = 'orchard'</Filter>
-      &maxscale_zoom10;
-      <PolygonPatternSymbolizer file="&symbols;/orchard.png" />
-    </Rule>
-    <Rule>
-      <Filter>[landuse] = 'vineyard'</Filter>
-      &maxscale_zoom13;
-      <PolygonPatternSymbolizer file="&symbols;/vineyard.png" />
-    </Rule>
-    <Rule>
-      &maxscale_zoom10;
-      &minscale_zoom14;
-      <Filter>[landuse] = 'cemetery' or [landuse] = 'grave_yard' or 
[amenity]='grave_yard'</Filter>
-      <PolygonSymbolizer fill="#aacbaf"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom10;
-      &minscale_zoom18;
-      <Filter>[landuse] = 'residential'</Filter>
-      <PolygonSymbolizer fill="#ddd"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom12;
-      &minscale_zoom18;
-      <Filter>[landuse] = 'garages'</Filter>
-      <PolygonSymbolizer fill-opacity="0.2" fill="#996"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom10;
-      &minscale_zoom18;
-      <Filter>[military] = 'barracks'</Filter>
-      <PolygonSymbolizer fill="#ff8f8f"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom10;
-      &minscale_zoom13;
-      <Filter>[landuse]='field' or [natural]='field'</Filter>
-      <PolygonSymbolizer fill-opacity="0.2" fill="#666600"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom14;
-      &minscale_zoom18;
-      <Filter>[landuse]='field' or [natural]='field'</Filter>
-      <PolygonSymbolizer fill-opacity="0.2" fill="#666600"/>
-      <LineSymbolizer stroke="#660" stroke-width="0.3" stroke-opacity="0.4"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom9;
-      &minscale_zoom10;
-      <Filter>[military] = 'danger_area'</Filter>
-      <PolygonSymbolizer fill-opacity="0.3" fill="pink"/>
-    </Rule>
+    <!-- <Rule> -->
+    <!--   &maxscale_zoom10; -->
+    <!--   &minscale_zoom18; -->
+    <!--   <Filter>[landuse] = 'residential'</Filter> -->
+    <!--   <PolygonSymbolizer fill="#ddd"/> -->
+    <!-- </Rule> -->
+    <!-- <Rule> -->
+    <!--   &maxscale_zoom14; -->
+    <!--   &minscale_zoom18; -->
+    <!--   <Filter>[landuse]='field' or [natural]='field'</Filter> -->
+    <!--   <PolygonSymbolizer fill-opacity="0.2" fill="#666600"/> -->
+    <!--   <LineSymbolizer stroke="#660" stroke-width="0.3" 
stroke-opacity="0.4"/> -->
+    <!-- </Rule> -->
     <Rule>
       &maxscale_zoom11;
       &minscale_zoom18;
@@ -151,12 +76,6 @@
     </Rule>
     <Rule>
       <Filter>[landuse] = 'forest'</Filter>
-      &maxscale_zoom8;
-      &minscale_zoom13;
-      <PolygonSymbolizer fill="#8dc56c"/>
-    </Rule>
-    <Rule>
-      <Filter>[landuse] = 'forest'</Filter>
       &maxscale_zoom14;
       <PolygonPatternSymbolizer file="&symbols;/forest.png" />
     </Rule>
@@ -182,27 +101,16 @@
     </Rule>
     <Rule>
       <Filter>[landuse] = 'retail'</Filter>
-      &maxscale_zoom10;
-      <PolygonSymbolizer fill="#f1dada"/>
-    </Rule>
-    <Rule>
-      <Filter>[landuse] = 'retail'</Filter>
       &maxscale_zoom15;
       <LineSymbolizer stroke="red" stroke-width="0.3"/>
     </Rule>
     <Rule>
-      <Filter>[landuse] = 'industrial' or [landuse]='railway'</Filter>
+      <Filter>[landuse]='railway'</Filter>
       &maxscale_zoom10;
       <PolygonSymbolizer fill="#dfd1d6"/>
     </Rule>
     <Rule>
       <Filter>[power] = 'station' or [power]='generator'</Filter>
-      &maxscale_zoom10;
-      &minscale_zoom11;
-      <PolygonSymbolizer fill="#bbb"/>
-    </Rule>
-    <Rule>
-      <Filter>[power] = 'station' or [power]='generator'</Filter>
       &maxscale_zoom12;
       <PolygonSymbolizer fill="#bbb"/>
       <LineSymbolizer stroke="#555" stroke-width="0.4"/>
@@ -214,11 +122,6 @@
       <LineSymbolizer stroke="#555" stroke-width="0.4"/>
     </Rule>
     <Rule>
-      <Filter>[landuse] = 'commercial'</Filter>
-      &maxscale_zoom10;
-      <PolygonSymbolizer fill="#efc8c8"/>
-    </Rule>
-    <Rule>
       <Filter>[landuse] = 'brownfield' or [landuse]='landfill' or [landuse] = 
'greenfield' or [landuse]='construction'</Filter>
       &maxscale_zoom10;
       <PolygonSymbolizer fill-opacity="0.7" fill="#9d9d6c"/>
@@ -249,31 +152,25 @@
       <PolygonSymbolizer fill="#c6e4b4"/>
     </Rule>
     <Rule>
-      <Filter>[natural] = 'scrub'</Filter>
-      &maxscale_zoom10;
-      &minscale_zoom13;
-      <PolygonSymbolizer fill="#b5e3b5"/>
-    </Rule>
-    <Rule>
       &maxscale_zoom14;
       <Filter>[natural] = 'scrub'</Filter>
       <PolygonPatternSymbolizer file="&symbols;/scrub.png" />
     </Rule>
+    <!-- <Rule> -->
+    <!--   <Filter>[amenity] = 'university' or [amenity] = 'college' or 
[amenity] = 'school' or [amenity]='hospital' or 
[amenity]='kindergarten'</Filter> -->
+    <!--   &maxscale_zoom10; -->
+    <!--   <PolygonSymbolizer fill="#f0f0d8"/> -->
+    <!-- </Rule> -->
     <Rule>
-      <Filter>[amenity] = 'university' or [amenity] = 'college' or [amenity] = 
'school' or [amenity]='hospital' or [amenity]='kindergarten'</Filter>
-      &maxscale_zoom10;
-      <PolygonSymbolizer fill="#f0f0d8"/>
-    </Rule>
-    <Rule>
-      <Filter>[amenity] = 'university' or [amenity] = 'college' or [amenity] = 
'school' or [amenity]='hospital' or [amenity]='kindergarten'</Filter>
+      <Filter>[amenity] = 'university' or [amenity] = 'college' or [amenity] = 
'school' or [amenity]='hospital' or [amenity]='kindergarten' or 
[amenity]='place_of_worship' or [amenity]='library' or [amenity]='townhall' or 
[amenity]='post_office' or [amenity]='public_building' or [amenity]='police' 
</Filter>
       &maxscale_zoom12;
       <LineSymbolizer stroke="brown" stroke-width="0.3"/>
     </Rule>
-    <Rule>
-      <Filter>[amenity] = 'parking'</Filter>
-      &maxscale_zoom10;
-      <PolygonSymbolizer fill="#f7efb7"/>
-    </Rule>
+    <!-- <Rule> -->
+    <!--   <Filter>[amenity] = 'parking'</Filter> -->
+    <!--   &maxscale_zoom10; -->
+    <!--   <PolygonSymbolizer fill="#f7efb7"/> -->
+    <!-- </Rule> -->
     <Rule>
       <Filter>[amenity] = 'parking'</Filter>
       &maxscale_zoom15;
@@ -295,19 +192,9 @@
       &maxscale_zoom13;
       <PolygonPatternSymbolizer file="&symbols;/beach.png" />
     </Rule>
-    <Rule>
-      <Filter>[highway] = 'services' or [highway] = 'rest_area'</Filter>
-      &maxscale_zoom14;
-      <PolygonSymbolizer fill="#efc8c8"/>
-    </Rule>
 </Style>
 <Style name="landcover_line">
     <Rule>
-      &maxscale_zoom14;
-      &minscale_zoom15;
-      <LineSymbolizer stroke-linejoin="round" stroke="#f2efe9" 
stroke-width="3" stroke-linecap="square"/>
-    </Rule>
-    <Rule>
       &maxscale_zoom16;
       <LineSymbolizer stroke-linejoin="round" stroke="#f2efe9" 
stroke-width="6" stroke-linecap="square"/>
     </Rule>
@@ -316,7 +203,7 @@
     <Rule>
       <Filter>[leisure] = 'sports_centre' or [leisure] = 'stadium'</Filter>
       &maxscale_zoom10;
-      <PolygonSymbolizer fill="#33cc99"/>
+      <LineSymbolizer stroke="#888" stroke-width="0.5"/>
     </Rule>
     <Rule>
       <Filter>[leisure]='track'</Filter>
@@ -342,7 +229,7 @@
        where landuse is not null
           or leisure is not null
           or aeroway in ('apron','aerodrome')
-          or amenity in 
('parking','university','college','school','hospital','kindergarten','grave_yard')
+          or amenity in 
('parking','university','college','school','hospital','kindergarten','grave_yard','place_of_worship','library','townhall','post_office','public_building','police')
           or military in ('barracks','danger_area')
           or "natural" in 
('field','beach','desert','heath','mud','grassland','wood','sand','scrub')
           or power in ('station','sub_station','generator')
diff --git a/stylesheet/black-and-white/inc/layers.xml.inc 
b/stylesheet/black-and-white/inc/layers.xml.inc
index 2405e5b..afec28b 100644
--- a/stylesheet/black-and-white/inc/layers.xml.inc
+++ b/stylesheet/black-and-white/inc/layers.xml.inc
@@ -3,13 +3,13 @@
 <!ENTITY layer-water SYSTEM "layer-water.xml.inc">
 <!ENTITY layer-water_features SYSTEM "layer-water_features.xml.inc">
 <!ENTITY layer-citywall SYSTEM "layer-citywall.xml.inc">
-<!ENTITY layer-buildings SYSTEM "layer-buildings.xml.inc">
+<!-- <!ENTITY layer-buildings SYSTEM "layer-buildings.xml.inc"> -->
 <!ENTITY layer-ferry-routes SYSTEM "layer-ferry-routes.xml.inc">
 <!ENTITY layer-aerialways SYSTEM "layer-aerialways.xml.inc">
 <!ENTITY layer-placenames SYSTEM "layer-placenames.xml.inc">
 <!ENTITY layer-amenity-stations SYSTEM "layer-amenity-stations.xml.inc">
 <!ENTITY layer-amenity-symbols SYSTEM "layer-amenity-symbols.xml.inc">
 <!ENTITY layer-amenity-points SYSTEM "layer-amenity-points.xml.inc">
-<!ENTITY layer-power SYSTEM "layer-power.xml.inc">
+<!-- <!ENTITY layer-power SYSTEM "layer-power.xml.inc"> -->
 <!ENTITY layer-addressing SYSTEM "layer-addressing.xml.inc">
 <!ENTITY layer-admin SYSTEM "layer-admin.xml.inc">
diff --git a/stylesheet/black-and-white/osm.xml 
b/stylesheet/black-and-white/osm.xml
index 0dd195b..fc910bd 100644
--- a/stylesheet/black-and-white/osm.xml
+++ b/stylesheet/black-and-white/osm.xml
@@ -468,7 +468,7 @@
       <TextSymbolizer size="9" fill="#000033" fontset-name="bold-fonts" 
halo-radius="1" wrap-width="16" placement="interior">[name]</TextSymbolizer>
     </Rule>
     <Rule>
-      <Filter>[amenity] = 'school' or [amenity] = 'college'</Filter>
+      <Filter>[amenity] = 'school' or [amenity] = 'college' or 
[amenity]='townhall'</Filter>
       &maxscale_zoom15;
       <TextSymbolizer size="9" fill="#000033" fontset-name="book-fonts" 
halo-radius="1" wrap-width="14" placement="interior">[name]</TextSymbolizer>
     </Rule>
@@ -753,7 +753,7 @@
       <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#fee0b8" 
stroke-width="10" stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="10" 
stroke-linecap="round"/>
     </Rule>
     <Rule>
       <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
@@ -789,7 +789,7 @@
       <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#ffc" stroke-width="9.4" 
stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="9.4" 
stroke-linecap="round"/>
     </Rule>
     <Rule>
       <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
@@ -1501,7 +1501,7 @@
       <Filter>[highway] = 'motorway' and not [tunnel] = 'yes'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#809bc0" 
stroke-width="8.5" stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="white" 
stroke-width="8.5" stroke-linecap="round"/>
     </Rule>
     <Rule>
       <Filter>[highway] = 'motorway' and not [tunnel] = 'yes'</Filter>
@@ -1525,7 +1525,7 @@
       <Filter>[highway] = 'trunk' and not [tunnel] = 'yes'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9" 
stroke-width="11" stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="11" 
stroke-linecap="round"/>
     </Rule>
     <Rule>
       <Filter>[highway] = 'trunk' and not [tunnel] = 'yes'</Filter>
@@ -1549,7 +1549,7 @@
       <Filter>[highway] = 'primary' and not [tunnel] = 'yes'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#ec989a" 
stroke-width="11" stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="11" 
stroke-linecap="round"/>
     </Rule>
     <Rule>
       <Filter>[highway] = 'primary' and not [tunnel] = 'yes'</Filter>
@@ -1573,7 +1573,7 @@
       <Filter>[highway] = 'secondary' and not [tunnel]='yes'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5" 
stroke-width="11" stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="11" 
stroke-linecap="round"/>
     </Rule>
     <Rule>
       <Filter>[highway] = 'secondary' and not [tunnel]='yes'</Filter>
@@ -1807,7 +1807,7 @@
       <Filter>[highway] = 'tertiary' and not [tunnel]='yes'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3" 
stroke-width="9.4" stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="9.4" 
stroke-linecap="round"/>
     </Rule>
     <Rule>
       <Filter>[highway] = 'tertiary' and not [tunnel]='yes'</Filter>
@@ -2605,7 +2605,7 @@
       <Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#ec989a" 
stroke-width="9.5" stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="white" 
stroke-width="9.5" stroke-linecap="round"/>
     </Rule>
     <Rule>
       <Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
@@ -2623,7 +2623,7 @@
       <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5" 
stroke-width="10.5" stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="white" 
stroke-width="10.5" stroke-linecap="round"/>
     </Rule>  
     <Rule>
       <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
@@ -2641,7 +2641,7 @@
       <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3" 
stroke-width="9.5" stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="white" 
stroke-width="9.5" stroke-linecap="round"/>
     </Rule>
     <Rule>
       <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
@@ -2659,7 +2659,7 @@
       <Filter>[highway] = 'road'</Filter>
       &maxscale_zoom15;
       &minscale_zoom16;
-      <LineSymbolizer stroke-linejoin="round" stroke="#ddd" stroke-width="9.5" 
stroke-linecap="round"/>
+      <LineSymbolizer stroke-linejoin="round" stroke="white" 
stroke-width="9.5" stroke-linecap="round"/>
     </Rule>
     <Rule>
       <Filter>[highway] = 'road'</Filter>
-- 
1.7.5.4