(incubator-baremaps) branch fix-workflow-execution created (now f5accab8)

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bchapuis pushed a change to branch fix-workflow-execution
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git


      at f5accab8 Fix issues identified when executing the workflow

This branch includes the following new commits:

     new f5accab8 Fix issues identified when executing the workflow

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(incubator-baremaps) 01/01: Fix issues identified when executing the workflow

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bchapuis pushed a commit to branch fix-workflow-execution
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git

commit f5accab8c665e612b3751438215bf3ee90333111
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Mon Sep 16 11:57:12 2024 +0200

    Fix issues identified when executing the workflow
    
    - DataConversions should always call the wrapped methods
    - Only one log provider should be included in the project
    - Use MonotonicDataMap for coordinates and references
---
 .../main/java/org/apache/baremaps/workflow/WorkflowContext.java   | 2 +-
 .../java/org/apache/baremaps/data/collection/DataConversions.java | 8 +-------
 pom.xml                                                           | 6 ++++++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java
index 349f3012..ba07839f 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java
@@ -64,7 +64,7 @@ public class WorkflowContext {
   }
 
   public Map<Long, Coordinate> getCoordinateMap() throws IOException {
-    return DataConversions.asMap(getMemoryAlignedDataMap("coordinates", new LonLatDataType()));
+    return DataConversions.asMap(getMonotonicDataMap("coordinates", new LonLatDataType()));
   }
 
   public Map<Long, List<Long>> getReferenceMap() throws IOException {
diff --git a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/DataConversions.java b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/DataConversions.java
index 1211985d..593f6acd 100644
--- a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/DataConversions.java
+++ b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/DataConversions.java
@@ -270,13 +270,7 @@ public class DataConversions {
 
     @Override
     public V get(Object key) {
-      if (map instanceof MemoryAlignedDataMap) {
-        return map.get(key);
-      } else if (map instanceof IndexedDataMap) {
-        return map.get(key);
-      } else {
-        return super.get(key);
-      }
+      return map.get(key);
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index d60471ea..75f89b46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,6 +237,12 @@ limitations under the License.
         <groupId>mil.nga.geopackage</groupId>
         <artifactId>geopackage</artifactId>
         <version>${version.lib.geopackage}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>net.ripe.ipresource</groupId>