You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by bc...@apache.org on 2023/11/03 16:05:12 UTC
(incubator-baremaps) branch 745-daylight updated: Fix cache
This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch 745-daylight
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/745-daylight by this push:
new ce2b4a20 Fix cache
ce2b4a20 is described below
commit ce2b4a205f0d4293224dcbcba38ba7b960c34669
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Fri Nov 3 17:05:06 2023 +0100
Fix cache
---
.../apache/baremaps/workflow/tasks/ImportOsmChange.java | 14 ++++----------
.../org/apache/baremaps/workflow/tasks/ImportOsmPbf.java | 15 +++++----------
2 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmChange.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmChange.java
index 4b043726..93fa5c29 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmChange.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmChange.java
@@ -56,16 +56,10 @@ public record ImportOsmChange(
var cacheDir = cache != null ? cache : Files.createTempDirectory(Paths.get("."), "cache_");
- var coordinateKeysDir = Files.createDirectories(cacheDir.resolve("coordinate_keys"));
- var coordinateValuesDir = Files.createDirectories(cacheDir.resolve("coordinate_vals"));
- var coordinateMap =
- new MonotonicDataMap<>(
- new MemoryAlignedDataList<>(
- new PairDataType<>(new LongDataType(), new LongDataType()),
- new MemoryMappedDirectory(coordinateKeysDir)),
- new AppendOnlyBuffer<>(
- new LonLatDataType(),
- new MemoryMappedDirectory(coordinateValuesDir)));
+ var coordinateDir = Files.createDirectories(cacheDir.resolve("coordinates"));
+ var coordinateMap = new MemoryAlignedDataMap<>(
+ new LonLatDataType(),
+ new MemoryMappedDirectory(coordinateDir));;
var referenceKeysDir = Files.createDirectory(cacheDir.resolve("reference_keys"));
var referenceValuesDir = Files.createDirectory(cacheDir.resolve("reference_vals"));
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmPbf.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmPbf.java
index 1b3b6bc5..10ca57ae 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmPbf.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmPbf.java
@@ -76,18 +76,13 @@ public record ImportOsmPbf(
wayRepository.create();
relationRepository.create();
}
+
var cacheDir = cache != null ? cache : Files.createTempDirectory(Paths.get("."), "cache_");
- var coordinateKeysDir = Files.createDirectories(cacheDir.resolve("coordinate_keys"));
- var coordinateValuesDir = Files.createDirectories(cacheDir.resolve("coordinate_vals"));
- var coordinateMap =
- new MonotonicDataMap<>(
- new MemoryAlignedDataList<>(
- new PairDataType<>(new LongDataType(), new LongDataType()),
- new MemoryMappedDirectory(coordinateKeysDir)),
- new AppendOnlyBuffer<>(
- new LonLatDataType(),
- new MemoryMappedDirectory(coordinateValuesDir)));
+ var coordinateDir = Files.createDirectories(cacheDir.resolve("coordinates"));
+ var coordinateMap = new MemoryAlignedDataMap<>(
+ new LonLatDataType(),
+ new MemoryMappedDirectory(coordinateDir));
var referenceKeysDir = Files.createDirectory(cacheDir.resolve("reference_keys"));
var referenceValuesDir = Files.createDirectory(cacheDir.resolve("reference_vals"));