From 2ad895aeb980f1f43b3d35bedc5c3d16da0fc33f Mon Sep 17 00:00:00 2001
From: "Nathaniel V. KELSO" <nvkelso@gmail.com>
Date: Mon, 22 Nov 2021 17:42:12 -0800
Subject: [PATCH 1/3] Always be simplifying

Connects with https://github.com/tilezen/vector-datasource/issues/2014.

- Shifts simplification mostly to zoom 0 from 8
- Start simplifying transit layer
- Truncate min_zoom to 1 decimal place always
---
 queries.yaml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/queries.yaml b/queries.yaml
index 73f6108c4..915adefb4 100644
--- a/queries.yaml
+++ b/queries.yaml
@@ -152,7 +152,7 @@ layers:
   water:
     geometry_types: [Point, MultiPoint, Polygon, MultiPolygon, LineString, MultiLineString]
     simplify_before_intersect: true
-    simplify_start: 8
+    simplify_start: 0
     transform:
       - vectordatasource.transform.tags_create_dict
       - vectordatasource.transform.tags_name_i18n
@@ -168,7 +168,7 @@ layers:
   earth:
     geometry_types: [Point, MultiPoint, Polygon, MultiPolygon, LineString, MultiLineString]
     simplify_before_intersect: true
-    simplify_start: 8
+    simplify_start: 0
     transform:
       - vectordatasource.transform.tags_create_dict
       - vectordatasource.transform.tags_name_i18n
@@ -192,7 +192,7 @@ layers:
       - vectordatasource.transform.add_id_to_properties
       - vectordatasource.transform.detect_osm_relation
       - vectordatasource.transform.remove_feature_id
-      - vectordatasource.transform.truncate_min_zoom_to_2dp
+      - vectordatasource.transform.truncate_min_zoom_to_1dp
     sort: vectordatasource.sort.places
     area-inclusion-threshold: 1
   landuse:
@@ -208,12 +208,12 @@ layers:
       - vectordatasource.transform.remove_feature_id
       - vectordatasource.transform.normalize_operator_values
       - vectordatasource.transform.major_airport_detector
-      - vectordatasource.transform.truncate_min_zoom_to_2dp
+      - vectordatasource.transform.truncate_min_zoom_to_1dp
     sort: vectordatasource.sort.landuse
     area-inclusion-threshold: 1
   roads:
     geometry_types: [LineString, MultiLineString]
-    simplify_start: 8
+    simplify_start: 4
     tolerance: 1.0
     transform:
       - vectordatasource.transform.tags_create_dict
@@ -233,7 +233,7 @@ layers:
       - vectordatasource.transform.road_trim_properties
       - vectordatasource.transform.remove_feature_id
       - vectordatasource.transform.tags_remove
-      - vectordatasource.transform.truncate_min_zoom_to_2dp
+      - vectordatasource.transform.truncate_min_zoom_to_1dp
     sort: vectordatasource.sort.roads
     area-inclusion-threshold: 1
   buildings:
@@ -255,7 +255,7 @@ layers:
       - vectordatasource.transform.normalize_tourism_kind
       - vectordatasource.transform.building_trim_properties
       - vectordatasource.transform.remove_feature_id
-      - vectordatasource.transform.truncate_min_zoom_to_2dp
+      - vectordatasource.transform.truncate_min_zoom_to_1dp
     sort: vectordatasource.sort.buildings
     area-inclusion-threshold: 1
   pois:
@@ -280,7 +280,7 @@ layers:
       - vectordatasource.transform.major_airport_detector
       - vectordatasource.transform.elevation_to_meters
       - vectordatasource.transform.normalize_operator_values
-      - vectordatasource.transform.truncate_min_zoom_to_2dp
+      - vectordatasource.transform.truncate_min_zoom_to_1dp
     sort: vectordatasource.sort.pois
     area-inclusion-threshold: 1
   boundaries:
@@ -296,12 +296,14 @@ layers:
       - vectordatasource.transform.add_id_to_properties
       - vectordatasource.transform.detect_osm_relation
       - vectordatasource.transform.remove_feature_id
-      - vectordatasource.transform.truncate_min_zoom_to_2dp
+      - vectordatasource.transform.truncate_min_zoom_to_1dp
       - vectordatasource.transform.remap_viewpoint_kinds
       - vectordatasource.transform.unpack_viewpoint_claims
     area-inclusion-threshold: 1
   transit:
     geometry_types: [LineString, MultiLineString, Polygon, MultiPolygon]
+    simplify_start: 5
+    tolerance: 1.0
     transform:
       - vectordatasource.transform.tags_create_dict
       - vectordatasource.transform.tags_name_i18n
@@ -312,7 +314,7 @@ layers:
       - vectordatasource.transform.route_name
       - vectordatasource.transform.parse_layer_as_float
       - vectordatasource.transform.remove_feature_id
-      - vectordatasource.transform.truncate_min_zoom_to_2dp
+      - vectordatasource.transform.truncate_min_zoom_to_1dp
     sort: vectordatasource.sort.transit
     area-inclusion-threshold: 1
   admin_areas:

From 181298781dcbe89ec5b083fd752e4c9b12de8169 Mon Sep 17 00:00:00 2001
From: "Nathaniel V. KELSO" <nvkelso@gmail.com>
Date: Wed, 8 Dec 2021 09:40:43 -0800
Subject: [PATCH 2/3] Also merge line boundaries from NE at low zooms

Water and Earth are already merged above
---
 queries.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries.yaml b/queries.yaml
index 915adefb4..21ed533b9 100644
--- a/queries.yaml
+++ b/queries.yaml
@@ -779,7 +779,7 @@ post_process:
   - fn: vectordatasource.transform.merge_line_features
     params:
       source_layer: boundaries
-      start_zoom: 8
+      start_zoom: 0
       end_zoom: 15
 
   # no lake labels at zoom 0-3:

From 909d7a575ef6e811d324d3177cb6275e74b6ee63 Mon Sep 17 00:00:00 2001
From: "Nathaniel V. KELSO" <nvkelso@gmail.com>
Date: Sun, 12 Dec 2021 23:11:02 -0800
Subject: [PATCH 3/3] Simplify low zoom boundaries, too

---
 queries.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries.yaml b/queries.yaml
index 21ed533b9..007339726 100644
--- a/queries.yaml
+++ b/queries.yaml
@@ -286,7 +286,7 @@ layers:
   boundaries:
     geometry_types: [Polygon, MultiPolygon, LineString, MultiLineString]
     simplify_before_intersect: true
-    simplify_start: 8
+    simplify_start: 0
     tolerance: 1.0
     transform:
       - vectordatasource.transform.tags_create_dict