Fix minor issues

apache · Nov 13, 2023 · a4f74b0 · a4f74b0
1 parent d65d669
commit a4f74b0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/...aps-core/src/main/java/org/apache/baremaps/database/collection/DataCollectionAdapter.java b/...aps-core/src/main/java/org/apache/baremaps/database/collection/DataCollectionAdapter.java
@@ -45,7 +45,7 @@ public DataCollectionAdapter(DataCollection<S> collection, Function<S, T> transf
    * {@inheritDoc}
    */
   @Override
-  public Iterator iterator() {
+  public Iterator<T> iterator() {
     return collection.stream().map(this.transformer).iterator();
   }
 

diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataSchema.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataSchema.java
@@ -261,19 +261,12 @@ protected BaseValueHandler getHandler(Type type) {
       case LONG -> new LongValueHandler<Long>();
       case FLOAT -> new FloatValueHandler<Float>();
       case DOUBLE -> new DoubleValueHandler<Double>();
-      case GEOMETRY -> new GeometryValueHandler();
-      case POINT -> new GeometryValueHandler();
-      case MULTIPOINT -> new GeometryValueHandler();
-      case LINESTRING -> new GeometryValueHandler();
-      case MULTILINESTRING -> new GeometryValueHandler();
-      case POLYGON -> new GeometryValueHandler();
-      case MULTIPOLYGON -> new GeometryValueHandler();
-      case GEOMETRYCOLLECTION -> new GeometryValueHandler();
       case INET4_ADDRESS -> new Inet4AddressValueHandler();
       case INET6_ADDRESS -> new Inet6AddressValueHandler();
       case LOCAL_DATE -> new LocalDateValueHandler();
       case LOCAL_TIME -> new LocalTimeValueHandler();
       case LOCAL_DATE_TIME -> new LocalDateTimeValueHandler();
+      case GEOMETRY, POINT, MULTIPOINT, LINESTRING, MULTILINESTRING, POLYGON, MULTIPOLYGON, GEOMETRYCOLLECTION -> new GeometryValueHandler();
       default -> throw new IllegalArgumentException("Unsupported type: " + type);
     };
   }

diff --git a/...ore/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileByteReader.java b/...ore/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileByteReader.java
@@ -327,10 +327,10 @@ private void loadPointRow(DataRow row) {
    * @param row the row to fill.
    */
   private void loadPolygonRow(DataRow row) {
-    double xmin = getByteBuffer().getDouble();
-    double ymin = getByteBuffer().getDouble();
-    double xmax = getByteBuffer().getDouble();
-    double ymax = getByteBuffer().getDouble();
+    /* double xmin = */ getByteBuffer().getDouble();
+    /* double ymin = */ getByteBuffer().getDouble();
+    /* double xmax = */ getByteBuffer().getDouble();
+    /* double ymax = */ getByteBuffer().getDouble();
 
     int numParts = getByteBuffer().getInt();
     int numPoints = getByteBuffer().getInt();

diff --git a/basemap/import.js b/basemap/import.js
@@ -132,6 +132,7 @@ export default {
           "database": config.database,
           "databaseSrid": 3857,
           "replaceExisting": true,
+          "cleanCache": true,
         },
       ]
     },