From 140582fe28a4d329983c9d88e49681adcd2a3948 Mon Sep 17 00:00:00 2001 From: Mike Barry Date: Thu, 26 Oct 2023 06:55:57 -0400 Subject: [PATCH] exclude pt-omt --- .../main/java/com/onthegomap/planetiler/FeatureMerge.java | 2 +- .../com/onthegomap/planetiler/collection/LongLongMap.java | 8 ++++---- .../onthegomap/planetiler/expression/MultiExpression.java | 8 ++++---- .../java/com/onthegomap/planetiler/geo/PointIndex.java | 2 +- .../java/com/onthegomap/planetiler/geo/PolygonIndex.java | 4 ++-- .../com/onthegomap/planetiler/reader/SourceFeature.java | 2 +- .../com/onthegomap/planetiler/reader/osm/OsmReader.java | 2 +- .../java/com/onthegomap/planetiler/stats/ProcessInfo.java | 4 ++-- .../java/com/onthegomap/planetiler/util/Translations.java | 2 +- .../src/main/java/com/onthegomap/planetiler/util/Try.java | 4 ++-- .../com/onthegomap/planetiler/worker/WorkerPipeline.java | 4 ++-- pom.xml | 6 ++++++ 12 files changed, 27 insertions(+), 21 deletions(-) diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureMerge.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureMerge.java index 1bfe565c..202178d8 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureMerge.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureMerge.java @@ -572,5 +572,5 @@ public class FeatureMerge { return result; } - private record WithIndex(T feature, int hilbert) {} + private record WithIndex (T feature, int hilbert) {} } diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/LongLongMap.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/LongLongMap.java index 895cd2ec..381f1979 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/LongLongMap.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/LongLongMap.java @@ -51,10 +51,10 @@ public interface LongLongMap extends Closeable, MemoryEstimator.HasEstimate, Dis AppendStore.Longs.create(storage, params.resolve("values")) ); case ARRAY -> switch (storage) { - case MMAP -> new ArrayLongLongMapMmap(params.path(), params.madvise()); - case RAM -> new ArrayLongLongMapRam(false); - case DIRECT -> new ArrayLongLongMapRam(true); - }; + case MMAP -> new ArrayLongLongMapMmap(params.path(), params.madvise()); + case RAM -> new ArrayLongLongMapRam(false); + case DIRECT -> new ArrayLongLongMapRam(true); + }; }; } diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/MultiExpression.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/MultiExpression.java index 2de86b6f..97bc6c77 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/MultiExpression.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/MultiExpression.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; * * @param type of data value associated with each expression */ -public record MultiExpression(List> expressions) implements Simplifiable> { +public record MultiExpression (List> expressions) implements Simplifiable> { private static final Logger LOGGER = LoggerFactory.getLogger(MultiExpression.class); private static final Comparator BY_ID = Comparator.comparingInt(WithId::id); @@ -358,13 +358,13 @@ public record MultiExpression(List> expressions) implements Simplifi } /** An expression/value pair with unique ID to store whether we evaluated it yet. */ - private record EntryWithId(T result, Expression expression, @Override int id) implements WithId {} + private record EntryWithId (T result, Expression expression, @Override int id) implements WithId {} /** * An {@code expression} to evaluate on input elements and {@code result} value to return when the element matches. */ - public record Entry(T result, Expression expression) {} + public record Entry (T result, Expression expression) {} /** The result when an expression matches, along with the input element tag {@code keys} that triggered the match. */ - public record Match(T match, List keys, @Override int id) implements WithId {} + public record Match (T match, List keys, @Override int id) implements WithId {} } diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/PointIndex.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/PointIndex.java index 026d93bf..888d4b3e 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/PointIndex.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/PointIndex.java @@ -21,7 +21,7 @@ import org.locationtech.jts.index.strtree.STRtree; @ThreadSafe public class PointIndex { - private record GeomWithData(Coordinate coord, T data) {} + private record GeomWithData (Coordinate coord, T data) {} private final STRtree index = new STRtree(); diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/PolygonIndex.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/PolygonIndex.java index 848c1d13..6a2bfd82 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/PolygonIndex.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/PolygonIndex.java @@ -19,7 +19,7 @@ import org.locationtech.jts.index.strtree.STRtree; @ThreadSafe public class PolygonIndex { - private record GeomWithData(Polygon poly, T data) {} + private record GeomWithData (Polygon poly, T data) {} private final STRtree index = new STRtree(); @@ -77,7 +77,7 @@ public class PolygonIndex { List items = index.query(point.getEnvelopeInternal()); // optimization: if there's only one then skip checking contains/distance if (items.size() == 1) { - if (items.get(0) instanceof GeomWithData value) { + if (items.get(0)instanceof GeomWithData value) { @SuppressWarnings("unchecked") T t = (T) value.data; return List.of(t); } diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/SourceFeature.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/SourceFeature.java index 4a474a97..63c87a34 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/SourceFeature.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/SourceFeature.java @@ -128,7 +128,7 @@ public abstract class SourceFeature implements WithTags, WithGeometryType { private Geometry computeCentroidIfConvex() throws GeometryException { if (!canBePolygon()) { return centroid(); - } else if (polygon() instanceof Polygon poly && + } else if (polygon()instanceof Polygon poly && poly.getNumInteriorRing() == 0 && GeoUtils.isConvex(poly.getExteriorRing())) { return centroid(); diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/OsmReader.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/OsmReader.java index 7a9789fe..dbd3a97f 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/OsmReader.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/OsmReader.java @@ -592,7 +592,7 @@ public class OsmReader implements Closeable, MemoryEstimator.HasEstimate { * @param role "role" of the relation member * @param relation user-provided data about the relation from pass1 */ - public record RelationMember(String role, T relation) {} + public record RelationMember (String role, T relation) {} /** Raw relation membership data that gets encoded/decoded into a long. */ private record RelationMembership(String role, long relationId) {} diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProcessInfo.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProcessInfo.java index 29736ef4..4dda00a3 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProcessInfo.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProcessInfo.java @@ -38,7 +38,7 @@ public class ProcessInfo { for (GarbageCollectorMXBean garbageCollectorMXBean : ManagementFactory.getGarbageCollectorMXBeans()) { if (garbageCollectorMXBean instanceof NotificationEmitter emitter) { emitter.addNotificationListener((notification, handback) -> { - if (notification.getUserData() instanceof CompositeData compositeData) { + if (notification.getUserData()instanceof CompositeData compositeData) { var info = GarbageCollectionNotificationInfo.from(compositeData); GcInfo gcInfo = info.getGcInfo(); postGcMemoryUsage.set(gcInfo.getMemoryUsageAfterGc().entrySet().stream() @@ -142,7 +142,7 @@ public class ProcessInfo { * Returns the total amount of memory available on the system if available. */ public static OptionalLong getSystemMemoryBytes() { - if (ManagementFactory.getOperatingSystemMXBean() instanceof com.sun.management.OperatingSystemMXBean osBean) { + if (ManagementFactory.getOperatingSystemMXBean()instanceof com.sun.management.OperatingSystemMXBean osBean) { return OptionalLong.of(osBean.getTotalMemorySize()); } else { return OptionalLong.empty(); diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Translations.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Translations.java index 7e3c60b0..c06a0fce 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Translations.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Translations.java @@ -128,7 +128,7 @@ public class Translations { Map result = new HashMap<>(); for (var entry : tags.entrySet()) { String key = entry.getKey(); - if (key.startsWith("name:") && entry.getValue() instanceof String stringVal) { + if (key.startsWith("name:") && entry.getValue()instanceof String stringVal) { result.put(key, stringVal); } } diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Try.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Try.java index a6fdfb2d..4cef4263 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Try.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Try.java @@ -58,14 +58,14 @@ public interface Try { */ Try map(FunctionThatThrows fn); - record Success(T get) implements Try { + record Success (T get) implements Try { @Override public Try map(FunctionThatThrows fn) { return Try.apply(() -> fn.apply(get)); } } - record Failure(@Override Exception exception) implements Try { + record Failure (@Override Exception exception) implements Try { @Override public T get() { diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/WorkerPipeline.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/WorkerPipeline.java index 683b0611..9bdeede6 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/WorkerPipeline.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/WorkerPipeline.java @@ -34,7 +34,7 @@ import java.util.function.Consumer; * * @param input type of this pipeline */ -public record WorkerPipeline( +public record WorkerPipeline ( String name, WorkerPipeline previous, WorkQueue inputQueue, @@ -219,7 +219,7 @@ public record WorkerPipeline( * * @param type of elements that the next step must process */ - public record Builder( + public record Builder ( String prefix, String name, // keep track of previous elements so that build can wire-up the computation graph diff --git a/pom.xml b/pom.xml index e8ee98b1..b6c6e759 100644 --- a/pom.xml +++ b/pom.xml @@ -175,6 +175,12 @@ 2.40.0 + + *.java + + + planetiler-openmaptiles/**/*.java +