Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issues identified when executing the workflow #894

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Fix issues identified when executing the workflow #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public DataSource getDataSource(Object database) {
}

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 {
Expand Down
8 changes: 1 addition & 7 deletions baremaps-data/src/main/java/org/apache/baremaps/data/collection/DataConversions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,13 +270,7 @@ public V put(K key, V value) {

@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
Expand Down
1 change: 0 additions & 1 deletion baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicDataMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ public Iterator<Entry<Long, E>> entryIterator() {
.iterator();
}


/** {@inheritDoc} */
@Override
public long size() {
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading