fix: missing boundaries warning (#2079)

Author: aoles

ors-engine/src/main/java/org/heigit/ors/config/profile/ExtendedStorageProperties.java

@@ -61,7 +61,7 @@ public class ExtendedStorageProperties {
     @JsonIgnore
     private Path openborders;
     @JsonIgnore
-    private Boolean preprocessed = false;
+    private Boolean preprocessed;
 
     // Relevant for RoadAccessRestrictions
     @JsonProperty("use_for_warnings")
@@ -98,6 +98,7 @@ public void merge(ExtendedStorageProperties other) {
         outputLog = ofNullable(this.outputLog).orElse(other.outputLog);
         logLocation = ofNullable(this.logLocation).orElse(other.logLocation);
         maximumSlope = ofNullable(this.maximumSlope).orElse(other.maximumSlope);
+        preprocessed = ofNullable(this.preprocessed).orElse(other.preprocessed);
         boundaries = ofNullable(this.boundaries).orElse(other.boundaries);
         ids = ofNullable(this.ids).orElse(other.ids);
         openborders = ofNullable(this.openborders).orElse(other.openborders);
@@ -135,6 +136,9 @@ private void setAllPropertiesToNull(ArrayList<String> excludedProperties) {
         if (!excludedProperties.contains("maximum_slope")) {
             this.maximumSlope = null;
         }
+        if (!excludedProperties.contains("preprocessed")) {
+            this.preprocessed = null;
+        }
         if (!excludedProperties.contains("boundaries")) {
             this.boundaries = null;
         }
@@ -230,9 +234,14 @@ private void initializeFilepath(ArrayList<String> nonNullableProperties, Extende
 
     private void initializeBorders(ArrayList<String> nonNullableProperties, ExtendedStorageName storageName) {
         final Path emptyPath = Path.of("");
+        if (preprocessed == null) {
+            this.preprocessed = false;
+        }
         if (boundaries == null || boundaries.equals(emptyPath)) {
-            LOGGER.warn("Storage %s is missing boundaries. Disabling storage.".formatted(storageName));
-            enabled = false;
+            if (!preprocessed) {
+                LOGGER.warn("Storage %s is missing boundaries. Disabling storage.".formatted(storageName));
+                enabled = false;
+            }
             boundaries = Path.of("");
         } else {
             boundaries = boundaries.toAbsolutePath();
@@ -251,6 +260,7 @@ private void initializeBorders(ArrayList<String> nonNullableProperties, Extended
         } else {
             openborders = openborders.toAbsolutePath();
         }
+        nonNullableProperties.add("preprocessed");
         nonNullableProperties.add("boundaries");
         nonNullableProperties.add("ids");
         nonNullableProperties.add("openborders");

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/storages/builders/BordersGraphStorageBuilder.java

@@ -57,7 +57,6 @@ public class BordersGraphStorageBuilder extends AbstractGraphStorageBuilder {
     private BordersGraphStorage storage;
     private CountryBordersReader cbReader;
     private boolean preprocessed;
-
     private final GeometryFactory gf;
 
     public static final String BUILDER_NAME = "Borders";

ors-engine/src/test/java/org/heigit/ors/config/ExtendedStoragePropertiesTest.java

@@ -70,6 +70,11 @@ Boolean testStorageObjectIsEmpty(ExtendedStorageProperties storage, ArrayList<St
         } else {
             assertNotNull(storage.getMaximumSlope(), "maximum_slope should not be null");
         }
+        if (!nonNullFields.contains("preprocessed")) {
+            assertNull(storage.getPreprocessed(), "preprocessed should be null");
+        } else {
+            assertNotNull(storage.getPreprocessed(), "preprocessed should not be null");
+        }
         if (!nonNullFields.contains("boundaries")) {
             assertNull(storage.getBoundaries(), "boundaries should be null");
         } else {
@@ -135,6 +140,8 @@ void testSetBoundaries() {
         assertEquals(Path.of(""), storage.getBoundaries());
     }
 
+
+
     @Test
     void testSetIds() {
         HelperClass storage = new HelperClass();
@@ -421,16 +428,18 @@ void assertSetHereTrafficPathLogic(String streets, String refPattern, String pat
 
     // Same for borders
     @ParameterizedTest
-    @CsvSource({"'', '', ''", // All paths null
-            "'/custom/path.csv', '', ''", // Only boundaries set
-            "'', '/custom/path.csv', ''", // Only ids set
-            "'', '', '/custom/path.csv'", // Only openborders set
-            "'/custom/path.csv', '/custom/path.csv', ''", // boundaries and ids set
-            "'/custom/path.csv', '', '/custom/path.csv'", // boundaries and openborders set
-            "'', '/custom/path.csv', '/custom/path.csv'", // ids and openborders set
-            "'/custom/path.csv', '/custom/path.csv', '/custom/path.csv'" // All paths set -> Enabled!
+    @CsvSource({"'','', '', '', ''", // All paths null
+            "'','/custom/path.csv', '', ''", // Only boundaries set
+            "'','', '/custom/path.csv', ''", // Only ids set
+            "'','', '', '/custom/path.csv'", // Only openborders set
+            "'','/custom/path.csv', '/custom/path.csv', ''", // boundaries and ids set
+            "'','/custom/path.csv', '', '/custom/path.csv'", // boundaries and openborders set
+            "'','', '/custom/path.csv', '/custom/path.csv'", // ids and openborders set
+            "'true','', '/custom/path.csv', '/custom/path.csv'",
+            "'','/custom/path.csv', '/custom/path.csv', '/custom/path.csv'", // All paths set -> Enabled!
+            "'true','/custom/path.csv', '/custom/path.csv', '/custom/path.csv'"
     })
-    void assertSetBordersPathLogic(String boundaries, String ids, String openborders) {
+    void assertSetBordersPathLogic(String preprocessed, String boundaries, String ids, String openborders) {
         ExtendedStorageProperties storage;
         // Test null values
         storage = new ExtendedStorageProperties();
@@ -439,13 +448,15 @@ void assertSetBordersPathLogic(String boundaries, String ids, String openborders
 
         // Create JSON string based on parameters
         storage = new ExtendedStorageProperties();
+        var isPreprocessed = Boolean.parseBoolean(preprocessed);
+        storage.setPreprocessed(isPreprocessed);
         storage.setBoundaries(Path.of(boundaries));
         storage.setIds(Path.of(ids));
         storage.setOpenborders(Path.of(openborders));
         storage.initialize(ExtendedStorageName.BORDERS);
 
         // Check if storage is enabled or disabled based on paths
-        boolean shouldBeEnabled = !boundaries.isEmpty() && !ids.isEmpty() && !openborders.isEmpty();
+        boolean shouldBeEnabled = (isPreprocessed || !boundaries.isEmpty()) && !ids.isEmpty() && !openborders.isEmpty();
         assertEquals(shouldBeEnabled, storage.getEnabled(), "initialize should disable storage if one of the paths is null");
 
         // Check paths
@@ -471,6 +482,7 @@ void assertSetBordersPathLogic(String boundaries, String ids, String openborders
         // Assert everything else was set to null
         testStorageObjectIsEmpty(storage, new ArrayList<>() {{
             add("enabled");
+            add("preprocessed");
             add("boundaries");
             add("ids");
             add("openborders");