Merged
Conversation
3 tasks
Member
Author
peitili
reviewed
Dec 14, 2021
| params: | ||
| source_layer: water | ||
| start_zoom: 0 | ||
| end_zoom: 16 |
c99cca3 to
405361c
Compare
Contributor
|
This PR has 95 integration tests failures and 23 errors vs master where it has 92 failures and 0 errors 23 errors vs master: 3 new Failures vs master: |
Contributor
|
made a commit to try to fix the integration tests errors (not failures) |
nvkelso
commented
Dec 15, 2021
| # should only have top 10 features | ||
| self.assertEqual(10, len(features)) | ||
| # should only have top 2 features | ||
| self.assertEqual(2, len(features)) |
Member
Author
There was a problem hiding this comment.
At zoom 8 our area threshold for labels is 500,000,000 (was 200,000,000) and for polygons it's still 20000000.
Under the earlier system 5 meet the area threshold, but after only 2 do. So the changes here make sense to me.
This was referenced Dec 15, 2021
nvkelso
commented
Dec 16, 2021
| end_zoom: 15 | ||
| properties: | ||
| - id | ||
| - area |
Member
Author
There was a problem hiding this comment.
could add boundary and osm_relation, too
nvkelso
commented
Dec 16, 2021
| - fn: vectordatasource.transform.drop_properties | ||
| params: | ||
| source_layer: water | ||
| start_zoom: 8 |
Member
Author
There was a problem hiding this comment.
This should be for low zoom tiles as well, so 8 > 0.
nvkelso
commented
Dec 16, 2021
| - fn: vectordatasource.transform.drop_properties | ||
| params: | ||
| source_layer: water | ||
| start_zoom: 8 |
nvkelso
commented
Dec 16, 2021
| ] if area >= area_threshold][0] | ||
| where: >- | ||
| kind == 'lake' and label_placement | ||
| kind in ['lake','bay','water','riverbank','reservoir'] and label_placement |
Member
Author
There was a problem hiding this comment.
I'm seeing basin and dock label points very early still in London, and strait along the English Channel.
The full list of water kinds is:
basin, bay, canal, ditch, dock, drain, fjord, fountain, lake, playa, reef, river, riverbank, strait, stream, swimming_pool, water
But perhaps it's too brittle to have a full list (since values will come and go), when the measure should just be that we generated a label_placement for it at all?
Member
Author
There was a problem hiding this comment.
Perhaps:
where: >-
(properties is not None and properties.get('label_placement') is True)
nvkelso
commented
Dec 16, 2021
nvkelso
commented
Dec 16, 2021
| - wikidata_id | ||
| - kind_tile_rank | ||
| - label_placement | ||
| where: >- |
Member
Author
There was a problem hiding this comment.
Also drop boundary which randomly appears when a river is also forms part of an administrative boundary.
Member
Author
There was a problem hiding this comment.
This where clause doesn't seem to work.
There's another pattern we can switch to, like:
# no lake labels at zoom 0-3:
# https://github.com/tilezen/vector-datasource/issues/1730
- fn: vectordatasource.transform.drop_names
params:
source_layer: water
start_zoom: 0
end_zoom: 4
geom_types: [Polygon, MultiPolygon]
where: >-
kind == 'lake'
nvkelso
commented
Dec 16, 2021
| (6, 40000000000), | ||
| (7, 10000000000), | ||
| (8, 500000000), | ||
| (9, 200000000), |
Member
Author
There was a problem hiding this comment.
The larger range of min_zoom remappings is working for features are in the allowlist, woot!
nvkelso
commented
Dec 16, 2021
nvkelso
commented
Dec 16, 2021
| all_name_variants: true | ||
| properties: | ||
| - name | ||
| where: >- |
nvkelso
commented
Dec 16, 2021
| properties: | ||
| - name | ||
| where: >- | ||
| geom_type in ('Polygon', 'MultiPolygon') |
Member
Author
There was a problem hiding this comment.
Same where clause switch as above.
nvkelso
commented
Dec 16, 2021
| 'kind': 'lake', | ||
| 'label_placement': True, | ||
| 'min_zoom': 5, | ||
| 'min_zoom': 2, # min_zoom changed at https://github.com/tilezen/vector-datasource/pull/2010/ |
Member
Author
There was a problem hiding this comment.
Only the 'label_placement': True point should have names at this early zoom, and the min_zoom on that should probably be a different value besides 2 (like 7)?
nvkelso
commented
Dec 16, 2021
| source_layer: water | ||
| start_zoom: 0 | ||
| end_zoom: 15 | ||
| geom_types: [LineString, MultiLineString, Polygon, MultiPolygon] |
Member
Author
There was a problem hiding this comment.
Switched to geom_types param instead of where clause.
nvkelso
commented
Dec 16, 2021
| source_layer: water | ||
| start_zoom: 0 | ||
| end_zoom: 15 | ||
| geom_types: [Polygon, MultiPolygon] |
Member
Author
There was a problem hiding this comment.
Switched to geom_types param instead of where clause.
nvkelso
commented
Dec 16, 2021
| (kind == 'water' and zoom < 12) or | ||
| (kind == 'canal' and zoom < 13) or | ||
| (kind == 'basin' and zoom < 13) or | ||
| (kind == 'dock' and zoom < 13) or |
Member
Author
There was a problem hiding this comment.
I expanded the list of kinds in this section based on QA where I saw low zoom basin, dock and straight points around London and the English Channel. Now it has every water kind.
Member
Author
|
Final QA over Sweden checks out, all remaining issues resolved. Ready to merge. |
Contributor
|
two new failures: |
Closed
Member
Author
|
Those look like they should be updated, but don't show a problem with the new logic. Let's keep tracking that with #2038, but merge this now. |
2 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Connects to #1998 and replaces PR #2000 (RIP).