-
Notifications
You must be signed in to change notification settings - Fork 1
style(vector): adjust the v2 stylesheets to mirror schema changes BM-1299 #1193
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
Merged
tawera-manaena
merged 10 commits into
master
from
feat/topographic-v2-stylesheet-refinements
Jun 26, 2025
Merged
style(vector): adjust the v2 stylesheets to mirror schema changes BM-1299 #1193
tawera-manaena
merged 10 commits into
master
from
feat/topographic-v2-stylesheet-refinements
Jun 26, 2025
Conversation
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
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
9fce97f to
8316cce
Compare
This comment was marked as outdated.
This comment was marked as outdated.
github-merge-queue bot
pushed a commit
to linz/basemaps
that referenced
this pull request
Jun 23, 2025
…1299 (#3462) This PR is a sibling of [this PR] in the **basemaps-config** repository. [this PR]: linz/basemaps-config#1193 --- ### Motivation As a general rule, all features assigned to a particular Shortbread layer should have the same geometry type, with exceptions (i.e. the `contours` and `land` layers). Currently, we have a few Shortbread layers that comprise features of differing geometry types (e.g. `Points` and `Polygons`, rather than `Points` only). We also have some datasets that are duplicated across layers and that are not targeted by any style entries. Such duplicates can be removed. ### Modifications I have identified and resolved the following inconsistencies for the following Shortbread layers: - **pois** The `pois` layer contains `Point` and `Polygon` features. It should only contain `Point` features. - Moved the `50326-nz-rifle-range-polygons-topo-150k` dataset to the `sites` layer and [updated the stylesheet](linz/basemaps-config@c6c93a4). I've changed the tags for the following features to more appropriate OSM key-value pairs: - Changed the tag for **historic site** `Point` features and [updated the stylesheet](linz/basemaps-config@4574414). - Changed the tag for **ladder** `Point` features and [updated the stylesheet](linz/basemaps-config@ce259a3). - **streets** The `streets` layer contains `LineString`, `Point` and `Polygon` features. It should only contain `LineString` features. - Moved the following datasets to the `pois` layer and [updated the stylesheet](linz/basemaps-config@5698928): - `50275-nz-ford-points-topo-150k` - `50080-nz-chatham-island-ford-points-topo-150k` - Removed the following datasets as they already live under the `street_polygons` layer and are not targeted by any style entries under the `streets` layer: - airports: - `50237-nz-airport-polygons-topo-150k` - `50063-nz-chatham-island-airport-polygons-topo-150k` - `52231-cook-islands-airport-polygons-topo-125k-zone4` - `52168-niue-airport-polygons-topo-150k` - runways: - `50333-nz-runway-polygons-topo-150k` - `50914-nz-kermadec-is-runway-polygons-topo-125k` - `52302-cook-islands-runway-polygons-topo-125k-zone3` - `52268-cook-islands-runway-polygons-topo-125k-zone4` - `52211-cook-islands-runway-polygons-topo-150k-zone4` - `52190-niue-runway-polygons-topo-150k` - `50103-nz-chatham-island-runway-polygons-topo-150k` I have adjusted the 'special tagging' logic for the following Shortbread layers: - **place_labels** The logic for handling `place_labels` features currently preserves null-like values for certain properties. For example: ``` { ... "natural": "cape", "place": "city", "water": "0" } ``` I've adjusted the logic so that properties with values of `"0"` are interpreted as `undefined`. This is desired as such properties are already optional. This now allows us to discard such property key-value pairs instead of carrying them through. | Before | After | | - | - | | ![][before] | ![][after] | [before]: https://github.com/user-attachments/assets/b3019574-c301-4733-a656-b1e1c3a81572 [after]: https://github.com/user-attachments/assets/1d0e9c81-25a6-4228-9866-43b3ffba0ab8 ### Verification I built this pull request as a container and triggered a Vector ETL [Argo workflow] using it. Once the workflow finished, I updated the [topographic-v2] tileset to point to the `2193` and `3857` Cotar files generated by the workflow. This gave me previews links from which I could check that my schema and stylesheet changes were in-sync: [Argo workflow]: https://argo.linzaccess.com/workflows/argo/test-basemaps-vector-etl-shortbread-7szck [topographic-v2]: linz/basemaps-config@12a5cd7 - **Previews** - [labels-v2](https://basemaps.linz.govt.nz/?config=s3://linz-basemaps-staging/config/config-B9TJ44JyN6nqJ27S7pSSno7Q5CBagd9PshA9SJAy9YXZ.json.gz&i=topographic-v2&s=labels-v2&debug) - [topographic-v2](https://basemaps.linz.govt.nz/?config=s3://linz-basemaps-staging/config/config-B9TJ44JyN6nqJ27S7pSSno7Q5CBagd9PshA9SJAy9YXZ.json.gz&i=topographic-v2&s=topographic-v2&debug) - **Screenshots** - **sites: rifle range** | [labels-v2][link_1] | | - | |  | | [topographic-v2][link_2] | | - | |  | - **pois: ford** | [topographic-v2][link_3] | | - | |  | - **pois: historic sites** | [topographic-v2][link_4] | | - | |  | - **pois: ladder points** | [topographic-v2][link_5] | | - | |  | [link_1]: https://basemaps.linz.govt.nz/@-41.1533574,175.0393980,z15?style=labels-v2&i=topographic-v2&config=TmVmbYRQjL9T2JWgyaSie193b4D1qZnBD8hjaSqPFYSsEvEYYhaGYKrcnYVvz53UPmJVZTgEdYwDWba59Letg9UjJyeKMEvCTfp2U9ifEgVFkDAeqm1B4A3i9U5BatR&debug=true [link_2]: https://basemaps.linz.govt.nz/@-41.1533574,175.0393980,z15?style=topographic-v2&i=topographic-v2&config=TmVmbYRQjL9T2JWgyaSie193b4D1qZnBD8hjaSqPFYSsEvEYYhaGYKrcnYVvz53UPmJVZTgEdYwDWba59Letg9UjJyeKMEvCTfp2U9ifEgVFkDAeqm1B4A3i9U5BatR&debug=true [link_3]: https://basemaps.linz.govt.nz/@-44.3990633,171.0402933,z17?style=topographic-v2&i=topographic-v2&config=TmVmbYRQjL9T2JWgyaSie193b4D1qZnBD8hjaSqPFYSsEvEYYhaGYKrcnYVvz53UPmJVZTgEdYwDWba59Letg9UjJyeKMEvCTfp2U9ifEgVFkDAeqm1B4A3i9U5BatR&debug=true [link_4]: https://basemaps.linz.govt.nz/@-40.7047198,175.6567562,z17?style=topographic-v2&i=topographic-v2&config=TmVmbYRQjL9T2JWgyaSie193b4D1qZnBD8hjaSqPFYSsEvEYYhaGYKrcnYVvz53UPmJVZTgEdYwDWba59Letg9UjJyeKMEvCTfp2U9ifEgVFkDAeqm1B4A3i9U5BatR&debug=true [link_5]: https://basemaps.linz.govt.nz/@-39.6467341,176.1228721,z17?style=topographic-v2&i=topographic-v2&config=TmVmbYRQjL9T2JWgyaSie193b4D1qZnBD8hjaSqPFYSsEvEYYhaGYKrcnYVvz53UPmJVZTgEdYwDWba59Letg9UjJyeKMEvCTfp2U9ifEgVFkDAeqm1B4A3i9U5BatR&debug=true
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
d63bfe4 to
dd53b63
Compare
Contributor
Vector Style UpdateVector Style updated for st_labels-v2Vector Style updated for st_topographic-v2Vector Data UpdateVector data updates for ts_topographic-v2Feature updates for ts_topographic-v2🟦 51154-nzgb-gazetteer-application-labels-wfs-layer - version: 415986 (from: 389949) features: 5271 (+228) Vector Tile Anaylse Report for WebMercatorQuad🟩 WebMercatorQuad(Click to Expand) 🟩Zoom - 0Biggest Tile
Distributions
Layers
Zoom - 1Biggest Tile
Distributions
Layers
Zoom - 2Biggest Tile
Distributions
Layers
Zoom - 3Biggest Tile
Distributions
Layers
Zoom - 4Biggest Tile
Distributions
Layers
Zoom - 5Biggest Tile
Distributions
Layers
Zoom - 6Biggest Tile
Distributions
Layers
Zoom - 7Biggest Tile
Distributions
Layers
Zoom - 8Biggest Tile
Distributions
Layers
Zoom - 9Biggest Tile
Distributions
Layers
Zoom - 10Biggest Tile
Distributions
Layers
Zoom - 11Biggest Tile
Distributions
Layers
Zoom - 12Biggest Tile
Distributions
Layers
Zoom - 13Biggest Tile
Distributions
Layers
Zoom - 14Biggest Tile
Distributions
Layers
Zoom - 15Biggest Tile
Distributions
Layers
Vector Tile Anaylse Report for NZTM2000Quad🟩 NZTM2000Quad(Click to Expand) 🟩Zoom - 0Biggest Tile
Distributions
Layers
Zoom - 1Biggest Tile
Distributions
Layers
Zoom - 2Biggest Tile
Distributions
Layers
Zoom - 3Biggest Tile
Distributions
Layers
Zoom - 4Biggest Tile
Distributions
Layers
Zoom - 5Biggest Tile
Distributions
Layers
Zoom - 6Biggest Tile
Distributions
Layers
Zoom - 7Biggest Tile
Distributions
Layers
Zoom - 8Biggest Tile
Distributions
Layers
Zoom - 9Biggest Tile
Distributions
Layers
Zoom - 10Biggest Tile
Distributions
Layers
Zoom - 11Biggest Tile
Distributions
Layers
Zoom - 12Biggest Tile
Distributions
Layers
Zoom - 13Biggest Tile
Distributions
Layers
Zoom - 14Biggest Tile
Distributions
Layers
Zoom - 15Biggest Tile
Distributions
Layers
|
Wentao-Kuang
approved these changes
Jun 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR is a sibling of this PR in the basemaps repository.
Motivation
This PR's sibling re-homes various datasets from one Shortbread layer to another. It also adjusts the tags for various datasets. We need to update the affected style entries in the
topographic-v2stylesheet to reflect the changes.Modifications
labels-v2
filterandsource-layerfor rifle range features to reflect its new tag and Shortbread layer.topographic-v2
filterandsource-layerfor rifle range features to reflect its new tag and Shortbread layer.filterandsource-layerfor ford features to reflect its new tag and Shortbread layer.filterfor historic site features to reflect its new tag.filterfor ladder features to reflect its new tag.topolite-v2
Verification
1st attempt (Argo)
place_labelslayer are missing from the map.2nd attempt (Argo)
place_labelslayer are now displayed from the map.3rd attempt (Argo)