From e461fcd3fd021df5328499680211f7db38eadb14 Mon Sep 17 00:00:00 2001
From: Mike Barry <msb5014@gmail.com>
Date: Thu, 26 Oct 2023 06:38:19 -0400
Subject: [PATCH 1/6] Math.clamp

---
 .../planetiler/collection/ArrayLongLongMapMmap.java    |  2 +-
 .../java/com/onthegomap/planetiler/geo/GeoUtils.java   |  2 +-
 .../com/onthegomap/planetiler/geo/TileExtents.java     |  4 ++--
 .../java/com/onthegomap/planetiler/util/SortKey.java   | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ArrayLongLongMapMmap.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ArrayLongLongMapMmap.java
index e208248b25..17791e6ef8 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ArrayLongLongMapMmap.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ArrayLongLongMapMmap.java
@@ -95,7 +95,7 @@ private static int guessPendingChunkLimit(long chunkSize) {
     int minChunks = 1;
     int maxChunks = (int) (MAX_BYTES_TO_USE / chunkSize);
     int targetChunks = (int) (ProcessInfo.getMaxMemoryBytes() * 0.5d / chunkSize);
-    return Math.min(maxChunks, Math.max(minChunks, targetChunks));
+    return Math.clamp(targetChunks, minChunks, maxChunks);
   }
 
   public void init() {
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java
index c71dbd6e68..35f32587e3 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java
@@ -416,7 +416,7 @@ public static Geometry createGeometryCollection(List<Geometry> polygonGroup) {
   /** Returns a point approximately {@code ratio} of the way from start to end and {@code offset} units to the right. */
   public static Point pointAlongOffset(LineString lineString, double ratio, double offset) {
     int numPoints = lineString.getNumPoints();
-    int middle = Math.max(0, Math.min(numPoints - 2, (int) (numPoints * ratio)));
+    int middle = Math.clamp((int) (numPoints * ratio), 0, numPoints - 2);
     Coordinate a = lineString.getCoordinateN(middle);
     Coordinate b = lineString.getCoordinateN(middle + 1);
     LineSegment segment = new LineSegment(a, b);
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/TileExtents.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/TileExtents.java
index f6313cf28d..911be3c76e 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/TileExtents.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/TileExtents.java
@@ -21,11 +21,11 @@ private TileExtents(ForZoom[] zoomExtents) {
   }
 
   private static int quantizeDown(double value, int levels) {
-    return Math.max(0, Math.min(levels, (int) Math.floor(value * levels)));
+    return Math.clamp((int) Math.floor(value * levels), 0, levels);
   }
 
   private static int quantizeUp(double value, int levels) {
-    return Math.max(0, Math.min(levels, (int) Math.ceil(value * levels)));
+    return Math.clamp((int) Math.ceil(value * levels), 0, levels);
   }
 
   /** Returns a filter to tiles that intersect {@code worldBounds} (specified in world web mercator coordinates). */
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/SortKey.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/SortKey.java
index 3cb9a843cb..abdffdad7e 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/SortKey.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/SortKey.java
@@ -13,7 +13,7 @@
  * To sort by a field descending, specify its range from high to low.
  * <p>
  * For example this SQL ordering:
- * 
+ *
  * <pre>
  * {@code
  * ORDER BY rank ASC,
@@ -23,7 +23,7 @@
  * </pre>
  * <p>
  * would become:
- * 
+ *
  * <pre>
  * {@code
  * feature.setSortKey(
@@ -125,7 +125,7 @@ public SortKey thenByInt(int value, int start, int end) {
     }
     int levels = end + 1 - start;
     if (value < start || value > end) {
-      value = Math.max(start, Math.min(end, value));
+      value = Math.clamp(value, start, end);
     }
     return accumulate(value, start, levels);
   }
@@ -141,7 +141,7 @@ public SortKey thenByDouble(double value, double start, double end, int levels)
       return thenByDouble(start - value, end, start, levels);
     }
     if (value < start || value > end) {
-      value = Math.max(start, Math.min(end, value));
+      value = Math.clamp(value, start, end);
     }
 
     int intVal = doubleRangeToInt(value, start, end, levels);
@@ -160,7 +160,7 @@ public SortKey thenByLog(double value, double start, double end, int levels) {
     }
     assert start > 0 : "log thresholds must be > 0 got [" + start + ", " + end + "]";
     if (value < start || value > end) {
-      value = Math.max(start, Math.min(end, value));
+      value = Math.clamp(value, start, end);
     }
 
     int intVal = doubleRangeToInt(Math.log(value), Math.log(start), Math.log(end), levels);

From aee73c8bc7eb27309860a59f3bcbb213f4569542 Mon Sep 17 00:00:00 2001
From: Mike Barry <msb5014@gmail.com>
Date: Thu, 26 Oct 2023 20:39:20 -0400
Subject: [PATCH 2/6] snippets and switch expressions

---
 .../planetiler/FeatureCollector.java          |  5 +-
 .../com/onthegomap/planetiler/VectorTile.java | 65 +++++++++----------
 .../planetiler/collection/FeatureGroup.java   | 24 +++----
 .../planetiler/expression/DataType.java       | 21 +++---
 .../planetiler/expression/Expression.java     | 31 ++++-----
 .../expression/MultiExpression.java           | 22 +++----
 .../onthegomap/planetiler/geo/GeoUtils.java   | 28 ++++----
 .../planetiler/geo/PolygonIndex.java          |  4 +-
 .../planetiler/reader/SourceFeature.java      |  2 +-
 .../planetiler/stats/ProcessInfo.java         |  4 +-
 .../planetiler/stats/ProcessTime.java         |  7 +-
 .../planetiler/util/Downloader.java           |  5 +-
 .../onthegomap/planetiler/util/SortKey.java   |  8 +--
 .../planetiler/util/TileSizeStats.java        |  2 +-
 .../planetiler/util/Translations.java         |  2 +-
 .../planetiler/worker/WorkerPipeline.java     | 10 ++-
 .../custommap/ConfigExpressionParser.java     |  2 +-
 .../planetiler/examples/OsmQaTiles.java       | 10 +--
 18 files changed, 107 insertions(+), 145 deletions(-)

diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureCollector.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureCollector.java
index d7a9b075be..49729ee76d 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureCollector.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureCollector.java
@@ -22,16 +22,13 @@
  * feature.
  * <p>
  * For example to add a polygon feature for a lake and a center label point with its name:
- *
- * <pre>
- * {@code
+ * {@snippet :
  * featureCollector.polygon("water")
  *   .setAttr("class", "lake");
  * featureCollector.centroid("water_name")
  *   .setAttr("class", "lake")
  *   .setAttr("name", element.getString("name"));
  * }
- * </pre>
  */
 public class FeatureCollector implements Iterable<FeatureCollector.Feature> {
 
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
index 811b508434..05adad325e 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
@@ -509,20 +509,14 @@ public VectorTileProto.Tile toProto() {
 
       for (Object value : layer.values()) {
         VectorTileProto.Tile.Value.Builder tileValue = VectorTileProto.Tile.Value.newBuilder();
-        if (value instanceof String stringValue) {
-          tileValue.setStringValue(stringValue);
-        } else if (value instanceof Integer intValue) {
-          tileValue.setSintValue(intValue);
-        } else if (value instanceof Long longValue) {
-          tileValue.setSintValue(longValue);
-        } else if (value instanceof Float floatValue) {
-          tileValue.setFloatValue(floatValue);
-        } else if (value instanceof Double doubleValue) {
-          tileValue.setDoubleValue(doubleValue);
-        } else if (value instanceof Boolean booleanValue) {
-          tileValue.setBoolValue(booleanValue);
-        } else {
-          tileValue.setStringValue(value.toString());
+        switch (value) {
+          case String stringValue -> tileValue.setStringValue(stringValue);
+          case Integer intValue -> tileValue.setSintValue(intValue);
+          case Long longValue -> tileValue.setSintValue(longValue);
+          case Float floatValue -> tileValue.setFloatValue(floatValue);
+          case Double doubleValue -> tileValue.setDoubleValue(doubleValue);
+          case Boolean booleanValue -> tileValue.setBoolValue(booleanValue);
+          case Object ignored -> tileValue.setStringValue(value.toString());
         }
         tileLayer.addValues(tileValue.build());
       }
@@ -1072,31 +1066,32 @@ static int commandAndLength(Command command, int repeat) {
     }
 
     void accept(Geometry geometry) {
-      if (geometry instanceof MultiLineString multiLineString) {
-        for (int i = 0; i < multiLineString.getNumGeometries(); i++) {
-          encode(((LineString) multiLineString.getGeometryN(i)).getCoordinateSequence(), false, GeometryType.LINE);
+      switch (geometry) {
+        case MultiLineString multiLineString -> {
+          for (int i = 0; i < multiLineString.getNumGeometries(); i++) {
+            encode(((LineString) multiLineString.getGeometryN(i)).getCoordinateSequence(), false, GeometryType.LINE);
+          }
         }
-      } else if (geometry instanceof Polygon polygon) {
-        LineString exteriorRing = polygon.getExteriorRing();
-        encode(exteriorRing.getCoordinateSequence(), true, GeometryType.POLYGON);
-
-        for (int i = 0; i < polygon.getNumInteriorRing(); i++) {
-          LineString interiorRing = polygon.getInteriorRingN(i);
-          encode(interiorRing.getCoordinateSequence(), true, GeometryType.LINE);
+        case Polygon polygon -> {
+          LineString exteriorRing = polygon.getExteriorRing();
+          encode(exteriorRing.getCoordinateSequence(), true, GeometryType.POLYGON);
+          for (int i = 0; i < polygon.getNumInteriorRing(); i++) {
+            LineString interiorRing = polygon.getInteriorRingN(i);
+            encode(interiorRing.getCoordinateSequence(), true, GeometryType.LINE);
+          }
         }
-      } else if (geometry instanceof MultiPolygon multiPolygon) {
-        for (int i = 0; i < multiPolygon.getNumGeometries(); i++) {
-          accept(multiPolygon.getGeometryN(i));
+        case MultiPolygon multiPolygon -> {
+          for (int i = 0; i < multiPolygon.getNumGeometries(); i++) {
+            accept(multiPolygon.getGeometryN(i));
+          }
         }
-      } else if (geometry instanceof LineString lineString) {
-        encode(lineString.getCoordinateSequence(), shouldClosePath(geometry), GeometryType.LINE);
-      } else if (geometry instanceof Point point) {
-        encode(point.getCoordinateSequence(), false, GeometryType.POINT);
-      } else if (geometry instanceof Puntal) {
-        encode(new CoordinateArraySequence(geometry.getCoordinates()), shouldClosePath(geometry),
+        case LineString lineString ->
+          encode(lineString.getCoordinateSequence(), shouldClosePath(geometry), GeometryType.LINE);
+        case Point point -> encode(point.getCoordinateSequence(), false, GeometryType.POINT);
+        case Puntal ignored -> encode(new CoordinateArraySequence(geometry.getCoordinates()), shouldClosePath(geometry),
           geometry instanceof MultiPoint, GeometryType.POINT);
-      } else {
-        LOGGER.warn("Unrecognized geometry type: " + geometry.getGeometryType());
+        case null -> LOGGER.warn("Null geometry type");
+        default -> LOGGER.warn("Unrecognized geometry type: " + geometry.getGeometryType());
       }
     }
 
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java
index d990f62b28..d7dcdcfe0b 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java
@@ -220,21 +220,15 @@ private byte[] encodeValue(VectorTile.Feature vectorTileFeature, RenderedFeature
         if (entry.getValue() != null) {
           packer.packInt(commonValueStrings.encode(entry.getKey()));
           Object value = entry.getValue();
-          if (value instanceof String string) {
-            packer.packValue(ValueFactory.newString(string));
-          } else if (value instanceof Integer integer) {
-            packer.packValue(ValueFactory.newInteger(integer.longValue()));
-          } else if (value instanceof Long longValue) {
-            packer.packValue(ValueFactory.newInteger(longValue));
-          } else if (value instanceof Float floatValue) {
-            packer.packValue(ValueFactory.newFloat(floatValue));
-          } else if (value instanceof Double doubleValue) {
-            packer.packValue(ValueFactory.newFloat(doubleValue));
-          } else if (value instanceof Boolean booleanValue) {
-            packer.packValue(ValueFactory.newBoolean(booleanValue));
-          } else {
-            packer.packValue(ValueFactory.newString(value.toString()));
-          }
+          packer.packValue(switch (value) {
+            case String string -> ValueFactory.newString(string);
+            case Integer integer -> ValueFactory.newInteger(integer.longValue());
+            case Long longValue -> ValueFactory.newInteger(longValue);
+            case Float floatValue -> ValueFactory.newFloat(floatValue);
+            case Double doubleValue -> ValueFactory.newFloat(doubleValue);
+            case Boolean booleanValue -> ValueFactory.newBoolean(booleanValue);
+            default -> ValueFactory.newString(value.toString());
+          });
         }
       }
       // Use the same binary format for encoding geometries in output vector tiles. Benchmarking showed
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/DataType.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/DataType.java
index ab93fdef07..de3fdac9b8 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/DataType.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/DataType.java
@@ -34,19 +34,14 @@ public enum DataType implements BiFunction<WithTags, String, Object> {
 
   /** Returns the data type associated with {@code value}, or {@link #GET_TAG} as a fallback. */
   public static DataType typeOf(Object value) {
-    if (value instanceof String) {
-      return GET_STRING;
-    } else if (value instanceof Integer) {
-      return GET_INT;
-    } else if (value instanceof Long) {
-      return GET_LONG;
-    } else if (value instanceof Double) {
-      return GET_DOUBLE;
-    } else if (value instanceof Boolean) {
-      return GET_BOOLEAN;
-    } else {
-      return GET_TAG;
-    }
+    return switch (value) {
+      case String ignored -> GET_STRING;
+      case Integer ignored -> GET_INT;
+      case Long ignored -> GET_LONG;
+      case Double ignored -> GET_DOUBLE;
+      case Boolean ignored -> GET_BOOLEAN;
+      default -> GET_TAG;
+    };
   }
 
   /** Returns the data type associated with {@code id}, or {@link #GET_TAG} as a fallback. */
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java
index 6fbe641ba8..bd912f3c3c 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java
@@ -23,12 +23,9 @@
  * <p>
  * Calling {@code toString()} on any expression will generate code that can be used to recreate an identical copy of the
  * original expression, assuming that the generated code includes:
- *
- * <pre>
- * {@code
+ * {@snippet :
  * import static com.onthegomap.planetiler.expression.Expression.*;
  * }
- * </pre>
  */
 // TODO rename to BooleanExpression
 public interface Expression extends Simplifiable<Expression> {
@@ -141,14 +138,13 @@ default Expression replace(Expression a, Expression b) {
   default Expression replace(Predicate<Expression> replace, Expression b) {
     if (replace.test(this)) {
       return b;
-    } else if (this instanceof Not not) {
-      return new Not(not.child.replace(replace, b));
-    } else if (this instanceof Or or) {
-      return new Or(or.children.stream().map(child -> child.replace(replace, b)).toList());
-    } else if (this instanceof And and) {
-      return new And(and.children.stream().map(child -> child.replace(replace, b)).toList());
     } else {
-      return this;
+      return switch (this) {
+        case Not(var child) -> new Not(child.replace(replace, b));
+        case Or(var children) -> new Or(children.stream().map(child -> child.replace(replace, b)).toList());
+        case And(var children) -> new And(children.stream().map(child -> child.replace(replace, b)).toList());
+        default -> this;
+      };
     }
   }
 
@@ -156,14 +152,13 @@ default Expression replace(Predicate<Expression> replace, Expression b) {
   default boolean contains(Predicate<Expression> filter) {
     if (filter.test(this)) {
       return true;
-    } else if (this instanceof Not not) {
-      return not.child.contains(filter);
-    } else if (this instanceof Or or) {
-      return or.children.stream().anyMatch(child -> child.contains(filter));
-    } else if (this instanceof And and) {
-      return and.children.stream().anyMatch(child -> child.contains(filter));
     } else {
-      return false;
+      return switch (this) {
+        case Not(var child) -> child.contains(filter);
+        case Or(var children) -> children.stream().anyMatch(child -> child.contains(filter));
+        case And(var children) -> children.stream().anyMatch(child -> child.contains(filter));
+        default -> false;
+      };
     }
   }
 
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 97bc6c7737..87c53bf403 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
@@ -50,19 +50,15 @@ public static <T> Entry<T> entry(T result, Expression expression) {
    * when a particular key is present on the input.
    */
   private static boolean mustAlwaysEvaluate(Expression expression) {
-    if (expression instanceof Expression.Or or) {
-      return or.children().stream().anyMatch(MultiExpression::mustAlwaysEvaluate);
-    } else if (expression instanceof Expression.And and) {
-      return and.children().stream().allMatch(MultiExpression::mustAlwaysEvaluate);
-    } else if (expression instanceof Expression.Not not) {
-      return !mustAlwaysEvaluate(not.child());
-    } else if (expression instanceof Expression.MatchAny any && any.matchWhenMissing()) {
-      return true;
-    } else {
-      return !(expression instanceof Expression.MatchAny) &&
-        !(expression instanceof Expression.MatchField) &&
-        !FALSE.equals(expression);
-    }
+    return switch (expression) {
+      case Expression.Or(var children) -> children.stream().anyMatch(MultiExpression::mustAlwaysEvaluate);
+      case Expression.And(var children) -> children.stream().allMatch(MultiExpression::mustAlwaysEvaluate);
+      case Expression.Not(var child) -> !mustAlwaysEvaluate(child);
+      case Expression.MatchAny any when any.matchWhenMissing() -> true;
+      case null, default -> !(expression instanceof Expression.MatchAny) &&
+          !(expression instanceof Expression.MatchField) &&
+          !FALSE.equals(expression);
+    };
   }
 
   /** Calls {@code acceptKey} for every tag that could possibly cause {@code exp} to match an input element. */
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java
index 35f32587e3..525b790bbf 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java
@@ -390,22 +390,22 @@ public static Geometry polygonToLineString(Geometry geom) throws GeometryExcepti
   }
 
   private static void getLineStrings(Geometry input, List<LineString> output) throws GeometryException {
-    if (input instanceof LinearRing linearRing) {
-      output.add(JTS_FACTORY.createLineString(linearRing.getCoordinateSequence()));
-    } else if (input instanceof LineString lineString) {
-      output.add(lineString);
-    } else if (input instanceof Polygon polygon) {
-      getLineStrings(polygon.getExteriorRing(), output);
-      for (int i = 0; i < polygon.getNumInteriorRing(); i++) {
-        getLineStrings(polygon.getInteriorRingN(i), output);
+    switch (input) {
+      case LinearRing linearRing -> output.add(JTS_FACTORY.createLineString(linearRing.getCoordinateSequence()));
+      case LineString lineString -> output.add(lineString);
+      case Polygon polygon -> {
+        getLineStrings(polygon.getExteriorRing(), output);
+        for (int i = 0; i < polygon.getNumInteriorRing(); i++) {
+          getLineStrings(polygon.getInteriorRingN(i), output);
+        }
       }
-    } else if (input instanceof GeometryCollection gc) {
-      for (int i = 0; i < gc.getNumGeometries(); i++) {
-        getLineStrings(gc.getGeometryN(i), output);
+      case GeometryCollection gc -> {
+        for (int i = 0; i < gc.getNumGeometries(); i++) {
+          getLineStrings(gc.getGeometryN(i), output);
+        }
       }
-    } else {
-      throw new GeometryException("get_line_strings_bad_type",
-        "unrecognized geometry type: " + input.getGeometryType());
+      case null, default -> throw new GeometryException("get_line_strings_bad_type",
+        "unrecognized geometry type: " + (input == null ? "null" : input.getGeometryType()));
     }
   }
 
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 6a2bfd823f..848c1d137e 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 @@
 @ThreadSafe
 public class PolygonIndex<T> {
 
-  private record GeomWithData<T> (Polygon poly, T data) {}
+  private record GeomWithData<T>(Polygon poly, T data) {}
 
   private final STRtree index = new STRtree();
 
@@ -77,7 +77,7 @@ public List<T> getContainingOrNearest(Point point) {
     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 63c87a3415..4a474a9727 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 final Geometry pointOnSurface() throws GeometryException {
   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/stats/ProcessInfo.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProcessInfo.java
index 4dda00a326..29736ef493 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 static long getDirectUsedMemoryLimit() {
    * 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/stats/ProcessTime.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProcessTime.java
index 16645bbf75..7e8cb0b62d 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProcessTime.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProcessTime.java
@@ -10,15 +10,12 @@
  * A utility for measuring the wall and CPU time that this JVM consumes between snapshots.
  * <p>
  * For example:
- *
- * <pre>
- * {@code
+ * {@snippet :
  * var start = ProcessTime.now();
  * // do expensive work...
- * var end - ProcessTime.now();
+ * var end = ProcessTime.now();
  * LOGGER.log("Expensive work took " + end.minus(start));
  * }
- * </pre>
  */
 @Immutable
 public record ProcessTime(Duration wall, Optional<Duration> cpu, Duration gc) {
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Downloader.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Downloader.java
index fa9c77781a..a75a707074 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Downloader.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Downloader.java
@@ -43,15 +43,12 @@
  * changes.
  * <p>
  * For example:
- *
- * <pre>
- * {@code
+ * {@snippet :
  * Downloader.create(PlanetilerConfig.defaults())
  *   .add("natural_earth", "http://url/of/natural_earth.zip", Path.of("natural_earth.zip"))
  *   .add("osm", "http://url/of/file.osm.pbf", Path.of("file.osm.pbf"))
  *   .run();
  * }
- * </pre>
  * <p>
  * As a shortcut to find the URL of a file to download from the <a href="https://download.geofabrik.de/">Geofabrik
  * download site</a>, you can use "geofabrik:extract name" (i.e. "geofabrik:monaco" or "geofabrik:australia") to look up
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/SortKey.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/SortKey.java
index abdffdad7e..fb6594850a 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/SortKey.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/SortKey.java
@@ -14,18 +14,14 @@
  * <p>
  * For example this SQL ordering:
  *
- * <pre>
- * {@code
+ * {@snippet lang = "sql" :
  * ORDER BY rank ASC,
  * population DESC,
  * length(name) ASC
  * }
- * </pre>
  * <p>
  * would become:
- *
- * <pre>
- * {@code
+ * {@snippet :
  * feature.setSortKey(
  *   SortKey
  *     .orderByInt(rank, MIN_RANK, MAX_RANK)
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/TileSizeStats.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/TileSizeStats.java
index cb3f6d8708..e196e07eee 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/TileSizeStats.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/TileSizeStats.java
@@ -44,7 +44,7 @@
  * archive, or run the following an existing archive:
  *
  * <pre>
- * {@code
+ * {@snippet lang="bash" :
  * java -jar planetiler.jar stats --input=<path to pmtiles or mbtiles> --output=layerstats.tsv.gz
  * }
  * </pre>
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 c06a0fcec1..7e3c60b0f8 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 Map<String, String> getNameTranslations(Map<String, Object> tags) {
       Map<String, String> 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/worker/WorkerPipeline.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/WorkerPipeline.java
index 9bdeede68b..506b2a2115 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
@@ -18,23 +18,21 @@
  * <p>
  * For example:
  *
- * <pre>
- * {@code
+ * {@snippet :
  * WorkerPipeline.start("name", stats)
  *   .readFrom("reader", List.of(1, 2, 3))
  *   .addBuffer("reader_queue", 10)
- *   .addWorker("process", 2, (i, next) -> next.accept(doExpensiveWork(i))
+ *   .addWorker("process", 2, (i, next) -> next.accept(doExpensiveWork(i)))
  *   .addBuffer("writer_queue", 10)
  *   .sinkToConsumer("writer", 1, result -> writeToDisk(result))
  *   .await();
  * }
- * </pre>
  * <p>
  * NOTE: to do any forking/joining, you must construct and wire-up queues and each sequence of steps manually.
  *
  * @param <T> input type of this pipeline
  */
-public record WorkerPipeline<T> (
+public record WorkerPipeline<T>(
   String name,
   WorkerPipeline<?> previous,
   WorkQueue<T> inputQueue,
@@ -219,7 +217,7 @@ public <T> Builder<T> readFromQueue(WorkQueue<T> input) {
    *
    * @param <O> type of elements that the next step must process
    */
-  public record Builder<O> (
+  public record Builder<O>(
     String prefix,
     String name,
     // keep track of previous elements so that build can wire-up the computation graph
diff --git a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/ConfigExpressionParser.java b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/ConfigExpressionParser.java
index beaf5bca74..1137bfffe9 100644
--- a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/ConfigExpressionParser.java
+++ b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/ConfigExpressionParser.java
@@ -86,7 +86,7 @@ private <O> ConfigExpression<I, O> parse(Object object, Class<O> output) {
         return cast(signature(output), child, dataType);
       } else {
         var keys = map.keySet();
-        if (keys.equals(Set.of("coalesce")) && map.get("coalesce")instanceof Collection<?> cases) {
+        if (keys.equals(Set.of("coalesce")) && map.get("coalesce") instanceof Collection<?> cases) {
           return coalesce(cases.stream().map(item -> parse(item, output)).toList());
         } else if (keys.equals(Set.of("match"))) {
           return parseMatch(map.get("match"), true, output);
diff --git a/planetiler-examples/src/main/java/com/onthegomap/planetiler/examples/OsmQaTiles.java b/planetiler-examples/src/main/java/com/onthegomap/planetiler/examples/OsmQaTiles.java
index 4b14903465..72fe948e19 100644
--- a/planetiler-examples/src/main/java/com/onthegomap/planetiler/examples/OsmQaTiles.java
+++ b/planetiler-examples/src/main/java/com/onthegomap/planetiler/examples/OsmQaTiles.java
@@ -76,10 +76,12 @@ public void processFeature(SourceFeature sourceFeature, FeatureCollector feature
         }
         feature
           .setAttr("@id", sourceFeature.id())
-          .setAttr("@type", element instanceof OsmElement.Node ? "node" :
-            element instanceof OsmElement.Way ? "way" :
-            element instanceof OsmElement.Relation ? "relation" : null
-          );
+          .setAttr("@type", switch (element) {
+            case OsmElement.Node ignored -> "node";
+            case OsmElement.Way ignored -> "way";
+            case OsmElement.Relation ignored -> "relation";
+            default -> null;
+          });
         var info = element.info();
         if (info != null) {
           feature

From 507ea4e7b440bc248c67fc41c080a96df5782235 Mon Sep 17 00:00:00 2001
From: Mike Barry <msb5014@gmail.com>
Date: Thu, 26 Oct 2023 21:06:33 -0400
Subject: [PATCH 3/6] sequenced collections

---
 .../planetiler/benchmarks/BenchmarkMbtilesRead.java    |  2 +-
 .../java/com/onthegomap/planetiler/FeatureMerge.java   | 10 +++++-----
 .../java/com/onthegomap/planetiler/VectorTile.java     |  6 +++---
 .../planetiler/collection/ExternalMergeSort.java       |  2 +-
 .../onthegomap/planetiler/expression/Expression.java   |  4 ++--
 .../planetiler/expression/MultiExpression.java         |  4 ++--
 .../java/com/onthegomap/planetiler/geo/GeoUtils.java   | 10 +++++-----
 .../com/onthegomap/planetiler/geo/PolygonIndex.java    |  6 +++---
 .../planetiler/reader/osm/OsmMultipolygon.java         |  2 +-
 .../planetiler/render/GeometryCoordinateSequences.java |  4 ++--
 .../onthegomap/planetiler/render/TiledGeometry.java    | 10 +++++-----
 .../onthegomap/planetiler/stats/ProgressLoggers.java   |  2 +-
 .../java/com/onthegomap/planetiler/util/AwsOsm.java    |  2 +-
 .../java/com/onthegomap/planetiler/util/Geofabrik.java |  2 +-
 .../com/onthegomap/planetiler/PlanetilerTests.java     |  4 ++--
 .../java/com/onthegomap/planetiler/VectorTileTest.java |  4 ++--
 .../planetiler/reader/ShapefileReaderTest.java         |  6 +++---
 .../com/onthegomap/planetiler/custommap/Contexts.java  |  2 +-
 .../custommap/expression/ConfigExpression.java         |  2 +-
 19 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/planetiler-benchmarks/src/main/java/com/onthegomap/planetiler/benchmarks/BenchmarkMbtilesRead.java b/planetiler-benchmarks/src/main/java/com/onthegomap/planetiler/benchmarks/BenchmarkMbtilesRead.java
index b9255ffa74..e0a19f94a7 100644
--- a/planetiler-benchmarks/src/main/java/com/onthegomap/planetiler/benchmarks/BenchmarkMbtilesRead.java
+++ b/planetiler-benchmarks/src/main/java/com/onthegomap/planetiler/benchmarks/BenchmarkMbtilesRead.java
@@ -47,7 +47,7 @@ public static void main(String[] args) throws Exception {
     List<TileCoord> randomCoordsToFetchPerRepetition = new LinkedList<>();
 
     do {
-      try (var db = Mbtiles.newReadOnlyDatabase(mbtilesPaths.get(0))) {
+      try (var db = Mbtiles.newReadOnlyDatabase(mbtilesPaths.getFirst())) {
         try (var statement = db.connection().prepareStatement(SELECT_RANDOM_COORDS)) {
           statement.setInt(1, nrTileReads - randomCoordsToFetchPerRepetition.size());
           var rs = statement.executeQuery();
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 202178d8e1..d272cf11eb 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureMerge.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureMerge.java
@@ -124,7 +124,7 @@ private static List<VectorTile.Feature> mergeGeometries(
     List<VectorTile.Feature> result = new ArrayList<>(features.size());
     var groupedByAttrs = groupByAttrs(features, result, geometryType);
     for (List<VectorTile.Feature> groupedFeatures : groupedByAttrs) {
-      VectorTile.Feature feature1 = groupedFeatures.get(0);
+      VectorTile.Feature feature1 = groupedFeatures.getFirst();
       if (groupedFeatures.size() == 1) {
         result.add(feature1);
       } else {
@@ -158,7 +158,7 @@ public static List<VectorTile.Feature> mergeLineStrings(List<VectorTile.Feature>
     List<VectorTile.Feature> result = new ArrayList<>(features.size());
     var groupedByAttrs = groupByAttrs(features, result, GeometryType.LINE);
     for (List<VectorTile.Feature> groupedFeatures : groupedByAttrs) {
-      VectorTile.Feature feature1 = groupedFeatures.get(0);
+      VectorTile.Feature feature1 = groupedFeatures.getFirst();
       double lengthLimit = lengthLimitCalculator.apply(feature1.attrs());
 
       // as a shortcut, can skip line merging only if:
@@ -300,7 +300,7 @@ public static List<VectorTile.Feature> mergeNearbyPolygons(List<VectorTile.Featu
     Collection<List<VectorTile.Feature>> groupedByAttrs = groupByAttrs(features, result, GeometryType.POLYGON);
     for (List<VectorTile.Feature> groupedFeatures : groupedByAttrs) {
       List<Polygon> outPolygons = new ArrayList<>();
-      VectorTile.Feature feature1 = groupedFeatures.get(0);
+      VectorTile.Feature feature1 = groupedFeatures.getFirst();
       List<Geometry> geometries = new ArrayList<>(groupedFeatures.size());
       for (var feature : groupedFeatures) {
         try {
@@ -331,7 +331,7 @@ public static List<VectorTile.Feature> mergeNearbyPolygons(List<VectorTile.Featu
           }
           merged = GeoUtils.snapAndFixPolygon(merged, stats, "merge").reverse();
         } else {
-          merged = polygonGroup.get(0);
+          merged = polygonGroup.getFirst();
           if (!(merged instanceof Polygonal) || merged.getEnvelopeInternal().getArea() < minArea) {
             continue;
           }
@@ -572,5 +572,5 @@ public static List<VectorTile.Feature> removePointsOutsideBuffer(List<VectorTile
     return result;
   }
 
-  private record WithIndex<T> (T feature, int hilbert) {}
+  private record WithIndex<T>(T feature, int hilbert) {}
 }
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
index 05adad325e..6d15b14fd5 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
@@ -263,7 +263,7 @@ private static Geometry decodeCommands(GeometryType geomType, int[] commands, in
             lineStrings.add(gf.createLineString(coordSeq));
           }
           if (lineStrings.size() == 1) {
-            geometry = lineStrings.get(0);
+            geometry = lineStrings.getFirst();
           } else if (lineStrings.size() > 1) {
             geometry = gf.createMultiLineString(lineStrings.toArray(new LineString[0]));
           }
@@ -305,12 +305,12 @@ private static Geometry decodeCommands(GeometryType geomType, int[] commands, in
           }
           List<Polygon> polygons = new ArrayList<>();
           for (List<LinearRing> rings : polygonRings) {
-            LinearRing shell = rings.get(0);
+            LinearRing shell = rings.getFirst();
             LinearRing[] holes = rings.subList(1, rings.size()).toArray(new LinearRing[rings.size() - 1]);
             polygons.add(gf.createPolygon(shell, holes));
           }
           if (polygons.size() == 1) {
-            geometry = polygons.get(0);
+            geometry = polygons.getFirst();
           }
           if (polygons.size() > 1) {
             geometry = gf.createMultiPolygon(GeometryFactory.toPolygonArray(polygons));
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ExternalMergeSort.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ExternalMergeSort.java
index c63269e723..11a63af5be 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ExternalMergeSort.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ExternalMergeSort.java
@@ -185,7 +185,7 @@ public void sort() {
       .sinkToConsumer("worker", workers, group -> {
         try {
           readSemaphore.acquire();
-          var chunk = group.get(0);
+          var chunk = group.getFirst();
           var others = group.stream().skip(1).toList();
           var toSort = time(reading, () -> {
             // merge all chunks into first one, and remove the others
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java
index bd912f3c3c..22fa9eb0ab 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java
@@ -229,7 +229,7 @@ public Expression simplifyOnce() {
         return TRUE;
       }
       if (children.size() == 1) {
-        return children.get(0).simplifyOnce();
+        return children.getFirst().simplifyOnce();
       }
       if (children.contains(FALSE)) {
         return FALSE;
@@ -283,7 +283,7 @@ public Expression simplifyOnce() {
         return FALSE;
       }
       if (children.size() == 1) {
-        return children.get(0).simplifyOnce();
+        return children.getFirst().simplifyOnce();
       }
       if (children.contains(TRUE)) {
         return 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 87c53bf403..484c569333 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
@@ -172,7 +172,7 @@ default List<O> getMatches(WithTags input) {
      */
     default O getOrElse(WithTags input, O defaultValue) {
       List<O> matches = getMatches(input);
-      return matches.isEmpty() ? defaultValue : matches.get(0);
+      return matches.isEmpty() ? defaultValue : matches.getFirst();
     }
 
     /**
@@ -180,7 +180,7 @@ default O getOrElse(WithTags input, O defaultValue) {
      */
     default O getOrElse(Map<String, Object> tags, O defaultValue) {
       List<O> matches = getMatches(WithTags.from(tags));
-      return matches.isEmpty() ? defaultValue : matches.get(0);
+      return matches.isEmpty() ? defaultValue : matches.getFirst();
     }
 
     /** Returns true if any expression matches that tags from an input element. */
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java
index 525b790bbf..0809f4de4b 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/GeoUtils.java
@@ -281,15 +281,15 @@ public static Geometry fixPolygon(Geometry geom, double buffer) throws GeometryE
   }
 
   public static Geometry combineLineStrings(List<LineString> lineStrings) {
-    return lineStrings.size() == 1 ? lineStrings.get(0) : createMultiLineString(lineStrings);
+    return lineStrings.size() == 1 ? lineStrings.getFirst() : createMultiLineString(lineStrings);
   }
 
   public static Geometry combinePolygons(List<Polygon> polys) {
-    return polys.size() == 1 ? polys.get(0) : createMultiPolygon(polys);
+    return polys.size() == 1 ? polys.getFirst() : createMultiPolygon(polys);
   }
 
   public static Geometry combinePoints(List<Point> points) {
-    return points.size() == 1 ? points.get(0) : createMultiPoint(points);
+    return points.size() == 1 ? points.getFirst() : createMultiPoint(points);
   }
 
   /**
@@ -383,7 +383,7 @@ public static Geometry polygonToLineString(Geometry geom) throws GeometryExcepti
     if (lineStrings.isEmpty()) {
       throw new GeometryException("polygon_to_linestring_empty", "No line strings");
     } else if (lineStrings.size() == 1) {
-      return lineStrings.get(0);
+      return lineStrings.getFirst();
     } else {
       return createMultiLineString(lineStrings);
     }
@@ -530,7 +530,7 @@ public static Geometry combine(Geometry... geometries) {
         innerGeometries.add(geom);
       }
     }
-    return innerGeometries.size() == 1 ? innerGeometries.get(0) :
+    return innerGeometries.size() == 1 ? innerGeometries.getFirst() :
       JTS_FACTORY.createGeometryCollection(innerGeometries.toArray(Geometry[]::new));
   }
 
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 848c1d137e..0d06d9039b 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
@@ -45,7 +45,7 @@ private void build() {
   /** Returns the data associated with the first polygon containing {@code point}. */
   public T getOnlyContaining(Point point) {
     List<T> result = getContaining(point);
-    return result.isEmpty() ? null : result.get(0);
+    return result.isEmpty() ? null : result.getFirst();
   }
 
   /** Returns the data associated with all polygons containing {@code point}. */
@@ -77,7 +77,7 @@ public List<T> getContainingOrNearest(Point point) {
     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.getFirst() instanceof GeomWithData<?> value) {
         @SuppressWarnings("unchecked") T t = (T) value.data;
         return List.of(t);
       }
@@ -108,7 +108,7 @@ public List<T> getContainingOrNearest(Point point) {
   /** Returns the data associated with a polygon that contains {@code point} or nearest polygon if none are found. */
   public T get(Point point) {
     List<T> nearests = getContainingOrNearest(point);
-    return nearests.isEmpty() ? null : nearests.get(0);
+    return nearests.isEmpty() ? null : nearests.getFirst();
   }
 
   /** Indexes {@code item} for all polygons contained in {@code geom}. */
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/OsmMultipolygon.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/OsmMultipolygon.java
index 4e18f59498..31ca60a356 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/OsmMultipolygon.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/OsmMultipolygon.java
@@ -232,7 +232,7 @@ private static Set<Ring> groupParentChildShells(List<Ring> polygons) {
     if (numPolygons == 0) {
       return shells;
     }
-    shells.add(polygons.get(0));
+    shells.add(polygons.getFirst());
     if (numPolygons == 1) {
       return shells;
     }
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/render/GeometryCoordinateSequences.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/render/GeometryCoordinateSequences.java
index 261129183f..60b117f8b9 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/render/GeometryCoordinateSequences.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/render/GeometryCoordinateSequences.java
@@ -122,7 +122,7 @@ static Geometry reassembleLineStrings(List<List<CoordinateSequence>> geoms) {
   static Geometry reassemblePolygons(List<List<CoordinateSequence>> groups) throws GeometryException {
     int numGeoms = groups.size();
     if (numGeoms == 1) {
-      return reassemblePolygon(groups.get(0));
+      return reassemblePolygon(groups.getFirst());
     } else {
       Polygon[] polygons = new Polygon[numGeoms];
       for (int i = 0; i < numGeoms; i++) {
@@ -135,7 +135,7 @@ static Geometry reassemblePolygons(List<List<CoordinateSequence>> groups) throws
   /** Returns a {@link Polygon} built from all outer/inner rings in {@code group}, reversing all inner rings. */
   private static Polygon reassemblePolygon(List<CoordinateSequence> group) throws GeometryException {
     try {
-      LinearRing first = GeoUtils.JTS_FACTORY.createLinearRing(group.get(0));
+      LinearRing first = GeoUtils.JTS_FACTORY.createLinearRing(group.getFirst());
       LinearRing[] rest = new LinearRing[group.size() - 1];
       for (int j = 1; j < group.size(); j++) {
         CoordinateSequence seq = group.get(j);
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/render/TiledGeometry.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/render/TiledGeometry.java
index d5b9469ae8..03ffbfc994 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/render/TiledGeometry.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/render/TiledGeometry.java
@@ -258,7 +258,7 @@ private void slicePoint(Coordinate coord) {
             TileCoord tile = TileCoord.ofXYZ(wrappedX, y, z);
             double tileY = worldY - y;
             tileContents.computeIfAbsent(tile, t -> List.of(new ArrayList<>()))
-              .get(0)
+              .getFirst()
               .add(GeoUtils.coordinateSequence(tileX * 256, tileY * 256));
           }
         }
@@ -384,7 +384,7 @@ private void addShapeToResults(Map<TileCoord, List<CoordinateSequence>> inProgre
     for (var entry : inProgressShapes.entrySet()) {
       TileCoord tileID = entry.getKey();
       List<CoordinateSequence> inSeqs = entry.getValue();
-      if (area && inSeqs.get(0).size() < 4) {
+      if (area && inSeqs.getFirst().size() < 4) {
         // not enough points in outer polygon, ignore
         continue;
       }
@@ -573,20 +573,20 @@ record SkippedSegment(Direction side, int lo, int hi, boolean asc) {}
               }
               /*
               A tile is inside a filled region when there is an odd number of vertical edges to the left and right
-              
+
               for example a simple shape:
                      ---------
                out   |  in   | out
                (0/2) | (1/1) | (2/0)
                      ---------
-              
+
               or a more complex shape
                      ---------       ---------
                out   |  in   | out   | in    |
                (0/4) | (1/3) | (2/2) | (3/1) |
                      |       ---------       |
                      -------------------------
-              
+
               So we keep track of this number by xor'ing the left and right fills repeatedly,
               then and'ing them together at the end.
                */
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProgressLoggers.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProgressLoggers.java
index 3d7535ce72..44dce911d2 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProgressLoggers.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/ProgressLoggers.java
@@ -275,7 +275,7 @@ private void addDeltaLogger(String name, Supplier<Duration> supplier, DoubleFunc
 
   /** Adds the CPU utilization of every thread starting with {@code prefix} since the last log to output. */
   public ProgressLoggers addThreadPoolStats(String name, String prefix) {
-    boolean first = loggers.isEmpty() || !(loggers.get(loggers.size() - 1) instanceof WorkerPipelineLogger);
+    boolean first = loggers.isEmpty() || !(loggers.getLast() instanceof WorkerPipelineLogger);
     try {
       Map<Long, ProcessInfo.ThreadState> lastThreads = ProcessInfo.getThreadStats();
       AtomicLong lastTime = new AtomicLong(System.nanoTime());
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/AwsOsm.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/AwsOsm.java
index 823a2dc316..cdd3a818d2 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/AwsOsm.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/AwsOsm.java
@@ -95,7 +95,7 @@ protected String searchIndexForDownloadUrl(String searchQuery, List<ContentXml>
       } else if (results.size() > 1) {
         throw new IllegalArgumentException("Found multiple AWS osm download URLs for " + searchQuery + ": " + results);
       }
-      return results.get(0);
+      return results.getFirst();
     }
   }
 
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Geofabrik.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Geofabrik.java
index fe7bf2c0b5..07e514ad6c 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Geofabrik.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Geofabrik.java
@@ -106,7 +106,7 @@ private static String getIfOnly(String name, String searchQuery, List<Properties
         "Multiple " + name + " for '" + searchQuery + "': " + values.stream().map(d -> d.id).collect(
           Collectors.joining(", ")));
     } else if (values.size() == 1) {
-      return values.get(0).urls.get("pbf");
+      return values.getFirst().urls.get("pbf");
     } else {
       return null;
     }
diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/PlanetilerTests.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/PlanetilerTests.java
index d1964b296f..8cd3303c7c 100644
--- a/planetiler-core/src/test/java/com/onthegomap/planetiler/PlanetilerTests.java
+++ b/planetiler-core/src/test/java/com/onthegomap/planetiler/PlanetilerTests.java
@@ -827,7 +827,7 @@ void testReorderNestedMultipolygons() throws Exception {
 
     var tileContents = results.tiles.get(TileCoord.ofXYZ(0, 0, 0));
     assertEquals(1, tileContents.size());
-    Geometry geom = tileContents.get(0).geometry().geom();
+    Geometry geom = tileContents.getFirst().geometry().geom();
     assertTrue(geom instanceof MultiPolygon, geom.toString());
     MultiPolygon multiPolygon = (MultiPolygon) geom;
     assertSameNormalizedFeature(newPolygon(
@@ -1884,7 +1884,7 @@ void testIssue546Terschelling() throws Exception {
       var point = newPoint(tileX, tileY);
 
       assertEquals(1, problematicTile.size());
-      var geomCompare = problematicTile.get(0).geometry();
+      var geomCompare = problematicTile.getFirst().geometry();
       geomCompare.validate();
       var geom = geomCompare.geom();
 
diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/VectorTileTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/VectorTileTest.java
index 84a9f8b4a4..9f065ae40e 100644
--- a/planetiler-core/src/test/java/com/onthegomap/planetiler/VectorTileTest.java
+++ b/planetiler-core/src/test/java/com/onthegomap/planetiler/VectorTileTest.java
@@ -160,7 +160,7 @@ void testAttributeTypes() {
 
     List<VectorTile.Feature> decoded = VectorTile.decode(encoded);
     assertEquals(1, decoded.size());
-    Map<String, Object> decodedAttributes = decoded.get(0).attrs();
+    Map<String, Object> decodedAttributes = decoded.getFirst().attrs();
     assertEquals("value1", decodedAttributes.get("key1"));
     assertEquals(123L, decodedAttributes.get("key2"));
     assertEquals(234.1f, decodedAttributes.get("key3"));
@@ -220,7 +220,7 @@ void testMultiPolygon() {
 
     var features = VectorTile.decode(encoded);
     assertEquals(1, features.size());
-    MultiPolygon mp2 = (MultiPolygon) decodeSilently(features.get(0).geometry());
+    MultiPolygon mp2 = (MultiPolygon) decodeSilently(features.getFirst().geometry());
     assertEquals(mp.getNumGeometries(), mp2.getNumGeometries());
   }
 
diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/reader/ShapefileReaderTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/reader/ShapefileReaderTest.java
index 1cb2d20937..b534024796 100644
--- a/planetiler-core/src/test/java/com/onthegomap/planetiler/reader/ShapefileReaderTest.java
+++ b/planetiler-core/src/test/java/com/onthegomap/planetiler/reader/ShapefileReaderTest.java
@@ -94,9 +94,9 @@ void testReadShapefileLeniently(@TempDir Path dir) throws IOException, Transform
       assertEquals(1, reader.getFeatureCount());
       List<SimpleFeature> features = new ArrayList<>();
       reader.readFeatures(features::add);
-      assertEquals(10.5113, features.get(0).latLonGeometry().getCentroid().getX(), 1e-4);
-      assertEquals(0, features.get(0).latLonGeometry().getCentroid().getY(), 1e-4);
-      assertEquals(3, features.get(0).getTag("value"));
+      assertEquals(10.5113, features.getFirst().latLonGeometry().getCentroid().getX(), 1e-4);
+      assertEquals(0, features.getFirst().latLonGeometry().getCentroid().getY(), 1e-4);
+      assertEquals(3, features.getFirst().getTag("value"));
     }
   }
 
diff --git a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/Contexts.java b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/Contexts.java
index 57ca78c959..1ad9a4091d 100644
--- a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/Contexts.java
+++ b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/Contexts.java
@@ -410,7 +410,7 @@ public Object apply(String key) {
     }
 
     public String matchKey() {
-      return matchKeys().isEmpty() ? null : matchKeys().get(0);
+      return matchKeys().isEmpty() ? null : matchKeys().getFirst();
     }
 
     public Object matchValue() {
diff --git a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ConfigExpression.java b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ConfigExpression.java
index 58bcf47343..a6be26191c 100644
--- a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ConfigExpression.java
+++ b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ConfigExpression.java
@@ -164,7 +164,7 @@ public O apply(I i) {
     public ConfigExpression<I, O> simplifyOnce() {
       return switch (children.size()) {
         case 0 -> constOf(null);
-        case 1 -> children.get(0);
+        case 1 -> children.getFirst();
         default -> {
           var result = children.stream()
             .flatMap(

From 6f0ac9f46c67beb4040b24101d1e82b7d1555cd6 Mon Sep 17 00:00:00 2001
From: Mike Barry <msb5014@gmail.com>
Date: Fri, 27 Oct 2023 05:59:33 -0400
Subject: [PATCH 4/6] tweaks

---
 .../src/main/java/com/onthegomap/planetiler/VectorTile.java | 2 +-
 .../com/onthegomap/planetiler/collection/FeatureGroup.java  | 6 +++---
 .../java/com/onthegomap/planetiler/util/TileSizeStats.java  | 2 +-
 .../com/onthegomap/planetiler/worker/WorkerPipeline.java    | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
index 6d15b14fd5..97964fb721 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
@@ -516,7 +516,7 @@ public VectorTileProto.Tile toProto() {
           case Float floatValue -> tileValue.setFloatValue(floatValue);
           case Double doubleValue -> tileValue.setDoubleValue(doubleValue);
           case Boolean booleanValue -> tileValue.setBoolValue(booleanValue);
-          case Object ignored -> tileValue.setStringValue(value.toString());
+          case Object other -> tileValue.setStringValue(other.toString());
         }
         tileLayer.addValues(tileValue.build());
       }
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java
index d7dcdcfe0b..be4162db80 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java
@@ -217,9 +217,9 @@ private byte[] encodeValue(VectorTile.Feature vectorTileFeature, RenderedFeature
       var attrs = vectorTileFeature.attrs();
       packer.packMapHeader((int) attrs.values().stream().filter(Objects::nonNull).count());
       for (Map.Entry<String, Object> entry : attrs.entrySet()) {
-        if (entry.getValue() != null) {
+        Object value = entry.getValue();
+        if (value != null) {
           packer.packInt(commonValueStrings.encode(entry.getKey()));
-          Object value = entry.getValue();
           packer.packValue(switch (value) {
             case String string -> ValueFactory.newString(string);
             case Integer integer -> ValueFactory.newInteger(integer.longValue());
@@ -227,7 +227,7 @@ private byte[] encodeValue(VectorTile.Feature vectorTileFeature, RenderedFeature
             case Float floatValue -> ValueFactory.newFloat(floatValue);
             case Double doubleValue -> ValueFactory.newFloat(doubleValue);
             case Boolean booleanValue -> ValueFactory.newBoolean(booleanValue);
-            default -> ValueFactory.newString(value.toString());
+            case Object other -> ValueFactory.newString(other.toString());
           });
         }
       }
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/TileSizeStats.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/TileSizeStats.java
index e196e07eee..cb3f6d8708 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/TileSizeStats.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/TileSizeStats.java
@@ -44,7 +44,7 @@
  * archive, or run the following an existing archive:
  *
  * <pre>
- * {@snippet lang="bash" :
+ * {@code
  * java -jar planetiler.jar stats --input=<path to pmtiles or mbtiles> --output=layerstats.tsv.gz
  * }
  * </pre>
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 506b2a2115..22abcacd80 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
@@ -17,7 +17,6 @@
  * A mini-framework for chaining sequential steps that run in dedicated threads with a queue between each.
  * <p>
  * For example:
- *
  * {@snippet :
  * WorkerPipeline.start("name", stats)
  *   .readFrom("reader", List.of(1, 2, 3))

From dccbf788791706ec26b3577b2054173540405193 Mon Sep 17 00:00:00 2001
From: Mike Barry <msb5014@gmail.com>
Date: Fri, 27 Oct 2023 07:14:07 -0400
Subject: [PATCH 5/6] http request builder HEAD, closeable executors,
 HashMap.newHashMap constructor

---
 .../com/onthegomap/planetiler/VectorTile.java |  2 +-
 .../planetiler/collection/FeatureGroup.java   |  2 +-
 .../planetiler/reader/GeoPackageReader.java   |  2 +-
 .../planetiler/reader/NaturalEarthReader.java |  2 +-
 .../planetiler/reader/ShapefileReader.java    |  2 +-
 .../planetiler/reader/osm/PbfDecoder.java     |  4 +-
 .../planetiler/stats/PrometheusStats.java     |  2 +-
 .../planetiler/util/Downloader.java           |  2 +-
 .../onthegomap/planetiler/worker/Worker.java  | 50 +++++++++----------
 .../render/FeatureRendererTest.java           |  2 +-
 10 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
index 97964fb721..cc7ca9b844 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java
@@ -376,7 +376,7 @@ public static List<Feature> decode(byte[] encoded) {
 
         for (VectorTileProto.Tile.Feature feature : layer.getFeaturesList()) {
           int tagsCount = feature.getTagsCount();
-          Map<String, Object> attrs = new HashMap<>(tagsCount / 2);
+          Map<String, Object> attrs = HashMap.newHashMap(tagsCount / 2);
           int tagIdx = 0;
           while (tagIdx < feature.getTagsCount()) {
             String key = keys.get(feature.getTags(tagIdx++));
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java
index be4162db80..058b3a4218 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java
@@ -417,7 +417,7 @@ private VectorTile.Feature decodeVectorTileFeature(SortableFeature entry) {
         GeometryType geomType = decodeGeomType(geomTypeAndScale);
         int scale = decodeScale(geomTypeAndScale);
         int mapSize = unpacker.unpackMapHeader();
-        Map<String, Object> attrs = new HashMap<>(mapSize);
+        Map<String, Object> attrs = HashMap.newHashMap(mapSize);
         for (int i = 0; i < mapSize; i++) {
           String key = commonValueStrings.decode(unpacker.unpackInt());
           Value v = unpacker.unpackValue();
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/GeoPackageReader.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/GeoPackageReader.java
index fff8b20cd8..91882acba5 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/GeoPackageReader.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/GeoPackageReader.java
@@ -153,7 +153,7 @@ public void readFeatures(Consumer<SimpleFeature> next) throws Exception {
         Geometry latLonGeom = (transform.isIdentity()) ? featureGeom : JTS.transform(featureGeom, transform);
 
         FeatureColumns columns = feature.getColumns();
-        SimpleFeature geom = SimpleFeature.create(latLonGeom, new HashMap<>(columns.columnCount()),
+        SimpleFeature geom = SimpleFeature.create(latLonGeom, HashMap.newHashMap(columns.columnCount()),
           sourceName, featureName, ++id);
 
         for (int i = 0; i < columns.columnCount(); ++i) {
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/NaturalEarthReader.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/NaturalEarthReader.java
index c8fe0a939b..14ae862a82 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/NaturalEarthReader.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/NaturalEarthReader.java
@@ -177,7 +177,7 @@ public void readFeatures(Consumer<SimpleFeature> next) throws Exception {
 
             // create the feature and pass to next stage
             Geometry latLonGeometry = GeoUtils.WKB_READER.read(geometry);
-            SimpleFeature readerGeometry = SimpleFeature.create(latLonGeometry, new HashMap<>(column.length - 1),
+            SimpleFeature readerGeometry = SimpleFeature.create(latLonGeometry, HashMap.newHashMap(column.length - 1),
               sourceName, table, ++id);
             for (int c = 0; c < column.length; c++) {
               if (c != geometryColumn) {
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/ShapefileReader.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/ShapefileReader.java
index d48f6f44a0..4532356175 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/ShapefileReader.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/ShapefileReader.java
@@ -137,7 +137,7 @@ public void readFeatures(Consumer<SimpleFeature> next) throws TransformException
           latLonGeometry = JTS.transform(source, transformToLatLon);
         }
         if (latLonGeometry != null) {
-          SimpleFeature geom = SimpleFeature.create(latLonGeometry, new HashMap<>(attributeNames.length),
+          SimpleFeature geom = SimpleFeature.create(latLonGeometry, HashMap.newHashMap(attributeNames.length),
             sourceName, layer, ++id);
           for (int i = 1; i < attributeNames.length; i++) {
             geom.setTag(attributeNames[i], feature.getAttribute(i));
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/PbfDecoder.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/PbfDecoder.java
index dd4b6976af..dc6c925552 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/PbfDecoder.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/reader/osm/PbfDecoder.java
@@ -133,7 +133,7 @@ public Iterator<OsmElement> iterator() {
 
   private Map<String, Object> buildTags(int num, IntUnaryOperator key, IntUnaryOperator value) {
     if (num > 0) {
-      Map<String, Object> tags = new HashMap<>(num);
+      Map<String, Object> tags = HashMap.newHashMap(num);
       for (int i = 0; i < num; i++) {
         String k = fieldDecoder.decodeString(key.applyAsInt(i));
         String v = fieldDecoder.decodeString(value.applyAsInt(i));
@@ -366,7 +366,7 @@ public OsmElement.Node next() {
 
         if (tags == null) {
           // divide by 2 as key&value, multiply by 2 because of the better approximation
-          tags = new HashMap<>(Math.max(3, 2 * (nodes.getKeysValsCount() / 2) / nodes.getKeysValsCount()));
+          tags = HashMap.newHashMap(Math.max(3, 2 * (nodes.getKeysValsCount() / 2) / nodes.getKeysValsCount()));
         }
 
         tags.put(fieldDecoder.decodeString(keyIndex), fieldDecoder.decodeString(valueIndex));
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/PrometheusStats.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/PrometheusStats.java
index c3b42a81a6..bdf37f0ffb 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/PrometheusStats.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/PrometheusStats.java
@@ -213,7 +213,7 @@ public Map<String, Long> dataErrors() {
 
   @Override
   public void close() {
-    executor.shutdown();
+    executor.close();
     push();
   }
 
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Downloader.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Downloader.java
index a75a707074..5b5dde1742 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Downloader.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/Downloader.java
@@ -244,7 +244,7 @@ private CompletableFuture<ResourceMetadata> httpHeadFollowRedirects(String url,
 
   CompletableFuture<ResourceMetadata> httpHead(String url) {
     return client
-      .sendAsync(newHttpRequest(url).method("HEAD", HttpRequest.BodyPublishers.noBody()).build(),
+      .sendAsync(newHttpRequest(url).HEAD().build(),
         responseInfo -> {
           int status = responseInfo.statusCode();
           Optional<String> location = Optional.empty();
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/Worker.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/Worker.java
index aec95fe535..c1d78a0d6e 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/Worker.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/Worker.java
@@ -54,33 +54,33 @@ public Worker(String prefix, Stats stats, int threads, RunnableThatThrows task)
   public Worker(String prefix, Stats stats, int threads, IntConsumerThatThrows task) {
     this.prefix = prefix;
     stats.gauge(prefix + "_threads", threads);
-    var es = Executors.newFixedThreadPool(threads, new NamedThreadFactory(prefix));
-    String parentStage = LogUtil.getStage();
-    List<CompletableFuture<?>> results = new ArrayList<>();
-    for (int i = 0; i < threads; i++) {
-      final int threadId = i;
-      results.add(CompletableFuture.runAsync(() -> {
-        LogUtil.setStage(parentStage, prefix);
-        String id = Thread.currentThread().getName();
-        LOGGER.trace("Starting worker");
-        try {
-          long start = System.nanoTime();
-          task.accept(threadId);
-          stats.timers().finishedWorker(prefix, Duration.ofNanos(System.nanoTime() - start));
-        } catch (Throwable e) {
-          System.err.println("Worker " + id + " died");
-          // when one worker dies it may close resources causing others to die as well, so only log the first
-          if (firstWorkerDied.compareAndSet(false, true)) {
-            e.printStackTrace(); // NOSONAR
+    try (var es = Executors.newFixedThreadPool(threads, new NamedThreadFactory(prefix))) {
+      String parentStage = LogUtil.getStage();
+      List<CompletableFuture<?>> results = new ArrayList<>();
+      for (int i = 0; i < threads; i++) {
+        final int threadId = i;
+        results.add(CompletableFuture.runAsync(() -> {
+          LogUtil.setStage(parentStage, prefix);
+          String id = Thread.currentThread().getName();
+          LOGGER.trace("Starting worker");
+          try {
+            long start = System.nanoTime();
+            task.accept(threadId);
+            stats.timers().finishedWorker(prefix, Duration.ofNanos(System.nanoTime() - start));
+          } catch (Throwable e) {
+            System.err.println("Worker " + id + " died");
+            // when one worker dies it may close resources causing others to die as well, so only log the first
+            if (firstWorkerDied.compareAndSet(false, true)) {
+              e.printStackTrace(); // NOSONAR
+            }
+            throwFatalException(e);
+          } finally {
+            LOGGER.trace("Finished worker");
           }
-          throwFatalException(e);
-        } finally {
-          LOGGER.trace("Finished worker");
-        }
-      }, es));
+        }, es));
+      }
+      done = joinFutures(results);
     }
-    es.shutdown();
-    done = joinFutures(results);
   }
 
   /**
diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/render/FeatureRendererTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/render/FeatureRendererTest.java
index fab955013a..549f7569ff 100644
--- a/planetiler-core/src/test/java/com/onthegomap/planetiler/render/FeatureRendererTest.java
+++ b/planetiler-core/src/test/java/com/onthegomap/planetiler/render/FeatureRendererTest.java
@@ -47,7 +47,7 @@ class FeatureRendererTest {
   private FeatureCollector collector(Geometry worldGeom) {
     var latLonGeom = GeoUtils.worldToLatLonCoords(worldGeom);
     return new FeatureCollector.Factory(config, stats)
-      .get(SimpleFeature.create(latLonGeom, new HashMap<>(0), null, null,
+      .get(SimpleFeature.create(latLonGeom, HashMap.newHashMap(0), null, null,
         1));
   }
 

From 7487205d6990c0c98982baf8e878677b56b2f9e5 Mon Sep 17 00:00:00 2001
From: Mike Barry <msb5014@gmail.com>
Date: Fri, 27 Oct 2023 08:01:07 -0400
Subject: [PATCH 6/6] undo executorservice close

---
 .../planetiler/stats/PrometheusStats.java     |  2 +-
 .../onthegomap/planetiler/worker/Worker.java  | 50 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/PrometheusStats.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/PrometheusStats.java
index bdf37f0ffb..c3b42a81a6 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/PrometheusStats.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/PrometheusStats.java
@@ -213,7 +213,7 @@ public Map<String, Long> dataErrors() {
 
   @Override
   public void close() {
-    executor.close();
+    executor.shutdown();
     push();
   }
 
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/Worker.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/Worker.java
index c1d78a0d6e..aec95fe535 100644
--- a/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/Worker.java
+++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/Worker.java
@@ -54,33 +54,33 @@ public Worker(String prefix, Stats stats, int threads, RunnableThatThrows task)
   public Worker(String prefix, Stats stats, int threads, IntConsumerThatThrows task) {
     this.prefix = prefix;
     stats.gauge(prefix + "_threads", threads);
-    try (var es = Executors.newFixedThreadPool(threads, new NamedThreadFactory(prefix))) {
-      String parentStage = LogUtil.getStage();
-      List<CompletableFuture<?>> results = new ArrayList<>();
-      for (int i = 0; i < threads; i++) {
-        final int threadId = i;
-        results.add(CompletableFuture.runAsync(() -> {
-          LogUtil.setStage(parentStage, prefix);
-          String id = Thread.currentThread().getName();
-          LOGGER.trace("Starting worker");
-          try {
-            long start = System.nanoTime();
-            task.accept(threadId);
-            stats.timers().finishedWorker(prefix, Duration.ofNanos(System.nanoTime() - start));
-          } catch (Throwable e) {
-            System.err.println("Worker " + id + " died");
-            // when one worker dies it may close resources causing others to die as well, so only log the first
-            if (firstWorkerDied.compareAndSet(false, true)) {
-              e.printStackTrace(); // NOSONAR
-            }
-            throwFatalException(e);
-          } finally {
-            LOGGER.trace("Finished worker");
+    var es = Executors.newFixedThreadPool(threads, new NamedThreadFactory(prefix));
+    String parentStage = LogUtil.getStage();
+    List<CompletableFuture<?>> results = new ArrayList<>();
+    for (int i = 0; i < threads; i++) {
+      final int threadId = i;
+      results.add(CompletableFuture.runAsync(() -> {
+        LogUtil.setStage(parentStage, prefix);
+        String id = Thread.currentThread().getName();
+        LOGGER.trace("Starting worker");
+        try {
+          long start = System.nanoTime();
+          task.accept(threadId);
+          stats.timers().finishedWorker(prefix, Duration.ofNanos(System.nanoTime() - start));
+        } catch (Throwable e) {
+          System.err.println("Worker " + id + " died");
+          // when one worker dies it may close resources causing others to die as well, so only log the first
+          if (firstWorkerDied.compareAndSet(false, true)) {
+            e.printStackTrace(); // NOSONAR
           }
-        }, es));
-      }
-      done = joinFutures(results);
+          throwFatalException(e);
+        } finally {
+          LOGGER.trace("Finished worker");
+        }
+      }, es));
     }
+    es.shutdown();
+    done = joinFutures(results);
   }
 
   /**