chore: add boundary way metrics and indexing improvements to ImportStatistics and ImportService

- Introduced `boundaryWaysProcessed` and `boundaryPhaseEntitiesRead` metrics in ImportStatistics.
- Updated phase 1.1.2 to show detailed boundary processing stats.
- Enhanced ImportService with boundary-specific metrics tracking and reset logic.

Author: dgraf-gh

src/main/java/com/dedicatedcode/paikka/service/importer/ImportService.java

@@ -275,6 +275,7 @@ private void indexBoundaryMemberWays(Path pbfFile,
                                          RocksDB wayIndexDb,
                                          RocksDB neededNodesDb,
                                          ImportStatistics stats) throws Exception {
+        stats.resetBoundaryPhaseEntitiesRead();
         final byte[] ONE = new byte[]{1};
         try (RocksBatchWriter wayWriter = new RocksBatchWriter(wayIndexDb, 10_000, stats);
              RocksBatchWriter neededWriter = new RocksBatchWriter(neededNodesDb, 500_000, stats)) {
@@ -283,6 +284,7 @@ private void indexBoundaryMemberWays(Path pbfFile,
 
                 while (iterator.hasNext()) {
                     EntityContainer container = iterator.next();
+                    stats.incrementBoundaryPhaseEntitiesRead();
                     if (container.getType() != EntityType.Way) continue;
 
                     OsmWay way = (OsmWay) container.getEntity();
@@ -299,7 +301,7 @@ private void indexBoundaryMemberWays(Path pbfFile,
                         neededWriter.put(s2Helper.longToByteArray(nid), ONE);
                     }
                     wayWriter.put(wayKey, s2Helper.longArrayToByteArray(nodeIds));
-                    stats.incrementWaysProcessed();
+                    stats.incrementBoundaryWaysProcessed();
                 }
             });
 
@@ -308,23 +310,6 @@ private void indexBoundaryMemberWays(Path pbfFile,
         }
     }
 
-    private void updateGridIndexEntry(RocksDB gridIndexDb, long cellId, long osmId) throws Exception {
-        byte[] key = s2Helper.longToByteArray(cellId);
-        synchronized (this) {
-            byte[] existingData = gridIndexDb.get(key);
-            long[] newArray;
-            if (existingData == null) {
-                newArray = new long[]{osmId};
-            } else {
-                long[] oldArray = s2Helper.byteArrayToLongArray(existingData);
-                if (Arrays.stream(oldArray).anyMatch(id -> id == osmId)) return;
-                newArray = Arrays.copyOf(oldArray, oldArray.length + 1);
-                newArray[oldArray.length] = osmId;
-            }
-            gridIndexDb.put(key, s2Helper.longArrayToByteArray(newArray));
-        }
-    }
-
     private void pass1DiscoveryAndIndexing(Path pbfFile, RocksDB wayIndexDb, RocksDB boundaryWayIndexDb, RocksDB neededNodesDb, RocksDB relIndexDb, RocksDB poiIndexDb, ImportStatistics stats) throws Exception {
 
         final byte[] ONE = new byte[]{1};
@@ -1394,7 +1379,7 @@ private void storeBoundary(long osmId, int level, String name, String code,
                 hasMir = true;
             }
         } catch (Exception e) {
-            // MIR computation failed — boundary still works, just no fast-path optimisation
+            // MIR computation failed — boundary still works, just no fast-path optimization
         }
 
         int nameOffset = fbb.createString(name != null ? name : "Unknown");

src/main/java/com/dedicatedcode/paikka/service/importer/ImportStatistics.java

@@ -89,6 +89,9 @@ public String toString() {
     private final AtomicLong rocksDbWrites = new AtomicLong(0);
     private final AtomicLong queueSize = new AtomicLong(0);
     private final AtomicLong activeThreads = new AtomicLong(0);
+    private final AtomicLong boundaryWaysProcessed = new AtomicLong(0);
+    private final AtomicLong boundaryPhaseEntitiesRead = new AtomicLong(0);
+
     private volatile String currentPhase = "Initializing";
     private volatile boolean running = true;
     private final long startTime = System.currentTimeMillis();
@@ -97,8 +100,6 @@ public String toString() {
     private final AtomicLong compactionEntriesTotal = new AtomicLong(0);
     private final AtomicLong compactionEntriesProcessed = new AtomicLong(0);
 
-
-
     private volatile long compactionStartTime = 0;
 
     private volatile long datasetBytes;
@@ -217,6 +218,25 @@ public void decrementActiveThreads() {
         activeThreads.decrementAndGet();
     }
 
+    public long getBoundaryWaysProcessed() {
+        return boundaryWaysProcessed.get();
+    }
+
+    public void incrementBoundaryWaysProcessed() {
+        boundaryWaysProcessed.incrementAndGet();
+    }
+
+    public long getBoundaryPhaseEntitiesRead() {
+        return boundaryPhaseEntitiesRead.get();
+    }
+
+    public void incrementBoundaryPhaseEntitiesRead() {
+        boundaryPhaseEntitiesRead.incrementAndGet();
+    }
+
+    public void resetBoundaryPhaseEntitiesRead() {
+        boundaryPhaseEntitiesRead.set(0);
+    }
     public String getCurrentPhase() {
         return currentPhase;
     }
@@ -437,12 +457,12 @@ public void startProgressReporter() {
                     sb.append(String.format(" │ \033[35mRelations:\033[0m %s", formatCompactNumber(getRelationsFound())));
 
                 } else  if (phase.contains("1.1.2")) {
-                    long pbfPerSec = phaseSeconds > 0 ? (long)(getEntitiesRead() / phaseSeconds) : 0;
-                    sb.append(String.format("\033[1;36m[%s]\033[0m \033[1mScanning PBF Structure\033[0m", formatTime(elapsed)));
+                    long boundaryEntities = getBoundaryPhaseEntitiesRead();
+                    long pbfPerSec = phaseSeconds > 0 ? (long)(boundaryEntities / phaseSeconds) : 0;
+                    sb.append(String.format("\033[1;36m[%s]\033[0m \033[1mIndexing Boundary Member Ways\033[0m", formatTime(elapsed)));
                     sb.append(String.format(" │ \033[32mPBF Entities:\033[0m %s \033[33m(%s/s)\033[0m",
-                                            formatCompactNumber(getEntitiesRead()), formatCompactRate(pbfPerSec)));
-                    sb.append(String.format(" │ \033[37mNodes Found:\033[0m %s", formatCompactNumber(getNodesFound())));
-                    sb.append(String.format(" │ \033[34mWays Found:\033[0m %s", formatCompactNumber(getWaysProcessed())));
+                                            formatCompactNumber(boundaryEntities), formatCompactRate(pbfPerSec)));
+                    sb.append(String.format(" │ \033[34mBoundary Ways:\033[0m %s", formatCompactNumber(getBoundaryWaysProcessed())));
                     sb.append(String.format(" │ \033[35mRelations:\033[0m %s", formatCompactNumber(getRelationsFound())));
 
                 } else if (phase.contains("1.1.3")) {