This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository openstreetmap-carto.

commit f360d667736f30853232ddfa6d898d4314e9a02a
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sun Aug 30 16:57:16 2015 +0200

    Imported Upstream version 2.34.0
---
 INSTALL.md                      |   5 +-
 README.md                       |   2 +-
 amenity-points.mss              |  26 +++++--
 buildings.mss                   |   6 ++
 landcover.mss                   |  42 +++-------
 preview.png                     | Bin 79761 -> 79418 bytes
 project.mml                     |  78 +++++++++++++++----
 project.yaml                    |  95 ++++++++++++++++++-----
 roads.mss                       | 166 ++++++++++++++++++++++++++++++++++++----
 shapefiles.mss                  |   2 +-
 symbols/community_centre-14.svg |  38 +++++++++
 symbols/quarry.png              | Bin 189 -> 9863 bytes
 symbols/veterinary-14.svg       |  40 ++++++++++
 13 files changed, 411 insertions(+), 89 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 3633e6d..5a65290 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -37,7 +37,8 @@ Put these shapefiles at `path/to/openstreetmap-carto/data`.
 ### Populated places shapefile
 
 The Natural Earth 2.0 populated places shapefile contains data that triggers a 
bug in mapnik. As
-a workaround we run the shapefile through ogr2ogr to clean up the data.
+a workaround we run the shapefile through ogr2ogr to clean up the data. This 
is not required for
+Mapnik 2.2 or later, where the shapefile can just be renamed.
 
 ```
 ogr2ogr ne_10m_populated_places_fixed.shp ne_10m_populated_places.shp
@@ -82,7 +83,7 @@ In Ubuntu 13.10 (Saucy) and lower, replace fonts-taml-tscu 
with ttf-tamil-fonts.
 If you aren't using TileMill, you can compile the CartoCSS stylesheets into 
Mapnik XML using the command-line `carto` command.
 
 * [carto](https://github.com/mapbox/carto) >= 0.9.5 (we're using instances 
with cascading rules and min/max zoom properties)
-* [mapnik](https://github.com/mapnik/mapnik/wiki/Mapnik-Installation) >= 
2.1.0. Mapnik 3.0.0 support is not yet complete.
+* [mapnik](https://github.com/mapnik/mapnik/wiki/Mapnik-Installation) >= 
2.1.0. Mapnik 3.0 is supported, but not required.
 
 ---
 
diff --git a/README.md b/README.md
index d51126b..67c2bd8 100644
--- a/README.md
+++ b/README.md
@@ -81,4 +81,4 @@ maps using mapnik, many based on this project. Some 
alternatives are:
 * Andy Allan [@gravitystorm](https://github.com/gravitystorm/)
 * Matthijs Melissen [@math1985](https://github.com/math1985/)
 * Paul Norman [@pnorman](https://github.com/pnorman/)
-* Mateusz Konieczny [@matkoniecz](https://github.com/mkoniecz/)
+* Mateusz Konieczny [@matkoniecz](https://github.com/matkoniecz/)
diff --git a/amenity-points.mss b/amenity-points.mss
index 07e4e11..cad3ae8 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -126,12 +126,12 @@
     marker-fill: @transportation-icon;
   }
 
-  [feature = 'amenity_car_sharing'][zoom >= 16] {
+  [feature = 'amenity_car_sharing'][zoom >= 18] {
     point-file: url('symbols/car_share.p.16.png');
     point-placement: interior;
   }
 
-  [feature = 'amenity_car_rental'][zoom >= 16] {
+  [feature = 'amenity_car_rental'][zoom >= 17] {
     marker-file: url('symbols/rental_car.16.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
@@ -235,6 +235,13 @@
     marker-clip: false;
   }
 
+  [feature = 'amenity_community_centre'][zoom >= 17] {
+    marker-file: url('symbols/community_centre-14.svg');
+    marker-fill: @amenity-brown;
+    marker-placement: interior;
+    marker-clip: false;
+  }
+
   [feature = 'amenity_townhall'][zoom >= 16] {
     marker-file: url('symbols/town_hall.16.svg');
     marker-fill: @amenity-brown;
@@ -298,6 +305,13 @@
     marker-clip: false;
   }
 
+  [feature = 'amenity_veterinary'][zoom >= 17] {
+    marker-file: url('symbols/veterinary-14.svg');
+    marker-fill: @health-color;
+    marker-placement: interior;
+    marker-clip: false;
+  }
+
   [feature = 'amenity_place_of_worship'][zoom >= 16] {
     marker-file: url('symbols/place_of_worship.16.svg');
     marker-fill: #000000;
@@ -1077,7 +1091,7 @@
   }
 
   [feature = 'amenity_car_rental'][zoom >= 17],
-  [feature = 'amenity_car_sharing'][zoom >= 17],
+  [feature = 'amenity_car_sharing'][zoom >= 18],
   [feature = 'amenity_bicycle_rental'][zoom >= 17],
   [feature = 'leisure_slipway'][zoom >= 17] {
     text-name: "[name]";
@@ -1120,6 +1134,7 @@
 
 
   [feature = 'amenity_police'][zoom >= 17],
+  [feature = 'amenity_community_centre'][zoom >= 17],
   [feature = 'amenity_fire_station'][zoom >= 17],
   [feature = 'amenity_drinking_water'][zoom >= 17],
   [feature = 'amenity_recyling'][zoom >= 17],
@@ -1903,7 +1918,8 @@
   [feature = 'amenity_clinic'],
   [feature = 'amenity_pharmacy'],
   [feature = 'amenity_doctors'],
-  [feature = 'amenity_dentist'] {
+  [feature = 'amenity_dentist'],
+  [feature = 'amenity_veterinary'] {
     [zoom >= 17] {
       text-name: "[name]";
       text-size: 8;
@@ -2017,7 +2033,7 @@
   }
 
   [feature = 'landuse_military'][is_building = 'no'] {
-    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 8][way_pixels > 3000],
     [zoom >= 17] {
       text-name: "[name]";
       text-size: @landcover-font-size;
diff --git a/buildings.mss b/buildings.mss
index abe5081..482633f 100644
--- a/buildings.mss
+++ b/buildings.mss
@@ -44,3 +44,9 @@
     }
   }
 }
+
+#bridge {
+  [zoom >= 12] {
+    polygon-fill: #B8B8B8;
+  }
+}
diff --git a/landcover.mss b/landcover.mss
index 86a2f62..4b8fcfd 100644
--- a/landcover.mss
+++ b/landcover.mss
@@ -169,7 +169,7 @@
     }
   }
 
-  [feature = 'amenity_prison'][zoom >= 10] {
+  [feature = 'amenity_prison'][zoom >= 10][way_pixels > 75] {
     polygon-pattern-file: url('symbols/grey_vertical_hatch.png');
     polygon-pattern-alignment: global;
     line-color: #888;
@@ -210,16 +210,6 @@
     }
   }
 
-  [feature = 'landuse_meadow'],
-  [feature = 'natural_grassland'],
-  [feature = 'landuse_grass'] {
-    [zoom >= 10] {
-      polygon-fill: @grass;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
-    }
-  }
-
   [feature = 'leisure_park'],
   [feature = 'leisure_recreation_ground'] {
     [zoom >= 10] {
@@ -229,18 +219,6 @@
     }
   }
 
-  [feature = 'leisure_common'][zoom >= 10] {
-    polygon-fill: @grass;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
-  }
-
-  [feature = 'leisure_garden'][zoom >= 10] {
-    polygon-fill: @grass;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
-  }
-
   [feature = 'leisure_golf_course'][zoom >= 10],
   [feature = 'leisure_miniature_golf'][zoom >= 15] {
     polygon-fill: @golf_course;
@@ -298,8 +276,14 @@
     }
   }
 
+  [feature = 'landuse_meadow'],
+  [feature = 'natural_grassland'],
+  [feature = 'landuse_grass'],
   [feature = 'landuse_recreation_ground'],
-  [feature = 'landuse_conservation'] {
+  [feature = 'landuse_conservation'],
+  [feature = 'landuse_village_green'],
+  [feature = 'leisure_common'],
+  [feature = 'leisure_garden'] {
     [zoom >= 10] {
       polygon-fill: @grass;
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
@@ -307,12 +291,6 @@
     }
   }
 
-  [feature = 'landuse_village_green'][zoom >= 10] {
-    polygon-fill: @grass;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
-  }
-
   [feature = 'landuse_retail'][zoom >= 10] {
     polygon-fill: @retail;
     [zoom >= 16] {
@@ -614,7 +592,9 @@
 }
 
 #landuse-overlay {
-  [landuse = 'military'][zoom >= 10] {
+  [landuse = 'military'][zoom >= 7][way_pixels > 900],
+  [landuse = 'military'][zoom >= 8][way_pixels > 100],
+  [landuse = 'military'][zoom >= 10][way_pixels > 75] {
     polygon-pattern-file: url('symbols/military_red_hatch.png');
     polygon-pattern-alignment: global;
     line-color: @military;
diff --git a/preview.png b/preview.png
index 8983b55..fb53b01 100644
Binary files a/preview.png and b/preview.png differ
diff --git a/project.mml b/project.mml
index 3189cc4..5392882 100644
--- a/project.mml
+++ b/project.mml
@@ -100,7 +100,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way, name, way_pixels,\n    COALESCE(wetland, 
landuse, \"natural\") AS feature\n  FROM (SELECT\n      way, COALESCE(name, '') 
AS name,\n      ('landuse_' || (CASE WHEN landuse IN ('forest') THEN landuse 
ELSE NULL END)) AS landuse,\n      ('natural_' || (CASE WHEN \"natural\" IN 
('wood', 'sand', 'scree', 'shingle', 'bare_rock') THEN \"natural\" ELSE NULL 
END)) AS \"natural\",\n      ('wetland_' || (CASE WHEN \"natural\" IN 
('wetland', 'mud') THEN (CASE WHEN  [...]
+        "table": "(SELECT\n    way, name, way_pixels,\n    COALESCE(wetland, 
landuse, \"natural\") AS feature\n  FROM (SELECT\n      way, COALESCE(name, '') 
AS name,\n      ('landuse_' || (CASE WHEN landuse IN ('forest', 'military') 
THEN landuse ELSE NULL END)) AS landuse,\n      ('natural_' || (CASE WHEN 
\"natural\" IN ('wood', 'sand', 'scree', 'shingle', 'bare_rock') THEN 
\"natural\" ELSE NULL END)) AS \"natural\",\n      ('wetland_' || (CASE WHEN 
\"natural\" IN ('wetland', 'mud') THEN [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -501,6 +501,32 @@
       "advanced": {}
     },
     {
+      "name": "bridge",
+      "srs-name": "900913",
+      "geometry": "polygon",
+      "class": "",
+      "id": "bridge",
+      "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+      "Datasource": {
+        "extent": "-20037508,-20037508,20037508,20037508",
+        "table": "(SELECT\n    way,\n    
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n    
man_made,\n    name\n  FROM planet_osm_polygon\n  WHERE man_made = 'bridge'\n) 
AS bridge",
+        "geometry_field": "way",
+        "type": "postgis",
+        "key_field": "",
+        "dbname": "gis"
+      },
+      "extent": [
+        -180,
+        -85.05112877980659,
+        180,
+        85.05112877980659
+      ],
+      "properties": {
+        "minzoom": 12
+      },
+      "advanced": {}
+    },
+    {
       "name": "buildings",
       "srs-name": "900913",
       "geometry": "polygon",
@@ -561,7 +587,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT way, (CASE WHEN substr(feature, length(feature)-3, 
4) = 'link' THEN substr(feature, 0, length(feature)-4) ELSE feature END) AS 
feature,\n        horse, foot, bicycle, tracktype, int_surface, access, 
construction,\n        service, oneway, link, layernotnull\n  FROM ( -- 
subselect that contains both roads and rail/aero\n    SELECT\n        way,\n    
    ('highway_' || highway) AS feature, --only motorway to tertiary links are 
accepted later on\n        horse,\n   [...]
+        "table": "(SELECT way, (CASE WHEN substr(feature, length(feature)-3, 
4) = 'link' THEN substr(feature, 0, length(feature)-4) ELSE feature END) AS 
feature,\n        horse, foot, bicycle, tracktype, int_surface, access, 
construction,\n        service, oneway, link, layernotnull\n  FROM ( -- 
subselect that contains both roads and rail/aero\n    SELECT\n        way,\n    
    ('highway_' || highway) AS feature, --only motorway to tertiary links are 
accepted later on\n        horse,\n   [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -614,7 +640,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way, landuse\n  FROM planet_osm_polygon\n  
WHERE landuse = 'military'\n    AND building IS NULL\n) AS landuse_overlay",
+        "table": "(SELECT\n    way,\n    landuse,\n    
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels\n  
FROM planet_osm_polygon\n  WHERE landuse = 'military'\n    AND building IS 
NULL\n) AS landuse_overlay",
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -627,7 +653,7 @@
         85.05112877980659
       ],
       "properties": {
-        "minzoom": 10
+        "minzoom": 7
       },
       "advanced": {}
     },
@@ -795,7 +821,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT way, (CASE WHEN substr(feature, length(feature)-3, 
4) = 'link' THEN substr(feature, 0, length(feature)-4) ELSE feature END) AS 
feature,\n        horse, foot, bicycle, tracktype, int_surface, access, 
construction,\n        service, oneway, link, layernotnull\n  FROM ( -- 
subselect that contains both roads and rail/aero\n    SELECT\n        way,\n    
    ('highway_' || highway) AS feature, --only motorway to tertiary links are 
accepted later on\n        horse,\n   [...]
+        "table": "(SELECT way, (CASE WHEN substr(feature, length(feature)-3, 
4) = 'link' THEN substr(feature, 0, length(feature)-4) ELSE feature END) AS 
feature,\n        horse, foot, bicycle, tracktype, int_surface, access, 
construction,\n        service, oneway, link, layernotnull\n  FROM ( -- 
subselect that contains both roads and rail/aero\n    SELECT\n        way,\n    
    ('highway_' || highway) AS feature, --only motorway to tertiary links are 
accepted later on\n        horse,\n   [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -847,7 +873,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT way, (CASE WHEN substr(feature, length(feature)-3, 
4) = 'link' THEN substr(feature, 0, length(feature)-4) ELSE feature END) AS 
feature,\n        horse, foot, bicycle, tracktype, int_surface, access, 
construction,\n        service, oneway, link, layernotnull\n  FROM ( -- 
subselect that contains both roads and rail/aero\n    SELECT\n        way,\n    
    ('highway_' || highway) AS feature, --only motorway to tertiary links are 
accepted later on\n        horse,\n   [...]
+        "table": "(SELECT way, (CASE WHEN substr(feature, length(feature)-3, 
4) = 'link' THEN substr(feature, 0, length(feature)-4) ELSE feature END) AS 
feature,\n        horse, foot, bicycle, tracktype, int_surface, access, 
construction,\n        service, oneway, link, layernotnull\n  FROM ( -- 
subselect that contains both roads and rail/aero\n    SELECT\n        way,\n    
    ('highway_' || highway) AS feature, --only motorway to tertiary links are 
accepted later on\n        horse,\n   [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -925,7 +951,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    COALESCE(\n      ('highway_' || (CASE 
WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, 
length(highway)-4) ELSE highway end)),\n      ('railway_' || (CASE WHEN 
(railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 
'INT-spur-siding-yard' WHEN railway IN ('rail', 'tram', 'light_rail', 
'funicular', 'narrow_gauge') THEN railway ELSE NULL END))\n    ) AS feature,\n  
  CASE WHEN tunnel = 'yes' OR tunnel = 'building_ [...]
+        "table": "(SELECT\n    way,\n    COALESCE(\n      ('highway_' || (CASE 
WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, 
length(highway)-4) ELSE highway end)),\n      ('railway_' || (CASE WHEN 
(railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 
'INT-spur-siding-yard' WHEN railway IN ('rail', 'tram', 'light_rail', 
'funicular', 'narrow_gauge') THEN railway ELSE NULL END))\n    ) AS feature,\n  
  CASE WHEN tunnel = 'yes' OR tunnel = 'building_ [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -978,7 +1004,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT way, (CASE WHEN substr(feature, length(feature)-3, 
4) = 'link' THEN substr(feature, 0, length(feature)-4) ELSE feature END) AS 
feature,\n        horse, foot, bicycle, tracktype, int_surface, access, 
construction,\n        service, oneway, link, layernotnull\n  FROM ( -- 
subselect that contains both roads and rail/aero\n    SELECT\n        way,\n    
    ('highway_' || highway) AS feature, --only motorway to tertiary links are 
accepted later on\n        horse,\n   [...]
+        "table": "(SELECT way, (CASE WHEN substr(feature, length(feature)-3, 
4) = 'link' THEN substr(feature, 0, length(feature)-4) ELSE feature END) AS 
feature,\n        horse, foot, bicycle, tracktype, int_surface, access, 
construction,\n        service, oneway, link, layernotnull\n  FROM ( -- 
subselect that contains both roads and rail/aero\n    SELECT\n        way,\n    
    ('highway_' || highway) AS feature, --only motorway to tertiary links are 
accepted later on\n        horse,\n   [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -1423,7 +1449,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    COALESCE(\n      'aeroway_' || CASE 
WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      
'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 
'chalet', 'guest_house', 'hostel', 'hotel', 'motel', 'information', 'museum', 
'picnic_site') THEN tourism ELSE NULL END,\n      'amenity_' || CASE WHEN 
amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 
'cafe', 'car_rental', 'car_sha [...]
+        "table": "(SELECT\n    way,\n    COALESCE(\n      'aeroway_' || CASE 
WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      
'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 
'chalet', 'guest_house', 'hostel', 'hotel', 'motel', 'information', 'museum', 
'picnic_site') THEN tourism ELSE NULL END,\n      'amenity_' || CASE WHEN 
amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 
'biergarten', 'bar', 'library', 'theatre [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -1449,7 +1475,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    COALESCE(\n      'aeroway_' || CASE 
WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      
'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 
'chalet', 'guest_house', 'hostel', 'hotel', 'motel', 'information', 'museum', 
'picnic_site') THEN tourism ELSE NULL END,\n      'amenity_' || CASE WHEN 
amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 
'cafe', 'car_rental', 'car_sha [...]
+        "table": "(SELECT\n    way,\n    COALESCE(\n      'aeroway_' || CASE 
WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      
'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 
'chalet', 'guest_house', 'hostel', 'hotel', 'motel', 'information', 'museum', 
'picnic_site') THEN tourism ELSE NULL END,\n      'amenity_' || CASE WHEN 
amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 
'biergarten', 'bar', 'library', 'theatre [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -1572,6 +1598,32 @@
       "advanced": {}
     },
     {
+      "name": "bridge-text",
+      "srs-name": "900913",
+      "geometry": "polygon",
+      "class": "",
+      "id": "bridge-text",
+      "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+      "Datasource": {
+        "extent": "-20037508,-20037508,20037508,20037508",
+        "table": "(SELECT\n    way,\n    
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n    
man_made,\n    name\n  FROM planet_osm_polygon\n  WHERE man_made = 'bridge'\n) 
AS bridge_text",
+        "geometry_field": "way",
+        "type": "postgis",
+        "key_field": "",
+        "dbname": "gis"
+      },
+      "extent": [
+        -180,
+        -85.05112877980659,
+        180,
+        85.05112877980659
+      ],
+      "properties": {
+        "minzoom": 11
+      },
+      "advanced": {}
+    },
+    {
       "name": "roads-text-ref",
       "srs-name": "900913",
       "geometry": "linestring",
@@ -1684,7 +1736,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n    
COALESCE(\n      'landuse_' || CASE WHEN landuse IN ('forest') THEN landuse 
ELSE NULL END,\n      'natural_' || CASE WHEN \"natural\" IN ('wood', 
'glacier', 'sand', 'scree', 'shingle', 'bare_rock') THEN \"natural\" ELSE NULL 
END,\n      'place_' || CASE WHEN place IN ('island') THEN place ELSE NULL 
END,\n      'boundary_' || CASE WHEN boundary IN ('national_park') THEN [...]
+        "table": "(SELECT\n    way,\n    
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n    
COALESCE(\n      'landuse_' || CASE WHEN landuse IN ('forest', 'military') THEN 
landuse ELSE NULL END,\n      'natural_' || CASE WHEN \"natural\" IN ('wood', 
'glacier', 'sand', 'scree', 'shingle', 'bare_rock') THEN \"natural\" ELSE NULL 
END,\n      'place_' || CASE WHEN place IN ('island') THEN place ELSE NULL 
END,\n      'boundary_' || CASE WHEN boundary IN ('national [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -1711,7 +1763,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n    
COALESCE(\n      'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 
'helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      'tourism_' || CASE 
WHEN tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 
'guest_house', 'camp_site', 'caravan_site', 'theme_park', 'museum', 'zoo', 
'information', 'picnic_site') THEN tourism ELSE NULL END,\n      'amenity_' ||  
[...]
+        "table": "(SELECT\n    way,\n    
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n    
COALESCE(\n      'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 
'helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      'tourism_' || CASE 
WHEN tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 
'guest_house', 'camp_site', 'caravan_site', 'theme_park', 'museum', 'zoo', 
'information', 'picnic_site') THEN tourism ELSE NULL END,\n      'amenity_' ||  
[...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -1763,7 +1815,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 
+y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    way_pixels,\n    feature,\n    
access,\n    CONCAT(\n        name,\n        CASE WHEN name IS NOT NULL AND 
elevation IS NOT NULL THEN E'\\n' ELSE NULL END,\n        CASE WHEN elevation 
IS NOT NULL THEN CONCAT(REPLACE(ROUND(elevation)::TEXT, '-', U&'\\2212'), 
U&'\\00A0', 'm') ELSE NULL END\n    ) AS name,\n    CASE\n      WHEN 
\"natural\" IN ('peak', 'volcano', 'saddle') THEN elevation\n      ELSE NULL\n  
  END AS score,\n    operator,\n    ref,\n  [...]
+        "table": "(SELECT\n    way,\n    way_pixels,\n    feature,\n    
access,\n    CONCAT(\n        name,\n        CASE WHEN name IS NOT NULL AND 
elevation IS NOT NULL THEN E'\\n' ELSE NULL END,\n        CASE WHEN elevation 
IS NOT NULL THEN CONCAT(REPLACE(ROUND(elevation)::TEXT, '-', U&'\\2212'), 
U&'\\00A0', 'm') ELSE NULL END\n    ) AS name,\n    CASE\n      WHEN 
\"natural\" IN ('peak', 'volcano', 'saddle') THEN elevation\n      ELSE NULL\n  
  END AS score,\n    operator,\n    ref,\n  [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
diff --git a/project.yaml b/project.yaml
index 22dcf90..48e9cec 100644
--- a/project.yaml
+++ b/project.yaml
@@ -114,12 +114,12 @@ Layer:
             COALESCE(wetland, landuse, "natural") AS feature
           FROM (SELECT
               way, COALESCE(name, '') AS name,
-              ('landuse_' || (CASE WHEN landuse IN ('forest') THEN landuse 
ELSE NULL END)) AS landuse,
+              ('landuse_' || (CASE WHEN landuse IN ('forest', 'military') THEN 
landuse ELSE NULL END)) AS landuse,
               ('natural_' || (CASE WHEN "natural" IN ('wood', 'sand', 'scree', 
'shingle', 'bare_rock') THEN "natural" ELSE NULL END)) AS "natural",
               ('wetland_' || (CASE WHEN "natural" IN ('wetland', 'mud') THEN 
(CASE WHEN "natural" IN ('mud') THEN "natural" ELSE wetland END) ELSE NULL 
END)) AS wetland,
               way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS 
way_pixels
             FROM planet_osm_polygon
-            WHERE (landuse IN ('forest')
+            WHERE (landuse IN ('forest', 'military')
               OR "natural" IN ('wood', 'wetland', 'mud', 'sand', 'scree', 
'shingle', 'bare_rock'))
               AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real
               AND building IS NULL
@@ -415,6 +415,25 @@ Layer:
     properties:
       minzoom: 17
     advanced: {}
+  - id: "bridge"
+    name: "bridge"
+    class: ""
+    geometry: "polygon"
+    <<: *extents
+    Datasource:
+      <<: *osm2pgsql
+      table: |-
+        (SELECT
+            way,
+            way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS 
way_pixels,
+            man_made,
+            name
+          FROM planet_osm_polygon
+          WHERE man_made = 'bridge'
+        ) AS bridge
+    properties:
+      minzoom: 12
+    advanced: {}
   - id: "buildings"
     name: "buildings"
     class: ""
@@ -482,7 +501,10 @@ Layer:
                 bicycle,
                 tracktype,
                 CASE WHEN surface IN ('unpaved', 'compacted', 'dirt', 'earth', 
'fine_gravel', 'grass', 
-                       'grass_paver', 'gravel', 'ground', 'mud', 
'pebblestone', 'salt', 'sand', 'woodchips', 'clay') THEN 'unpaved' ELSE 'paved' 
END AS int_surface,
+                  'grass_paver', 'gravel', 'ground', 'mud', 'pebblestone', 
'salt', 'sand', 'woodchips', 'clay') THEN 'unpaved' ELSE 
+                  CASE WHEN surface IN ('paved', 'asphalt', 'cobblestone', 
'cobblestone:flattened', 'sett', 'concrete', 'concrete:lanes', 
+                  'concrete:plates', 'paving_stones', 'metal', 'wood') THEN 
'paved' 
+                  ELSE null END END AS int_surface,
                 CASE WHEN access IN ('destination') THEN 'destination'::text
                   WHEN access IN ('no', 'private') THEN 'no'::text
                   ELSE NULL
@@ -612,13 +634,15 @@ Layer:
       <<: *osm2pgsql
       table: |-
         (SELECT
-            way, landuse
+            way,
+            landuse,
+            way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS 
way_pixels
           FROM planet_osm_polygon
           WHERE landuse = 'military'
             AND building IS NULL
         ) AS landuse_overlay
     properties:
-      minzoom: 10
+      minzoom: 7
     advanced: {}
   - id: "line-barriers"
     name: "line-barriers"
@@ -757,7 +781,10 @@ Layer:
                 bicycle,
                 tracktype,
                 CASE WHEN surface IN ('unpaved', 'compacted', 'dirt', 'earth', 
'fine_gravel', 'grass', 
-                       'grass_paver', 'gravel', 'ground', 'mud', 
'pebblestone', 'salt', 'sand', 'woodchips', 'clay') THEN 'unpaved' ELSE 'paved' 
END AS int_surface,
+                  'grass_paver', 'gravel', 'ground', 'mud', 'pebblestone', 
'salt', 'sand', 'woodchips', 'clay') THEN 'unpaved' ELSE 
+                  CASE WHEN surface IN ('paved', 'asphalt', 'cobblestone', 
'cobblestone:flattened', 'sett', 'concrete', 'concrete:lanes', 
+                  'concrete:plates', 'paving_stones', 'metal', 'wood') THEN 
'paved' 
+                  ELSE null END END AS int_surface,
                 CASE WHEN access IN ('destination') THEN 'destination'::text
                   WHEN access IN ('no', 'private') THEN 'no'::text
                   ELSE NULL
@@ -909,7 +936,10 @@ Layer:
                 bicycle,
                 tracktype,
                 CASE WHEN surface IN ('unpaved', 'compacted', 'dirt', 'earth', 
'fine_gravel', 'grass', 
-                       'grass_paver', 'gravel', 'ground', 'mud', 
'pebblestone', 'salt', 'sand', 'woodchips', 'clay') THEN 'unpaved' ELSE 'paved' 
END AS int_surface,
+                  'grass_paver', 'gravel', 'ground', 'mud', 'pebblestone', 
'salt', 'sand', 'woodchips', 'clay') THEN 'unpaved' ELSE 
+                  CASE WHEN surface IN ('paved', 'asphalt', 'cobblestone', 
'cobblestone:flattened', 'sett', 'concrete', 'concrete:lanes', 
+                  'concrete:plates', 'paving_stones', 'metal', 'wood') THEN 
'paved' 
+                  ELSE null END END AS int_surface,
                 CASE WHEN access IN ('destination') THEN 'destination'::text
                   WHEN access IN ('no', 'private') THEN 'no'::text
                   ELSE NULL
@@ -1081,8 +1111,11 @@ Layer:
             ) AS feature,
             CASE WHEN tunnel = 'yes' OR tunnel = 'building_passage' OR covered 
= 'yes' THEN 'yes' ELSE 'no' END AS int_tunnel,
             CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 
'yes' ELSE 'no' END AS link,
-            CASE WHEN surface IN ('unpaved', 'compacted', 'dirt', 'earth', 
'fine_gravel', 'grass', 
-                       'grass_paver', 'gravel', 'ground', 'mud', 
'pebblestone', 'salt', 'sand', 'woodchips', 'clay') THEN 'unpaved' ELSE 'paved' 
END AS int_surface
+                CASE WHEN surface IN ('unpaved', 'compacted', 'dirt', 'earth', 
'fine_gravel', 'grass', 
+                  'grass_paver', 'gravel', 'ground', 'mud', 'pebblestone', 
'salt', 'sand', 'woodchips', 'clay') THEN 'unpaved' ELSE 
+                  CASE WHEN surface IN ('paved', 'asphalt', 'cobblestone', 
'cobblestone:flattened', 'sett', 'concrete', 'concrete:lanes', 
+                  'concrete:plates', 'paving_stones', 'metal', 'wood') THEN 
'paved' 
+                  ELSE null END END AS int_surface
           FROM planet_osm_roads
           WHERE highway IS NOT NULL
             OR (railway IS NOT NULL AND railway != 'preserved'
@@ -1136,7 +1169,10 @@ Layer:
                 bicycle,
                 tracktype,
                 CASE WHEN surface IN ('unpaved', 'compacted', 'dirt', 'earth', 
'fine_gravel', 'grass', 
-                       'grass_paver', 'gravel', 'ground', 'mud', 
'pebblestone', 'salt', 'sand', 'woodchips', 'clay') THEN 'unpaved' ELSE 'paved' 
END AS int_surface,
+                  'grass_paver', 'gravel', 'ground', 'mud', 'pebblestone', 
'salt', 'sand', 'woodchips', 'clay') THEN 'unpaved' ELSE 
+                  CASE WHEN surface IN ('paved', 'asphalt', 'cobblestone', 
'cobblestone:flattened', 'sett', 'concrete', 'concrete:lanes', 
+                  'concrete:plates', 'paving_stones', 'metal', 'wood') THEN 
'paved' 
+                  ELSE null END END AS int_surface,
                 CASE WHEN access IN ('destination') THEN 'destination'::text
                   WHEN access IN ('no', 'private') THEN 'no'::text
                   ELSE NULL
@@ -1579,7 +1615,7 @@ Layer:
             COALESCE(
               'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN 
aeroway ELSE NULL END,
               'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 
'caravan_site', 'chalet', 'guest_house', 'hostel', 'hotel', 'motel', 
'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,
-              'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 
'bar', 'bicycle_rental', 'bus_station', 'cafe', 'car_rental', 'car_sharing', 
'cinema', 'clinic', 'fire_station', 'fuel', 'hospital', 'ice_cream', 'embassy', 
'library', 'courthouse', 'townhall', 'parking', 'bicycle_parking', 
'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship', 
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 
'restaurant', 'food_court', 'fast_food', 'tel [...]
+              'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 
'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 
'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 
'bicycle_parking', 'motorcycle_parking', 'police', 'fire_station', 
'place_of_worship', 'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 
'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 
'hospital', 'ice_cream', 'pharmacy', 'doctors', 'de [...]
               'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'beauty', 
'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 
'convenience', 'department_store', 'doityourself', 'hardware', 'florist', 
'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 
'bicycle', 'mall', 'pet', 'photo', 'photo_studio', 'photography', 'seafood', 
'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle', 
'musical_instrument', 'newsagent', 'o [...]
               'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 
'miniature_golf', 'golf_course', 'picnic_table') THEN leisure ELSE NULL END,
               'man_made_' || CASE WHEN man_made IN ('mast', 'water_tower', 
'lighthouse', 'windmill') THEN man_made ELSE NULL END,
@@ -1599,7 +1635,7 @@ Layer:
           -- The upcoming where clause is needed for performance only, as the 
CASE statements would end up doing the equivalent filtering
           WHERE aeroway IN ('helipad', 'aerodrome')
             OR tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 
'chalet', 'guest_house', 'hostel', 'hotel', 'motel', 'information', 'museum', 
'viewpoint', 'picnic_site')
-            OR amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 
'bus_station', 'cafe', 'car_rental', 'car_sharing', 'cinema', 'clinic', 
'fire_station', 'fuel', 'hospital', 'ice_cream', 'embassy', 'library', 
'courthouse', 'townhall', 'parking', 'bicycle_parking', 'motorcycle_parking', 
'pharmacy', 'doctors', 'dentist', 'place_of_worship', 'police', 'post_box', 
'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court', 
'fast_food', 'telephone', 'emergency_pho [...]
+            OR amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 
'bus_station', 'cafe', 'car_rental', 'car_sharing', 'cinema', 'clinic', 
'community_centre', 'fire_station', 'fuel', 'hospital', 'ice_cream', 'embassy', 
'library', 'courthouse', 'townhall', 'parking', 'bicycle_parking', 
'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship', 
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 
'restaurant', 'food_court', 'fast_food', 'teleph [...]
             OR shop IS NOT NULL -- skip checking a huge list and use a null 
check
             OR leisure IN ('water_park', 'playground', 'miniature_golf', 
'golf_course', 'picnic_table')
             OR man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill')
@@ -1625,7 +1661,7 @@ Layer:
             COALESCE(
               'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN 
aeroway ELSE NULL END,
               'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 
'caravan_site', 'chalet', 'guest_house', 'hostel', 'hotel', 'motel', 
'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,
-              'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 
'bar', 'bicycle_rental', 'bus_station', 'cafe', 'car_rental', 'car_sharing', 
'cinema', 'clinic', 'fire_station', 'fuel', 'hospital', 'ice_cream', 'embassy', 
'library', 'courthouse', 'townhall', 'parking', 'bicycle_parking', 
'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship', 
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 
'restaurant', 'food_court', 'fast_food', 'tel [...]
+              'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 
'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 
'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 
'bicycle_parking', 'motorcycle_parking', 'police', 'fire_station', 
'place_of_worship', 'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 
'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 
'hospital', 'ice_cream', 'pharmacy', 'doctors', 'de [...]
               'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'beauty', 
'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 
'convenience', 'department_store', 'doityourself', 'hardware', 'florist', 
'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 
'bicycle', 'mall', 'pet', 'photo', 'photo_studio', 'photography', 'seafood', 
'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle', 
'musical_instrument', 'newsagent', 'o [...]
               'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 
'miniature_golf', 'golf_course', 'picnic_table', 'slipway') THEN leisure ELSE 
NULL END,
               'man_made_' || CASE WHEN man_made IN ('mast', 'water_tower', 
'lighthouse', 'windmill') THEN man_made ELSE NULL END,
@@ -1653,7 +1689,7 @@ Layer:
           -- The upcoming where clause is needed for performance only, as the 
CASE statements would end up doing the equivalent filtering
           WHERE aeroway IN ('helipad', 'aerodrome')
             OR tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 
'chalet', 'guest_house', 'hostel', 'hotel', 'motel', 'information', 'museum', 
'viewpoint', 'picnic_site')
-            OR amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 
'bus_station', 'cafe', 'car_rental', 'car_sharing', 'cinema', 'clinic', 
'fire_station', 'fuel', 'hospital', 'ice_cream', 'embassy', 'library', 
'courthouse', 'townhall', 'parking', 'bicycle_parking', 'motorcycle_parking', 
'pharmacy', 'doctors', 'dentist', 'place_of_worship', 'police', 'post_box', 
'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court', 
'fast_food', 'telephone', 'emergency_pho [...]
+            OR amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 
'bus_station', 'cafe', 'car_rental', 'car_sharing', 'cinema', 'clinic', 
'community_centre', 'fire_station', 'fuel', 'hospital', 'ice_cream', 'embassy', 
'library', 'courthouse', 'townhall', 'parking', 'bicycle_parking', 
'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship', 
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 
'restaurant', 'food_court', 'fast_food', 'teleph [...]
             OR shop IS NOT NULL -- skip checking a huge list and use a null 
check
             OR leisure IN ('water_park', 'playground', 'miniature_golf', 
'golf_course', 'picnic_table', 'slipway')
             OR man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill')
@@ -1746,6 +1782,25 @@ Layer:
     properties:
       minzoom: 11
     advanced: {}
+  - id: "bridge-text"
+    name: "bridge-text"
+    class: ""
+    geometry: "polygon"
+    <<: *extents
+    Datasource:
+      <<: *osm2pgsql
+      table: |-
+        (SELECT
+            way,
+            way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS 
way_pixels,
+            man_made,
+            name
+          FROM planet_osm_polygon
+          WHERE man_made = 'bridge'
+        ) AS bridge_text
+    properties:
+      minzoom: 11
+    advanced: {}
   - id: "roads-text-ref"
     name: "roads-text-ref"
     class: ""
@@ -1848,7 +1903,7 @@ Layer:
             way,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS 
way_pixels,
             COALESCE(
-              'landuse_' || CASE WHEN landuse IN ('forest') THEN landuse ELSE 
NULL END,
+              'landuse_' || CASE WHEN landuse IN ('forest', 'military') THEN 
landuse ELSE NULL END,
               'natural_' || CASE WHEN "natural" IN ('wood', 'glacier', 'sand', 
'scree', 'shingle', 'bare_rock') THEN "natural" ELSE NULL END,
               'place_' || CASE WHEN place IN ('island') THEN place ELSE NULL 
END,
               'boundary_' || CASE WHEN boundary IN ('national_park') THEN 
boundary ELSE NULL END,
@@ -1857,7 +1912,7 @@ Layer:
             name,
             CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' 
END AS is_building -- always no with the where conditions
           FROM planet_osm_polygon
-          WHERE (landuse IN ('forest')
+          WHERE (landuse IN ('forest', 'military')
               OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 
'bare_rock')
               OR "place" IN ('island')
               OR boundary IN ('national_park')
@@ -1886,7 +1941,7 @@ Layer:
             COALESCE(
               'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 
'aerodrome') THEN aeroway ELSE NULL END,
               'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'hotel', 
'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', 
'theme_park', 'museum', 'zoo', 'information', 'picnic_site') THEN tourism ELSE 
NULL END,
-              'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 
'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 
'courthouse', 'townhall', 'cinema', 'clinic', 'parking', 'bicycle_parking', 
'motorcycle_parking', 'police', 'fire_station', 'place_of_worship', 
'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 
'university', 'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 
'pharmacy', 'doctors', 'dentist', 'atm', 'bicy [...]
+              'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 
'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 
'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 
'bicycle_parking', 'motorcycle_parking', 'police', 'fire_station', 
'place_of_worship', 'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 
'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 
'hospital', 'ice_cream', 'pharmacy', 'doctors', 'de [...]
               'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'beauty', 
'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 
'convenience', 'department_store', 'doityourself', 'hardware', 'florist', 
'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 
'bicycle', 'mall', 'pet', 'photo', 'photo_studio', 'photography', 'seafood', 
'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle', 
'musical_instrument', 'newsagent', 'o [...]
               'leisure_' || CASE WHEN leisure IN ('swimming_pool', 
'water_park', 'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 
'track', 'pitch', 'playground', 'park', 'recreation_ground', 'common', 
'garden', 'nature_reserve', 'marina', 'picnic_table') THEN leisure ELSE NULL 
END,
               'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 
'recreation_ground', 'conservation', 'village_green', 'quarry', 'vineyard', 
'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 
'allotments', 'forest', 'farmyard', 'farm', 'farmland', 
'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 
'brownfield', 'landfill', 'construction', 'military') THEN landuse ELSE NULL 
END,
@@ -1911,7 +1966,7 @@ Layer:
           -- The upcoming where clause is needed for performance only, as the 
CASE statements would end up doing the equivalent filtering
           WHERE (aeroway IN ('gate', 'apron', 'helipad', 'aerodrome')
               OR tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 
'chalet', 'guest_house', 'camp_site', 'caravan_site', 'theme_park', 'museum', 
'attraction', 'zoo', 'information', 'picnic_site')
-              OR amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 
'fast_food', 'biergarten', 'bar', 'library', 'theatre', 'courthouse', 
'townhall', 'cinema', 'clinic', 'parking', 'bicycle_parking', 
'motorcycle_parking', 'police', 'fire_station', 'place_of_worship', 
'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 
'university', 'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 
'pharmacy', 'doctors', 'dentist', 'atm', 'bicycle_rental', 'car_ren [...]
+              OR amenity IN ('shelter', 'atm', 'bank', 'bar', 
'bicycle_rental', 'bus_station', 'cafe', 'car_rental', 'car_sharing', 'cinema', 
'clinic', 'community_centre', 'fire_station', 'fuel', 'hospital', 'ice_cream', 
'embassy', 'library', 'courthouse', 'townhall', 'parking', 'bicycle_parking', 
'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship', 
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 
'restaurant', 'food_court', 'fast_food', 'tele [...]
               OR shop IS NOT NULL -- skip checking a huge list and use a null 
check
               OR leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 
'golf_course', 'sports_centre', 'stadium', 'track', 'pitch', 'playground', 
'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 
'picnic_table')
               OR landuse IN ('reservoir', 'basin', 'recreation_ground', 
'conservation', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 
'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 
'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'retail', 
'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 
'construction', 'military')
@@ -1992,7 +2047,7 @@ Layer:
                 COALESCE(
                   'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 
'helipad', 'aerodrome') THEN aeroway ELSE NULL END,
                   'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'hotel', 
'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', 
'theme_park', 'museum', 'zoo', 'information', 'picnic_site') THEN tourism ELSE 
NULL END,
-                  'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 
'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 
'courthouse', 'townhall', 'cinema', 'clinic', 'parking', 'bicycle_parking', 
'motorcycle_parking', 'police', 'fire_station', 'place_of_worship', 
'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 
'university', 'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 
'pharmacy', 'doctors', 'dentist', 'atm', ' [...]
+                  'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 
'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 
'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 
'bicycle_parking', 'motorcycle_parking', 'police', 'fire_station', 
'place_of_worship', 'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 
'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 
'hospital', 'ice_cream', 'pharmacy', 'doctors', [...]
                   'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 
'beauty', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 
'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 
'florist', 'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 
'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio', 'photography', 
'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 
'motorcycle', 'musical_instrument', 'newsagent' [...]
                   'leisure_' || CASE WHEN leisure IN ('swimming_pool', 
'water_park', 'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 
'track', 'pitch', 'playground', 'park', 'recreation_ground', 'common', 
'garden', 'nature_reserve', 'marina', 'slipway', 'picnic_table') THEN leisure 
ELSE NULL END,
                   'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 
'recreation_ground', 'conservation', 'village_green', 'quarry', 'vineyard', 
'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 
'allotments', 'forest', 'farmyard', 'farm', 'farmland', 
'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 
'brownfield', 'landfill', 'construction', 'military') THEN landuse ELSE NULL 
END,
@@ -2026,7 +2081,7 @@ Layer:
               -- The upcoming where clause is needed for performance only, as 
the CASE statements would end up doing the equivalent filtering
               WHERE (aeroway IN ('gate', 'apron', 'helipad', 'aerodrome')
                   OR tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 
'chalet', 'guest_house', 'camp_site', 'caravan_site', 'theme_park', 'museum', 
'attraction', 'zoo', 'information', 'viewpoint', 'picnic_site')
-                  OR amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 
'fast_food', 'biergarten', 'bar', 'library', 'theatre', 'courthouse', 
'townhall', 'cinema', 'clinic', 'parking', 'bicycle_parking', 
'motorcycle_parking', 'police', 'fire_station', 'place_of_worship', 
'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 
'university', 'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 
'pharmacy', 'doctors', 'dentist', 'atm', 'bicycle_rental', 'car [...]
+                  OR amenity IN ('shelter', 'atm', 'bank', 'bar', 
'bicycle_rental', 'bus_station', 'cafe', 'car_rental', 'car_sharing', 'cinema', 
'clinic', 'community_centre', 'fire_station', 'fuel', 'hospital', 'ice_cream', 
'embassy', 'library', 'courthouse', 'townhall', 'parking', 'bicycle_parking', 
'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship', 
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 
'restaurant', 'food_court', 'fast_food', ' [...]
                   OR shop IS NOT NULL -- skip checking a huge list and use a 
null check
                   OR leisure IN ('swimming_pool', 'water_park', 
'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 'track', 'pitch', 
'playground', 'park', 'recreation_ground', 'common', 'garden', 
'nature_reserve', 'marina', 'slipway', 'picnic_table')
                   OR landuse IN ('reservoir', 'basin', 'recreation_ground', 
'conservation', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 
'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 
'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'retail', 
'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 
'construction', 'military')
diff --git a/roads.mss b/roads.mss
index 7ed116c..98c2851 100644
--- a/roads.mss
+++ b/roads.mss
@@ -98,8 +98,8 @@
 @living-street-width-z15:         6;
 @pedestrian-width-z15:            6;
 @bridleway-width-z15:             1.2;
-@footway-width-z15:               1.5;
-@cycleway-width-z15:              1.3;
+@footway-width-z15:               1;
+@cycleway-width-z15:              0.9;
 @path-width-z15:                  0.5;
 @track-width-z15:                 1.5;
 @track-grade1-width-z15:          0.75;
@@ -111,6 +111,8 @@
 @pedestrian-width-z16:            9;
 @service-width-z16:               6;
 @minor-service-width-z16:         4;
+@footway-width-z16:               1.3;
+@cycleway-width-z16:              0.9;
 
 @motorway-width-z17:             18;
 @motorway-link-width-z17:        11.5;
@@ -123,8 +125,11 @@
 @pedestrian-width-z17:           14;
 @service-width-z17:               7;
 
-@footway-width-z19:               1.8;
-@cycleway-width-z19:              1.6;
+@footway-width-z18:               1.3;
+@cycleway-width-z18:              1;
+
+@footway-width-z19:               1.6;
+@cycleway-width-z19:              1.3;
 
 @casing-width-z12:                0.5;
 @casing-width-z13:                0.5;
@@ -414,6 +419,8 @@
         [zoom >= 15] {
           line-width: @footway-width-z13 + 2 * (@paths-background-width + 
@paths-bridge-casing-width);
           [zoom >= 15] { line-width: @footway-width-z15 + 2 * 
(@paths-background-width + @paths-bridge-casing-width); }
+          [zoom >= 16] { line-width: @footway-width-z16 + 2 * 
(@paths-background-width + @paths-bridge-casing-width); }
+          [zoom >= 18] { line-width: @footway-width-z18 + 2 * 
(@paths-background-width + @paths-bridge-casing-width); }
           [zoom >= 19] { line-width: @footway-width-z19 + 2 * 
(@paths-background-width + @paths-bridge-casing-width); }
           line-color: @bridge-casing;
           line-join: round;
@@ -424,6 +431,8 @@
         [zoom >= 15] {
           line-width: @footway-width-z13 + 2 * (@paths-background-width + 
@paths-tunnel-casing-width);
           [zoom >= 15] { line-width: @footway-width-z15 + 2 * 
(@paths-background-width + @paths-tunnel-casing-width); }
+          [zoom >= 16] { line-width: @footway-width-z16 + 2 * 
(@paths-background-width + @paths-tunnel-casing-width); }
+          [zoom >= 18] { line-width: @footway-width-z18 + 2 * 
(@paths-background-width + @paths-tunnel-casing-width); }
           [zoom >= 19] { line-width: @footway-width-z19 + 2 * 
(@paths-background-width + @paths-bridge-casing-width); }
           line-color: @tunnel-casing;
           line-dasharray: 4,2;
@@ -438,6 +447,8 @@
         [zoom >= 15] {
           line-width: @cycleway-width-z13 + 2 * (@paths-background-width + 
@paths-bridge-casing-width);
           [zoom >= 15] { line-width: @cycleway-width-z15 + 2 * 
(@paths-background-width + @paths-bridge-casing-width); }
+          [zoom >= 16] { line-width: @cycleway-width-z16 + 2 * 
(@paths-background-width + @paths-bridge-casing-width); }
+          [zoom >= 18] { line-width: @cycleway-width-z18 + 2 * 
(@paths-background-width + @paths-bridge-casing-width); }
           [zoom >= 19] { line-width: @cycleway-width-z19 + 2 * 
(@paths-background-width + @paths-bridge-casing-width); }
           line-color: @bridge-casing;
           line-join: round;
@@ -448,6 +459,8 @@
         [zoom >= 15] {
           line-width: @cycleway-width-z13 + 2 * (@paths-background-width + 
@paths-tunnel-casing-width);
           [zoom >= 15] { line-width: @cycleway-width-z15 + 2 * 
(@paths-background-width + @paths-tunnel-casing-width); }
+          [zoom >= 16] { line-width: @cycleway-width-z16 + 2 * 
(@paths-background-width + @paths-tunnel-casing-width); }
+          [zoom >= 18] { line-width: @cycleway-width-z18 + 2 * 
(@paths-background-width + @paths-tunnel-casing-width); }
           [zoom >= 19] { line-width: @cycleway-width-z19 + 2 * 
(@paths-background-width + @paths-bridge-casing-width); }
           line-color: @tunnel-casing;
           line-dasharray: 4,2;
@@ -630,6 +643,8 @@
         [zoom >= 15] {
           line-width: @footway-width-z13 + 2 * @paths-background-width;
           [zoom >= 15] { line-width: @footway-width-z15 + 2 * 
@paths-background-width; }
+          [zoom >= 16] { line-width: @footway-width-z16 + 2 * 
@paths-background-width; }
+          [zoom >= 18] { line-width: @footway-width-z18 + 2 * 
@paths-background-width; }
           [zoom >= 19] { line-width: @footway-width-z19 + 2 * 
@paths-background-width; }
           line-color: @footway-casing;
           line-join: round;
@@ -643,6 +658,8 @@
           line-join: round;
           line-width: @footway-width-z13 + 2 * @paths-background-width;
           [zoom >= 15] { line-width: @footway-width-z15 + 2 * 
@paths-background-width; }
+          [zoom >= 16] { line-width: @footway-width-z16 + 2 * 
@paths-background-width; }
+          [zoom >= 18] { line-width: @footway-width-z18 + 2 * 
@paths-background-width; }
           [zoom >= 19] { line-width: @footway-width-z19 + 2 * 
@paths-background-width; }
         }
       }
@@ -655,6 +672,8 @@
         [zoom >= 15] {
           line-width: @cycleway-width-z13 + 2 * @paths-background-width;
           [zoom >= 15] { line-width: @cycleway-width-z15 + 2 * 
@paths-background-width; }
+          [zoom >= 16] { line-width: @cycleway-width-z16 + 2 * 
@paths-background-width; }
+          [zoom >= 18] { line-width: @cycleway-width-z18 + 2 * 
@paths-background-width; }
           [zoom >= 19] { line-width: @cycleway-width-z19 + 2 * 
@paths-background-width; }
           line-color: @cycleway-casing;
           line-join: round;
@@ -668,6 +687,8 @@
           line-join: round;
           line-width: @cycleway-width-z13 + 2 * @paths-background-width;
           [zoom >= 15] { line-width: @cycleway-width-z15 + 2 * 
@paths-background-width; }
+          [zoom >= 16] { line-width: @cycleway-width-z16 + 2 * 
@paths-background-width; }
+          [zoom >= 18] { line-width: @cycleway-width-z18 + 2 * 
@paths-background-width; }
           [zoom >= 19] { line-width: @cycleway-width-z19 + 2 * 
@paths-background-width; }
         }
       }
@@ -1292,6 +1313,12 @@ tertiary is rendered from z10 and is not included in 
osm_planet_roads. */
           background/line-join: round;
           background/line-width: @footway-width-z15 + 2 * 
@paths-background-width;
           background/line-opacity: 0.4;
+          [zoom >= 16] {
+            background/line-width: @footway-width-z16 + 2 * 
@paths-background-width;
+          }
+          [zoom >= 18] {
+            background/line-width: @footway-width-z18 + 2 * 
@paths-background-width;
+          }
           [zoom >= 19] {
             background/line-width: @footway-width-z19 + 2 * 
@paths-background-width;
           }
@@ -1302,17 +1329,53 @@ tertiary is rendered from z10 and is not included in 
osm_planet_roads. */
         line/line-cap: round;
         line/line-width: @footway-width-z13;
         [zoom >= 15][int_surface = 'paved'] {
-          line/line-width:  @footway-width-z15;
+          line/line-dasharray: 2,3.5;
+          line/line-width: @footway-width-z15;
+          [zoom >= 16] {
+            line/line-dasharray: 3,3.5;
+            line/line-width: @footway-width-z16;
+          }
+          [zoom >= 17] {
+            line/line-dasharray: 3,3;
+          }
+          [zoom >= 18] {
+            line/line-width: @footway-width-z18;
+          }
+          [zoom >= 19] {
+            line/line-width: @footway-width-z19;
+          }
+        }
+        [zoom >= 15][int_surface = null] {
+          line/line-color: @footway-fill;
+          line/line-dasharray: 1,3,2,4;
+          line/line-join: round;
+          line/line-cap: round;
+          line/line-width: @footway-width-z15;
+          [zoom >= 16] {
+            line/line-dasharray: 1,4,2,3;
+            line/line-width: @footway-width-z16;
+          }
+          [zoom >= 18] {
+            line/line-width: @footway-width-z18;
+          }
           [zoom >= 19] {
-            line/line-width:  @footway-width-z19;          
+            line/line-width: @footway-width-z19;
           }
         }
         [zoom >= 15][int_surface = 'unpaved'] {
-          line/line-dasharray: 0.5,2.5;
-          line/line-width:  @footway-width-z15/1.7;
+          line/line-color: @footway-fill;
+          line/line-dasharray: 1,4;
+          line/line-join: round;
+          line/line-cap: round;
+          line/line-width: @footway-width-z15;
+          [zoom >= 16] {
+            line/line-width: @footway-width-z16;
+          }
+          [zoom >= 18] {
+            line/line-width: @footway-width-z18;
+          }
           [zoom >= 19] {
-            line/line-dasharray: 0.8,2.5;
-            line/line-width:  @footway-width-z19/1.7;
+            line/line-width: @footway-width-z19;
           }
         }
       }
@@ -1328,6 +1391,12 @@ tertiary is rendered from z10 and is not included in 
osm_planet_roads. */
           background/line-join: round;
           background/line-width: @cycleway-width-z15 + 2 * 
@paths-background-width;
           background/line-opacity: 0.4;
+          [zoom >= 16] {
+            background/line-width: @cycleway-width-z16 + 2 * 
@paths-background-width;
+          }
+          [zoom >= 18] {
+            background/line-width: @cycleway-width-z18 + 2 * 
@paths-background-width;
+          }
           [zoom >= 19] {
             background/line-width: @cycleway-width-z19 + 2 * 
@paths-background-width;
           }
@@ -1338,17 +1407,53 @@ tertiary is rendered from z10 and is not included in 
osm_planet_roads. */
         line/line-cap: round;
         line/line-width: @cycleway-width-z13;
         [zoom >= 15][int_surface = 'paved'] {
-          line/line-width:  @cycleway-width-z15;
+          line/line-dasharray: 2,3.5;
+          line/line-width: @cycleway-width-z15;
+          [zoom >= 16] {
+            line/line-dasharray: 3,3.5;
+            line/line-width: @cycleway-width-z16;
+          }
+          [zoom >= 17] {
+            line/line-dasharray: 3,3;
+          }
+          [zoom >= 18] {
+            line/line-width: @cycleway-width-z18;
+          }
           [zoom >= 19] {
-            line/line-width:  @cycleway-width-z19;          
+            line/line-width: @cycleway-width-z19;
+          }
+        }
+        [zoom >= 15][int_surface = null] {
+          line/line-color: @cycleway-fill;
+          line/line-dasharray: 1,3,2,4;
+          line/line-join: round;
+          line/line-cap: round;
+          line/line-width: @cycleway-width-z15;
+          [zoom >= 16] {
+            line/line-dasharray: 1,4,2,3;
+            line/line-width: @cycleway-width-z16;
+          }
+          [zoom >= 18] {
+            line/line-width: @cycleway-width-z18;
+          }
+          [zoom >= 19] {
+            line/line-width: @cycleway-width-z19;
           }
         }
         [zoom >= 15][int_surface = 'unpaved'] {
-          line/line-dasharray: 0.5,2.5;
-          line/line-width:  @cycleway-width-z15/1.7;
+          line/line-color: @cycleway-fill;
+          line/line-dasharray: 1,4;
+          line/line-join: round;
+          line/line-cap: round;
+          line/line-width:  @cycleway-width-z15;
+          [zoom >= 16] {
+            line/line-width:  @cycleway-width-z16;
+          }
+          [zoom >= 18] {
+            line/line-width: @cycleway-width-z18;
+          }
           [zoom >= 19] {
-            line/line-dasharray: 0.8,2.5;
-            line/line-width:  @cycleway-width-z19/1.7;
+            line/line-width:  @cycleway-width-z19;
           }
         }
       }
@@ -1974,6 +2079,35 @@ tertiary is rendered from z10 and is not included in 
osm_planet_roads. */
   }
 }
 
+#bridge-text  {
+  [man_made = 'bridge'] {
+    [zoom >= 12][way_pixels > 4] {
+      text-name: "[name]";
+      text-size: 8;
+      text-fill: black;
+      text-face-name: @book-fonts;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-min-distance: 2;
+      text-wrap-width: 30;
+      [way_pixels > 100] {
+        text-size: 9;
+      }
+      [way_pixels > 1000] {
+        text-size: 11;
+        text-halo-radius: 1.5;
+      }
+      [way_pixels > 4000] {
+        text-size: 12;
+      }
+      [way_pixels > 10000] {
+        text-size: 13;
+        text-halo-radius: 2;
+      }
+    }
+  }
+}
+
 .access::fill {
   [access = 'destination'] {
     [feature = 'highway_secondary'],
diff --git a/shapefiles.mss b/shapefiles.mss
index f67fb5e..4edbb72 100644
--- a/shapefiles.mss
+++ b/shapefiles.mss
@@ -1,7 +1,7 @@
 #necountries {
   [zoom >= 1][zoom < 4] {
     line-width: 0.5;
-    line-color: grey;
+    line-color: @admin-boundaries;
   }
 }
 
diff --git a/symbols/community_centre-14.svg b/symbols/community_centre-14.svg
new file mode 100644
index 0000000..bd6e94e
--- /dev/null
+++ b/symbols/community_centre-14.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="100%"
+   width="100%"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     style="fill:none;stroke:none;visibility:hidden"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     d="M 11.473506,2.5 C 11.473506,3.328427 10.813795,4 10,4 9.1862051,4 
8.5264938,3.328427 8.5264938,2.5 8.5264938,1.6715729 9.1862051,1 10,1 c 
0.813795,0 1.473506,0.6715729 1.473506,1.5 z M 3,6 5,6 5,9 3,9 Z M 
5.4735062,2.5 C 5.4735062,3.328427 4.8137949,4 4,4 3.1862051,4 
2.5264938,3.328427 2.5264938,2.5 2.5264938,1.6715729 3.1862051,1 4,1 
4.8137949,1 5.4735062,1.6715729 5.4735062,2.5 Z M 0,5 7,5 7,6 0,6 Z M 1,13 3,9 
4,9 2,13 Z M 7,13 5,9 4,9 6,13 Z M 9,6 11,6 11,9 9,9 Z M 7,5 14,5 14 [...]
+     
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
+     id="path4139-0" />
+</svg>
diff --git a/symbols/quarry.png b/symbols/quarry.png
index bfabdc7..d541fc0 100644
Binary files a/symbols/quarry.png and b/symbols/quarry.png differ
diff --git a/symbols/veterinary-14.svg b/symbols/veterinary-14.svg
new file mode 100644
index 0000000..be0dda0
--- /dev/null
+++ b/symbols/veterinary-14.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 4.939089,0.12499997 c -1.4191217,0 -1.6451859,1.93046953 
-1.28125,2.90625003 C 3.8887816,3.6542301 4.5922019,4.2560356 5.314089,4 
6.2476315,3.5384628 6.5113975,2.3550377 6.251589,1.4375 6.1256004,0.82627427 
5.6379877,0.12499997 4.939089,0.12499997 z m 3.96875,0 c -0.698899,0 
-1.186511,0.7012743 -1.3125,1.31250003 C 7.335531,2.3550377 7.599299,3.5384628 
8.532839,4 9.254726,4.2560356 9.9581461,3.6542301 10.189089,3.03125 
10.553025,2.0554695 10.326961,0.12499997 8.907839,0.1249999 [...]
+     id="veterinary"
+     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+</svg>

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to