-
Notifications
You must be signed in to change notification settings - Fork 120
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -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 | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||||
|
@@ -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,13 +280,13 @@ 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: | ||||
geometry_types: [Polygon, MultiPolygon, LineString, MultiLineString] | ||||
simplify_before_intersect: true | ||||
simplify_start: 8 | ||||
simplify_start: 0 | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @peitili this change is since PR review, based on build QA. The feature merging was working, but the linework detail was significantly more detailed that the water or earth layers on visual inspection. See PR comment for images. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since boundaries appear in the 0/0/0 tile and zoom 1 tiles, this will have largest impact there on p50 size (not just p99). |
||||
tolerance: 1.0 | ||||
transform: | ||||
- vectordatasource.transform.tags_create_dict | ||||
|
@@ -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 | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||||
|
@@ -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: | ||||
|
@@ -777,7 +779,7 @@ post_process: | |||
- fn: vectordatasource.transform.merge_line_features | ||||
params: | ||||
source_layer: boundaries | ||||
start_zoom: 8 | ||||
start_zoom: 0 | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @peitili I added this config change since your review. |
||||
end_zoom: 15 | ||||
|
||||
# no lake labels at zoom 0-3: | ||||
|
There was a problem hiding this comment.
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.