diff --git a/VERSION b/VERSION
index b7c0a9b1d..a20e2d82d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v1.6.0
+v1.7.0
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index c80e4e922..bc9564340 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,3 +1,159 @@
+v1.7.0
+------
+* **Release date:** 2019-02-15.
+* **Requires:** [tileserver v2.2.0](https://github.com/tilezen/tileserver/releases/tag/v2.2.0) and [tilequeue v2.3.0](https://github.com/tilezen/tilequeue/releases/tag/v2.3.0) and [rawr_tiles v1.0.0](https://github.com/tilezen/raw_tiles/releases/tag/v1.0.0) and [coanacatl v1.0.0](https://github.com/tilezen/coanacatl/releases/tag/v1.0.0).
+
+  #### ENHANCEMENTS
+
+  * **all layers**: Add `collision_rank` property for label collisions for **pois** layer, and other layers for features with `name` properties, or `ref`, `shield_text`, `bicycle_shield_text`, `bus_shield_text`, or `walking_shield_text`. We now recommend colliding labels client side first with `min_zoom`, and then to tie break with the new `collision_rank` values. (Issue [#988](https://github.com/tilezen/vector-datasource/issues/988))
+  * **boundaries**: Adds support for alternate points of view in boundaries layer with `kind:*` properties (like `kind:iso`). Currently this is only for zooms 5, 6 and 7 from Natural Earth. We plan to add more lower zoom data from Natural Earth, and high-zoom data from OpenStreetMap in the next release. (Issue [#1552](https://github.com/tilezen/vector-datasource/issues/1552)) The following country and international organizations worldviews are supported: 
+    * Argentina (`ar`), Bangladesh (`bd`), Brazil (`br`), China (`cn`), Egypt (`eg`), France (`fr`), Germany (`de`), Greece (`gr`), India (`in`), Indonesia (`id`), Israel (`il`), Italy (`it`), Japan (`jp`), Morocco (`ma`), Nepal (`np`), Netherlands (`nl`), Pakistan (`pk`), Palestine (`ps`), Poland (`pl`), Portugal (`pt`), Russia (`ru`), Saudi Arabia (`sa`), South Korea (`ko`), Spain (`es`), Sweden (`se`), Taiwan (`tw`), Turkey (`tr`), United Kingdom (`gb`), United States (`us`), Vietnam (`vn`), ISO (`iso`)
+  * **boundaries**: Add new disputed boundary lines with kind values of `disputed_breakaway`, `disputed_claim`, `disputed_elusive`, `disputed_reference_line`, from Natural Earth at low zooms, for alternate points of view (Issue [#1552](https://github.com/tilezen/vector-datasource/issues/1552))
+  * **landuse**: Remap landuse kinds at mid- and low-zooms to improve merging. This is similar to what we already did for roads. (Issue [#1779](https://github.com/tilezen/vector-datasource/issues/1779))
+  * **landuse**: Additional landuse kind merging at low- and mid-zooms, including to `urban_area` which was previously low-zoom only. (Issues [#1721](https://github.com/tilezen/vector-datasource/issues/1721) and [#1795](https://github.com/tilezen/vector-datasource/issues/1795))
+  * **landuse**: Add new kinds for `grassland`, `vineyard`, `bare_rock`, `barren` (low- and mid-zooms only), `desert`, `heath`, `sand`, `shingle`, and other natural "landcover" features, starting at zoom 9 (Issue [#1259](https://github.com/tilezen/vector-datasource/issues/1259))
+  * **landuse**: Add `kind_detail` property for `wetland` features. If available, value will be one of: `bog`, `fen`, `mangrove`, `marsh`, `mud`, `reedbed`, `saltern`, `saltmarsh`, `string_bog`, `swamp`, `tidalflat`, `wet_meadow`. (Issue [#1253](https://github.com/tilezen/vector-datasource/issues/1253))
+  * **landuse**: Add `low_emission_zone` kind data, added to schema in v1.6. (Issue [#1553](https://github.com/tilezen/vector-datasource/issues/1553))
+  * **pois**: Add `wetland` kind, with `kind_detail`, see landuse item above for values.
+  * **pois**: Add `common` kind, to match the existing landuse layer polygons.
+  * **roads**: Populate data for truck `hgv` routing restriction properties and related shields (whitelisted: `agricultural`, `delivery`, `designated`, `destination`, `local`, `no`), added to schema in v1.6, including `maxweight`, `maxheight`, `maxwidth`, `maxlength`, `maxaxleload`, `hazmat`. (Issue [#1553](https://github.com/tilezen/vector-datasource/issues/1553))
+  * **roads**: Add `toll` and `toll_hgv` boolean properties. (Issue [#1553](https://github.com/tilezen/vector-datasource/issues/1553)
+  * **places**: Add `population_rank` property to `locality`, `region`, `country`, and other kinds useful for setting text size and colliding labels. An integar value from 0 (no population) up to 18 (over 1 billion people). See documentation for more details.
+  * **traffic_flow**: Add `road_kind_detail` property to enable data-driven client-side traffic line offseting, thanks [@zaczkows](https://github.com/zaczkows)! (Issue [#1829](https://github.com/tilezen/vector-datasource/issues/1829))
+  * **traffic_flow**: Add `is_hov_lane` property to enable client-side filtering, thanks [@conor-ettinoffe-here](https://github.com/conor-ettinoffe-here)! (PR [#1831](https://github.com/tilezen/vector-datasource/issues/1831))
+  * **traffic_incidents**: Add `is_hov_lane` property to enable client-side filtering, thanks [@conor-ettinoffe-here](https://github.com/conor-ettinoffe-here)! (PR [#1831](https://github.com/tilezen/vector-datasource/issues/1831))
+
+  #### BUG FIXES
+
+  * **landuse**: Fix v1.6 regression where `aerodrome` polygons sorted above `runway` and `taxiway` polygons in error, thanks [@bcamper](https://github.com/bcamper)! (Issue [#1814](https://github.com/tilezen/vector-datasource/issues/1814))
+  * **landuse**: Add additional filter for newer OSM `area:aeroway` tagging of `runway`, `taxiway`, and `apron` polygons to restore features from prior year's tile builds. (Issue [#1814](https://github.com/tilezen/vector-datasource/issues/1814))
+  * **landuse**: Better differentiate between parks that should be `common` instead of `national_park` (Issue [#1082](https://github.com/tilezen/vector-datasource/issues/1082))
+  * **landuse**: Better differentiate between parks that should be `park` instead of `national_park` (Issue [#1728](https://github.com/tilezen/vector-datasource/issues/1728))
+  * **landuse**: Features of kind `mud` now sorts above `water` and below `wetland` (Issue [#1753](https://github.com/tilezen/vector-datasource/issues/1753))
+  * **landuse**: Deal with US National Forest, US National Park server side performance (Issue [#475](https://github.com/tilezen/vector-datasource/issues/475))
+    * Harmonise kind assignment for `national_park`, `forest`, and other low-zoom green areas.
+    * Add `protection_title` based filtering for `national_park`.
+    * BLM managed `protected_areas` are now filtered separately in the United States.
+  * **landuse**: Change area grading of `nature_reserve` to start zoom 8+, but demote most zoom 10 features to zoom 15. (Issue [#1749](https://github.com/tilezen/vector-datasource/issues/1749))
+  * **landuse**: Show all landcover kinds consistently starting at zoom 9. (Issue [#1813](https://github.com/tilezen/vector-datasource/issues/1813))
+    * Limit generic `forest` and `natural_wood` to zoom 9+.
+    * Promote some landcover-ish landuses up a few zooms to zoom 9+, like `farm` and `farmland`, `orchard`.
+    * Limit `residential` areas to zoom 9+.
+  * **landuse**: Adjust earliest `min_zoom` for many landcover kinds (Issue [#1794](https://github.com/tilezen/vector-datasource/issues/1794))
+    * Pushed `dam`, `prison`, `fort`, `range`, and `danger_area` kinds down to z11+.
+    * Push down `aquarium`, `recreation_ground`, `track`, `sports_centre`, `wastewater_plant`, `caravan_site` to zoom 12+.
+    * Promote some `camp_site` to zoom 12+, and area grade the rest.
+    * Push down `harbour`, `port`, `port_terminal`, `ferry_terminal`, `container_terminal` to zoom 13+.
+    * Push down `enclosure`, `petting_zoo`, `aviary`, `animal`, `summer_toboggan`, `winery`, `allotments`, `pedestrian`, `playground` to zoom 13+.
+    * Push down `bridge`, `tower`, `breakwater`, `groyne`, `dike`, `cutline` to zoom 13+.
+    * Push down `footway`, `library`, `fuel`, `cinema`, `theatre`, `runway`, `taxiway`, `apron`, `trail_riding_station`, `water_park`, `dog_park`, `picnic_site`, `tree_row`, `hedge`, to zoom 13+.
+    * Limit `quarry` to zoom 13+, area graded down to zoom 16.
+    * Limit `amusement_ride`, `carousel`, `water_slide`, `roller_coaster` to zoom 15+.
+    * Limit `marsh` to z15.
+  * **landuse**: Whitelist `kind_detail` values:
+    * For _crane_ related kinds: `portal_crane`, `gantry_crane`, `travel_lift`, `floor-mounted_crane`, `shiploader`, `tower_crane`.
+    * For _religion_ related kinds: `animist`, `bahai`, `buddhist`, `caodaism`, `catholic`, `christian`, `confucian`, `hindu`, `jain`, `jewish`, `multifaith`, `muslim`, `pagan`, `pastafarian`, `scientologist`, `shinto`, `sikh`, `spiritualist`, `taoist`, `tenrikyo`, `unitarian_universalist`, `voodoo`, `yazidi`, and `zoroastrian`.
+    * For _wall_ related kinds: `dry_stone`, `noise_barrier`, `brick`, `stone`, `pise`, `castle_wall`, `seawall`, `jersey_barrier`, `flood_wall`, `concrete`, `gabion`.
+  * **pois**: Fix junk `healthcare` values and kinds introduced in v1.5. Added: `chiropractor`, `hospice`, `occupational_therapist`, `optometrist`, `paediatrics`, `physiotherapist`, `podiatrist`, `psychotherapist`, `rehabilitation`, and `speech_therapist` kinds. (Issue [#1596](https://github.com/tilezen/vector-datasource/issues/1596))
+  * **pois**: Better differentiate between parks that should be `common` instead of `national_park` (Issue [#1082](https://github.com/tilezen/vector-datasource/issues/1082))
+  * **pois**: Better differentiate between parks that should be `park` instead of `national_park` (Issue [#1728](https://github.com/tilezen/vector-datasource/issues/1728))
+  * **pois**: Deal with US National Forest, US National Park server side performance, same as landcover (Issue [#475](https://github.com/tilezen/vector-datasource/issues/475))
+  * **pois**: Prefer `forest` labels over wilderness at zoom 7 (Issue [#1608](https://github.com/tilezen/vector-datasource/issues/1608))
+  * **pois**: Add `public_transport=station` with `railway=halt` as a synonym for `station` kind. Require names on `station` features. (Issue [#1747](https://github.com/tilezen/vector-datasource/issues/1747))
+  * **pois**: Match new landuse kind and `min_zoom` changes in **landuse** layer for "parks" at low-zooms.
+  * **pois**: Clamp POIs with unlimited `min_zoom` ranges to min 13. Technically affected most kinds, though actual occurrence was rare. (Issue [#1750](https://github.com/tilezen/vector-datasource/issues/1750))
+  * **pois**: Limit `min_zoom` for POIs to at least match their landuse AOIs.
+  * **pois**: POIs for `park` labels shown too soon (Issue [#1767](https://github.com/tilezen/vector-datasource/issues/1767))
+  * **pois**: POI labels for `park` show up too late / too early (Issue [#1081](https://github.com/tilezen/vector-datasource/issues/1081))
+  * **pois**: Too many `park` and `nature_reserve` labeled at zoom 10 (Issue [#1609](https://github.com/tilezen/vector-datasource/issues/1609))
+  * **pois**: Hide early `cafe`, `restaurant` kinds to zoom 15 (Issue [#1632](https://github.com/tilezen/vector-datasource/issues/1632))
+  * **pois**: Hide early `post_office` (Issue [#1631](https://github.com/tilezen/vector-datasource/issues/1631))
+  * **pois**: Hide early `museums` and `landmarks`, show z12+. (Issue [#1630](https://github.com/tilezen/vector-datasource/issues/1630))
+  * **pois**: Hide early `prison`, show z13+. (Issue [#1630](https://github.com/tilezen/vector-datasource/issues/1630))
+  * **pois**: Hide early `atm`, `bus_stop`, `drinking_water`, `post_box`, `telephone` to zoom 18. (Issue [#1626](https://github.com/tilezen/vector-datasource/issues/1626))
+  * **pois**: Hide early `parking` when no area, show large parking lots and garages earlier based on estimated capacity (Issue [#1625](https://github.com/tilezen/vector-datasource/issues/1625))
+  * **pois**: Modify `min_zoom` of `bicycle` to area grades from zoom 15 to 17. (Issue [#1627](https://github.com/tilezen/vector-datasource/issues/1627))
+  * **pois**: Push `water_tower` zoom down depending on height: zoom 15 if taller than 20 meters, zoom 16 if taller than 10 meters, else zoom 17. (Issue [#1627](https://github.com/tilezen/vector-datasource/issues/1627))
+  * **pois**: Push `theatre` down to z15 min. (Issue [#1627](https://github.com/tilezen/vector-datasource/issues/1627))
+  * **pois**: Hide early `bicycle_parking` and `car_sharing` to z19, unless `car_sharing` has name (Issue [#1624](https://github.com/tilezen/vector-datasource/issues/1624))
+  * **pois**: Hide early `military` POIs (Issue [#1623](https://github.com/tilezen/vector-datasource/issues/1623))
+  * **pois**: Hide early `university`, `college` (Issue [#1622](https://github.com/tilezen/vector-datasource/issues/1622))
+  * **pois**: Hide early `school`, `kindergarten` (default 17 for point geoms, arae grade polyons zoom 13+) (Issue [#1621](https://github.com/tilezen/vector-datasource/issues/1621))
+  * **pois**: Hide some earlier `golf_course` (Issue [#1619](https://github.com/tilezen/vector-datasource/issues/1619))
+  * **pois**: Hide early `cemetery`  (Issue [#1611](https://github.com/tilezen/vector-datasource/issues/1611))
+  * **pois**: Limit zoom range of `range` to zoom 11+.
+  * **pois**: Limit zoom range of `quarry` to zoom 13+ (Issue [#1799](https://github.com/tilezen/vector-datasource/issues/1799))
+  * **pois**: Limit zoom range of `marsh` to zoom 15+ (Issue [#1800](https://github.com/tilezen/vector-datasource/issues/1800))
+  * **pois**: Limit zoom range of `substations` (varies by area) (Issue [#1612](https://github.com/tilezen/vector-datasource/issues/1612))
+  * **pois**: Consolidate `graveyard` and `cemetery` to share same zoom ranges (Issue [#1780](https://github.com/tilezen/vector-datasource/issues/1780))
+  * **pois**: Use same tier 2 zoom range for `nature_reserve` POIs as the landuse polygons.
+  * **pois**: Fix tier 1, 3, and 4 area thresholds to not duplicate zoom 12 test.
+  * **pois**: Fix tier3 POIs zoom 12 area threshold to 200000 (Issue [#1769](https://github.com/tilezen/vector-datasource/issues/1769))
+  * **pois**: Simplify most tier 1 & 2 POI min zooms to area-based thresholds.
+  * **pois**: Default `fitness_station` to zoom 18 instead of 17.
+  * **pois**: Whitelist `kind_detail` values:
+    * For _crane_ relaed kind: `portal_crane`, `gantry_crane`, `travel_lift`, `floor-mounted_crane`, `shiploader`, `tower_crane`.
+    * For _cuisine_ related kinds: `american`, `asian`, `barbecue`, `breakfast`, `burger`, `cake`, `chicken`, `chinese`, `coffee_shop`, `crepe`, `donut`, `fish`, `fish_and_chips`, `french`, `friture`, `georgian`, `german`, `greek`, `ice_cream`, `indian`, `international`, `italian`, `japanese`, `kebab`, `korean`, `lebanese`, `local`, `mediterranean`, `mexican`, `noodle`, `pizza`, `ramen`, `regional`, `sandwich`, `seafood`, `spanish`, `steak_house`, `sushi`, `tapas`, `thai`, `turkish`, `vegetarian`, `vietnamese`.
+    * For _health_facility_ related kinds: `CSCom`, `chemist_dispensing`, `clinic`, `counselling_centre`, `dispensary`, `first_aid`, `health_center`, `health_centre`, `hospital`, `laboratory`, `medical_clinic`, `office`, `pharmacy`.
+    * For _religion_ related kinds: `animist`, `bahai`, `buddhist`, `caodaism`, `catholic`, `christian`, `confucian`, `hindu`, `jain`, `jewish`, `multifaith`, `muslim`, `pagan`, `pastafarian`, `scientologist`, `shinto`, `sikh`, `spiritualist`, `taoist`, `tenrikyo`, `unitarian_universalist`, `voodoo`, `yazidi`, and `zoroastrian`.
+    * For _sports_ related kinds: `10pin`, `9pin`, `american_football`, `archery`, `athletics`, `badminton`, `baseball`, `basketball`, `beachvolleyball`, `billiards`, `bmx`, `boules`, `bowls`, `canoe`, `chess`, `climbing`, `cricket`, `cricket_nets`, `cycling`, `equestrian`, `exercise`, `field_hockey`, `fitness`, `football`, `free_flying`, `futsal`, `gaelic_games`, `golf`, `gymnastics`, `handball`, `hockey`, `horse_racing`, `ice_hockey`, `ice_skating`, `karting`, `model_aerodrome`, `motocross`, `motor`, `multi`, `netball`, `padel`, `pelota`, `rugby`, `rugby_league`, `rugby_union`, `running`, `scuba_diving`, `shooting`, `skateboard`, `skating`, `skiing`, `soccer`, `soccer;basketball`, `softball`, `swimming`, `table_tennis`, `team_handball`, `tennis`, `trampoline`, `volleyball`, `yoga`.
+    * For _wall_ related kinds: `dry_stone`, `noise_barrier`, `brick`, `stone`, `pise`, `castle_wall`, `seawall`, `jersey_barrier`, `flood_wall`, `concrete`, `gabion`.
+  * **boundaries**: Drop `name`, `name:left`, and `name:right` from `locality` lines at zoom 11 and 12 (Issue [#1738](https://github.com/tilezen/vector-datasource/issues/1738))
+  * **boundaries**: Fix boundary `name:left` and `name:right` values that were sometimes flipped, especially for `country` and `region` features (Issue [#1770](https://github.com/tilezen/vector-datasource/issues/1770))
+  * **boundaries**: Made `min_zoom` of `country` lines depend on the data.
+  * **roads**: Fix v1.6 regression where `runway` and `taxiway` lines were sorted below **landuse** layer polygons for the same in error, thanks [@bcamper](https://github.com/bcamper)! (Issue [#1814](https://github.com/tilezen/vector-datasource/issues/1814))
+  * **roads**: Expand `is_bridge` logic to include viaduct and any other not "no" bridges (Issue [#1314](https://github.com/tilezen/vector-datasource/issues/1314))
+  * **earth**: Add `min_zoom` properties. (Issue [#1073](https://github.com/tilezen/vector-datasource/issues/1073))
+  * **water**: 0/0/0 tile has clipped water content (Issues [#1806](https://github.com/tilezen/vector-datasource/issues/1806) and [#1107](https://github.com/tilezen/vector-datasource/issues/1107))
+  * **water**: Drop all `lake` name variants zooms 0-4 (again). Drop additional lake names and variants at mid- and high-zooms (zooms 5-15) based on area. (Issue [#1730](https://github.com/tilezen/vector-datasource/issues/1730))
+  * **water**: Update `min_zoom` of label placement points based on their inclusion in tiles, not just their raw NE data value.
+  * **water**: Extract water boundaries at zoom 8, with the switch to OSM data from NE.
+  * **places**: Don't emit `area=0` on point labels (Issue [#1825](https://github.com/tilezen/vector-datasource/issues/1825))
+  * **places**: Default `country` labels to **zoom 6** instead of 1 when there isn't Natural Earth match (Issue [#1826](https://github.com/tilezen/vector-datasource/issues/1826))
+  * **places**: Default `region` labels to **zoom 8** instead of 1 when there isn't Natural Earth match (Issue [#1826](https://github.com/tilezen/vector-datasource/issues/1826))
+
+  #### DOCUMENTATION CHANGES
+
+  * TODO: Updated TileJSON for v1.7 schema changes.
+  * Updated Layers documentation for v1.7 schema changes.
+  * Publish docs to [tilezen.readthedocs.io](https://tilezen.readthedocs.io).
+  * Update documentation formatting for ReadTheDocs.io Markdown requirements.
+  * Restructure some file layout for ReadTheDocs.io build system, including: `CHANGELOG`, `LICENSE`, `CONTRIBUTING`, `MIGRATION_GUIDE`, `PERFORMANCE`, `SEMANTIC-VERSIONING`, and `TEST` files.
+  * Corrected order of `low_emission_zone` in list.
+  * Generalized `hgv_restriction` property units to mostly meters for heavy goods vehicle truck access restrictions.
+
+  #### INTERNAL CHANGES
+
+  * Add `gunicorn` to dependencies, thanks [@rwrx](https://github.com/rwrx). [PR #1690](https://github.com/tilezen/vector-datasource/pull/1690)
+  * Bump `PyYAML` version for CVE-2017-18342.
+  * Stop using `tags->` in YAML (Issue [#1199](https://github.com/tilezen/vector-datasource/issues/1199))
+  * Add ability to make tests from relations
+  * Estimate `capacity` for parking lots and garages based on area and parking type with new `tz_estimate_parking_capacity` function.
+  * Protect against `None` shapes in way area calculation.
+  * Add `all_the_kinds` script to output all the `kind` and `kind_detail` values per `$layer`, with their `min_zoom` from the YAML files.
+  * Add whitelists to `kind_detail` in each layer YAML so that we can enumerate all possible values for the script.
+  * Extend Natural Earth test generator to support polygons.
+  * Use new `drop_names` post-process function to drop _all_ the localized names (not just the default name)
+  * Add `CollisionRanker` to support YAML-based spreadsheets for `collision_rank` logic, including reserved, gaps, and filters across layers.
+  * Add `safe_int` implementation for SQL.
+  * Expose a test method that can return the whole tile. Used in new `collision_rank` tests.
+  * Clip to Mercator world bounds before projecting shapefiles.
+  * Deal with 'download only' test mode.
+  * Skip download only tests after downloading fixtures (if any).
+  * Update assets bundle for #1552 & #1809, and updated OSMdata.com land, water.
+  * Guard against future airport runway polygons in landuse versus runway lines in roads `sort_rank` errors with a test.
+  * Don't create a zero area property on points in SQL templating.
+  * Support for multiple shapefiles in a single ZIP for asset bundle creation. (Issue [#1809](https://github.com/tilezen/vector-datasource/issues/1809))
+  * Add support for `==` operator in YAML evaluation.
+  * Add new `drop_names` function to drop all name variant properties.
+  * Add new `remap` function to remap landuse kind values at low- and mid-zooms.
+  * Add new `remap_viewpoint_kinds` function remap Natural Earth's points of view to kinds (and drop null values).
+  * Add new `add_vehicle_restrictions` function for hgv (heavy good vehicles) trucks.
+  * Add new `add_collision_rank` function.
+  * Add new `update_min_zoom` function.
+  * Refactor order of landuse layer property dropping, and small inner geometry dropping for merging.
+
+
 v1.6.0
 ------
 * **Release date:** 2018-12-26.
@@ -16,7 +172,7 @@ v1.6.0
   * **earth**: Simplify at zoom 8 to match the transition from Natural Earth to OpenStreetMap, significantly reducing file size at that zoom. [Issue #1477](https://github.com/tilezen/vector-datasource/issues/1477) and [PR #1714](https://github.com/tilezen/vector-datasource/pull/1714).
   * **earth**: Truncate `min_zoom` floats to tenths place (and often just ints), to improve merging. [Issue #1477](https://github.com/tilezen/vector-datasource/issues/1477) and [PR #1714](https://github.com/tilezen/vector-datasource/pull/1714).
   * **landuse**: Add `allotments` (community gardens), was already in POIs layer. [PR #1742](https://github.com/tilezen/vector-datasource/pull/1742)
-  * **landuse**: Add `boatyard` and military firing `range` polygons, they already had POIs. [PR #1720](https://github.com/tilezen/vector-datasource/pull/1720). 
+  * **landuse**: Add `boatyard` and military firing `range` polygons, they already had POIs. [PR #1720](https://github.com/tilezen/vector-datasource/pull/1720).
   * **places**: Use the Natural Earth v4.1 `min_zoom` property to cull more places at low-zooms, and reduce tile overpacking. [Issue #1687](https://github.com/tilezen/vector-datasource/issues/1687) and [PR #1693](https://github.com/tilezen/vector-datasource/pull/1693) and [PR #1734](https://github.com/tilezen/vector-datasource/pull/1734). [Issue #1729](https://github.com/tilezen/vector-datasource/issues/1729)
   * **pois**: Add `turning_circle` and `turning_loop`, thanks [@westnordost](https://github.com/westnordost). [Issue #1695](https://github.com/tilezen/vector-datasource/issues/1695).
   * **roads**: Add cross-junction and multi-pass merging to remove more vertices and reduce overall feature count, thanks [@bcamper](https://github.com/bcamper). [Issue #1227](https://github.com/tilezen/vector-datasource/issues/1227), [PR #1703](https://github.com/tilezen/vector-datasource/pull/1703), [PR #1706](https://github.com/tilezen/vector-datasource/pull/1706), [PR #1708](https://github.com/tilezen/vector-datasource/pull/1708), [PR #1718](https://github.com/tilezen/vector-datasource/pull/1718).
@@ -61,7 +217,7 @@ v1.6.0
   * Represent numbers as numbers (not strings), and allow strings not just Unicode strings. [PR #1744](https://github.com/tilezen/vector-datasource/pull/1744)
   * Update simplification process, address bugs. [d66f43](https://github.com/tilezen/vector-datasource/commit/d66f438ed0c86446e5f671dc036e786a5909d3ab)
   * NOTE: No **database migrations** were provided, v1.5 was the last version that included those, as we've migrated to global RAWR tile builds.
-  
+
 
 v1.5.0
 ------
@@ -80,7 +236,7 @@ v1.5.0
   * **landuse**: Add **kind_detail** optional property for `wetland` when _wetland_ is `bog`, `fen`, `mangrove`, `marsh`, `mud`, `reedbed`, `saltern`, `saltmarsh`, `string_bog`, `swamp`, `tidalflat`, `wet_meadow`.
   * **landuse**: Add **kind_detail** optional property for `cemetery` and `grave_yard` kinds, with common values: `animist`, `bahai`, `buddhist`, `caodaism`, `catholic`, `christian`, `confucian`, `hindu`, `jain`, `jewish`, `multifaith`, `muslim`, `pagan`, `pastafarian`, `scientologist`, `shinto`, `sikh`, `spiritualist`, `taoist`, `tenrikyo`, `unitarian_universalist`, `voodoo`, `yazidi`, and `zoroastrian`.
   * **landuse**: Add **denomination** optional property for `cemetery` and `grave_yard` kinds, with common values: `adventist`, `anglican`, `armenian_apostolic`, `assemblies_of_god`, `baptist`, `buddhist`, `bulgarian_orthodox`, `catholic`, `christian`, `church_of_scotland`, `episcopal`, `evangelical`, `greek_catholic`, `greek_orthodox`, `iglesia_ni_cristo`, `jehovahs_witness`, `lutheran`, `mennonite`, `methodist`, `mormon`, `new_apostolic`, `nondenominational`, `orthodox`, `pentecostal`, `presbyterian`, `protestant`, `quaker`, `reformed`, `roman_catholic`, `romanian_orthodox`, `russian_orthodox`, `salvation_army`, `serbian_orthodox`, `seventh_day_adventist`, `shia`, `shingon_shu`, `sunni`, `theravada`, `tibetan`, `united`, `united_methodist`, `united_reformed`, `uniting`, and `曹洞宗`.
-  * **landuse**: Add `airfield` kind for military airfields. 
+  * **landuse**: Add `airfield` kind for military airfields.
   * **landuse**: Add `container_terminal` kind.
   * **landuse**: Add `crane` kind as line geometry. [Issue #1417](https://github.com/tilezen/vector-datasource/issues/1417).
   * **landuse**: Add `cutting` kind.
@@ -95,7 +251,7 @@ v1.5.0
   * **landuse**: Add `mud` kind.
   * **landuse**: Add `naval_base` kind for military.
   * **landuse**: Add `orchard` kind with optional **kind_detail** values: `agave_plants`, ` almond_trees`, ` apple_trees`, ` avocado_trees`, ` banana_plants`, ` cherry_trees`, ` coconut_palms`, ` coffea_plants`, ` date_palms`, ` hazel_plants`, ` hop_plants`, ` kiwi_plants`, ` macadamia_trees`, ` mango_trees`, ` oil_palms`, ` olive_trees`, ` orange_trees`, ` papaya_trees`, ` peach_trees`, ` persimmon_trees`, ` pineapple_plants`, ` pitaya_plants`, ` plum_trees`, ` rubber_trees`, ` tea_plants`, ` walnut_trees`.
-  * **landuse**: Add `pier` polygon when's used for mooring. 
+  * **landuse**: Add `pier` polygon when's used for mooring.
   * **landuse**: Add `plant_nursery` kind.
   * **landuse**: Add `port_terminal` kind.
   * **landuse**: Add `port` kind.
@@ -240,8 +396,8 @@ v1.5.0
   * **Update MapboxGL demo**, thanks to Apollo Mapping
   * Use service wording changes (Less > Fewer)
   * Updated Layers documentation for v1.5 schema changes.
-  * TODO: Updated tilejson/tilejson.json.erb for v1.5 schema changes.
-  
+  * Updated tilejson/tilejson.json.erb for v1.5 schema changes.
+
 
   #### INTERNAL CHANGES
 
@@ -350,7 +506,7 @@ v1.3.0
   * Fix test failures based on upstream OpenStreetMap data changes.
   * _NOTE: while the v1.3.0 release was tagged correctly the VERSION file was stuck at v1.2.0 leading to the incorrectly report in Python installs as v1.2.0._
 
-  
+
 
 v1.2.0
 ------
diff --git a/tilejson/tilejson.json.erb b/tilejson/tilejson.json.erb
index b533647e9..55e6e41c9 100644
--- a/tilejson/tilejson.json.erb
+++ b/tilejson/tilejson.json.erb
@@ -10,7 +10,7 @@
         40.764372,
         15
     ],
-    "description" : "Worldwide vector tiles from the Tilezen community, v1.6.",
+    "description" : "Worldwide vector tiles from the Tilezen community, v1.7.0",
     "format" : "<%= @params[:format] %>",
     "maxzoom" : 16.0,
     "minzoom" : 0.0,
@@ -27,8 +27,11 @@
             "fields" : {
                 "name" : "String. Localized name variants are in properties like 'name:en'. Common value.",
                 "id" : "Number. Common value.",
-                "kind" : "String. Common value, one of: aboriginal_lands, country, county, disputed, indefinite, indeterminate, lease_limit, line_of_control, macroregion, map_unit, municipality, overlay_limit, region.",
+                "kind" : "String. Common value, one of: aboriginal_lands, country, county, disputed, disputed_breakaway, disputed_claim, disputed_elusive, disputed_reference_line, indefinite, indeterminate, lease_limit, line_of_control, macroregion, map_unit, municipality, overlay_limit, region.",
+                "kind:*": "String. Optional property for alternate points of view in boundaries layer with kind:* properties (like kind:iso). The following country and international organizations worldviews are supported: Argentina (ar), Bangladesh (bd), Brazil (br), China (cn), Egypt (eg), France (fr), Germany (de), Greece (gr), India (in), Indonesia (id), Israel (il), Italy (it), Japan (jp), Morocco (ma), Nepal (np), Netherlands (nl), Pakistan (pk), Palestine (ps), Poland (pl), Portugal (pt), Russia (ru), Saudi Arabia (sa), South Korea (ko), Spain (es), Sweden (se), Taiwan (tw), Turkey (tr), United Kingdom (gb), United States (us), Vietnam (vn), ISO (iso)",
+                "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible. Common value.",
                 "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value.",
+                "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom.",
                 "area" : "Number. Common value.",
                 "admin_level" : "Common optional value, one of: 2, 4, 6, 8.",
                 "id:left" : "Integer. For the relation on the left side of the boundary line. Common optional value.",
@@ -54,6 +57,7 @@
                 "source" : "String. Common value, one of: openstreetmap.org.",
                 "landuse_kind" : "String. Tilezen calculates the `landuse_kind` value by intercutting `buildings` with the `landuse` layer to determine if a building is over a parks, hospitals, universities or other landuse features. Common value, one of: aerodrome, allotments, amusement_ride, animal, apron, aquarium, artwork, attraction, aviary, battlefield, beach, breakwater, bridge, camp_site, caravan_site, carousel, cemetery, cinema, city_wall, college, commercial, common, cutline, dam, dike, dog_park, enclosure, farm, farmland, farmyard, fence, footway, forest, fort, fuel, garden, gate, generator, glacier, golf_course, grass, groyne, hanami, hospital, industrial, land, library, maze, meadow, military, national_park, nature_reserve, park, parking, pedestrian, petting_zoo, picnic_site, pier, pitch, place_of_worship, plant, playground, prison, protected_area, quarry, railway, recreation_ground, recreation_track, residential, resort, rest_area, retail, retaining_wall, rock, roller_coaster, runway, rural, school, scree, scrub, service_area, snow_fence, sports_centre, stadium, stone, substation, summer_toboggan, taxiway, theatre, theme_park, tower, trail_riding_station, university, urban_area, urban, village_green, wastewater_plant, water_park, water_slide, water_works, wetland, wilderness_hut, wildlife_park, winery, winter_sports, wood, works, zoo.",
                 "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value.",
+                "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom.",
                 "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible (eg: based on area and volume limits). Common value.",
                 "scalerank" : "Integer. Common value, one of: 1, 2, 3, 4, 5.",
                 "addr_housenumber" : "String. Common optional value.",
@@ -82,7 +86,9 @@
                 "id" : "Integer. Common value.",
                 "source" : "String. Common value, one of: openstreetmap.org, naturalearthdata.com, openstreetmapdata.com.",
                 "kind" : "String. Common value, one of: archipelago, arete, cliff, earth, island, islet, ridge, valley.",
-                "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value."
+                "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible. Common value.",
+                "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value.",
+                "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom."
             },
             "maxzoom" : 16.0,
             "minzoom" : 0.0,
@@ -94,9 +100,11 @@
                 "name" : "String. Localized name variants are in properties like 'name:en'. Common value.",
                 "id" : "Integer. Common value.",
                 "source" : "String. Common value, one of: openstreetmap.org, naturalearthdata.com.",
-                "kind" : "String. Common value, one of: aerodrome, airfield, allotments, amusement_ride, animal, apron, aquarium, artwork, attraction, aviary, battlefield, beach, boatyard, breakwater, bridge, camp_site, caravan_site, carousel, cemetery, cinema, city_wall, college, commercial, common, container_terminal, crane, cutline, cutting, dam, danger_area, dike, ditch, dog_park, embankment, enclosure, farm, farmland, farmyard, fence, fence, ferry_terminal, footway, forest, fort, fuel, garden, gate, generator, glacier, golf_course, grass, groyne, guard_rail, hanami, harbour, hospital, industrial, kerb, land, library, maze, meadow, military, mud, national_park, nature_reserve, naval_base, orchard, park, parking, pedestrian, petting_zoo, picnic_site, pier, pier, pitch, place_of_worship, plant, plant_nursery, playground, port, port_terminal, power_line, power_minor_line, prison, protected_area, quarry, quay, railway, range, recreation_ground, recreation_track, residential, resort, rest_area, retail, retaining_wall, rock, roller_coaster, runway, rural, school, scree, scrub, service_area, shipyard, snow_fence, sports_centre, stadium, stone, substation, summer_toboggan, taxiway, theatre, theme_park, tower, trail_riding_station, university, urban, urban_area, village_green, wall, wastewater_plant, water_park, water_slide, water_works, wetland, wharf, wilderness_hut, wildlife_park, winery, winter_sports, wood, works, zoo.",
+                "kind" : "String. Common value, one of: aerodrome, airfield, allotments, amusement_ride, animal, apron, aquarium, artwork, attraction, aviary, bare_rock, barren, battlefield, beach, boatyard, breakwater, bridge, camp_site, caravan_site, carousel, cemetery, cinema, city_wall, college, commercial, common, container_terminal, crane, cutline, cutting, dam, danger_area, desert, dike, ditch, dog_park, embankment, enclosure, farm, farmland, farmyard, fence, fence, ferry_terminal, footway, forest, fort, fuel, garden, gate, generator, glacier, golf_course, grass, grassland, groyne, guard_rail, hanami, harbour, heath, hospital, industrial, kerb, land, library, maze, meadow, military, mud, national_park, nature_reserve, naval_base, orchard, park, parking, pedestrian, petting_zoo, picnic_site, pier, pier, pitch, place_of_worship, plant, plant_nursery, playground, port, port_terminal, power_line, power_minor_line, prison, protected_area, quarry, quay, railway, range, recreation_ground, recreation_track, residential, resort, rest_area, retail, retaining_wall, rock, roller_coaster, runway, rural, sand, school, scree, scrub, service_area, shingle, shipyard, snow_fence, sports_centre, stadium, stone, substation, summer_toboggan, taxiway, theatre, theme_park, tower, trail_riding_station, university, urban, urban_area, village_green, vineyard, wall, wastewater_plant, water_park, water_slide, water_works, wetland, wharf, wilderness_hut, wildlife_park, winery, winter_sports, wood, works, zoo, low_emission_zone.",
                 "kind_detail" : "String. Common optional value.",
+                "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible. Common value.",
                 "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value.",
+                "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom.",
                 "area" : "Number. Spherical Mercator area in square meters, polygons only. Common optional value.",
                 "protect_class" : "String. Common optional value, one of: 1, 2, 3, 4, 5, 6.",
                 "operator" : "String. Example: United States National Park Service. Common optional value."
@@ -113,10 +121,12 @@
                 "source" : "`openstreetmap` or `naturalearthdata.com`",
                 "kind" : "String. Common value, one of: country, locality, region, neighbourhood, macrohood, borough, microhood.",
                 "kind_detail" : "String. Common optional value, one of: city, farm, hamlet, isolated_dwelling, locality, province, state, town, village.",
+                "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom.",
                 "admin_level" : "Integer. Common optional value, one of: 2, 4, 6, 8.",
                 "population" : "Integer. Common value.",
+                "population_rank": "Integer. Common value. An integar value from 0 (no population) up to 18 (over 1 billion people).",
                 "scalerank" : "Integer. Common optional value.",
-                "capital" : "Boolean. True for localities that are country capitals. Optional, one of: True.",
+                "country_capital" : "Boolean. True for localities that are country capitals. Optional, one of: True.",
                 "region_capital" : "Boolean. True for localities that are region (state, province) capitals. Optional, one of: True.",
                 "labelrank" : "Integer. Optional value.",
                 "min_zoom" : "Number. Mostly on neighbourhoods. Common value.",
@@ -133,8 +143,9 @@
                 "name" : "String. Localized name variants are in properties like 'name:en'. Common value.",
                 "id" : "Integer. Common value.",
                 "source" : "String. Common value, one of: openstreetmap.org.",
-                "kind" : "String. One value of: accountant, adit, administrative, adult_gaming_centre, advertising_agency, aerodrome, airfield, airport, alcohol, alpine_hut, ambulatory_care, ambulatory_care, amusement_ride, animal, aquarium, archaeological_site, architect, are_home, art, arts_centre, artwork, assisted_living, association, atm, attraction, atv, aviary, baby_hatch, bakery, bank, bar, battlefield, bbq, beach, beach_resort, beacon, bed_and_breakfast, bench, bicycle, bicycle_junction, bicycle_parking, bicycle_rental, bicycle_rental_station, bicycle_repair_station, biergarten, block, blood_bank, boat_lift, boat_rental, boat_storage, boatyard, bollard, bookmaker, books, border_control, brewery, bunker, bureau_de_change, bus_station, bus_stop, butcher, cafe, camera, camp_site, car, car_parts, car_rental, car_repair, car_sharing, car_wash, car_wash, caravan_site, carousel, carpenter, casino, cave_entrance, chalet, charging_station, charging_station, charity, chemist, childcare, childrens_centre, cinema, clinic, closed, clothes, club, coffee, college, communications_tower, community_centre, company, computer, confectionery, consulting, container_terminal, convenience, copyshop, cosmetics, courthouse, craft, crane, cross, customs, cycle_barrier, dairy_kitchen, dam, danger_area, day_care, defibrillator, deli, dentist, department_store, dispensary, dive_centre, doctors, dog_park, doityourself, dressmaker, drinking_water, dry_cleaning, dune, educational_institution, egress, electrician, electronics, elevator, embassy, emergency_phone, employment_agency, enclosure, estate_agent, farm, fashion, fast_food, ferry_terminal, field_hospital, financial, fire_hydrant, fire_station, firepit, fishing, fishing_area, fishmonger, fitness, fitness_station, florist, food_bank, ford, fort, foundation, fuel, funeral_directors, furniture, gambling, garden, garden_centre, gardener, gas_canister, gate, generator, geyser, gift, golf, government, greengrocer, grocery, group_home, guest_house, hairdresser, halt, hanami, handicraft, harbourmaster, hardware, hazard, health_centre, healthcare, healthcare_alternative, healthcare_centre, healthcare_laboratory, helipad, heliport, hifi, historical, horse_riding, hospital, hostel, hot_spring, hotel, hunting, hunting_stand, hunting_stand, hvac, ice_cream, industrial, information, insurance, it, jewelry, karaoke, karaoke_box, kindergarten, landmark, laundry, lawyer, level_crossing, library, life_ring, lifeguard_tower, lift_gate, lighthouse, lock, lottery, love_hotel, mall, marina, marketplace, marketplace, mast, maze, memorial, metal_construction, midwife, mineshaft, mini_roundabout, miniature_golf, mobile_phone, money_transfer, monument, mooring, motel, motorcycle, motorcycle_parking, motorcycle_parking, motorway_junction, museum, music, naval_base, newsagent, newspaper, ngo, nightclub, nightclub, notary, nursing_home, obelisk, observatory, office, offshore_platform, optician, outdoor, outreach, painter, parking, parking_garage, peak, perfumery, pet, petroleum_well, petting_zoo, pharmacy, phone, photo, photographer, photographic_laboratory, physician, picnic_site, picnic_table, place_of_worship, plaque, playground, plumber, police, political_party, port_terminal, post_box, post_office, pottery, power_pole, power_tower, power_wind, prison, pub, put_in, put_in_egress, pylon, quay, range, ranger_station, rapid, recreation_track, recycling, refugee_camp, religion, research, residential_home, resort, rest_area, restaurant, rock, roller_coaster, saddle, sanitary_dump_station, sawmill, school, scuba_diving, service_area, shelter, ship_chandler, shipyard, shoemaker, shoes, shop, shower, sinkhole, ski, ski_rental, ski_school, slaughterhouse, slipway, slipway, snow_cannon, snowmobile, social_facility, soup_kitchen, sports, sports_centre, spring, stadium, station, stationery, stone, stonemason, street_lamp, studio, subway_entrance, summer_camp, summer_toboggan, supermarket, swimming_area, tailor, tax_advisor, taxi, telecommunication, telephone, telescope, theatre, theme_park, therapist, tobacco, toilets, toll_booth, townhall, toys, trade, traffic_signals, trail_riding_station, trailhead, tram_stop, travel_agency, travel_agent, tree, turning_circle, turning_loop, tyres, university, veterinary, viewpoint, volcano, walking_junction, waste_basket, waste_disposal, water_park, water_point, water_slide, water_tower, water_well, waterfall, watering_place, waterway_fuel, wayside_cross, wharf, wilderness_hut, wildlife_park, windmill, wine, winery, workshop, zoo.",
+                "kind" : "String. One value of: accountant, adit, administrative, adult_gaming_centre, advertising_agency, aerodrome, airfield, airport, alcohol, alpine_hut, ambulatory_care, ambulatory_care, amusement_ride, animal, aquarium, archaeological_site, architect, are_home, art, arts_centre, artwork, assisted_living, association, atm, attraction, atv, aviary, baby_hatch, bakery, bank, bar, battlefield, bbq, beach, beach_resort, beacon, bed_and_breakfast, bench, bicycle, bicycle_junction, bicycle_parking, bicycle_rental, bicycle_rental_station, bicycle_repair_station, biergarten, block, blood_bank, boat_lift, boat_rental, boat_storage, boatyard, bollard, bookmaker, books, border_control, brewery, bunker, bureau_de_change, bus_station, bus_stop, butcher, cafe, camera, camp_site, car, car_parts, car_rental, car_repair, car_sharing, car_wash, car_wash, caravan_site, carousel, carpenter, casino, cave_entrance, chalet, charging_station, charging_station, charity, chemist, childcare, childrens_centre, cinema, clinic, closed, clothes, club, coffee, college, common, communications_tower, community_centre, company, computer, confectionery, consulting, container_terminal, convenience, copyshop, cosmetics, courthouse, craft, crane, cross, customs, cycle_barrier, dairy_kitchen, dam, danger_area, day_care, defibrillator, deli, dentist, department_store, dispensary, dive_centre, doctors, dog_park, doityourself, dressmaker, drinking_water, dry_cleaning, dune, educational_institution, egress, electrician, electronics, elevator, embassy, emergency_phone, employment_agency, enclosure, estate_agent, farm, fashion, fast_food, ferry_terminal, field_hospital, financial, fire_hydrant, fire_station, firepit, fishing, fishing_area, fishmonger, fitness, fitness_station, florist, food_bank, ford, fort, foundation, fuel, funeral_directors, furniture, gambling, garden, garden_centre, gardener, gas_canister, gate, generator, geyser, gift, golf, government, greengrocer, grocery, group_home, guest_house, hairdresser, halt, hanami, handicraft, harbourmaster, hardware, hazard, health_centre, healthcare, healthcare_alternative, healthcare_centre, healthcare_laboratory, helipad, heliport, hifi, historical, horse_riding, hospital, hostel, hot_spring, hotel, hunting, hunting_stand, hunting_stand, hvac, ice_cream, industrial, information, insurance, it, jewelry, karaoke, karaoke_box, kindergarten, landmark, laundry, lawyer, level_crossing, library, life_ring, lifeguard_tower, lift_gate, lighthouse, lock, lottery, love_hotel, mall, marina, marketplace, marketplace, mast, maze, memorial, metal_construction, midwife, mineshaft, mini_roundabout, miniature_golf, mobile_phone, money_transfer, monument, mooring, motel, motorcycle, motorcycle_parking, motorcycle_parking, motorway_junction, museum, music, naval_base, newsagent, newspaper, ngo, nightclub, nightclub, notary, nursing_home, obelisk, observatory, office, offshore_platform, optician, outdoor, outreach, painter, parking, parking_garage, peak, perfumery, pet, petroleum_well, petting_zoo, pharmacy, phone, photo, photographer, photographic_laboratory, physician, picnic_site, picnic_table, place_of_worship, plaque, playground, plumber, police, political_party, port_terminal, post_box, post_office, pottery, power_pole, power_tower, power_wind, prison, pub, put_in, put_in_egress, pylon, quay, range, ranger_station, rapid, recreation_track, recycling, refugee_camp, religion, research, residential_home, resort, rest_area, restaurant, rock, roller_coaster, saddle, sanitary_dump_station, sawmill, school, scuba_diving, service_area, shelter, ship_chandler, shipyard, shoemaker, shoes, shop, shower, sinkhole, ski, ski_rental, ski_school, slaughterhouse, slipway, slipway, snow_cannon, snowmobile, social_facility, soup_kitchen, sports, sports_centre, spring, stadium, station, stationery, stone, stonemason, street_lamp, studio, subway_entrance, summer_camp, summer_toboggan, supermarket, swimming_area, tailor, tax_advisor, taxi, telecommunication, telephone, telescope, theatre, theme_park, therapist, tobacco, toilets, toll_booth, townhall, toys, trade, traffic_signals, trail_riding_station, trailhead, tram_stop, travel_agency, travel_agent, tree, turning_circle, turning_loop, tyres, university, veterinary, viewpoint, volcano, walking_junction, waste_basket, waste_disposal, water_park, water_point, water_slide, water_tower, water_well, waterfall, watering_place, waterway_fuel, wayside_cross, wetland, wharf, wilderness_hut, wildlife_park, windmill, wine, winery, workshop, zoo, chiropractor, hospice, occupational_therapist, optometrist, paediatrics, physiotherapist, podiatrist, psychotherapist, rehabilitation, speech_therapist.",
                 "kind_detail" : "String. Common optional value.",
+                "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom.",
                 "aeroway" : "String. Common optional value.",
                 "attraction" : "String. Common optional value.",
                 "cuisine" : "String. Common optional value.",
@@ -180,10 +191,12 @@
                 "name" : "String. Some names are abbreviated, eg: 'St' instead of 'Street'. Localized name variants are in properties like 'name:en'. Common value.",
                 "id" : "Integer. Common value.",
                 "source" : "String. Common value, one of: openstreetmap.org, naturalearthdata.com.",
+                "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible. Common value.",
                 "kind" : "String. Common value, one of: aerialway, exit, ferry, highway, major_road, minor_road, path, piste, quay, racetrack, rail.",
                 "landuse_kind" : "String. Tilezen calculates the `landuse_kind` value by intercutting `buildings` with the `landuse` layer to determine if a building is over a parks, hospitals, universities or other landuse features. Common value, one of: aerodrome, allotments, amusement_ride, animal, apron, aquarium, artwork, attraction, aviary, battlefield, beach, breakwater, bridge, camp_site, caravan_site, carousel, cemetery, cinema, city_wall, college, commercial, common, cutline, dam, dike, dog_park, enclosure, farm, farmland, farmyard, fence, footway, forest, fort, fuel, garden, gate, generator, glacier, golf_course, grass, groyne, hanami, hospital, industrial, land, library, maze, meadow, military, national_park, nature_reserve, park, parking, pedestrian, petting_zoo, picnic_site, pier, pitch, place_of_worship, plant, playground, prison, protected_area, quarry, railway, recreation_ground, recreation_track, residential, resort, rest_area, retail, retaining_wall, rock, roller_coaster, runway, rural, school, scree, scrub, service_area, snow_fence, sports_centre, stadium, stone, substation, summer_toboggan, taxiway, theatre, theme_park, tower, trail_riding_station, university, urban_area, urban, village_green, wastewater_plant, water_park, water_slide, water_works, wetland, wilderness_hut, wildlife_park, winery, winter_sports, wood, works, zoo.",
                 "ref" : "String. Used for road shields. Common value.",
                 "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value.",
+                "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom.",
                 "access" : "String. Common optional value",
                 "aerialway" : "String. Common optional value, one of: cable_car, canopy, chair_lift, drag_lift, gondola, goods, j_bar, magic_carpet, mixed_lift, platter, rope_tow, t_bar, unknown, zip_line.",
                 "aeroway" : "String. Common optional value, one of: runway, taxiway.",
@@ -200,6 +213,7 @@
                 "is_bus_route" : "Boolean. If present and `true`, then buses or trolley-buses travel down this road. This property is determined based on whether the road is part of an OSM bus route relation, and is only present on roads at zoom 12 and higher. Common optional value, one of: True.",
                 "is_link" : "Boolean. True if the road is part of a highway link or ramp. The property will not be present if the road is not part of a highway link or ramp. Common optional value, one of: True.",
                 "is_tunnel" : "Boolean. True if the road is part of a tunnel. The property will not be present if the road is not part of a tunnel. Common optional value, one of: True.",
+                "hgv" : "String. Optional value.",
                 "leisure" : "String. Common optional value, one of: alpine_slide, archery, athletics, bmx, cycling, disc_golf, drag_racing, equestrian, horse_racing, karting,, motor, mud_truck_racing, obstacle_course, running, ski_jumping, skiing, soap_box_derby.",
                 "man_made" : "String. Common optional value.",
                 "mooring" : "String. Common optional value.",
@@ -230,7 +244,9 @@
                 "snowshoe" : "String. For ski pistes. Optional value.",
                 "sport" : "String. Optional value.",
                 "state" : "String. Optional value.",
-                "symbol" : "String. For ski pistes. Optional value."
+                "symbol" : "String. For ski pistes. Optional value.",
+                "toll" : "Boolean. Optional value.",
+                "toll_hgv" : "Boolean. Optional value."
             },
             "maxzoom" : 16.0,
             "minzoom" : 5.0,
@@ -242,8 +258,10 @@
                 "name" : "String. Localized name variants are in properties like 'name:en'. Common value.",
                 "id" : "Integer. Common value.",
                 "source" : "String. Common value, one of: openstreetmap.org.",
+                "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible. Common value.",
                 "kind" : "String. Common value, one of: light_rail, platform, railway, subway, train, tram.",
                 "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value.",
+                "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom.",
                 "ref" : "String. Common optional value.",
                 "network" : "String. Common optional value.",
                 "operator" : "String. Common optional value.",
@@ -271,8 +289,10 @@
                 "name" : "String. Localized name variants are in properties like 'name:en'. Common value.",
                 "kind" : "String. detailed below, per geometry type. Common value, one of: basin, bay, canal, dam, ditch, dock, drain, fjord, fountain, lake, ocean, playa, reef, river, riverbank, sea, strait, stream, swimming_pool, water.",
                 "source" : "String. Common value, one of: naturalearthdata.com, openstreetmapdata.com, openstreetmap.org.",
+                "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible. Common value.",
                 "boundary" : "Boolean. For line geometries only. Common value.",
                 "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value.",
+                "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom.",
                 "area" : "in square meters (spherical Mercator, no real-world), `polygon` features only. Common optional value.",
                 "id" : "OpenStreetMap feature `osm_id`, when sourced from `openstreetmap.org`. Common optional value.",
                 "is_tunnel" : "for `line` features only (`true` values only). Common optional value."