Updated documentation to match previous changes for harbor->harbour a…

…nd gaming->adult_gaming_centre. Altered min_zooms for port or harbour-related landuse.

docs/layers.md

@@ -526,7 +526,7 @@ _TIP: Some `landuse` features only exist as point features in OpenStreetMap. Fin
 * `groyne`
 * `guard_rail`
 * `hanami`
-* `harbor` (a.k.a harbour)
+* `harbour`
 * `hospital`
 * `industrial`
 * `kerb`
@@ -762,6 +762,7 @@ To resolve inconsistency in data tagging in OpenStreetMap we normalize several o
 * `accountant`
 * `adit`
 * `administrative`
+* `adult_gaming_centre`
 * `advertising_agency`
 * `aerodrome`
 * `aeroway_gate`
@@ -890,7 +891,6 @@ To resolve inconsistency in data tagging in OpenStreetMap we normalize several o
 * `fuel` - Fuel stations provide liquid gas (or diesel) for automotive use.
 * `furniture`
 * `gallery` - An art gallery.
-* `gaming`
 * `garden` - _See planned bug fixes in [#1085](https://github.com/tilezen/vector-datasource/issues/1085)._
 * `gardener`
 * `garden_centre`
@@ -903,7 +903,7 @@ To resolve inconsistency in data tagging in OpenStreetMap we normalize several o
 * `golf_course`
 * `government`
 * `greengrocer` - Shop selling fruits and vegetables.
-* `grocery` - Shop selling non-perishable foods.
+* `grocery` - Shop selling non-perishable food often similar to, but smaller than, a `supermarket`. See also [grocery store on Wikipedia](https://en.wikipedia.org/wiki/Grocery_store).
 * `group_home`
 * `guest_house`
 * `hairdresser`

integration-test/1423-kinds-for-maki-icon-library-support.py

@@ -1688,6 +1688,7 @@ def test_shipyard_way(self):
             z, x, y, 'landuse', {
                 'id': 398258882,
                 'kind': u'shipyard',
+                'min_zoom': 15,
             })
 
     def test_wharf_way(self):
@@ -1708,6 +1709,7 @@ def test_wharf_way(self):
             z, x, y, 'landuse', {
                 'id': 184311022,
                 'kind': u'wharf',
+                'min_zoom': 16,
             })
 
     def test_quay_way(self):
@@ -1728,6 +1730,7 @@ def test_quay_way(self):
             z, x, y, 'landuse', {
                 'id': 45061639,
                 'kind': u'quay',
+                'min_zoom': 16,
             })
 
     def test_naval_base_way(self):

yaml/landuse.yaml

@@ -610,6 +610,8 @@ filters:
   # port, ferry, container terminals
   - filter:
       landuse:
+        - harbour
+        - port
         - port_terminal
         - ferry_terminal
         - container_terminal
@@ -1134,9 +1136,13 @@ filters:
       kind_detail: {col: "crane:type"}
   - filter:
       landuse:
-        - harbour
-        - port
         - shipyard
+    min_zoom: 15
+    output:
+      <<: *output_properties
+      kind: {col: landuse}
+  - filter:
+      landuse:
         - wharf
         - quay
     min_zoom: 16