From 0d7cd887ce38b9dfde71c4f49597bcd1fa86c199 Mon Sep 17 00:00:00 2001 From: Michael Barry Date: Tue, 2 Aug 2022 07:07:41 -0400 Subject: [PATCH] Make planetiler-openmaptiles runnable as a standalone project (#19) --- .github/cache-sources-action/action.yml | 22 + .github/dependabot.yml | 23 + .github/workflows/maven.yml | 125 ++-- .github/workflows/performance.yml | 34 +- .github/workflows/snapshot.yml | 32 + .github/workflows/update-pr.yml | 2 +- .gitignore | 5 +- .idea/codeStyles/Project.xml | 598 ++++++++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/eclipseCodeFormatter.xml | 13 + .idea/vcs.xml | 6 + .mvn/jvm.config | 5 + .mvn/wrapper/MavenWrapperDownloader.java | 118 ++++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 2 + .vscode/settings.json | 11 + README.md | 52 +- eclipse-formatter.xml | 480 ++++++++++++++ mvnw | 310 +++++++++ mvnw.cmd | 182 ++++++ pom.xml | 233 ++++++- scripts/build.sh | 7 + scripts/check-doc-links.sh | 7 + scripts/check-monaco.sh | 7 + scripts/format.sh | 5 + scripts/regenerate-openmaptiles.sh | 20 + scripts/set-versions.sh | 12 + scripts/test-release.sh | 19 + .../openmaptiles/Generate.java | 10 +- .../openmaptiles/Layer.java | 2 +- .../openmaptiles/OpenMapTilesMain.java | 4 +- .../openmaptiles/OpenMapTilesProfile.java | 10 +- .../generated/OpenMapTilesSchema.java | 41 +- .../openmaptiles/generated/Tables.java | 2 +- .../openmaptiles/layers/AerodromeLabel.java | 14 +- .../openmaptiles/layers/Aeroway.java | 6 +- .../openmaptiles/layers/Boundary.java | 6 +- .../openmaptiles/layers/Building.java | 10 +- .../openmaptiles/layers/Housenumber.java | 6 +- .../openmaptiles/layers/Landcover.java | 8 +- .../openmaptiles/layers/Landuse.java | 12 +- .../openmaptiles/layers/MountainPeak.java | 14 +- .../openmaptiles/layers/Park.java | 14 +- .../openmaptiles/layers/Place.java | 16 +- .../openmaptiles/layers/Poi.java | 16 +- .../openmaptiles/layers/Transportation.java | 10 +- .../layers/TransportationName.java | 18 +- .../openmaptiles/layers/Water.java | 10 +- .../openmaptiles/layers/WaterName.java | 12 +- .../openmaptiles/layers/Waterway.java | 14 +- .../openmaptiles/util/OmtLanguageUtils.java | 4 +- .../openmaptiles/util/Utils.java | 2 +- .../openmaptiles/util/VerifyMonaco.java | 2 +- .../openmaptiles/GenerateTest.java | 25 +- .../openmaptiles/OpenMapTilesProfileTest.java | 2 +- .../openmaptiles/OpenMapTilesTest.java | 28 +- .../layers/AbstractLayerTest.java | 19 +- .../layers/AerodromeLabelTest.java | 2 +- .../openmaptiles/layers/AerowayTest.java | 2 +- .../openmaptiles/layers/BoundaryTest.java | 61 +- .../openmaptiles/layers/BuildingTest.java | 12 +- .../openmaptiles/layers/HousenumberTest.java | 2 +- .../openmaptiles/layers/LandcoverTest.java | 18 +- .../openmaptiles/layers/LanduseTest.java | 8 +- .../openmaptiles/layers/MountainPeakTest.java | 21 +- .../openmaptiles/layers/ParkTest.java | 2 +- .../openmaptiles/layers/PlaceTest.java | 64 +- .../openmaptiles/layers/PoiTest.java | 11 +- .../layers/TransportationTest.java | 14 +- .../openmaptiles/layers/WaterNameTest.java | 18 +- .../openmaptiles/layers/WaterTest.java | 34 +- .../openmaptiles/layers/WaterwayTest.java | 11 +- .../util/OmtLanguageUtilsTest.java | 3 +- .../openmaptiles/util/VerifyMonacoTest.java | 2 +- submodule.pom.xml | 57 ++ 75 files changed, 2560 insertions(+), 454 deletions(-) create mode 100644 .github/cache-sources-action/action.yml create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/snapshot.yml create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/eclipseCodeFormatter.xml create mode 100644 .idea/vcs.xml create mode 100644 .mvn/jvm.config create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 .vscode/settings.json create mode 100644 eclipse-formatter.xml create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100755 scripts/build.sh create mode 100755 scripts/check-doc-links.sh create mode 100755 scripts/check-monaco.sh create mode 100755 scripts/format.sh create mode 100755 scripts/regenerate-openmaptiles.sh create mode 100755 scripts/set-versions.sh create mode 100755 scripts/test-release.sh rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/Generate.java (98%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/Layer.java (84%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/OpenMapTilesMain.java (95%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/OpenMapTilesProfile.java (97%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/generated/OpenMapTilesSchema.java (98%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/generated/Tables.java (99%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/AerodromeLabel.java (87%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Aeroway.java (94%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Boundary.java (98%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Building.java (95%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Housenumber.java (93%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Landcover.java (96%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Landuse.java (91%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/MountainPeak.java (94%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Park.java (93%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Place.java (96%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Poi.java (93%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Transportation.java (98%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/TransportationName.java (95%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Water.java (94%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/WaterName.java (95%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/Waterway.java (95%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/util/OmtLanguageUtils.java (97%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/util/Utils.java (98%) rename src/main/java/{com/onthegomap/planetiler => org}/openmaptiles/util/VerifyMonaco.java (96%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/GenerateTest.java (91%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/OpenMapTilesProfileTest.java (96%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/OpenMapTilesTest.java (87%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/AbstractLayerTest.java (93%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/AerodromeLabelTest.java (98%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/AerowayTest.java (97%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/BoundaryTest.java (91%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/BuildingTest.java (94%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/HousenumberTest.java (92%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/LandcoverTest.java (94%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/LanduseTest.java (91%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/MountainPeakTest.java (92%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/ParkTest.java (98%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/PlaceTest.java (87%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/PoiTest.java (95%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/TransportationTest.java (98%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/WaterNameTest.java (91%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/WaterTest.java (88%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/layers/WaterwayTest.java (95%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/util/OmtLanguageUtilsTest.java (99%) rename src/test/java/{com/onthegomap/planetiler => org}/openmaptiles/util/VerifyMonacoTest.java (96%) create mode 100644 submodule.pom.xml diff --git a/.github/cache-sources-action/action.yml b/.github/cache-sources-action/action.yml new file mode 100644 index 0000000..9501ae8 --- /dev/null +++ b/.github/cache-sources-action/action.yml @@ -0,0 +1,22 @@ +# https://help.github.com/en/actions/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions +name: 'Cache data/sources' +description: 'Save/restore data/sources cache' +inputs: + basedir: + description: 'Base dir for computing file hash' + required: false + default: '' +runs: + using: 'composite' + steps: + - name: Get Date + id: get-data + run: | + echo "::set-output name=hash::${{ hashFiles('**/OpenMapTilesMain.java') }}" + echo "::set-output name=date::$(date -u "+%Y-%m-%d")" + shell: bash + working-directory: ${{ inputs.basedir }} + - uses: actions/cache@v2 + with: + path: data/sources + key: data-sources-${{ steps.get-data.outputs.date }}-${{ steps.get-data.outputs.hash }} diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..5a8c638 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,23 @@ +# Configure dependabot automatic version upgrades +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: maven + directory: "/" + open-pull-requests-limit: 1 + schedule: + interval: daily + time: "04:30" + timezone: America/New_York + labels: + - dependencies + - package-ecosystem: github-actions + directory: "/" + open-pull-requests-limit: 1 + schedule: + interval: daily + time: "04:30" + timezone: America/New_York + labels: + - dependencies diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f60cb53..c9003ce 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,18 +15,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 steps: - - name: Checkout parent Planetiler repo - uses: actions/checkout@v3 - with: - repository: lazaa32/planetiler - ref: omt_submodule - path: planetiler - name: Checkout this PR planetiler-openmaptiles repo uses: actions/checkout@v3 - with: - path: planetiler-openmaptiles - - name: Move planetiler-openmaptiles into planetiler - run: mv planetiler-openmaptiles planetiler - name: Set up JDK 17 uses: actions/setup-java@v3 with: @@ -34,7 +24,6 @@ jobs: distribution: 'temurin' cache: 'maven' - name: Ensure code formatted with mvn spotless:apply - working-directory: planetiler run: ./mvnw -DskipTests --batch-mode -no-transfer-progress spotless:check build: @@ -56,22 +45,8 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 15 steps: - - name: Checkout parent Planetiler repo - uses: actions/checkout@v3 - with: - repository: lazaa32/planetiler - ref: omt_submodule - path: planetiler - name: Checkout this PR planetiler-openmaptiles repo uses: actions/checkout@v3 - with: - path: planetiler-openmaptiles - - name: Move planetiler-openmaptiles into planetiler (linux/mac) - if: ${{ !contains(matrix.os, 'windows') }} - run: mv planetiler-openmaptiles planetiler - - name: Move planetiler-openmaptiles into planetiler (windows) - if: ${{ contains(matrix.os, 'windows') }} - run: mv -Force planetiler-openmaptiles planetiler - name: Set up JDK ${{ matrix.jdk }} uses: actions/setup-java@v3 with: @@ -81,11 +56,9 @@ jobs: # Skip spotless since that gets checked in a separate task - name: Build with mvnw (linux/mac) if: ${{ !contains(matrix.os, 'windows') }} - working-directory: planetiler run: ./mvnw ${{matrix.args}} -Dspotless.check.skip --batch-mode -no-transfer-progress package verify jib:buildTar --file pom.xml - name: Build with mvnw.cmd (windows) if: ${{ contains(matrix.os, 'windows') }} - working-directory: planetiler run: mvnw.cmd ${{matrix.args}} -Dspotless.check.skip --batch-mode -no-transfer-progress package verify jib:buildTar --file pom.xml shell: cmd @@ -94,18 +67,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 steps: - - name: Checkout parent Planetiler repo - uses: actions/checkout@v3 - with: - repository: lazaa32/planetiler - ref: omt_submodule - path: planetiler - name: Checkout this PR planetiler-openmaptiles repo uses: actions/checkout@v3 - with: - path: planetiler-openmaptiles - - name: Move planetiler-openmaptiles into planetiler - run: mv planetiler-openmaptiles planetiler - name: Set up JDK 17 uses: actions/setup-java@v3 with: @@ -113,59 +76,48 @@ jobs: distribution: 'temurin' cache: 'maven' - run: ./scripts/regenerate-openmaptiles.sh - working-directory: planetiler # Skip spotless since that gets checked in a separate task - - run: ./mvnw -Dspotless.check.skip -DskipTests --batch-mode -no-transfer-progress clean install -pl planetiler-openmaptiles -am - working-directory: planetiler - - run: ./mvnw -Dspotless.check.skip --batch-mode -no-transfer-progress verify -pl planetiler-openmaptiles - working-directory: planetiler - - examples: - name: Example project - runs-on: ubuntu-latest - timeout-minutes: 15 - continue-on-error: true - steps: - - name: Checkout parent Planetiler repo - uses: actions/checkout@v3 - with: - repository: lazaa32/planetiler - ref: omt_submodule - path: planetiler - - name: Checkout this PR planetiler-openmaptiles repo - uses: actions/checkout@v3 - with: - path: planetiler-openmaptiles - - name: Move planetiler-openmaptiles into planetiler - run: mv planetiler-openmaptiles planetiler - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: 'temurin' - - name: Build and test - run: mvn --batch-mode -no-transfer-progress package --file standalone.pom.xml - working-directory: planetiler/planetiler-examples - - name: Find jar - run: mv target/*with-deps.jar ./run.jar - working-directory: planetiler/planetiler-examples - - name: Run - run: java -jar run.jar --osm-path=../planetiler-core/src/test/resources/monaco-latest.osm.pbf --mbtiles=data/out.mbtiles - working-directory: planetiler/planetiler-examples - - name: Verify - run: java -cp run.jar com.onthegomap.planetiler.mbtiles.Verify data/out.mbtiles - working-directory: planetiler/planetiler-examples + - run: ./mvnw -Dspotless.check.skip --batch-mode -no-transfer-progress clean verify run: name: Build / Run runs-on: ubuntu-latest timeout-minutes: 15 + steps: + - name: Checkout this PR planetiler-openmaptiles repo + uses: actions/checkout@v3 + - name: Cache data/sources + uses: ./.github/cache-sources-action + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'temurin' + cache: 'maven' + - name: Build this branch + run: ./mvnw -DskipTests -Dimage.version=CI_ONLY --batch-mode -no-transfer-progress package jib:dockerBuild --file pom.xml + - name: 'Upload artifact' + uses: actions/upload-artifact@v3 + with: + name: planetiler-build + path: target/*with-deps.jar + - name: 'Download data (java)' + run: java -jar target/*with-deps.jar --only-download --area=monaco + - name: 'Download wikidata (java)' + run: java -jar target/*with-deps.jar --only-fetch-wikidata --area=monaco + - name: 'Verify build' + run: ./scripts/test-release.sh CI_ONLY + + submodule: + name: Planetiler submodule + runs-on: ubuntu-latest + timeout-minutes: 15 steps: - name: Checkout parent Planetiler repo uses: actions/checkout@v3 with: - repository: lazaa32/planetiler - ref: omt_submodule + repository: onthegomap/planetiler + ref: main path: planetiler - name: Checkout this PR planetiler-openmaptiles repo uses: actions/checkout@v3 @@ -174,21 +126,16 @@ jobs: - name: Move planetiler-openmaptiles into planetiler run: mv planetiler-openmaptiles planetiler - name: Cache data/sources - uses: ./planetiler/.github/cache-sources-action + uses: ./planetiler/planetiler-openmaptiles/.github/cache-sources-action - name: Set up JDK uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' cache: 'maven' - - name: Build this branch + - name: Build and test this branch working-directory: planetiler - run: ./mvnw -DskipTests -Dimage.version=CI_ONLY --batch-mode -no-transfer-progress package jib:dockerBuild --file pom.xml - - name: 'Upload artifact' - uses: actions/upload-artifact@v3 - with: - name: planetiler-build - path: planetiler/planetiler-dist/target/*with-deps.jar + run: ./mvnw -Dimage.version=CI_ONLY --batch-mode -no-transfer-progress verify package jib:dockerBuild --file pom.xml - name: 'Download data (java)' working-directory: planetiler run: java -jar planetiler-dist/target/*with-deps.jar --only-download --area=monaco @@ -199,4 +146,4 @@ jobs: working-directory: planetiler run: ./scripts/test-release.sh CI_ONLY env: - SKIP_EXAMPLE_PROJECT: true + SKIP_EXAMPLE_PROJECT: true \ No newline at end of file diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 33aa6fd..1520f67 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -26,36 +26,20 @@ jobs: uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} - - name: 'Checkout parent Planetiler repo for branch' - uses: actions/checkout@v3 - with: - repository: lazaa32/planetiler - ref: omt_submodule - path: branch/planetiler - - name: 'Checkout parent Planetiler repo for base' - uses: actions/checkout@v3 - with: - repository: lazaa32/planetiler - ref: omt_submodule - path: base/planetiler - name: 'Checkout PT-OMT PR branch' uses: actions/checkout@v3 with: - path: branch/planetiler-openmaptiles - - name: 'Move planetiler-openmaptiles into planetiler for base' - run: mv branch/planetiler-openmaptiles branch/planetiler + path: branch - name: 'Checkout PT-OMT base' uses: actions/checkout@v3 with: - path: base/planetiler-openmaptiles + path: base ref: ${{ github.event.pull_request.base.sha }} - - name: 'Move planetiler-openmaptiles into planetiler for base' - run: mv base/planetiler-openmaptiles base/planetiler - name: 'Cache data/sources' - uses: ./branch/planetiler/.github/cache-sources-action + uses: ./branch/.github/cache-sources-action with: basedir: branch - name: 'Set up JDK' @@ -71,16 +55,16 @@ jobs: - name: 'Build branch' run: ./scripts/build.sh - working-directory: branch/planetiler + working-directory: branch - name: 'Build base' run: ./scripts/build.sh - working-directory: base/planetiler + working-directory: base - name: 'Download data' run: | set -eo pipefail - cp base/planetiler/planetiler-dist/target/*with-deps.jar run.jar && java -jar run.jar --only-download --area="${{ env.AREA }}" - cp branch/planetiler/planetiler-dist/target/*with-deps.jar run.jar && java -jar run.jar --only-download --area="${{ env.AREA }}" + cp base/target/*with-deps.jar run.jar && java -jar run.jar --only-download --area="${{ env.AREA }}" + cp branch/target/*with-deps.jar run.jar && java -jar run.jar --only-download --area="${{ env.AREA }}" - name: 'Store build info' run: | @@ -92,14 +76,14 @@ jobs: - name: 'Run branch' run: | rm -rf data/out.mbtiles data/tmp - cp branch/planetiler/planetiler-dist/target/*with-deps.jar run.jar + cp branch/target/*with-deps.jar run.jar java -Xms${{ env.RAM }} -Xmx${{ env.RAM }} -jar run.jar --area="${{ env.AREA }}" "${{ env.BOUNDS_ARG }}" --mbtiles=data/out.mbtiles 2>&1 | tee log ls -alh run.jar | tee -a log cat log | strip-ansi > build-info/branchlogs.txt - name: 'Run base' run: | rm -rf data/out.mbtiles data/tmp - cp base/planetiler/planetiler-dist/target/*with-deps.jar run.jar + cp base/target/*with-deps.jar run.jar java -Xms${{ env.RAM }} -Xmx${{ env.RAM }} -jar run.jar --area="${{ env.AREA }}" "${{ env.BOUNDS_ARG }}" --mbtiles=data/out.mbtiles 2>&1 | tee log ls -alh run.jar | tee -a log cat log | strip-ansi > build-info/baselogs.txt diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml new file mode 100644 index 0000000..22043a6 --- /dev/null +++ b/.github/workflows/snapshot.yml @@ -0,0 +1,32 @@ +# Publish a docker image on each commit to main +name: Publish a Snapshot + +on: + push: + branches: [ main ] + +jobs: + snapshot: + runs-on: ubuntu-latest + timeout-minutes: 10 + steps: + - uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'temurin' + cache: 'maven' + - run: | + ./mvnw -B -ntp -Pjib-multi-arch \ + -Dimage.tags="latest" \ + -Djib.to.auth.username="${{ secrets.DOCKERHUB_USERNAME }}" \ + -Djib.to.auth.password="${{ secrets.DOCKERHUB_PASSWORD }}" \ + package jib:build --file pom.xml + - run: sha256sum target/*with-deps.jar + - run: md5sum target/*with-deps.jar + - name: 'Upload artifact' + uses: actions/upload-artifact@v3 + with: + name: planetiler-build + path: target/*with-deps.jar diff --git a/.github/workflows/update-pr.yml b/.github/workflows/update-pr.yml index c21b42a..a47c010 100644 --- a/.github/workflows/update-pr.yml +++ b/.github/workflows/update-pr.yml @@ -61,7 +61,7 @@ jobs: - https://github.com/onthegomap/planetiler/actions/runs/${{ github.event.workflow_run.id }} + https://github.com/openmaptiles/planetiler-openmaptiles/actions/runs/${{ github.event.workflow_run.id }}
ℹ️ Base Logs $(cat build-info/base_sha) diff --git a/.gitignore b/.gitignore index 25cf6f8..16f283d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ target/ # idea */.idea -.idea/ .idea/* *.iml !.idea/codeStyles @@ -18,4 +17,6 @@ target/ .classpath .project .settings -bin/ \ No newline at end of file +bin/ + +data/ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..16a51e0 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,598 @@ + + + + + diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/eclipseCodeFormatter.xml b/.idea/eclipseCodeFormatter.xml new file mode 100644 index 0000000..02d0ec3 --- /dev/null +++ b/.idea/eclipseCodeFormatter.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 0000000..813a7d4 --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1,5 @@ +--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED +--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED +--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED +--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED +--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..3e4b704 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to use instead of the default + * one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 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 EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..abd303b --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..6012034 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,11 @@ +{ + "java.format.settings.url": "eclipse-formatter.xml", + "java.format.settings.profile": "Planetiler", + "java.completion.importOrder": [ + "#", + "" + ], + "java.sources.organizeImports.staticStarThreshold": 5, + "java.sources.organizeImports.starThreshold": 999, + "java.saveActions.organizeImports": true +} diff --git a/README.md b/README.md index de0e49b..609de41 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,27 @@ # Planetiler OpenMapTiles Profile -This OpenMapTiles profile is based on [OpenMapTiles](https://github.com/openmaptiles/openmaptiles). -See [README.md](https://github.com/onthegomap/planetiler/blob/main/README.md) in the parent repository for instructions on how to run. +This OpenMapTiles profile for [Planetiler](https://github.com/onthegomap/planetiler) is based +on [OpenMapTiles](https://github.com/openmaptiles/openmaptiles). + +## How to run + +Using pre-built docker image: + +```bash +docker run -v "$(pwd)/data":/data openmaptiles/planetiler-openmaptiles:latest --force --download --area=monaco +``` + +Or to build from source, after [installing Java 16+](https://adoptium.net/installation.html): + +```bash +# Build the project (use mvnw.cmd on windows): +./mvnw clean package +# Then run: +java -jar target/*with-deps.jar --force --download --area=monaco +``` + +See [Planetiler README.md](https://github.com/onthegomap/planetiler/blob/main/README.md) for more description of the +available options. ## Differences from OpenMapTiles @@ -14,30 +34,35 @@ See [README.md](https://github.com/onthegomap/planetiler/blob/main/README.md) in ## Code Layout -[Generate.java](./src/main/java/com/onthegomap/planetiler/openmaptiles/Generate.java) generates code in -the [generated](./src/main/java/com/onthegomap/planetiler/openmaptiles/generated) package from an OpenMapTiles tag in GitHub: +[Generate.java](src/main/java/org/openmaptiles/Generate.java) generates code in +the [generated](src/main/java/org/openmaptiles/generated) package from an OpenMapTiles tag in +GitHub: -- [OpenMapTilesSchema](./src/main/java/com/onthegomap/planetiler/openmaptiles/generated/OpenMapTilesSchema.java) +- [OpenMapTilesSchema](src/main/java/org/openmaptiles/generated/OpenMapTilesSchema.java) contains an interface for each layer with constants for the name, attributes, and allowed values for each tag in that layer -- [Tables](./src/main/java/com/onthegomap/planetiler/openmaptiles/generated/Tables.java) +- [Tables](src/main/java/org/openmaptiles/generated/Tables.java) contains a record for each table that OpenMapTiles [imposm3](https://github.com/omniscale/imposm3) configuration generates (along with the tag-filtering expression) so layers can listen on instances of those records instead of doing the tag filtering and parsing themselves -The [layers](./src/main/java/com/onthegomap/planetiler/openmaptiles/layers) package contains a port of the SQL logic to +The [layers](src/main/java/org/openmaptiles/layers) package contains a port of the SQL logic to generate each layer from OpenMapTiles. Layers define how source features (or parsed imposm3 table rows) map to vector tile features, and logic for post-processing tile geometries. -[OpenMapTilesProfile](./src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfile.java) dispatches source features to +[OpenMapTilesProfile](src/main/java/org/openmaptiles/OpenMapTilesProfile.java) dispatches source +features to layer handlers and merges the results. -[OpenMapTilesMain](./src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesMain.java) is the main driver that registers +[OpenMapTilesMain](src/main/java/org/openmaptiles/OpenMapTilesMain.java) is the main driver that +registers source data and output location. ## Regenerating Code -To run `Generate.java`, use [scripts/regenerate-openmaptiles.sh](https://github.com/onthegomap/planetiler/blob/main/scripts/regenerate-openmaptiles.sh) script with the +To run `Generate.java`, +use [scripts/regenerate-openmaptiles.sh](https://github.com/onthegomap/planetiler/blob/main/scripts/regenerate-openmaptiles.sh) +script with the OpenMapTiles release tag: ```bash @@ -54,9 +79,12 @@ If you want to regenerate from a different repository than the default openmapti ## License -All code in this repository is under the [BSD license](./LICENSE.md) and the cartography decisions encoded in the schema and SQL are licensed under [CC-BY](./LICENSE.md). +All code in this repository is under the [BSD license](./LICENSE.md) and the cartography decisions encoded in the schema +and SQL are licensed under [CC-BY](./LICENSE.md). -Products or services using maps derived from OpenMapTiles schema need to visibly credit "OpenMapTiles.org" or reference "OpenMapTiles" with a link to https://openmaptiles.org/. Exceptions to attribution requirement can be granted on request. +Products or services using maps derived from OpenMapTiles schema need to visibly credit "OpenMapTiles.org" or +reference "OpenMapTiles" with a link to https://openmaptiles.org/. Exceptions to attribution requirement can be granted +on request. For a browsable electronic map based on OpenMapTiles and OpenStreetMap data, the credit should appear in the corner of the map. For example: diff --git a/eclipse-formatter.xml b/eclipse-formatter.xml new file mode 100644 index 0000000..5fa6d15 --- /dev/null +++ b/eclipse-formatter.xml @@ -0,0 +1,480 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..41c0f0c --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..8611571 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 4d855d9..1867a4e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,21 +2,62 @@ + 4.0.0 - planetiler-openmaptiles + + UTF-8 + 16 + 16 + 0.5-SNAPSHOT + 5.9.0 - - com.onthegomap.planetiler - planetiler-parent - 0.5-SNAPSHOT - + org.openmaptiles.OpenMapTilesMain + ${project.version} + openmaptiles/planetiler-openmaptiles:${image.version} + package + amd64 + linux + + + org.openmaptiles + planetiler-openmaptiles + 3.13.1 + + OpenMapTiles Vector Tile Schema implementation for Planetiler tool + + + + + osgeo + OSGeo Release Repository + https://repo.osgeo.org/repository/release/ + + false + + + true + + + + + nexus-snapshots + Nexus SNAPSHOT Repository + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + true + + + false + + + com.onthegomap.planetiler planetiler-core - ${project.parent.version} + ${planetiler.version} org.yaml @@ -29,29 +70,195 @@ 0.19.0 + com.onthegomap.planetiler planetiler-core - ${project.parent.version} + ${planetiler.version} test-jar test + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + test + - io.github.zlika - reproducible-build-maven-plugin + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M7 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M7 - maven-deploy-plugin + com.diffplug.spotless + spotless-maven-plugin + 2.24.0 - - true + + + + + 4.21.0 + eclipse-formatter.xml + + + + + **/*.md + + + **/target/** + + + + + + + + + check + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.1.0 + + + enforce-java + + enforce + + + + + 16 + + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.4.2 + + + com.onthegomap.planetiler + planetiler-core + ${planetiler.version} + + + + + + + true + + + ${mainClass} + + + + with-deps + + false + + + + + make-assembly + ${assembly-phase} + + single + + + + + + + + com.google.cloud.tools + jib-maven-plugin + 3.2.1 + + + + eclipse-temurin:17-jre + + + + ${jib.platform-arch} + ${jib.platform-os} + + + + + ${image} + + + + + https://github.com/openmaptiles/planetiler-openmaptiles + + + ${mainClass} + + + + + jib-multi-arch + + + + com.google.cloud.tools + jib-maven-plugin + + + + + amd64 + linux + + + arm64 + linux + + + + + + + + + diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 0000000..aa40a3e --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -o errexit +set -o pipefail +set -o nounset + +./mvnw -DskipTests=true clean package diff --git a/scripts/check-doc-links.sh b/scripts/check-doc-links.sh new file mode 100755 index 0000000..67dd44e --- /dev/null +++ b/scripts/check-doc-links.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -o errexit +set -o pipefail +set -o nounset + +find . -name '*.md' -not -path '*/target/*' -print0 | xargs -I {} -n 1 -0 markdown-link-check --quiet --config .github/workflows/docs_mlc_config.json {} diff --git a/scripts/check-monaco.sh b/scripts/check-monaco.sh new file mode 100755 index 0000000..a7aacbd --- /dev/null +++ b/scripts/check-monaco.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -o errexit +set -o pipefail +set -o nounset + +java -ea -cp target/*-with-deps.jar org.openmaptiles.util.VerifyMonaco $* diff --git a/scripts/format.sh b/scripts/format.sh new file mode 100755 index 0000000..3b6a99d --- /dev/null +++ b/scripts/format.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -e + +./mvnw spotless:apply diff --git a/scripts/regenerate-openmaptiles.sh b/scripts/regenerate-openmaptiles.sh new file mode 100755 index 0000000..47c8fa5 --- /dev/null +++ b/scripts/regenerate-openmaptiles.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +set -o errexit +set -o pipefail +set -o nounset + +TAG="${1:-"v3.13.1"}" +echo "tag=${TAG}" + +BASE_URL="${2:-"https://raw.githubusercontent.com/openmaptiles/openmaptiles/"}" +echo "base-url=${BASE_URL}" + +echo "Building..." +./mvnw -DskipTests=true package + +echo "Running..." +java -cp target/*-with-deps.jar org.openmaptiles.Generate -tag="${TAG}" -base-url="${BASE_URL}" + +echo "Formatting..." +./scripts/format.sh diff --git a/scripts/set-versions.sh b/scripts/set-versions.sh new file mode 100755 index 0000000..23e6d2d --- /dev/null +++ b/scripts/set-versions.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +set -eu + +if (( $# != 1 )); then + echo "Usage: set_versions.sh " >&2 + exit 1 +fi + +version="$1" + +./mvnw -B -ntp versions:set versions:commit -DnewVersion="${version}" diff --git a/scripts/test-release.sh b/scripts/test-release.sh new file mode 100755 index 0000000..61b08d7 --- /dev/null +++ b/scripts/test-release.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -exuo pipefail + +version="${1:-$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)}" + +echo "Test java build" +echo "::group::OpenMapTiles monaco (java)" +rm -f data/out.mbtiles +java -jar target/*with-deps.jar --download --area=monaco --mbtiles=data/out.mbtiles +./scripts/check-monaco.sh data/out.mbtiles +echo "::endgroup::" + +echo "::endgroup::" +echo "::group::OpenMapTiles monaco (docker)" +rm -f data/out.mbtiles +docker run -v "$(pwd)/data":/data openmaptiles/planetiler-openmaptiles:"${version}" --area=monaco --mbtiles=data/out.mbtiles +./scripts/check-monaco.sh data/out.mbtiles +echo "::endgroup::" diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/Generate.java b/src/main/java/org/openmaptiles/Generate.java similarity index 98% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/Generate.java rename to src/main/java/org/openmaptiles/Generate.java index 9bd86a4..261d826 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/Generate.java +++ b/src/main/java/org/openmaptiles/Generate.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles; +package org.openmaptiles; import static com.onthegomap.planetiler.expression.Expression.*; import static java.util.stream.Collectors.joining; @@ -161,9 +161,9 @@ public class Generate { tables.putAll(layer.tables); } - String packageName = "com.onthegomap.planetiler.openmaptiles.generated"; + String packageName = "org.openmaptiles.generated"; String[] packageParts = packageName.split("\\."); - Path output = Path.of("planetiler-openmaptiles", "src", "main", "java") + Path output = Path.of("src", "main", "java") .resolve(Path.of(packageParts[0], Arrays.copyOfRange(packageParts, 1, packageParts.length))); FileUtils.deleteDirectory(output); @@ -188,7 +188,7 @@ public class Generate { import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.expression.MultiExpression; - import com.onthegomap.planetiler.openmaptiles.Layer; + import org.openmaptiles.Layer; import com.onthegomap.planetiler.util.Translations; import java.util.List; import java.util.Map; @@ -225,7 +225,7 @@ public class Generate { info.languages.stream().map(Format::quote).collect(joining(", ")), layers.stream() .map( - l -> "new com.onthegomap.planetiler.openmaptiles.layers.%s(translations, config, stats)" + l -> "new org.openmaptiles.layers.%s(translations, config, stats)" .formatted(lowerUnderscoreToUpperCamel(l.layer.id))) .collect(joining("," + LINE_SEPARATOR)) .indent(6).trim() diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/Layer.java b/src/main/java/org/openmaptiles/Layer.java similarity index 84% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/Layer.java rename to src/main/java/org/openmaptiles/Layer.java index e34f4a9..5c42a9f 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/Layer.java +++ b/src/main/java/org/openmaptiles/Layer.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles; +package org.openmaptiles; import com.onthegomap.planetiler.ForwardingProfile; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesMain.java b/src/main/java/org/openmaptiles/OpenMapTilesMain.java similarity index 95% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesMain.java rename to src/main/java/org/openmaptiles/OpenMapTilesMain.java index 2663b22..0e0b729 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesMain.java +++ b/src/main/java/org/openmaptiles/OpenMapTilesMain.java @@ -1,9 +1,9 @@ -package com.onthegomap.planetiler.openmaptiles; +package org.openmaptiles; import com.onthegomap.planetiler.Planetiler; import com.onthegomap.planetiler.config.Arguments; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import java.nio.file.Path; +import org.openmaptiles.generated.OpenMapTilesSchema; /** * Main entrypoint for generating a map using the OpenMapTiles schema. diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfile.java b/src/main/java/org/openmaptiles/OpenMapTilesProfile.java similarity index 97% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfile.java rename to src/main/java/org/openmaptiles/OpenMapTilesProfile.java index 98a28c8..90d2d7b 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfile.java +++ b/src/main/java/org/openmaptiles/OpenMapTilesProfile.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles; +package org.openmaptiles; import static com.onthegomap.planetiler.geo.GeoUtils.EMPTY_LINE; import static com.onthegomap.planetiler.geo.GeoUtils.EMPTY_POINT; @@ -10,10 +10,6 @@ import com.onthegomap.planetiler.Planetiler; import com.onthegomap.planetiler.Profile; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.layers.Transportation; -import com.onthegomap.planetiler.openmaptiles.layers.TransportationName; import com.onthegomap.planetiler.reader.SimpleFeature; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmElement; @@ -21,6 +17,10 @@ import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; import java.util.ArrayList; import java.util.List; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; +import org.openmaptiles.layers.Transportation; +import org.openmaptiles.layers.TransportationName; /** * Delegates the logic for generating a map to individual implementations in the {@code layers} package. diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/generated/OpenMapTilesSchema.java b/src/main/java/org/openmaptiles/generated/OpenMapTilesSchema.java similarity index 98% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/generated/OpenMapTilesSchema.java rename to src/main/java/org/openmaptiles/generated/OpenMapTilesSchema.java index f440f61..3d9e8ba 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/generated/OpenMapTilesSchema.java +++ b/src/main/java/org/openmaptiles/generated/OpenMapTilesSchema.java @@ -35,17 +35,20 @@ See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for deta */ // AUTOGENERATED BY Generate.java -- DO NOT MODIFY -package com.onthegomap.planetiler.openmaptiles.generated; +package org.openmaptiles.generated; -import static com.onthegomap.planetiler.expression.Expression.*; +import static com.onthegomap.planetiler.expression.Expression.FALSE; +import static com.onthegomap.planetiler.expression.Expression.and; +import static com.onthegomap.planetiler.expression.Expression.matchAny; +import static com.onthegomap.planetiler.expression.Expression.or; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; -import com.onthegomap.planetiler.openmaptiles.Layer; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; import java.util.List; import java.util.Set; +import org.openmaptiles.Layer; /** * All vector tile layer definitions, attributes, and allowed values generated from the @@ -68,22 +71,22 @@ public class OpenMapTilesSchema { /** Returns a list of expected layer implementation instances from the {@code layers} package. */ public static List createInstances(Translations translations, PlanetilerConfig config, Stats stats) { return List.of( - new com.onthegomap.planetiler.openmaptiles.layers.Water(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Waterway(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Landcover(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Landuse(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.MountainPeak(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Park(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Boundary(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Aeroway(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Transportation(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Building(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.WaterName(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.TransportationName(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Place(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Housenumber(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.Poi(translations, config, stats), - new com.onthegomap.planetiler.openmaptiles.layers.AerodromeLabel(translations, config, stats) + new org.openmaptiles.layers.Water(translations, config, stats), + new org.openmaptiles.layers.Waterway(translations, config, stats), + new org.openmaptiles.layers.Landcover(translations, config, stats), + new org.openmaptiles.layers.Landuse(translations, config, stats), + new org.openmaptiles.layers.MountainPeak(translations, config, stats), + new org.openmaptiles.layers.Park(translations, config, stats), + new org.openmaptiles.layers.Boundary(translations, config, stats), + new org.openmaptiles.layers.Aeroway(translations, config, stats), + new org.openmaptiles.layers.Transportation(translations, config, stats), + new org.openmaptiles.layers.Building(translations, config, stats), + new org.openmaptiles.layers.WaterName(translations, config, stats), + new org.openmaptiles.layers.TransportationName(translations, config, stats), + new org.openmaptiles.layers.Place(translations, config, stats), + new org.openmaptiles.layers.Housenumber(translations, config, stats), + new org.openmaptiles.layers.Poi(translations, config, stats), + new org.openmaptiles.layers.AerodromeLabel(translations, config, stats) ); } diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/generated/Tables.java b/src/main/java/org/openmaptiles/generated/Tables.java similarity index 99% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/generated/Tables.java rename to src/main/java/org/openmaptiles/generated/Tables.java index 6bbb1dc..eb19c3f 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/generated/Tables.java +++ b/src/main/java/org/openmaptiles/generated/Tables.java @@ -35,7 +35,7 @@ See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for deta */ // AUTOGENERATED BY Generate.java -- DO NOT MODIFY -package com.onthegomap.planetiler.openmaptiles.generated; +package org.openmaptiles.generated; import static com.onthegomap.planetiler.expression.Expression.*; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabel.java b/src/main/java/org/openmaptiles/layers/AerodromeLabel.java similarity index 87% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabel.java rename to src/main/java/org/openmaptiles/layers/AerodromeLabel.java index 6019a1f..7f5b39c 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabel.java +++ b/src/main/java/org/openmaptiles/layers/AerodromeLabel.java @@ -33,20 +33,20 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullOrEmpty; +import static org.openmaptiles.util.Utils.nullIfEmpty; +import static org.openmaptiles.util.Utils.nullOrEmpty; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.OmtLanguageUtils; -import com.onthegomap.planetiler.openmaptiles.util.Utils; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; +import org.openmaptiles.util.OmtLanguageUtils; +import org.openmaptiles.util.Utils; /** * Defines the logic for generating map elements in the {@code aerodrome_label} layer from source features. diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Aeroway.java b/src/main/java/org/openmaptiles/layers/Aeroway.java similarity index 94% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Aeroway.java rename to src/main/java/org/openmaptiles/layers/Aeroway.java index 83241fd..1f45f44 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Aeroway.java +++ b/src/main/java/org/openmaptiles/layers/Aeroway.java @@ -33,14 +33,14 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; /** * Defines the logic for generating map elements in the {@code aeroway} layer from source features. diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Boundary.java b/src/main/java/org/openmaptiles/layers/Boundary.java similarity index 98% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Boundary.java rename to src/main/java/org/openmaptiles/layers/Boundary.java index 06d15d3..f566687 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Boundary.java +++ b/src/main/java/org/openmaptiles/layers/Boundary.java @@ -33,7 +33,7 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.util.MemoryEstimator.CLASS_HEADER_BYTES; import static com.onthegomap.planetiler.util.MemoryEstimator.POINTER_BYTES; @@ -49,8 +49,6 @@ import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; import com.onthegomap.planetiler.reader.SimpleFeature; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmElement; @@ -79,6 +77,8 @@ import org.locationtech.jts.geom.prep.PreparedGeometry; import org.locationtech.jts.geom.prep.PreparedGeometryFactory; import org.locationtech.jts.operation.linemerge.LineMerger; import org.locationtech.jts.operation.polygonize.Polygonizer; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Building.java b/src/main/java/org/openmaptiles/layers/Building.java similarity index 95% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Building.java rename to src/main/java/org/openmaptiles/layers/Building.java index f22ec66..02268c6 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Building.java +++ b/src/main/java/org/openmaptiles/layers/Building.java @@ -33,21 +33,18 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce; import static com.onthegomap.planetiler.util.MemoryEstimator.CLASS_HEADER_BYTES; import static com.onthegomap.planetiler.util.Parse.parseDoubleOrNull; import static java.util.Map.entry; +import static org.openmaptiles.util.Utils.coalesce; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeometryException; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.reader.osm.OsmElement; import com.onthegomap.planetiler.reader.osm.OsmRelationInfo; import com.onthegomap.planetiler.stats.Stats; @@ -56,6 +53,9 @@ import com.onthegomap.planetiler.util.Translations; import java.util.List; import java.util.Locale; import java.util.Map; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; /** * Defines the logic for generating map elements for buildings in the {@code building} layer from source features. diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Housenumber.java b/src/main/java/org/openmaptiles/layers/Housenumber.java similarity index 93% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Housenumber.java rename to src/main/java/org/openmaptiles/layers/Housenumber.java index 01002a7..4cf31cf 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Housenumber.java +++ b/src/main/java/org/openmaptiles/layers/Housenumber.java @@ -33,14 +33,14 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; /** * Defines the logic for generating map elements in the {@code housenumber} layer from source features. diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landcover.java b/src/main/java/org/openmaptiles/layers/Landcover.java similarity index 96% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landcover.java rename to src/main/java/org/openmaptiles/layers/Landcover.java index d2d621c..d581822 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landcover.java +++ b/src/main/java/org/openmaptiles/layers/Landcover.java @@ -33,7 +33,7 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; @@ -41,9 +41,6 @@ import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; import com.onthegomap.planetiler.geo.GeometryException; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; @@ -52,6 +49,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; /** * Defines the logic for generating map elements for natural land cover polygons like ice, sand, and forest in the diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landuse.java b/src/main/java/org/openmaptiles/layers/Landuse.java similarity index 91% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landuse.java rename to src/main/java/org/openmaptiles/layers/Landuse.java index d5082af..101281a 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Landuse.java +++ b/src/main/java/org/openmaptiles/layers/Landuse.java @@ -33,16 +33,13 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; +import static org.openmaptiles.util.Utils.coalesce; +import static org.openmaptiles.util.Utils.nullIfEmpty; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; @@ -50,6 +47,9 @@ import com.onthegomap.planetiler.util.Translations; import com.onthegomap.planetiler.util.ZoomFunction; import java.util.Map; import java.util.Set; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; /** * Defines the logic for generating map elements for man-made land use polygons like cemeteries, zoos, and hospitals in diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeak.java b/src/main/java/org/openmaptiles/layers/MountainPeak.java similarity index 94% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeak.java rename to src/main/java/org/openmaptiles/layers/MountainPeak.java index 0104d3b..afb32bb 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeak.java +++ b/src/main/java/org/openmaptiles/layers/MountainPeak.java @@ -33,10 +33,10 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.elevationTags; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; +import static org.openmaptiles.util.Utils.elevationTags; +import static org.openmaptiles.util.Utils.nullIfEmpty; import com.carrotsearch.hppc.LongIntMap; import com.onthegomap.planetiler.FeatureCollector; @@ -44,10 +44,6 @@ import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeometryException; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.OmtLanguageUtils; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; @@ -58,6 +54,10 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.prep.PreparedGeometry; import org.locationtech.jts.geom.prep.PreparedGeometryFactory; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; +import org.openmaptiles.util.OmtLanguageUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Park.java b/src/main/java/org/openmaptiles/layers/Park.java similarity index 93% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Park.java rename to src/main/java/org/openmaptiles/layers/Park.java index 669d02c..6bcc653 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Park.java +++ b/src/main/java/org/openmaptiles/layers/Park.java @@ -33,11 +33,11 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_BITS; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; +import static org.openmaptiles.util.Utils.coalesce; +import static org.openmaptiles.util.Utils.nullIfEmpty; import com.carrotsearch.hppc.LongIntMap; import com.onthegomap.planetiler.FeatureCollector; @@ -48,15 +48,15 @@ import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.geo.GeometryType; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.OmtLanguageUtils; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.SortKey; import com.onthegomap.planetiler.util.Translations; import java.util.List; import java.util.Locale; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; +import org.openmaptiles.util.OmtLanguageUtils; /** * Defines the logic for generating map elements for designated parks polygons and their label points in the {@code diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Place.java b/src/main/java/org/openmaptiles/layers/Place.java similarity index 96% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Place.java rename to src/main/java/org/openmaptiles/layers/Place.java index fe9a00b..072f144 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Place.java +++ b/src/main/java/org/openmaptiles/layers/Place.java @@ -33,12 +33,12 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_BITS; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullOrEmpty; +import static org.openmaptiles.util.Utils.coalesce; +import static org.openmaptiles.util.Utils.nullIfEmpty; +import static org.openmaptiles.util.Utils.nullOrEmpty; import com.carrotsearch.hppc.LongIntMap; import com.onthegomap.planetiler.FeatureCollector; @@ -49,10 +49,6 @@ import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.geo.PointIndex; import com.onthegomap.planetiler.geo.PolygonIndex; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.OmtLanguageUtils; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; @@ -71,6 +67,10 @@ import java.util.stream.DoubleStream; import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; import org.locationtech.jts.geom.Point; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; +import org.openmaptiles.util.OmtLanguageUtils; /** * Defines the logic for generating label points for populated places like continents, countries, cities, and towns in diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Poi.java b/src/main/java/org/openmaptiles/layers/Poi.java similarity index 93% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Poi.java rename to src/main/java/org/openmaptiles/layers/Poi.java index eb6cf74..b73febe 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Poi.java +++ b/src/main/java/org/openmaptiles/layers/Poi.java @@ -33,13 +33,13 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfLong; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullOrEmpty; import static java.util.Map.entry; +import static org.openmaptiles.util.Utils.coalesce; +import static org.openmaptiles.util.Utils.nullIfEmpty; +import static org.openmaptiles.util.Utils.nullIfLong; +import static org.openmaptiles.util.Utils.nullOrEmpty; import com.carrotsearch.hppc.LongIntMap; import com.onthegomap.planetiler.FeatureCollector; @@ -48,14 +48,14 @@ import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.OmtLanguageUtils; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; import com.onthegomap.planetiler.util.Translations; import java.util.List; import java.util.Map; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; +import org.openmaptiles.util.OmtLanguageUtils; /** * Defines the logic for generating map elements for things like shops, parks, and schools in the {@code poi} layer from diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Transportation.java b/src/main/java/org/openmaptiles/layers/Transportation.java similarity index 98% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Transportation.java rename to src/main/java/org/openmaptiles/layers/Transportation.java index f275d7b..10b0913 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Transportation.java +++ b/src/main/java/org/openmaptiles/layers/Transportation.java @@ -33,13 +33,13 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.*; import static com.onthegomap.planetiler.util.MemoryEstimator.CLASS_HEADER_BYTES; import static com.onthegomap.planetiler.util.MemoryEstimator.POINTER_BYTES; import static com.onthegomap.planetiler.util.MemoryEstimator.estimateSize; import static java.util.Map.entry; +import static org.openmaptiles.util.Utils.*; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; @@ -48,9 +48,6 @@ import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmElement; import com.onthegomap.planetiler.reader.osm.OsmReader; @@ -73,6 +70,9 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.prep.PreparedGeometry; import org.locationtech.jts.geom.prep.PreparedGeometryFactory; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationName.java b/src/main/java/org/openmaptiles/layers/TransportationName.java similarity index 95% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationName.java rename to src/main/java/org/openmaptiles/layers/TransportationName.java index f83f4dd..8d0cb8b 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationName.java +++ b/src/main/java/org/openmaptiles/layers/TransportationName.java @@ -33,12 +33,12 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; -import static com.onthegomap.planetiler.openmaptiles.layers.Transportation.highwayClass; -import static com.onthegomap.planetiler.openmaptiles.layers.Transportation.highwaySubclass; -import static com.onthegomap.planetiler.openmaptiles.layers.Transportation.isFootwayOrSteps; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.*; +import static org.openmaptiles.layers.Transportation.highwayClass; +import static org.openmaptiles.layers.Transportation.highwaySubclass; +import static org.openmaptiles.layers.Transportation.isFootwayOrSteps; +import static org.openmaptiles.util.Utils.*; import com.carrotsearch.hppc.LongArrayList; import com.carrotsearch.hppc.LongByteMap; @@ -50,10 +50,6 @@ import com.onthegomap.planetiler.ForwardingProfile; import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.OmtLanguageUtils; import com.onthegomap.planetiler.reader.osm.OsmElement; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; @@ -64,6 +60,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; +import org.openmaptiles.util.OmtLanguageUtils; /** * Defines the logic for generating map elements for road, shipway, rail, and path names in the {@code diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Water.java b/src/main/java/org/openmaptiles/layers/Water.java similarity index 94% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Water.java rename to src/main/java/org/openmaptiles/layers/Water.java index b98ce8f..0b040a2 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Water.java +++ b/src/main/java/org/openmaptiles/layers/Water.java @@ -33,7 +33,7 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.FeatureMerge; @@ -42,14 +42,14 @@ import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.expression.MultiExpression; import com.onthegomap.planetiler.geo.GeometryException; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.Utils; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Translations; import java.util.List; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; +import org.openmaptiles.util.Utils; /** * Defines the logic for generating map elements for oceans and lakes in the {@code water} layer from source features. diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/WaterName.java b/src/main/java/org/openmaptiles/layers/WaterName.java similarity index 95% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/WaterName.java rename to src/main/java/org/openmaptiles/layers/WaterName.java index e1c53f1..2bc19fc 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/WaterName.java +++ b/src/main/java/org/openmaptiles/layers/WaterName.java @@ -33,9 +33,9 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; +import static org.openmaptiles.util.Utils.nullIfEmpty; import com.carrotsearch.hppc.LongObjectMap; import com.onthegomap.planetiler.FeatureCollector; @@ -43,10 +43,6 @@ import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.OmtLanguageUtils; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.util.Parse; @@ -54,6 +50,10 @@ import com.onthegomap.planetiler.util.Translations; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; import org.locationtech.jts.geom.Geometry; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; +import org.openmaptiles.util.OmtLanguageUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Waterway.java b/src/main/java/org/openmaptiles/layers/Waterway.java similarity index 95% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Waterway.java rename to src/main/java/org/openmaptiles/layers/Waterway.java index 3d5baa1..64d749a 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/layers/Waterway.java +++ b/src/main/java/org/openmaptiles/layers/Waterway.java @@ -33,9 +33,9 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.nullIfEmpty; +import static org.openmaptiles.util.Utils.nullIfEmpty; import com.carrotsearch.hppc.LongObjectHashMap; import com.google.common.util.concurrent.AtomicDouble; @@ -45,11 +45,6 @@ import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.collection.Hppc; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeometryException; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; -import com.onthegomap.planetiler.openmaptiles.generated.OpenMapTilesSchema; -import com.onthegomap.planetiler.openmaptiles.generated.Tables; -import com.onthegomap.planetiler.openmaptiles.util.OmtLanguageUtils; -import com.onthegomap.planetiler.openmaptiles.util.Utils; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmElement; import com.onthegomap.planetiler.reader.osm.OsmReader; @@ -59,6 +54,11 @@ import com.onthegomap.planetiler.util.Translations; import com.onthegomap.planetiler.util.ZoomFunction; import java.util.List; import java.util.Map; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.generated.OpenMapTilesSchema; +import org.openmaptiles.generated.Tables; +import org.openmaptiles.util.OmtLanguageUtils; +import org.openmaptiles.util.Utils; /** * Defines the logic for generating river map elements in the {@code waterway} layer from source features. diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/util/OmtLanguageUtils.java b/src/main/java/org/openmaptiles/util/OmtLanguageUtils.java similarity index 97% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/util/OmtLanguageUtils.java rename to src/main/java/org/openmaptiles/util/OmtLanguageUtils.java index 5b3d452..1cc36c5 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/util/OmtLanguageUtils.java +++ b/src/main/java/org/openmaptiles/util/OmtLanguageUtils.java @@ -33,10 +33,10 @@ Design license: CC-BY 4.0 See https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md for details on usage */ -package com.onthegomap.planetiler.openmaptiles.util; +package org.openmaptiles.util; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce; import static com.onthegomap.planetiler.util.LanguageUtils.*; +import static org.openmaptiles.util.Utils.coalesce; import com.onthegomap.planetiler.util.LanguageUtils; import com.onthegomap.planetiler.util.Translations; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/util/Utils.java b/src/main/java/org/openmaptiles/util/Utils.java similarity index 98% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/util/Utils.java rename to src/main/java/org/openmaptiles/util/Utils.java index fe8190c..de9f4bf 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/util/Utils.java +++ b/src/main/java/org/openmaptiles/util/Utils.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles.util; +package org.openmaptiles.util; import com.onthegomap.planetiler.util.Parse; import java.util.Map; diff --git a/src/main/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonaco.java b/src/main/java/org/openmaptiles/util/VerifyMonaco.java similarity index 96% rename from src/main/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonaco.java rename to src/main/java/org/openmaptiles/util/VerifyMonaco.java index efd57d4..fffc910 100644 --- a/src/main/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonaco.java +++ b/src/main/java/org/openmaptiles/util/VerifyMonaco.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles.util; +package org.openmaptiles.util; import com.onthegomap.planetiler.mbtiles.Mbtiles; import com.onthegomap.planetiler.mbtiles.Verify; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/GenerateTest.java b/src/test/java/org/openmaptiles/GenerateTest.java similarity index 91% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/GenerateTest.java rename to src/test/java/org/openmaptiles/GenerateTest.java index 96ca0f7..b659a91 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/GenerateTest.java +++ b/src/test/java/org/openmaptiles/GenerateTest.java @@ -1,7 +1,6 @@ -package com.onthegomap.planetiler.openmaptiles; +package org.openmaptiles; import static com.onthegomap.planetiler.expression.Expression.*; -import static com.onthegomap.planetiler.openmaptiles.Generate.parseYaml; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.DynamicTest.dynamicTest; @@ -20,7 +19,7 @@ class GenerateTest { @Test void testParseSimple() { - MultiExpression parsed = Generate.generateFieldMapping(parseYaml(""" + MultiExpression parsed = Generate.generateFieldMapping(Generate.parseYaml(""" output: key: value key2: @@ -37,7 +36,7 @@ class GenerateTest { @Test void testParseAnd() { - MultiExpression parsed = Generate.generateFieldMapping(parseYaml(""" + MultiExpression parsed = Generate.generateFieldMapping(Generate.parseYaml(""" output: __AND__: key1: val1 @@ -53,7 +52,7 @@ class GenerateTest { @Test void testParseAndWithOthers() { - MultiExpression parsed = Generate.generateFieldMapping(parseYaml(""" + MultiExpression parsed = Generate.generateFieldMapping(Generate.parseYaml(""" output: - key0: val0 - __AND__: @@ -73,7 +72,7 @@ class GenerateTest { @Test void testParseAndContainingOthers() { - MultiExpression parsed = Generate.generateFieldMapping(parseYaml(""" + MultiExpression parsed = Generate.generateFieldMapping(Generate.parseYaml(""" output: __AND__: - key1: val1 @@ -94,7 +93,7 @@ class GenerateTest { @Test void testParseContainsKey() { - MultiExpression parsed = Generate.generateFieldMapping(parseYaml(""" + MultiExpression parsed = Generate.generateFieldMapping(Generate.parseYaml(""" output: key1: val1 key2: @@ -175,9 +174,9 @@ class GenerateTest { ) ).map(test -> dynamicTest(test.name, () -> { Expression parsed = Generate - .parseImposm3MappingExpression("point", parseYaml(test.mapping), new Generate.Imposm3Filters( - parseYaml(test.reject), - parseYaml(test.require) + .parseImposm3MappingExpression("point", Generate.parseYaml(test.mapping), new Generate.Imposm3Filters( + Generate.parseYaml(test.reject), + Generate.parseYaml(test.require) )); assertEquals(test.expected, parsed.replace(matchType("point"), TRUE).simplify()); })); @@ -186,7 +185,7 @@ class GenerateTest { @Test void testTypeMappingTopLevelType() { Expression parsed = Generate - .parseImposm3MappingExpression("point", parseYaml(""" + .parseImposm3MappingExpression("point", Generate.parseYaml(""" key: val """), new Generate.Imposm3Filters(null, null)); assertEquals(and( @@ -198,10 +197,10 @@ class GenerateTest { @Test void testTypeMappings() { Map props = new LinkedHashMap<>(); - props.put("points", parseYaml(""" + props.put("points", Generate.parseYaml(""" key: val """)); - props.put("polygons", parseYaml(""" + props.put("polygons", Generate.parseYaml(""" key2: val2 """)); Expression parsed = Generate diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfileTest.java b/src/test/java/org/openmaptiles/OpenMapTilesProfileTest.java similarity index 96% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfileTest.java rename to src/test/java/org/openmaptiles/OpenMapTilesProfileTest.java index 864d8ee..0ffafa8 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesProfileTest.java +++ b/src/test/java/org/openmaptiles/OpenMapTilesProfileTest.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles; +package org.openmaptiles; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesTest.java b/src/test/java/org/openmaptiles/OpenMapTilesTest.java similarity index 87% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesTest.java rename to src/test/java/org/openmaptiles/OpenMapTilesTest.java index bc30a10..53d2b10 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/OpenMapTilesTest.java +++ b/src/test/java/org/openmaptiles/OpenMapTilesTest.java @@ -1,8 +1,7 @@ -package com.onthegomap.planetiler.openmaptiles; +package org.openmaptiles; import static com.onthegomap.planetiler.TestUtils.assertContains; import static com.onthegomap.planetiler.TestUtils.assertFeatureNear; -import static com.onthegomap.planetiler.openmaptiles.util.VerifyMonaco.MONACO_BOUNDS; import static com.onthegomap.planetiler.util.Gzip.gunzip; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.DynamicTest.dynamicTest; @@ -11,7 +10,7 @@ import com.onthegomap.planetiler.TestUtils; import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.config.Arguments; import com.onthegomap.planetiler.mbtiles.Mbtiles; -import com.onthegomap.planetiler.openmaptiles.util.VerifyMonaco; +import com.onthegomap.planetiler.util.FileUtils; import java.io.IOException; import java.nio.file.Path; import java.util.Map; @@ -23,11 +22,13 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestFactory; +import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.io.TempDir; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; +import org.openmaptiles.util.VerifyMonaco; /** * End-to-end tests for OpenMapTiles generation. @@ -42,22 +43,29 @@ class OpenMapTilesTest { private static Mbtiles mbtiles; @BeforeAll + @Timeout(30) public static void runPlanetiler() throws Exception { Path dbPath = tmpDir.resolve("output.mbtiles"); + var osmPath = TestUtils.extractPathToResource(tmpDir, "monaco-latest.osm.pbf"); + var naturalEarthPath = TestUtils.extractPathToResource(tmpDir, "natural_earth_vector.sqlite.zip"); + var waterPath = tmpDir.resolve("water"); + // windows seems to have trouble closing zip file after reading from it, so extract first instead + FileUtils.unzipResource("/water-polygons-split-3857.zip", waterPath); OpenMapTilesMain.run(Arguments.of( // Override input source locations - "osm_path", TestUtils.pathToResource("monaco-latest.osm.pbf"), - "natural_earth_path", TestUtils.pathToResource("natural_earth_vector.sqlite.zip"), - "water_polygons_path", TestUtils.pathToResource("water-polygons-split-3857.zip"), + "osm_path", osmPath, + "natural_earth_path", naturalEarthPath, + "water_polygons_path", waterPath, // no centerlines in monaco - so fake it out with an empty source - "lake_centerlines_path", TestUtils.pathToResource("water-polygons-split-3857.zip"), + "lake_centerlines_path", waterPath, // Override temp dir location - "tmp", tmpDir.toString(), + "tmpdir", tmpDir.resolve("tmp"), // Override output location - "mbtiles", dbPath.toString() + "mbtiles", dbPath )); + mbtiles = Mbtiles.newReadOnlyDatabase(dbPath); } @@ -220,6 +228,6 @@ class OpenMapTilesTest { private static void assertNumFeatures(String layer, Map attrs, int zoom, int expected, Class clazz) { - TestUtils.assertNumFeatures(mbtiles, layer, zoom, attrs, MONACO_BOUNDS, expected, clazz); + TestUtils.assertNumFeatures(mbtiles, layer, zoom, attrs, VerifyMonaco.MONACO_BOUNDS, expected, clazz); } } diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AbstractLayerTest.java b/src/test/java/org/openmaptiles/layers/AbstractLayerTest.java similarity index 93% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AbstractLayerTest.java rename to src/test/java/org/openmaptiles/layers/AbstractLayerTest.java index b63c57f..1f688cb 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AbstractLayerTest.java +++ b/src/test/java/org/openmaptiles/layers/AbstractLayerTest.java @@ -1,11 +1,9 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.assertSubmap; import static com.onthegomap.planetiler.TestUtils.newLineString; import static com.onthegomap.planetiler.TestUtils.newPoint; import static com.onthegomap.planetiler.TestUtils.rectangle; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.util.Utils.coalesce; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -15,7 +13,6 @@ import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.geo.GeometryException; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.reader.SimpleFeature; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmReader; @@ -29,6 +26,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.StreamSupport; +import org.openmaptiles.OpenMapTilesProfile; +import org.openmaptiles.util.Utils; public abstract class AbstractLayerTest { @@ -45,7 +44,7 @@ public abstract class AbstractLayerTest { static void assertFeatures(int zoom, List> expected, Iterable actual) { // ensure both are sorted by layer var expectedList = - expected.stream().sorted(Comparator.comparing(d -> coalesce(d.get("_layer"), "").toString())).toList(); + expected.stream().sorted(Comparator.comparing(d -> Utils.coalesce(d.get("_layer"), "").toString())).toList(); var actualList = StreamSupport.stream(actual.spliterator(), false) .sorted(Comparator.comparing(FeatureCollector.Feature::getLayer)) .toList(); @@ -122,7 +121,7 @@ public abstract class AbstractLayerTest { return SimpleFeature.create( newPoint(0, 0), new HashMap<>(props), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ); @@ -132,7 +131,7 @@ public abstract class AbstractLayerTest { return SimpleFeature.create( newLineString(0, 0, 1, 1), new HashMap<>(props), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ); @@ -142,7 +141,7 @@ public abstract class AbstractLayerTest { return SimpleFeature.createFakeOsmFeature( newLineString(0, 0, 1, 0, 1, 1, 0, 1, 0, 0), new HashMap<>(props), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0, null @@ -153,7 +152,7 @@ public abstract class AbstractLayerTest { return SimpleFeature.create( GeoUtils.worldToLatLonCoords(rectangle(0, Math.sqrt(area))), new HashMap<>(props), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ); @@ -169,7 +168,7 @@ public abstract class AbstractLayerTest { return SimpleFeature.createFakeOsmFeature( newLineString(0, 0, 1, 1), map, - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0, (relationInfos == null ? List.of() : relationInfos).stream() diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabelTest.java b/src/test/java/org/openmaptiles/layers/AerodromeLabelTest.java similarity index 98% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabelTest.java rename to src/test/java/org/openmaptiles/layers/AerodromeLabelTest.java index 82b8cfe..d1a7fd7 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerodromeLabelTest.java +++ b/src/test/java/org/openmaptiles/layers/AerodromeLabelTest.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerowayTest.java b/src/test/java/org/openmaptiles/layers/AerowayTest.java similarity index 97% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerowayTest.java rename to src/test/java/org/openmaptiles/layers/AerowayTest.java index ec55d8a..d277fa6 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/AerowayTest.java +++ b/src/test/java/org/openmaptiles/layers/AerowayTest.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BoundaryTest.java b/src/test/java/org/openmaptiles/layers/BoundaryTest.java similarity index 91% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BoundaryTest.java rename to src/test/java/org/openmaptiles/layers/BoundaryTest.java index 3307063..310d3b6 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BoundaryTest.java +++ b/src/test/java/org/openmaptiles/layers/BoundaryTest.java @@ -1,9 +1,7 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.newLineString; import static com.onthegomap.planetiler.TestUtils.rectangle; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -18,6 +16,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; import org.junit.jupiter.api.Test; +import org.openmaptiles.OpenMapTilesProfile; class BoundaryTest extends AbstractLayerTest { @@ -28,21 +27,21 @@ class BoundaryTest extends AbstractLayerTest { process(SimpleFeature.create( newLineString(0, 0, 1, 1), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_110m_admin_0_boundary_lines_land", 0 )), process(SimpleFeature.create( newLineString(0, 0, 1, 1), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_50m_admin_0_boundary_lines_land", 1 )), process(SimpleFeature.create( newLineString(0, 0, 1, 1), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_0_boundary_lines_land", 2 )) @@ -62,7 +61,7 @@ class BoundaryTest extends AbstractLayerTest { Map.of( "featurecla", "International boundary (verify)" ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_110m_admin_0_boundary_lines_land", 0 ))); @@ -79,7 +78,7 @@ class BoundaryTest extends AbstractLayerTest { Map.of( "featurecla", "Disputed (please verify)" ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_110m_admin_0_boundary_lines_land", 0 ))); @@ -93,7 +92,7 @@ class BoundaryTest extends AbstractLayerTest { Map.of( "featurecla", "International boundary (verify)" ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_50m_admin_0_boundary_lines_land", 0 ))); @@ -107,7 +106,7 @@ class BoundaryTest extends AbstractLayerTest { Map.of( "featurecla", "International boundary (verify)" ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_0_boundary_lines_land", 0 ))); @@ -117,7 +116,7 @@ class BoundaryTest extends AbstractLayerTest { Map.of( "featurecla", "Lease Limit" ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_0_boundary_lines_land", 0 ))); @@ -140,7 +139,7 @@ class BoundaryTest extends AbstractLayerTest { Map.of( "min_zoom", 7d ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_1_states_provinces_lines", 0 ))); @@ -159,7 +158,7 @@ class BoundaryTest extends AbstractLayerTest { Map.of( "min_zoom", 7.6d ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_1_states_provinces_lines", 0 ))); @@ -169,7 +168,7 @@ class BoundaryTest extends AbstractLayerTest { Map.of( "min_zoom", 7.9d ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_1_states_provinces_lines", 0 ))); @@ -177,7 +176,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(0, List.of(), process(SimpleFeature.create( newLineString(0, 0, 1, 1), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_1_states_provinces_lines", 0 ))); @@ -416,7 +415,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( newLineString(0, 0, 0, 10), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 3, Stream.concat( @@ -430,7 +429,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( newLineString(0, 0, 5, 10), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 4, profile.preprocessOsmRelation(country1).stream().map(r -> new OsmReader.RelationMember<>("", r)) @@ -440,7 +439,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( newLineString(0, 10, 5, 10), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 4, profile.preprocessOsmRelation(country1).stream().map(r -> new OsmReader.RelationMember<>("", r)) @@ -452,7 +451,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( newLineString(0, 0, -5, 10), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 4, profile.preprocessOsmRelation(country2).stream().map(r -> new OsmReader.RelationMember<>("", r)) @@ -462,7 +461,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( newLineString(0, 10, -5, 10), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 4, profile.preprocessOsmRelation(country2).stream().map(r -> new OsmReader.RelationMember<>("", r)) @@ -471,7 +470,7 @@ class BoundaryTest extends AbstractLayerTest { )); List features = new ArrayList<>(); - profile.finish(OSM_SOURCE, new FeatureCollector.Factory(params, stats), features::add); + profile.finish(OpenMapTilesProfile.OSM_SOURCE, new FeatureCollector.Factory(params, stats), features::add); assertEquals(3, features.size()); // ensure shared edge has country labels on right sides @@ -515,7 +514,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( newLineString(0, 0, 0, 10, 5, 5), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 3, profile.preprocessOsmRelation(country1).stream().map(r -> new OsmReader.RelationMember<>("", r)) @@ -523,7 +522,7 @@ class BoundaryTest extends AbstractLayerTest { ))); List features = new ArrayList<>(); - profile.finish(OSM_SOURCE, new FeatureCollector.Factory(params, stats), features::add); + profile.finish(OpenMapTilesProfile.OSM_SOURCE, new FeatureCollector.Factory(params, stats), features::add); assertFeatures(0, List.of(Map.of( "adm0_r", "", "adm0_l", "", @@ -546,7 +545,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( GeoUtils.polygonToLineString(rectangle(0, 10)), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 3, profile.preprocessOsmRelation(country1).stream().map(r -> new OsmReader.RelationMember<>("", r)) @@ -555,7 +554,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( GeoUtils.polygonToLineString(rectangle(1, 9)), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 3, profile.preprocessOsmRelation(country1).stream().map(r -> new OsmReader.RelationMember<>("", r)) @@ -563,7 +562,7 @@ class BoundaryTest extends AbstractLayerTest { ))); List features = new ArrayList<>(); - profile.finish(OSM_SOURCE, new FeatureCollector.Factory(params, stats), features::add); + profile.finish(OpenMapTilesProfile.OSM_SOURCE, new FeatureCollector.Factory(params, stats), features::add); assertFeatures(0, List.of(Map.of( "adm0_l", "C1", "adm0_r", "" @@ -584,7 +583,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( GeoUtils.worldToLatLonCoords(newLineString(0, 0, 0.1, 0, 0.1, 0.1, 0.02, 0.1, 0.02, -0.02)), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 3, profile.preprocessOsmRelation(country1).stream().map(r -> new OsmReader.RelationMember<>("", r)) @@ -592,7 +591,7 @@ class BoundaryTest extends AbstractLayerTest { ))); List features = new ArrayList<>(); - profile.finish(OSM_SOURCE, new FeatureCollector.Factory(params, stats), features::add); + profile.finish(OpenMapTilesProfile.OSM_SOURCE, new FeatureCollector.Factory(params, stats), features::add); assertFeatures(0, List.of(Map.of( "adm0_l", "", "adm0_r", "" @@ -610,7 +609,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( GeoUtils.worldToLatLonCoords(newLineString(0, 0, 0.1, 0, 0.1, 0.1, 0.2, 0.1, 0.2, -0.2)), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 3, profile.preprocessOsmRelation(country1).stream().map(r -> new OsmReader.RelationMember<>("", r)) @@ -620,7 +619,7 @@ class BoundaryTest extends AbstractLayerTest { assertFeatures(14, List.of(), process(SimpleFeature.createFakeOsmFeature( GeoUtils.worldToLatLonCoords(GeoUtils.polygonToLineString(rectangle(0.2, 0.3))), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 3, profile.preprocessOsmRelation(country1).stream().map(r -> new OsmReader.RelationMember<>("", r)) @@ -628,7 +627,7 @@ class BoundaryTest extends AbstractLayerTest { ))); List features = new ArrayList<>(); - profile.finish(OSM_SOURCE, new FeatureCollector.Factory(params, stats), features::add); + profile.finish(OpenMapTilesProfile.OSM_SOURCE, new FeatureCollector.Factory(params, stats), features::add); assertFeatures(0, List.of(Map.of( "adm0_l", "", "adm0_r", "" diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BuildingTest.java b/src/test/java/org/openmaptiles/layers/BuildingTest.java similarity index 94% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BuildingTest.java rename to src/test/java/org/openmaptiles/layers/BuildingTest.java index 8a4b9ee..077501f 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/BuildingTest.java +++ b/src/test/java/org/openmaptiles/layers/BuildingTest.java @@ -1,8 +1,6 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.rectangle; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; -import static org.junit.jupiter.api.Assertions.assertEquals; import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.geo.GeoUtils; @@ -12,7 +10,9 @@ import com.onthegomap.planetiler.reader.osm.OsmElement; import com.onthegomap.planetiler.reader.osm.OsmReader; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.openmaptiles.OpenMapTilesProfile; class BuildingTest extends AbstractLayerTest { @@ -118,7 +118,7 @@ class BuildingTest extends AbstractLayerTest { Map.of( "building", "yes" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0, relationInfos @@ -142,11 +142,11 @@ class BuildingTest extends AbstractLayerTest { 0 ); - assertEquals( + Assertions.assertEquals( 2, profile.postProcessLayerFeatures(Building.LAYER_NAME, 14, List.of(poly1, poly2)).size() ); - assertEquals( + Assertions.assertEquals( 1, profile.postProcessLayerFeatures(Building.LAYER_NAME, 13, List.of(poly1, poly2)).size() ); diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/HousenumberTest.java b/src/test/java/org/openmaptiles/layers/HousenumberTest.java similarity index 92% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/HousenumberTest.java rename to src/test/java/org/openmaptiles/layers/HousenumberTest.java index 045fce4..6ead5e9 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/HousenumberTest.java +++ b/src/test/java/org/openmaptiles/layers/HousenumberTest.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LandcoverTest.java b/src/test/java/org/openmaptiles/layers/LandcoverTest.java similarity index 94% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LandcoverTest.java rename to src/test/java/org/openmaptiles/layers/LandcoverTest.java index 5f2fab2..6dc07f0 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LandcoverTest.java +++ b/src/test/java/org/openmaptiles/layers/LandcoverTest.java @@ -1,8 +1,6 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.rectangle; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE; -import static org.junit.jupiter.api.Assertions.assertEquals; import com.onthegomap.planetiler.VectorTile; import com.onthegomap.planetiler.geo.GeoUtils; @@ -11,7 +9,9 @@ import com.onthegomap.planetiler.reader.SimpleFeature; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.openmaptiles.OpenMapTilesProfile; class LandcoverTest extends AbstractLayerTest { @@ -20,21 +20,21 @@ class LandcoverTest extends AbstractLayerTest { var glacier1 = process(SimpleFeature.create( GeoUtils.worldToLatLonCoords(rectangle(0, Math.sqrt(1))), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_110m_glaciated_areas", 0 )); var glacier2 = process(SimpleFeature.create( GeoUtils.worldToLatLonCoords(rectangle(0, Math.sqrt(1))), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_50m_glaciated_areas", 0 )); var glacier3 = process(SimpleFeature.create( GeoUtils.worldToLatLonCoords(rectangle(0, Math.sqrt(1))), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_glaciated_areas", 0 )); @@ -68,14 +68,14 @@ class LandcoverTest extends AbstractLayerTest { var ice1 = process(SimpleFeature.create( GeoUtils.worldToLatLonCoords(rectangle(0, Math.sqrt(1))), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_50m_antarctic_ice_shelves_polys", 0 )); var ice2 = process(SimpleFeature.create( GeoUtils.worldToLatLonCoords(rectangle(0, Math.sqrt(1))), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_antarctic_ice_shelves_polys", 0 )); @@ -201,7 +201,7 @@ class LandcoverTest extends AbstractLayerTest { private void assertMerges(List> expected, List in, int zoom) throws GeometryException { - assertEquals(expected, + Assertions.assertEquals(expected, profile.postProcessLayerFeatures("landcover", zoom, in).stream().map( VectorTile.Feature::attrs) .toList()); diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LanduseTest.java b/src/test/java/org/openmaptiles/layers/LanduseTest.java similarity index 91% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LanduseTest.java rename to src/test/java/org/openmaptiles/layers/LanduseTest.java index ff21bca..57b9999 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/LanduseTest.java +++ b/src/test/java/org/openmaptiles/layers/LanduseTest.java @@ -1,13 +1,13 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.rectangle; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.reader.SimpleFeature; import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; +import org.openmaptiles.OpenMapTilesProfile; class LanduseTest extends AbstractLayerTest { @@ -20,14 +20,14 @@ class LanduseTest extends AbstractLayerTest { )), process(SimpleFeature.create( GeoUtils.worldToLatLonCoords(rectangle(0, Math.sqrt(1))), Map.of("scalerank", 1.9), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_50m_urban_areas", 0 ))); assertFeatures(0, List.of(), process(SimpleFeature.create( GeoUtils.worldToLatLonCoords(rectangle(0, Math.sqrt(1))), Map.of("scalerank", 2.1), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_50m_urban_areas", 0 ))); diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeakTest.java b/src/test/java/org/openmaptiles/layers/MountainPeakTest.java similarity index 92% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeakTest.java rename to src/test/java/org/openmaptiles/layers/MountainPeakTest.java index 991bbfb..6c56eb4 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/MountainPeakTest.java +++ b/src/test/java/org/openmaptiles/layers/MountainPeakTest.java @@ -1,10 +1,7 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.newPoint; import static com.onthegomap.planetiler.TestUtils.rectangle; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; -import static org.junit.jupiter.api.Assertions.assertEquals; import com.google.common.collect.Lists; import com.onthegomap.planetiler.VectorTile; @@ -13,8 +10,10 @@ import com.onthegomap.planetiler.reader.SimpleFeature; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.openmaptiles.OpenMapTilesProfile; class MountainPeakTest extends AbstractLayerTest { @@ -156,7 +155,7 @@ class MountainPeakTest extends AbstractLayerTest { process(SimpleFeature.create( rectangle(0, 0.1), Map.of("iso_a2", "US"), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_0_countries", 0 )); @@ -173,7 +172,7 @@ class MountainPeakTest extends AbstractLayerTest { "natural", "volcano", "ele", "100" )), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); @@ -190,7 +189,7 @@ class MountainPeakTest extends AbstractLayerTest { "natural", "volcano", "ele", "100" )), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); @@ -226,9 +225,9 @@ class MountainPeakTest extends AbstractLayerTest { @Test void testMountainPeakPostProcessing() throws GeometryException { - assertEquals(List.of(), profile.postProcessLayerFeatures(MountainPeak.LAYER_NAME, 13, List.of())); + Assertions.assertEquals(List.of(), profile.postProcessLayerFeatures(MountainPeak.LAYER_NAME, 13, List.of())); - assertEquals(List.of(pointFeature( + Assertions.assertEquals(List.of(pointFeature( MountainPeak.LAYER_NAME, Map.of("rank", 1), 1 @@ -238,7 +237,7 @@ class MountainPeakTest extends AbstractLayerTest { 1 )))); - assertEquals(List.of( + Assertions.assertEquals(List.of( pointFeature( MountainPeak.LAYER_NAME, Map.of("rank", 1, "name", "a"), @@ -273,7 +272,7 @@ class MountainPeakTest extends AbstractLayerTest { @Test void testMountainPeakPostProcessingLimitsFeaturesOutsideZoom() throws GeometryException { - assertEquals(Lists.newArrayList( + Assertions.assertEquals(Lists.newArrayList( new VectorTile.Feature( MountainPeak.LAYER_NAME, 1, diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/ParkTest.java b/src/test/java/org/openmaptiles/layers/ParkTest.java similarity index 98% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/ParkTest.java rename to src/test/java/org/openmaptiles/layers/ParkTest.java index 33cd12a..a393b21 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/ParkTest.java +++ b/src/test/java/org/openmaptiles/layers/ParkTest.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import com.onthegomap.planetiler.geo.GeoUtils; import java.util.List; diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PlaceTest.java b/src/test/java/org/openmaptiles/layers/PlaceTest.java similarity index 87% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PlaceTest.java rename to src/test/java/org/openmaptiles/layers/PlaceTest.java index 972f98d..cbb59b0 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PlaceTest.java +++ b/src/test/java/org/openmaptiles/layers/PlaceTest.java @@ -1,13 +1,9 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.newPoint; import static com.onthegomap.planetiler.TestUtils.rectangle; import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_MAX; import static com.onthegomap.planetiler.collection.FeatureGroup.SORT_KEY_MIN; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.layers.Place.getSortKey; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import com.onthegomap.planetiler.geo.GeoUtils; @@ -15,7 +11,9 @@ import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.reader.SimpleFeature; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.openmaptiles.OpenMapTilesProfile; class PlaceTest extends AbstractLayerTest { @@ -53,7 +51,7 @@ class PlaceTest extends AbstractLayerTest { "scalerank", 0, "labelrank", 2 ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_0_countries", 0 )); @@ -79,7 +77,7 @@ class PlaceTest extends AbstractLayerTest { "name:en", "United States of America", "country_code_iso3166_1_alpha_2", "US" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); @@ -105,7 +103,7 @@ class PlaceTest extends AbstractLayerTest { "name:en", "United States of America", "country_code_iso3166_1_alpha_2", "US" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); @@ -122,7 +120,7 @@ class PlaceTest extends AbstractLayerTest { "labelrank", 2, "datarank", 1 ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_1_states_provinces", 0 )); @@ -135,7 +133,7 @@ class PlaceTest extends AbstractLayerTest { "labelrank", 8, "datarank", 1 ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_1_states_provinces", 0 )); @@ -149,7 +147,7 @@ class PlaceTest extends AbstractLayerTest { "name", "Massachusetts", "name:en", "Massachusetts" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); @@ -163,7 +161,7 @@ class PlaceTest extends AbstractLayerTest { "name", "Massachusetts", "name:en", "Massachusetts" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); @@ -188,7 +186,7 @@ class PlaceTest extends AbstractLayerTest { "name", "Massachusetts", "name:en", "Massachusetts" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); @@ -205,7 +203,7 @@ class PlaceTest extends AbstractLayerTest { "labelrank", 3, "datarank", 3 ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_1_states_provinces", 0 )); @@ -226,7 +224,7 @@ class PlaceTest extends AbstractLayerTest { "wikidata", "Q95027", "name", "Lugo" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); @@ -293,24 +291,24 @@ class PlaceTest extends AbstractLayerTest { void testPlaceSortKeyRanking() { int[] sortKeys = new int[]{ // max - getSortKey(0, Place.PlaceType.CITY, 1_000_000_000, "name"), + Place.getSortKey(0, Place.PlaceType.CITY, 1_000_000_000, "name"), - getSortKey(0, Place.PlaceType.CITY, 1_000_000_000, "name longer"), - getSortKey(0, Place.PlaceType.CITY, 1_000_000_000, "x".repeat(32)), + Place.getSortKey(0, Place.PlaceType.CITY, 1_000_000_000, "name longer"), + Place.getSortKey(0, Place.PlaceType.CITY, 1_000_000_000, "x".repeat(32)), - getSortKey(0, Place.PlaceType.CITY, 10_000_000, "name"), - getSortKey(0, Place.PlaceType.CITY, 0, "name"), + Place.getSortKey(0, Place.PlaceType.CITY, 10_000_000, "name"), + Place.getSortKey(0, Place.PlaceType.CITY, 0, "name"), - getSortKey(0, Place.PlaceType.TOWN, 1_000_000_000, "name"), - getSortKey(0, Place.PlaceType.ISOLATED_DWELLING, 1_000_000_000, "name"), - getSortKey(0, null, 1_000_000_000, "name"), + Place.getSortKey(0, Place.PlaceType.TOWN, 1_000_000_000, "name"), + Place.getSortKey(0, Place.PlaceType.ISOLATED_DWELLING, 1_000_000_000, "name"), + Place.getSortKey(0, null, 1_000_000_000, "name"), - getSortKey(1, Place.PlaceType.CITY, 1_000_000_000, "name"), - getSortKey(10, Place.PlaceType.CITY, 1_000_000_000, "name"), - getSortKey(null, Place.PlaceType.CITY, 1_000_000_000, "name"), + Place.getSortKey(1, Place.PlaceType.CITY, 1_000_000_000, "name"), + Place.getSortKey(10, Place.PlaceType.CITY, 1_000_000_000, "name"), + Place.getSortKey(null, Place.PlaceType.CITY, 1_000_000_000, "name"), // min - getSortKey(null, null, 0, null), + Place.getSortKey(null, null, 0, null), }; for (int i = 0; i < sortKeys.length; i++) { if (sortKeys[i] < SORT_KEY_MIN) { @@ -332,7 +330,7 @@ class PlaceTest extends AbstractLayerTest { "scalerank", 0, "wikidataid", "Q61" ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_populated_places", 0 )); @@ -366,7 +364,7 @@ class PlaceTest extends AbstractLayerTest { "scalerank", 2, "wikidataid", "Q100" ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_populated_places", 0 )); @@ -401,7 +399,7 @@ class PlaceTest extends AbstractLayerTest { "population", "667137", "capital", "4" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); @@ -476,9 +474,9 @@ class PlaceTest extends AbstractLayerTest { @Test void testCitySetRankFromGridrank() throws GeometryException { var layerName = Place.LAYER_NAME; - assertEquals(List.of(), profile.postProcessLayerFeatures(layerName, 13, List.of())); + Assertions.assertEquals(List.of(), profile.postProcessLayerFeatures(layerName, 13, List.of())); - assertEquals(List.of(pointFeature( + Assertions.assertEquals(List.of(pointFeature( layerName, Map.of("rank", 11), 1 @@ -488,7 +486,7 @@ class PlaceTest extends AbstractLayerTest { 1 )))); - assertEquals(List.of( + Assertions.assertEquals(List.of( pointFeature( layerName, Map.of("rank", 11, "name", "a"), diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PoiTest.java b/src/test/java/org/openmaptiles/layers/PoiTest.java similarity index 95% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PoiTest.java rename to src/test/java/org/openmaptiles/layers/PoiTest.java index 7884a09..dd556af 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/PoiTest.java +++ b/src/test/java/org/openmaptiles/layers/PoiTest.java @@ -1,11 +1,10 @@ -package com.onthegomap.planetiler.openmaptiles.layers; - -import static org.junit.jupiter.api.Assertions.assertEquals; +package org.openmaptiles.layers; import com.onthegomap.planetiler.geo.GeometryException; import com.onthegomap.planetiler.reader.SourceFeature; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -137,9 +136,9 @@ class PoiTest extends AbstractLayerTest { @Test void testGridRank() throws GeometryException { var layerName = Poi.LAYER_NAME; - assertEquals(List.of(), profile.postProcessLayerFeatures(layerName, 13, List.of())); + Assertions.assertEquals(List.of(), profile.postProcessLayerFeatures(layerName, 13, List.of())); - assertEquals(List.of(pointFeature( + Assertions.assertEquals(List.of(pointFeature( layerName, Map.of("rank", 1), 1 @@ -149,7 +148,7 @@ class PoiTest extends AbstractLayerTest { 1 )))); - assertEquals(List.of( + Assertions.assertEquals(List.of( pointFeature( layerName, Map.of("rank", 1, "name", "a"), diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationTest.java b/src/test/java/org/openmaptiles/layers/TransportationTest.java similarity index 98% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationTest.java rename to src/test/java/org/openmaptiles/layers/TransportationTest.java index 79574ee..3c6ff27 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/TransportationTest.java +++ b/src/test/java/org/openmaptiles/layers/TransportationTest.java @@ -1,16 +1,13 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.newLineString; import static com.onthegomap.planetiler.TestUtils.newPoint; import static com.onthegomap.planetiler.TestUtils.rectangle; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; import com.onthegomap.planetiler.FeatureCollector; import com.onthegomap.planetiler.config.Arguments; import com.onthegomap.planetiler.config.PlanetilerConfig; import com.onthegomap.planetiler.geo.GeometryException; -import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile; import com.onthegomap.planetiler.reader.SimpleFeature; import com.onthegomap.planetiler.reader.SourceFeature; import com.onthegomap.planetiler.reader.osm.OsmElement; @@ -21,6 +18,7 @@ import java.util.stream.Stream; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.openmaptiles.OpenMapTilesProfile; class TransportationTest extends AbstractLayerTest { @@ -495,7 +493,7 @@ class TransportationTest extends AbstractLayerTest { FeatureCollector features = process(SimpleFeature.create( newPoint(1, 2), junctionNode.tags(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, junctionNode.id() )); @@ -893,7 +891,7 @@ class TransportationTest extends AbstractLayerTest { process(SimpleFeature.create( rectangle(0, 0.1), Map.of("iso_a2", "GB"), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_admin_0_countries", 0 )); @@ -919,7 +917,7 @@ class TransportationTest extends AbstractLayerTest { "oneway", "yes", "ref", "M1" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); @@ -945,7 +943,7 @@ class TransportationTest extends AbstractLayerTest { "oneway", "yes", "ref", "M1" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 ))); diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterNameTest.java b/src/test/java/org/openmaptiles/layers/WaterNameTest.java similarity index 91% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterNameTest.java rename to src/test/java/org/openmaptiles/layers/WaterNameTest.java index bcf3317..54e0b00 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterNameTest.java +++ b/src/test/java/org/openmaptiles/layers/WaterNameTest.java @@ -1,10 +1,7 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.newLineString; import static com.onthegomap.planetiler.TestUtils.rectangle; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.LAKE_CENTERLINE_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; import com.onthegomap.planetiler.TestUtils; import com.onthegomap.planetiler.geo.GeoUtils; @@ -14,6 +11,7 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Geometry; +import org.openmaptiles.OpenMapTilesProfile; class WaterNameTest extends AbstractLayerTest { @@ -60,7 +58,7 @@ class WaterNameTest extends AbstractLayerTest { new HashMap<>(Map.of( "OSM_ID", -10 )), - LAKE_CENTERLINE_SOURCE, + OpenMapTilesProfile.LAKE_CENTERLINE_SOURCE, null, 0 ))); @@ -84,7 +82,7 @@ class WaterNameTest extends AbstractLayerTest { "natural", "water", "water", "pond" )), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 10 ))); @@ -97,7 +95,7 @@ class WaterNameTest extends AbstractLayerTest { new HashMap<>(Map.of( "OSM_ID", -10 )), - LAKE_CENTERLINE_SOURCE, + OpenMapTilesProfile.LAKE_CENTERLINE_SOURCE, null, 0 ))); @@ -106,7 +104,7 @@ class WaterNameTest extends AbstractLayerTest { new HashMap<>(Map.of( "OSM_ID", -10 )), - LAKE_CENTERLINE_SOURCE, + OpenMapTilesProfile.LAKE_CENTERLINE_SOURCE, null, 0 ))); @@ -134,7 +132,7 @@ class WaterNameTest extends AbstractLayerTest { "natural", "water", "water", "pond" )), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 10 ))); @@ -148,7 +146,7 @@ class WaterNameTest extends AbstractLayerTest { "scalerank", 1, "name", "Black sea" )), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_geography_marine_polys", 0 ))); diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterTest.java b/src/test/java/org/openmaptiles/layers/WaterTest.java similarity index 88% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterTest.java rename to src/test/java/org/openmaptiles/layers/WaterTest.java index d0a0b4e..d396c68 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterTest.java +++ b/src/test/java/org/openmaptiles/layers/WaterTest.java @@ -1,9 +1,6 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.rectangle; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.WATER_POLYGON_SOURCE; import com.onthegomap.planetiler.geo.GeoUtils; import com.onthegomap.planetiler.reader.SimpleFeature; @@ -11,6 +8,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; +import org.openmaptiles.OpenMapTilesProfile; class WaterTest extends AbstractLayerTest { @@ -26,7 +24,7 @@ class WaterTest extends AbstractLayerTest { )), process(SimpleFeature.create( rectangle(0, 10), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_110m_lakes", 0 ))); @@ -40,7 +38,7 @@ class WaterTest extends AbstractLayerTest { )), process(SimpleFeature.create( rectangle(0, 10), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_110m_ocean", 0 ))); @@ -53,7 +51,7 @@ class WaterTest extends AbstractLayerTest { )), process(SimpleFeature.create( rectangle(0, 10), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_lakes", 0 ))); @@ -66,7 +64,7 @@ class WaterTest extends AbstractLayerTest { )), process(SimpleFeature.create( rectangle(0, 10), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_ocean", 0 ))); @@ -84,7 +82,7 @@ class WaterTest extends AbstractLayerTest { )), process(SimpleFeature.create( rectangle(0, 10), Map.of(), - WATER_POLYGON_SOURCE, + OpenMapTilesProfile.WATER_POLYGON_SOURCE, null, 0 ))); @@ -106,7 +104,7 @@ class WaterTest extends AbstractLayerTest { "natural", "water", "water", "reservoir" )), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, id ))); @@ -215,28 +213,28 @@ class WaterTest extends AbstractLayerTest { process(SimpleFeature.create( rectangle(0, 10), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_110m_ocean", 0 )), process(SimpleFeature.create( rectangle(0, 10), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_50m_ocean", 0 )), process(SimpleFeature.create( rectangle(0, 10), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_ocean", 0 )), process(SimpleFeature.create( rectangle(0, 10), Map.of(), - WATER_POLYGON_SOURCE, + OpenMapTilesProfile.WATER_POLYGON_SOURCE, null, 0 )) @@ -249,21 +247,21 @@ class WaterTest extends AbstractLayerTest { process(SimpleFeature.create( rectangle(0, 10), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_110m_lakes", 0 )), process(SimpleFeature.create( rectangle(0, 10), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_50m_lakes", 0 )), process(SimpleFeature.create( rectangle(0, 10), Map.of(), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_10m_lakes", 0 )), @@ -273,7 +271,7 @@ class WaterTest extends AbstractLayerTest { "natural", "water", "water", "reservoir" ), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0 )) diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterwayTest.java b/src/test/java/org/openmaptiles/layers/WaterwayTest.java similarity index 95% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterwayTest.java rename to src/test/java/org/openmaptiles/layers/WaterwayTest.java index d05cedb..6bac579 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/layers/WaterwayTest.java +++ b/src/test/java/org/openmaptiles/layers/WaterwayTest.java @@ -1,8 +1,6 @@ -package com.onthegomap.planetiler.openmaptiles.layers; +package org.openmaptiles.layers; import static com.onthegomap.planetiler.TestUtils.newLineString; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.NATURAL_EARTH_SOURCE; -import static com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile.OSM_SOURCE; import static org.junit.jupiter.api.Assertions.assertEquals; import com.onthegomap.planetiler.FeatureCollector; @@ -18,6 +16,7 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.openmaptiles.OpenMapTilesProfile; class WaterwayTest extends AbstractLayerTest { @@ -33,7 +32,7 @@ class WaterwayTest extends AbstractLayerTest { FeatureCollector features = process(SimpleFeature.createFakeOsmFeature( newLineString(0, 0, 0, isLongEnough ? 3 : 1), Map.of(), - OSM_SOURCE, + OpenMapTilesProfile.OSM_SOURCE, null, 0, (relationInfos == null ? List.of() : relationInfos).stream() @@ -209,7 +208,7 @@ class WaterwayTest extends AbstractLayerTest { "featurecla", "River", "name", "name" ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_110m_rivers_lake_centerlines", 0 ))); @@ -228,7 +227,7 @@ class WaterwayTest extends AbstractLayerTest { "featurecla", "River", "name", "name" ), - NATURAL_EARTH_SOURCE, + OpenMapTilesProfile.NATURAL_EARTH_SOURCE, "ne_50m_rivers_lake_centerlines", 0 ))); diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/util/OmtLanguageUtilsTest.java b/src/test/java/org/openmaptiles/util/OmtLanguageUtilsTest.java similarity index 99% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/util/OmtLanguageUtilsTest.java rename to src/test/java/org/openmaptiles/util/OmtLanguageUtilsTest.java index 3f47807..93a818a 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/util/OmtLanguageUtilsTest.java +++ b/src/test/java/org/openmaptiles/util/OmtLanguageUtilsTest.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles.util; +package org.openmaptiles.util; import static com.onthegomap.planetiler.TestUtils.assertSubmap; import static com.onthegomap.planetiler.util.LanguageUtils.containsOnlyLatinCharacters; @@ -78,6 +78,7 @@ class OmtLanguageUtilsTest { } } + @ParameterizedTest @CsvSource(value = { "abcaāíìś+, null", diff --git a/src/test/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonacoTest.java b/src/test/java/org/openmaptiles/util/VerifyMonacoTest.java similarity index 96% rename from src/test/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonacoTest.java rename to src/test/java/org/openmaptiles/util/VerifyMonacoTest.java index b82ab41..4f3c7bf 100644 --- a/src/test/java/com/onthegomap/planetiler/openmaptiles/util/VerifyMonacoTest.java +++ b/src/test/java/org/openmaptiles/util/VerifyMonacoTest.java @@ -1,4 +1,4 @@ -package com.onthegomap.planetiler.openmaptiles.util; +package org.openmaptiles.util; import static com.onthegomap.planetiler.geo.GeoUtils.point; import static com.onthegomap.planetiler.util.Gzip.gzip; diff --git a/submodule.pom.xml b/submodule.pom.xml new file mode 100644 index 0000000..60f3d7c --- /dev/null +++ b/submodule.pom.xml @@ -0,0 +1,57 @@ + + + + 4.0.0 + + org.openmaptiles + planetiler-openmaptiles + + + com.onthegomap.planetiler + planetiler-parent + 0.5-SNAPSHOT + + + + + com.onthegomap.planetiler + planetiler-core + ${project.parent.version} + + + org.yaml + snakeyaml + + + org.commonmark + commonmark + + + + com.onthegomap.planetiler + planetiler-core + ${project.parent.version} + test-jar + test + + + + + + + io.github.zlika + reproducible-build-maven-plugin + + + + maven-deploy-plugin + + + true + + + + +