Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always be simplifying (Natural Earth low zooms) #2015

Merged
merged 3 commits into from
Dec 13, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions queries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ layers:
water:
geometry_types: [Point, MultiPoint, Polygon, MultiPolygon, LineString, MultiLineString]
simplify_before_intersect: true
simplify_start: 8
simplify_start: 0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the transforms already run on Natural Earth and OSM features, the simplify_start is independent of those and evaluated on each feature on the layer.

transform:
- vectordatasource.transform.tags_create_dict
- vectordatasource.transform.tags_name_i18n
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Features only come in starting at zoom 4, so simplifying before then is not necessary

tolerance: 1.0
transform:
- vectordatasource.transform.tags_create_dict
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Copy link
Member Author

@nvkelso nvkelso Nov 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, the transit layer wasn't simplified at all!? No wonder it's large.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Zoom 5 because:

tolerance: 1.0
transform:
- vectordatasource.transform.tags_create_dict
- vectordatasource.transform.tags_name_i18n
Expand All @@ -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:
Expand Down