OpenMapTiles 3.15.0 SNAPSHOT #126
Merged
Conversation
This file contains 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
…to match content of OMT PR 1457)
…on + added unit tests
Revamp water label display logic
…to match content of OMT PR 1465)
…le also primary and secondary roads
…to match content of OMT PR 1466)
…le IE roates in similar way as GB routes
…akes (to match OMT PR 1475)
Show the Trans-Canada Highway at z4, refactor national network list
…dary Add GB primary/secondary routes
Routes of Ireland
Render lake lines for big lakes
getFerryMinzoom() kept since we'd like to replicate `sql_filter: ST_Length(...` from OMT
…-refactor areaToMinZoom refactor
msbarry
reviewed
Dec 1, 2023
Comment on lines
625
to
636
| .setMinZoom(getFerryMinzoom(element)); | ||
| } | ||
|
|
||
| int getFerryMinzoom(Tables.OsmShipwayLinestring element) { | ||
| try { | ||
| return Utils.getClippedMinZoomForLength(element.source().length(), 3, 4, 11); | ||
| } catch (GeometryException e) { | ||
| e.log(stats, "omt_ferry_minzoom", | ||
| "Unable to calculate ferry minzoom for " + element.source().id()); | ||
| // ferries are supposed to be included in Z4-Z10 depending on their length (=this min. zoom calculation), for Z11+ always, hence 11 as fallback | ||
| return 11; | ||
| } |
There was a problem hiding this comment.
Did you try this out?
@Override
public void process(Tables.OsmShipwayLinestring element, FeatureCollector features) {
features.line(LAYER_NAME).setBufferPixels(BUFFER_SIZE)
.setAttr(Fields.CLASS, element.shipway()) // "ferry"
// no subclass
.setAttr(Fields.SERVICE, service(element.service()))
.setAttr(Fields.RAMP, element.isRamp() ? 1L : null)
.setAttr(Fields.BRUNNEL, brunnel(element.isBridge(), element.isTunnel(), element.isFord()))
.setAttr(Fields.LAYER, nullIfLong(element.layer(), 0))
.setSortKey(element.zOrder())
.setMinPixelSize(0) // merge during post-processing, then limit by size
.setMinZoom(4)
.setMinPixelSizeBelowZoom(10, 32);
}that should be doing exactly the same thing as the getFerryMinzoom function. When I try that out I see:
Your branch:
|
with that change:
|
…to match content of OMT PR 1423)
Introduce office POI class
This was referenced Dec 18, 2023
msbarry
approved these changes
Dec 21, 2023
|
Once that test is fixed, looks good to merge from my end. Thanks for the hard work on this! |
This was referenced Dec 22, 2023
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 brings into
planetiler-openmaptilesall the changes from OpenMapTiles ( https://github.com/openmaptiles/openmaptiles ) since 3.14.0, e.g. after it is merged,planetiler-openmaptiles/mainshould be equivalent to (current)openmaptiles/master. In other words, this implements OpenMapTiles 3.15.0 "snapshot".Depending on how it goes with OpenMapTiles, the plan would be to release
planetiler-openmaptiles 3.15.0shortly after release ofOpenMapTiles 3.15.0.This PR is the result of several incremental updates, usually trying to implement one OpenMapTiles PR in "1 to 1" fashion as one
planetiler-openmaptilesPR: