Move basemap profile into OpenMapTiles submodule #258
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
https://github.com/onthegomap/planetiler/actions/runs/2759982874 ℹ️ Base Logs 8a8db00ℹ️ This Branch Logs 3899452 |
msbarry
reviewed
Jun 21, 2022
| } | ||
| return name.trim(); | ||
| } | ||
|
|
There was a problem hiding this comment.
Everything above here has been reimplemented from scratch, let's move that (and corresponding tests) to a LanguageUtils class in the planetiler core module so the only openmaptiles-specific stuff that gets relicensed is the specific logic for mapping to output keys in getNames and getNamesWithoutTranslations.
There was a problem hiding this comment.
I moved this code to planetiler/util/LanguageUtils.java and planetiler/util/Utils.java.
There was a problem hiding this comment.
PR to planetiler-openmaptiles created openmaptiles/planetiler-openmaptiles#9
There was a problem hiding this comment.
Getting sonar failed message here because of missing test coverage. I kept the original tests in planetiler-openmaptiles LanguageUtilsTest as they all use getNames method. If I understand correctly this is original omt-tools method and thus should be in planetiler-openmaptiles?
There was a problem hiding this comment.
just pushed a few updates to this and a new version of LanguageUtilsTest
| @@ -83,7 +83,7 @@ | |||
|
|
|||
| <modules> | |||
| <module>planetiler-core</module> | |||
| <module>planetiler-basemap</module> | |||
| <module>planetiler-openmaptiles</module> | |||
There was a problem hiding this comment.
I assume you'll want to build/run the planetiler-openmaptiles on its own from the standalone repo? If so we'll want to think through how we are going to structure the pom.xml's so it can be run both standalone and as a child project here.
One option is what the planetiler-examples submodule does - it has 2 pom.xml's, one for standalone and one for a child module (although we could rename so main pom.xml is for standalone). We'll need to keep the 2 in sync but shouldn't be too bad unless you start adding a lot of dependencies.
There was a problem hiding this comment.
I did not think about it. For now, I build/run it from the parent planetiler repo, even for GH actions.
I am open to change it, I think having two pom.xml in sync could work.
There was a problem hiding this comment.
OK, sounds good for now - I could help set that up later.
@msbarry I sent you another invite, let me know if you have an issue accessing the repo. |
msbarry
reviewed
Jun 23, 2022
| } | ||
| return name.trim(); | ||
| } | ||
|
|
There was a problem hiding this comment.
just pushed a few updates to this and a new version of LanguageUtilsTest
|
SonarCloud Quality Gate failed. |
msbarry
reviewed
Jul 28, 2022
planetiler-core/src/main/java/com/onthegomap/planetiler/util/Utils.java
Outdated
Show resolved
Hide resolved
…submodule to READMe
|
Kudos, SonarCloud Quality Gate passed! |
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 moves the basemap profile into a separate repository planetiler-openmaptiles under the openmaptiles org as discussed in #228.
The aim is to separate the code of Planetiler (the tool) from OpenMapTiles schema. The reasons and benefits summarised in the discussion #228 (comment)
The code of the planetiler-openmaptiles is currently up-to-date with planetiler root repo. I released v3.13 and v3.13.1 to keep the same versioning as in OMT
How to use :