Submodule followups (#312)

.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:

.github/workflows/docs_mlc_config.json

@@ -3,5 +3,8 @@
     {
       "pattern": "^http://localhost.*$"
     }
-  ]
+  ],
+  "retryOn429": true,
+  "retryCount": 5,
+  "fallbackRetryDelay": "30s"
 }

.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

.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/planetiler-openmaptiles" vcs="Git" />
   </component>
 </project>

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

planetiler-benchmarks/pom.xml

@@ -19,7 +19,7 @@
       <version>${project.parent.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.onthegomap.planetiler</groupId>
+      <groupId>org.openmaptiles</groupId>
       <artifactId>planetiler-openmaptiles</artifactId>
       <version>${project.parent.version}</version>
     </dependency>

planetiler-benchmarks/src/main/java/com/onthegomap/planetiler/benchmarks/OpenMapTilesMapping.java

@@ -2,7 +2,6 @@ package com.onthegomap.planetiler.benchmarks;
 
 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.ArrayList;
 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

planetiler-dist/pom.xml

@@ -28,7 +28,7 @@
       <version>${project.parent.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.onthegomap.planetiler</groupId>
+      <groupId>org.openmaptiles</groupId>
       <artifactId>planetiler-openmaptiles</artifactId>
       <version>${project.parent.version}</version>
     </dependency>

planetiler-dist/src/main/java/com/onthegomap/planetiler/Main.java

@@ -10,11 +10,11 @@ import com.onthegomap.planetiler.examples.OsmQaTiles;
 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

planetiler-openmaptiles

@@ -1 +1 @@
-Subproject commit 62d420811bb11a1c0cbc0f2a32af41015f27dea8
+Subproject commit 0d7cd887ce38b9dfde71c4f49597bcd1fa86c199

pom.xml

@@ -83,7 +83,7 @@
 
   <modules>
     <module>planetiler-core</module>
-    <module>planetiler-openmaptiles</module>
+    <module>planetiler-openmaptiles/submodule.pom.xml</module>
     <module>planetiler-custommap</module>
     <module>planetiler-benchmarks</module>
     <module>planetiler-examples</module>
@@ -174,6 +174,7 @@
             </includes>
             <excludes>
               <exclude>**/target/**</exclude>
+              <exclude>planetiler-openmaptiles/**</exclude>
             </excludes>
             <flexmark/>
           </markdown>

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 {}

scripts/regenerate-openmaptiles.sh

@@ -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