Skip to content

Commit

Permalink
Submodule followups (#312)
Browse files Browse the repository at this point in the history
  • Loading branch information
msbarry authored Aug 2, 2022
1 parent 93fe757 commit 619ac83
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 50 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/docs_mlc_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
{
"pattern": "^http://localhost.*$"
}
]
],
"retryOn429": true,
"retryCount": 5,
"fallbackRetryDelay": "30s"
}
19 changes: 0 additions & 19 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Empty file removed planetiler-basemap/pom.xml
Empty file.
2 changes: 1 addition & 1 deletion planetiler-benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion planetiler-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion planetiler-openmaptiles
Submodule planetiler-openmaptiles updated 75 files
+22 −0 .github/cache-sources-action/action.yml
+23 −0 .github/dependabot.yml
+28 −81 .github/workflows/maven.yml
+9 −25 .github/workflows/performance.yml
+32 −0 .github/workflows/snapshot.yml
+1 −1 .github/workflows/update-pr.yml
+3 −2 .gitignore
+598 −0 .idea/codeStyles/Project.xml
+5 −0 .idea/codeStyles/codeStyleConfig.xml
+13 −0 .idea/eclipseCodeFormatter.xml
+6 −0 .idea/vcs.xml
+5 −0 .mvn/jvm.config
+118 −0 .mvn/wrapper/MavenWrapperDownloader.java
+ .mvn/wrapper/maven-wrapper.jar
+2 −0 .mvn/wrapper/maven-wrapper.properties
+11 −0 .vscode/settings.json
+40 −12 README.md
+480 −0 eclipse-formatter.xml
+310 −0 mvnw
+182 −0 mvnw.cmd
+219 −12 pom.xml
+7 −0 scripts/build.sh
+7 −0 scripts/check-doc-links.sh
+7 −0 scripts/check-monaco.sh
+5 −0 scripts/format.sh
+20 −0 scripts/regenerate-openmaptiles.sh
+12 −0 scripts/set-versions.sh
+19 −0 scripts/test-release.sh
+5 −5 src/main/java/org/openmaptiles/Generate.java
+1 −1 src/main/java/org/openmaptiles/Layer.java
+2 −2 src/main/java/org/openmaptiles/OpenMapTilesMain.java
+5 −5 src/main/java/org/openmaptiles/OpenMapTilesProfile.java
+22 −19 src/main/java/org/openmaptiles/generated/OpenMapTilesSchema.java
+1 −1 src/main/java/org/openmaptiles/generated/Tables.java
+7 −7 src/main/java/org/openmaptiles/layers/AerodromeLabel.java
+3 −3 src/main/java/org/openmaptiles/layers/Aeroway.java
+3 −3 src/main/java/org/openmaptiles/layers/Boundary.java
+5 −5 src/main/java/org/openmaptiles/layers/Building.java
+3 −3 src/main/java/org/openmaptiles/layers/Housenumber.java
+4 −4 src/main/java/org/openmaptiles/layers/Landcover.java
+6 −6 src/main/java/org/openmaptiles/layers/Landuse.java
+7 −7 src/main/java/org/openmaptiles/layers/MountainPeak.java
+7 −7 src/main/java/org/openmaptiles/layers/Park.java
+8 −8 src/main/java/org/openmaptiles/layers/Place.java
+8 −8 src/main/java/org/openmaptiles/layers/Poi.java
+5 −5 src/main/java/org/openmaptiles/layers/Transportation.java
+9 −9 src/main/java/org/openmaptiles/layers/TransportationName.java
+5 −5 src/main/java/org/openmaptiles/layers/Water.java
+6 −6 src/main/java/org/openmaptiles/layers/WaterName.java
+7 −7 src/main/java/org/openmaptiles/layers/Waterway.java
+2 −2 src/main/java/org/openmaptiles/util/OmtLanguageUtils.java
+1 −1 src/main/java/org/openmaptiles/util/Utils.java
+1 −1 src/main/java/org/openmaptiles/util/VerifyMonaco.java
+12 −13 src/test/java/org/openmaptiles/GenerateTest.java
+1 −1 src/test/java/org/openmaptiles/OpenMapTilesProfileTest.java
+18 −10 src/test/java/org/openmaptiles/OpenMapTilesTest.java
+9 −10 src/test/java/org/openmaptiles/layers/AbstractLayerTest.java
+1 −1 src/test/java/org/openmaptiles/layers/AerodromeLabelTest.java
+1 −1 src/test/java/org/openmaptiles/layers/AerowayTest.java
+30 −31 src/test/java/org/openmaptiles/layers/BoundaryTest.java
+6 −6 src/test/java/org/openmaptiles/layers/BuildingTest.java
+1 −1 src/test/java/org/openmaptiles/layers/HousenumberTest.java
+9 −9 src/test/java/org/openmaptiles/layers/LandcoverTest.java
+4 −4 src/test/java/org/openmaptiles/layers/LanduseTest.java
+10 −11 src/test/java/org/openmaptiles/layers/MountainPeakTest.java
+1 −1 src/test/java/org/openmaptiles/layers/ParkTest.java
+31 −33 src/test/java/org/openmaptiles/layers/PlaceTest.java
+5 −6 src/test/java/org/openmaptiles/layers/PoiTest.java
+6 −8 src/test/java/org/openmaptiles/layers/TransportationTest.java
+8 −10 src/test/java/org/openmaptiles/layers/WaterNameTest.java
+16 −18 src/test/java/org/openmaptiles/layers/WaterTest.java
+5 −6 src/test/java/org/openmaptiles/layers/WaterwayTest.java
+2 −1 src/test/java/org/openmaptiles/util/OmtLanguageUtilsTest.java
+1 −1 src/test/java/org/openmaptiles/util/VerifyMonacoTest.java
+57 −0 submodule.pom.xml
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -174,6 +174,7 @@
</includes>
<excludes>
<exclude>**/target/**</exclude>
<exclude>planetiler-openmaptiles/**</exclude>
</excludes>
<flexmark/>
</markdown>
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-doc-links.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
20 changes: 0 additions & 20 deletions scripts/regenerate-openmaptiles.sh

This file was deleted.

0 comments on commit 619ac83

Please sign in to comment.