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/09/28 19:44:29 UTC
[incubator-baremaps] 28/35: Fix conflicts
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
commit e3269396af4280919ec0a9238063c634f2910804
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Mon Sep 18 21:10:41 2023 +0200
Fix conflicts
---
.../src/main/java/org/apache/baremaps/workflow/tasks/ExecuteSql.java | 1 -
.../src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmPbf.java | 2 +-
basemap/config.js | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExecuteSql.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExecuteSql.java
index 57947c5c..8fd09f99 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExecuteSql.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExecuteSql.java
@@ -18,7 +18,6 @@ import java.sql.SQLException;
import java.util.Arrays;
import java.util.regex.Pattern;
import java.util.stream.Stream;
-
import org.apache.baremaps.workflow.Task;
import org.apache.baremaps.workflow.WorkflowContext;
import org.apache.baremaps.workflow.WorkflowException;
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 37c6de61..662cd7ca 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
@@ -41,7 +41,7 @@ import org.locationtech.jts.geom.Coordinate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public record ImportOpenStreetMap(Path file, Object database, Integer databaseSrid)
+public record ImportOsmPbf(Path file, Object database, Integer databaseSrid)
implements
Task {
diff --git a/basemap/config.js b/basemap/config.js
index 605c2e91..09c7848d 100644
--- a/basemap/config.js
+++ b/basemap/config.js
@@ -13,7 +13,7 @@ export default {
"host": "http://demo.baremaps.com:8888",
"database": {
"jdbcUrl": "jdbc:postgresql://localhost:5432/daylight?&user=daylight&password=daylight",
- "maximumPoolSize": 1,
+ "maximumPoolSize": 2,
},
"osmPbfUrl": "https://download.geofabrik.de/europe/switzerland-latest.osm.pbf",
"center": [6.6323, 46.5197],