Merge branch 'main' into dev

clarisma · Aug 26, 2023 · 9ada466 · 9ada466
2 parents 1f9a5bb + 922b128
commit 9ada466
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       	<groupId>junit</groupId>
       	<artifactId>junit</artifactId>
-      	<version>4.12</version>
+      	<version>4.13.2</version>
       	<scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/src/main/java/com/geodesk/feature/match/MatcherCoder.java b/src/main/java/com/geodesk/feature/match/MatcherCoder.java
@@ -113,7 +113,7 @@ with a frequently used key (found in the Global String Table)
     Tables (and hence the position of a Local Key) are only guaranteed to be
     2-byte aligned, so we use a little trick: We don't base the pointer off
     the address where it is stored (as we do for all other pointers), but
-    we add it to the address of the Tab Table, with its lower 2 bits set to
+    we add it to the address of the Tag Table, with its lower 2 bits set to
     zero.
 
 	If a Tag Table contains Local-Key Tags, bit 0 of the Tag-Table Pointer

diff --git a/src/main/java/com/geodesk/feature/polygon/PolygonBuilder.java b/src/main/java/com/geodesk/feature/polygon/PolygonBuilder.java
@@ -208,7 +208,7 @@ else if (way.role().equals("inner"))
         if (outerSegments == null) return factory.createEmpty(2);
         // Ring outerRings = null; // RingBuilder.buildFast(outerSegments);
         Ring outerRings = null; // RingBuilder.buildFast(outerSegments);
-        if (outerRings == null)
+        if (outerRings == null) // TODO: useless check (Used for fast-path in the past)
         {
             // log.debug("Building outer rings slowly for {}", rel);
             outerRings = RingBuilder.build(outerSegments);
@@ -222,7 +222,7 @@ else if (way.role().equals("inner"))
         {
             // Ring innerRings = null; // RingBuilder.buildFast(innerSegments);
             Ring innerRings = null; // RingBuilder.buildFast(innerSegments);
-            if (innerRings == null)
+            if (innerRings == null) // TODO: useless check (Used for fast-path in the past)
             {
                 // log.debug("Building inner rings slowly for {}", rel);
                 innerRings = RingBuilder.build(innerSegments);