diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 380da2acfb..b055cce61e 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -14,7 +14,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
with:
- submodules: true
+ # don't need to check planetiler-openmaptiles
+ submodules: false
- name: Run link check
uses: gaurav-nelson/github-action-markdown-link-check@1.0.13
with:
diff --git a/.github/workflows/docs_mlc_config.json b/.github/workflows/docs_mlc_config.json
index 20203622e4..5c40044447 100644
--- a/.github/workflows/docs_mlc_config.json
+++ b/.github/workflows/docs_mlc_config.json
@@ -3,5 +3,8 @@
{
"pattern": "^http://localhost.*$"
}
- ]
+ ],
+ "retryOn429": true,
+ "retryCount": 5,
+ "fallbackRetryDelay": "30s"
}
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 928fa519b4..fd1cb90772 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -64,25 +64,6 @@ jobs:
run: mvnw.cmd ${{matrix.args}} -Dspotless.check.skip --batch-mode -no-transfer-progress package verify jib:buildTar --file pom.xml
shell: cmd
- regenerate:
- name: Regenerate
- runs-on: ubuntu-latest
- timeout-minutes: 15
- steps:
- - uses: actions/checkout@v3
- with:
- submodules: true
- - name: Set up JDK 17
- uses: actions/setup-java@v3
- with:
- java-version: 17
- distribution: 'temurin'
- cache: 'maven'
- - run: ./scripts/regenerate-openmaptiles.sh
- # 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
- - run: ./mvnw -Dspotless.check.skip --batch-mode -no-transfer-progress verify -pl planetiler-openmaptiles
-
examples:
name: Example project
runs-on: ubuntu-latest
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f4c..cc1ed18fb4 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 9eaf0a501c..092cc2d508 100644
--- a/README.md
+++ b/README.md
@@ -273,7 +273,7 @@ Planetiler is made possible by these awesome open source projects:
- [OpenMapTiles](https://openmaptiles.org/) for the [schema](https://openmaptiles.org/schema/)
and [reference implementation](https://github.com/openmaptiles/openmaptiles)
that
- the [openmaptiles profile](https://github.com/openmaptiles/planetiler-openmaptiles/tree/main/src/main/java/com/onthegomap/planetiler/openmaptiles/layers)
+ the [openmaptiles profile](https://github.com/openmaptiles/planetiler-openmaptiles/tree/main/src/main/java/org/openmaptiles/layers)
is based on
- [Graphhopper](https://www.graphhopper.com/) for basis of utilities to process OpenStreetMap data in Java
- [JTS Topology Suite](https://github.com/locationtech/jts) for working with vector geometries
diff --git a/planetiler-basemap/pom.xml b/planetiler-basemap/pom.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/planetiler-benchmarks/pom.xml b/planetiler-benchmarks/pom.xml
index 87e55e0253..48382f99ea 100644
--- a/planetiler-benchmarks/pom.xml
+++ b/planetiler-benchmarks/pom.xml
@@ -19,7 +19,7 @@
${project.parent.version}
- com.onthegomap.planetiler
+ org.openmaptiles
planetiler-openmaptiles
${project.parent.version}
diff --git a/planetiler-benchmarks/src/main/java/com/onthegomap/planetiler/benchmarks/OpenMapTilesMapping.java b/planetiler-benchmarks/src/main/java/com/onthegomap/planetiler/benchmarks/OpenMapTilesMapping.java
index da8203608c..c91409d932 100644
--- a/planetiler-benchmarks/src/main/java/com/onthegomap/planetiler/benchmarks/OpenMapTilesMapping.java
+++ b/planetiler-benchmarks/src/main/java/com/onthegomap/planetiler/benchmarks/OpenMapTilesMapping.java
@@ -2,7 +2,6 @@
import com.onthegomap.planetiler.config.PlanetilerConfig;
import com.onthegomap.planetiler.expression.MultiExpression;
-import com.onthegomap.planetiler.openmaptiles.OpenMapTilesProfile;
import com.onthegomap.planetiler.reader.SourceFeature;
import com.onthegomap.planetiler.reader.osm.OsmElement;
import com.onthegomap.planetiler.reader.osm.OsmInputFile;
@@ -15,6 +14,7 @@
import java.util.List;
import java.util.Random;
import org.locationtech.jts.geom.Geometry;
+import org.openmaptiles.OpenMapTilesProfile;
/**
* Performance tests for {@link MultiExpression}. Times how long a sample of elements from an OSM input file take to
diff --git a/planetiler-dist/pom.xml b/planetiler-dist/pom.xml
index 263cf728d3..d5be3ceae7 100644
--- a/planetiler-dist/pom.xml
+++ b/planetiler-dist/pom.xml
@@ -28,7 +28,7 @@
${project.parent.version}
- com.onthegomap.planetiler
+ org.openmaptiles
planetiler-openmaptiles
${project.parent.version}
diff --git a/planetiler-dist/src/main/java/com/onthegomap/planetiler/Main.java b/planetiler-dist/src/main/java/com/onthegomap/planetiler/Main.java
index dbb4b16997..ca587e7d3b 100644
--- a/planetiler-dist/src/main/java/com/onthegomap/planetiler/Main.java
+++ b/planetiler-dist/src/main/java/com/onthegomap/planetiler/Main.java
@@ -10,11 +10,11 @@
import com.onthegomap.planetiler.examples.ToiletsOverlay;
import com.onthegomap.planetiler.examples.ToiletsOverlayLowLevelApi;
import com.onthegomap.planetiler.mbtiles.Verify;
-import com.onthegomap.planetiler.openmaptiles.OpenMapTilesMain;
-import com.onthegomap.planetiler.openmaptiles.util.VerifyMonaco;
import java.util.Arrays;
import java.util.Locale;
import java.util.Map;
+import org.openmaptiles.OpenMapTilesMain;
+import org.openmaptiles.util.VerifyMonaco;
/**
* Main entry-point for executable jar and container distributions of Planetiler, which delegates to individual {@code
diff --git a/planetiler-openmaptiles b/planetiler-openmaptiles
index 62d420811b..0d7cd887ce 160000
--- a/planetiler-openmaptiles
+++ b/planetiler-openmaptiles
@@ -1 +1 @@
-Subproject commit 62d420811bb11a1c0cbc0f2a32af41015f27dea8
+Subproject commit 0d7cd887ce38b9dfde71c4f49597bcd1fa86c199
diff --git a/pom.xml b/pom.xml
index 2c0faa199c..4b14883da2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
planetiler-core
- planetiler-openmaptiles
+ planetiler-openmaptiles/submodule.pom.xml
planetiler-custommap
planetiler-benchmarks
planetiler-examples
@@ -174,6 +174,7 @@
**/target/**
+ planetiler-openmaptiles/**
diff --git a/scripts/check-doc-links.sh b/scripts/check-doc-links.sh
index 67dd44e35c..cbe2f26b69 100755
--- a/scripts/check-doc-links.sh
+++ b/scripts/check-doc-links.sh
@@ -4,4 +4,4 @@ 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 {}
+find . -name '*.md' -not -path '*/target/*' -not -path '*/planetiler-openmaptiles/*' -not -path '*/data/*' -print0 | xargs -I {} -n 1 -0 markdown-link-check --quiet --config .github/workflows/docs_mlc_config.json {}
diff --git a/scripts/regenerate-openmaptiles.sh b/scripts/regenerate-openmaptiles.sh
deleted file mode 100755
index c79bd65f5b..0000000000
--- a/scripts/regenerate-openmaptiles.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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 --projects planetiler-dist -am package
-
-echo "Running..."
-java -cp planetiler-dist/target/*-with-deps.jar com.onthegomap.planetiler.openmaptiles.Generate -tag="${TAG}" -base-url="${BASE_URL}"
-
-echo "Formatting..."
-./scripts/format.sh