Workaround for inconsistent casing in Geopackage column names

Author: bdon

tiles/src/main/java/com/protomaps/basemap/Basemap.java

@@ -313,6 +313,7 @@ static void run(Arguments args) throws IOException {
         .addGeoPackageSource("landcover", sourcesDir.resolve("daylight-landcover.gpkg"),
           "https://r2-public.protomaps.com/datasets/daylight-landcover.gpkg");
     }
+
     Path pgfEncodingZip = sourcesDir.resolve("pgf-encoding.zip");
     Path qrankCsv = sourcesDir.resolve("qrank.csv.gz");
 

tiles/src/main/java/com/protomaps/basemap/layers/Boundaries.java

@@ -12,6 +12,7 @@
 import com.protomaps.basemap.feature.FeatureId;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.OptionalInt;
 
 @SuppressWarnings("java:S1192")
@@ -25,25 +26,40 @@ public String name() {
     return LAYER_NAME;
   }
 
+  /**
+   * Reads a Natural Earth attribute, falling back to the upper case spelling of the column.
+   * <p>
+   * Column name casing is not consistent across the Natural Earth distributions: the sqlite package is entirely lower
+   * case, while the GeoPackage package preserves whatever the source shapefiles use. That is lower case for most
+   * physical layers but upper case for the admin layers this handler reads, and some tables mix both.
+   */
+  private static String getNeString(SourceFeature sf, String key) {
+    Object value = sf.getTag(key);
+    if (value == null) {
+      value = sf.getTag(key.toUpperCase(Locale.ROOT));
+    }
+    return value == null ? null : value.toString();
+  }
+
   public void processNe(SourceFeature sf, FeatureCollector features) {
     String sourceLayer = sf.getSourceLayer();
     String kind = "";
     int adminLevel = 2;
     boolean disputed = false;
-    int themeMinZoom = 0;
     int themeMaxZoom = 0;
 
     if (sourceLayer.equals("ne_10m_admin_0_boundary_lines_land") ||
       sourceLayer.equals("ne_10m_admin_0_boundary_lines_map_units") ||
       sourceLayer.equals("ne_10m_admin_0_boundary_lines_disputed_areas") ||
       sourceLayer.equals("ne_10m_admin_1_states_provinces_lines")) {
-      themeMinZoom = 4;
       themeMaxZoom = 5;
       kind = "tz_boundary";
     }
 
+    String featureClass = getNeString(sf, "featurecla");
+
     if (!kind.isEmpty()) {
-      switch (sf.getString("featurecla", "")) {
+      switch (featureClass == null ? "" : featureClass) {
         case "Disputed (please verify)" -> {
           kind = "country";
           disputed = true;
@@ -130,19 +146,19 @@ public void processNe(SourceFeature sf, FeatureCollector features) {
       }
     }
 
-    if (sf.canBeLine() && sf.getString("min_zoom") != null && (!kind.isEmpty() && !kind.equals("tz_boundary"))) {
-      var minZoom = Double.parseDouble(sf.getString("min_zoom")) - 1.0;
+    String minZoomString = getNeString(sf, "min_zoom");
+
+    if (sf.canBeLine() && minZoomString != null && (!kind.isEmpty() && !kind.equals("tz_boundary"))) {
+      var minZoom = Double.parseDouble(minZoomString) - 1.0;
       int sortRank = 289 - (disputed ? 1 : 0);
       features.line(this.name())
         .setAttr("kind", kind)
         .setAttr("kind_detail", adminLevel)
         .setAttr("sort_rank", sortRank)
         .setSortKey(sortRank)
         .setAttr("disputed", disputed ? true : null)
-        .setAttr("brk_a3", sf.getString("brk_a3"))
-        .setZoomRange(
-          sf.getString("min_zoom") == null ? themeMinZoom : (int) minZoom,
-          themeMaxZoom)
+        .setAttr("brk_a3", getNeString(sf, "brk_a3"))
+        .setZoomRange((int) minZoom, themeMaxZoom)
         .setMinPixelSize(0)
         .setBufferPixels(8);
     }

tiles/src/test/java/com/protomaps/basemap/layers/BoundariesTest.java

@@ -103,4 +103,48 @@ void testDisputedOsmWay(String key, String value) {
       List.of(Map.of("disputed", true)),
       collector);
   }
+
+  // The Natural Earth GeoPackage spells the admin columns upper case and the sqlite package lower case,
+  // so the same feature has to be read correctly either way.
+
+  @Test
+  void testNeAdmin1LineGeoPackageCasing() {
+    assertFeatures(5,
+      List.of(Map.of("kind", "region", "kind_detail", 4, "brk_a3", "USA")),
+      process(SimpleFeature.create(
+        newLineString(0, 0, 1, 1),
+        new HashMap<>(Map.of("FEATURECLA", "Admin-1 boundary", "MIN_ZOOM", 2.0, "BRK_A3", "USA")),
+        "ne",
+        "ne_10m_admin_1_states_provinces_lines",
+        1
+      )));
+  }
+
+  @Test
+  void testNeAdmin1LineSqliteCasing() {
+    assertFeatures(5,
+      List.of(Map.of("kind", "region", "kind_detail", 4, "brk_a3", "USA")),
+      process(SimpleFeature.create(
+        newLineString(0, 0, 1, 1),
+        new HashMap<>(Map.of("featurecla", "Admin-1 boundary", "min_zoom", "2.0", "brk_a3", "USA")),
+        "ne",
+        "ne_10m_admin_1_states_provinces_lines",
+        1
+      )));
+  }
+
+  // Regression test for the NullPointerException from switching the "ne" source to the GeoPackage:
+  // FEATURECLA is present but featurecla is not, which used to blow up on a null switch expression.
+  @Test
+  void testNeAdmin1LineNullFeatureClass() {
+    assertFeatures(5,
+      List.of(),
+      process(SimpleFeature.create(
+        newLineString(0, 0, 1, 1),
+        new HashMap<>(Map.of("MIN_ZOOM", 2.0)),
+        "ne",
+        "ne_10m_admin_1_states_provinces_lines",
+        1
+      )));
+  }
 }