kopia lustrzana https://github.com/onthegomap/planetiler
Upgrade to Java 21 (#693)
rodzic
b23d7ea7f5
commit
b108f88453
|
@ -18,10 +18,10 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: true
|
||||
- name: Set up JDK 17
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 17
|
||||
java-version: 21
|
||||
distribution: 'temurin'
|
||||
cache: 'maven'
|
||||
- name: Ensure code formatted with mvn spotless:apply
|
||||
|
@ -34,13 +34,14 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
os: [ ubuntu-latest, macos-latest, windows-latest ]
|
||||
jdk: [ 17 ]
|
||||
jdk: [ 21 ]
|
||||
include:
|
||||
- os: ubuntu-latest
|
||||
jdk: 17
|
||||
jdk: 21
|
||||
args: "-DargLine='-Duser.language=fr -Duser.country=FR'"
|
||||
- os: ubuntu-latest
|
||||
jdk: 20
|
||||
jdk: 21
|
||||
args: ""
|
||||
runs-on: ${{ matrix.os }}
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
|
@ -71,10 +72,10 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: true
|
||||
- name: Set up JDK 17
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 17
|
||||
java-version: 21
|
||||
distribution: 'temurin'
|
||||
- name: Build and test
|
||||
run: mvn --batch-mode -no-transfer-progress package --file standalone.pom.xml
|
||||
|
@ -102,7 +103,7 @@ jobs:
|
|||
- name: Set up JDK
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 17
|
||||
java-version: 21
|
||||
distribution: 'temurin'
|
||||
cache: 'maven'
|
||||
|
||||
|
@ -139,7 +140,7 @@ jobs:
|
|||
- name: Set up JDK
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 17
|
||||
java-version: 21
|
||||
distribution: 'temurin'
|
||||
cache: 'maven'
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ jobs:
|
|||
- name: Set up JDK
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 17
|
||||
java-version: 21
|
||||
distribution: 'temurin'
|
||||
cache: 'maven'
|
||||
- uses: actions/setup-node@v4
|
||||
|
|
|
@ -32,7 +32,7 @@ jobs:
|
|||
uses: ./.github/cache-sources-action
|
||||
- uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: '17'
|
||||
java-version: '21'
|
||||
distribution: 'temurin'
|
||||
cache: 'maven'
|
||||
server-id: ossrh
|
||||
|
|
|
@ -29,7 +29,7 @@ jobs:
|
|||
- name: Set up JDK
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 17
|
||||
java-version: 21
|
||||
distribution: 'temurin'
|
||||
cache: 'maven'
|
||||
server-id: ossrh
|
||||
|
|
|
@ -20,10 +20,10 @@ jobs:
|
|||
# Disabling shallow clone is recommended for improving relevancy of reporting
|
||||
fetch-depth: 0
|
||||
submodules: true
|
||||
- name: Set up JDK 17
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 17
|
||||
java-version: 21
|
||||
distribution: 'temurin'
|
||||
cache: 'maven'
|
||||
- name: Cache SonarCloud packages
|
||||
|
|
|
@ -11,12 +11,12 @@ Pull requests are welcome! Any pull request should:
|
|||
To set up your local development environment:
|
||||
|
||||
- Fork the repo [setup submodules](README.md#git-submodules)
|
||||
- Install Java 17 or later. You can download Java manually from [Adoptium](https://adoptium.net/installation.html) or
|
||||
- Install Java 21 or later. You can download Java manually from [Adoptium](https://adoptium.net/installation.html) or
|
||||
use:
|
||||
- [Windows installer](https://adoptium.net/installation.html#windows-msi)
|
||||
- [macOS installer](https://adoptium.net/installation.html#macos-pkg) (or `brew install --cask temurin`,
|
||||
or `port install openjdk17-temurin`)
|
||||
- [Linux installer](https://adoptium.net/installation/linux/) (or `apt-get install openjdk-17-jdk`)
|
||||
or `port install openjdk21-temurin`)
|
||||
- [Linux installer](https://adoptium.net/installation/linux/) (or `apt-get install openjdk-21-jdk`)
|
||||
- Build and run the tests ([mvnw](https://github.com/takari/maven-wrapper) automatically downloads maven the first time
|
||||
you run it):
|
||||
- on mac/linux: `./mvnw clean test`
|
||||
|
@ -54,7 +54,7 @@ Troubleshooting:
|
|||
|
||||
- If any java source files show "Cannot resolve symbol..." errors for Planetiler classes, you might need to
|
||||
select: `File -> Invalidate Caches... -> Just Restart`.
|
||||
- If you see a "Project JDK is not defined" error, then choose `Setup SDK` and point IntelliJ at the Java 17 or later
|
||||
- If you see a "Project JDK is not defined" error, then choose `Setup SDK` and point IntelliJ at the Java 21 or later
|
||||
installed on your system
|
||||
|
||||
### Visual Studio Code
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
To generate a map of the world using the
|
||||
built-in [OpenMapTiles profile](https://github.com/openmaptiles/planetiler-openmaptiles), you will need a
|
||||
machine with
|
||||
Java 17 or later installed and at least 10x as much disk space and at least 0.5x as much RAM as the `planet.osm.pbf`
|
||||
Java 21 or later installed and at least 10x as much disk space and at least 0.5x as much RAM as the `planet.osm.pbf`
|
||||
file you start from. All testing has been done using Digital Ocean droplets with dedicated
|
||||
vCPUs ([referral link](https://m.do.co/c/a947e99aab25)) and OpenJDK 17 installed through `apt`. Planetiler splits work
|
||||
vCPUs ([referral link](https://m.do.co/c/a947e99aab25)) and OpenJDK 21 installed through `apt`. Planetiler splits work
|
||||
among available CPUs so the more you have, the less time it takes.
|
||||
|
||||
### 1) Choose the Data Source
|
||||
|
@ -84,10 +84,10 @@ To generate the tiles shown on https://onthegomap.github.io/planetiler-demo/ I u
|
|||
S3 snapshot, then ran Planetiler on a Digital Ocean Memory-Optimized droplet with 16 CPUs, 128GB RAM, and 1.17TB disk
|
||||
running Ubuntu 21.04 x64 in the nyc3 location.
|
||||
|
||||
First, I installed java 17 jre and screen:
|
||||
First, I installed java 21 jre and screen:
|
||||
|
||||
```bash
|
||||
apt-get update && apt-get install -y openjdk-17-jre-headless screen
|
||||
apt-get update && apt-get install -y openjdk-21-jre-headless screen
|
||||
```
|
||||
|
||||
Then I added a script `runworld.sh` to run with 100GB of RAM:
|
||||
|
|
|
@ -33,7 +33,7 @@ the [OpenStreetMap Americana Project](https://github.com/ZeLonewolf/openstreetma
|
|||
To generate a map of an area using the [OpenMapTiles profile](https://github.com/openmaptiles/planetiler-openmaptiles),
|
||||
you will need:
|
||||
|
||||
- Java 17+ (see [CONTRIBUTING.md](CONTRIBUTING.md)) or [Docker](https://docs.docker.com/get-docker/)
|
||||
- Java 21+ (see [CONTRIBUTING.md](CONTRIBUTING.md)) or [Docker](https://docs.docker.com/get-docker/)
|
||||
- at least 1GB of free disk space plus 5-10x the size of the `.osm.pbf` file
|
||||
- at least 0.5x as much free RAM as the input `.osm.pbf` file size
|
||||
|
||||
|
|
|
@ -292,15 +292,18 @@ Specific tile post processing operations for merging features may be defined:
|
|||
|
||||
- `merge_line_strings` - Combines linestrings with the same set of attributes into a multilinestring where segments with
|
||||
touching endpoints are merged.
|
||||
- `merge_polygons` - Combines polygons with the same set of attributes into a multipolygon where overlapping/touching polygons
|
||||
- `merge_polygons` - Combines polygons with the same set of attributes into a multipolygon where overlapping/touching
|
||||
polygons
|
||||
are combined into fewer polygons covering the same area.
|
||||
|
||||
The follow attributes for `merge_line_strings` may be set:
|
||||
|
||||
- `min_length` - Minimum tile pixel length of features to emit, or 0 to emit all merged linestrings.
|
||||
- `tolerance` - After merging, simplify linestrings using this pixel tolerance, or -1 to skip simplification step.
|
||||
- `buffer` - Number of pixels outside the visible tile area to include detail for, or -1 to skip clipping step.
|
||||
|
||||
The follow attribute for `merge_polygons` may be set:
|
||||
|
||||
- `min_area` - Minimum area in square tile pixels of polygons to emit.
|
||||
|
||||
For example:
|
||||
|
@ -534,7 +537,7 @@ in [PlanetilerStdLib](src/main/java/com/onthegomap/planetiler/custommap/expressi
|
|||
- `<string>.replace(from, to, limit)` returns the input string with the first N occurrences of from replaced by to
|
||||
- `<string>.replaceRegex(pattern, value)` replaces every occurrence of regular expression with value from the string
|
||||
it was called on using java's
|
||||
built-in [replaceAll](<https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/Matcher.html#replaceAll(java.lang.String)>)
|
||||
built-in [replaceAll](<https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/util/regex/Matcher.html#replaceAll(java.lang.String)>)
|
||||
behavior
|
||||
- `<string>.split(separator)` returns a list of strings split from the input by a separator
|
||||
- `<string>.split(separator, limit)` splits the list into up to N parts
|
||||
|
|
|
@ -14,6 +14,12 @@
|
|||
|
||||
<properties>
|
||||
<mainClass>com.onthegomap.planetiler.Main</mainClass>
|
||||
<!--
|
||||
compile against an earlier version so that Main runs but can emit a more readable
|
||||
error when running on an older version of Java
|
||||
-->
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<image.version>${project.version}</image.version>
|
||||
<image>ghcr.io/onthegomap/planetiler:${image.version}</image>
|
||||
<assembly-phase>package</assembly-phase>
|
||||
|
@ -54,7 +60,7 @@
|
|||
<skip>false</skip>
|
||||
<from>
|
||||
<image>
|
||||
eclipse-temurin:17-jre
|
||||
eclipse-temurin:21-jre
|
||||
</image>
|
||||
<platforms>
|
||||
<platform>
|
||||
|
|
|
@ -25,6 +25,15 @@ import org.openmaptiles.util.VerifyMonaco;
|
|||
* public static void main(String[] args)} methods of runnable classes.
|
||||
*/
|
||||
public class Main {
|
||||
static {
|
||||
int version = Runtime.version().feature();
|
||||
if (version < 21) {
|
||||
System.err.println(
|
||||
"You are using Java " + version +
|
||||
" but Planetiler requires 21 or later, for more details on upgrading see: https://github.com/onthegomap/planetiler/blob/main/CONTRIBUTING.md");
|
||||
System.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
private static final EntryPoint DEFAULT_TASK = OpenMapTilesMain::main;
|
||||
private static final Map<String, EntryPoint> ENTRY_POINTS = Map.ofEntries(
|
||||
|
|
|
@ -4,7 +4,7 @@ This is a minimal example project that shows how to create custom maps with Plan
|
|||
|
||||
Requirements:
|
||||
|
||||
- Java 17+ (see [CONTIRBUTING.md](../CONTRIBUTING.md))
|
||||
- Java 21+ (see [CONTIRBUTING.md](../CONTRIBUTING.md))
|
||||
- on mac: `brew install --cask temurin`
|
||||
- [Maven](https://maven.apache.org/install.html)
|
||||
- on mac: `brew install maven`
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<planetiler.version>0.7-SNAPSHOT</planetiler.version>
|
||||
<junit.version>5.10.0</junit.version>
|
||||
<!-- Replace this with the main class for the profile you add -->
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit d4aaae894b02e6feb5d1ae042bf31c1bcfa73c49
|
||||
Subproject commit 7dbbc5089e8ca5607d9c3ecf1991d35b1de5c6cf
|
18
pom.xml
18
pom.xml
|
@ -17,8 +17,8 @@
|
|||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<maven.source.excludeResources>true</maven.source.excludeResources>
|
||||
<jackson.version>2.15.3</jackson.version>
|
||||
<junit.version>5.10.0</junit.version>
|
||||
|
@ -203,7 +203,7 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- require building with jdk 17 -->
|
||||
<!-- require building with jdk 21 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-enforcer-plugin</artifactId>
|
||||
|
@ -217,7 +217,7 @@
|
|||
<configuration>
|
||||
<rules>
|
||||
<requireJavaVersion>
|
||||
<version>17</version>
|
||||
<version>21</version>
|
||||
</requireJavaVersion>
|
||||
</rules>
|
||||
</configuration>
|
||||
|
@ -245,6 +245,16 @@
|
|||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>3.1.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.11.0</version>
|
||||
<configuration>
|
||||
<compilerArgs>
|
||||
<arg>-proc:full</arg>
|
||||
</compilerArgs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
<pluginManagement>
|
||||
|
|
Ładowanie…
Reference in New Issue