Merge branch 'praszuk/feat/change-building-yes-value-simplification' …

…into v2.0.0
praszuk · Sep 7, 2024 · b82cc08 · b82cc08
2 parents 69b984a + bac0c52
commit b82cc08
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/org/openstreetmap/josm/plugins/plbuildings/utils/PreCheckUtils.java b/src/main/java/org/openstreetmap/josm/plugins/plbuildings/utils/PreCheckUtils.java
@@ -31,8 +31,14 @@ public static boolean isBuildingValueSimplification(@Nonnull OsmPrimitive curren
         if (newValue == null) {
             return true;
         }
+        if (newValue.equals(currentValue)) {
+            return false;
+        }
 
-        if (newValue.equals("house") && HOUSE_DETAILS.contains(currentValue)) {
+        if (newValue.equals("yes") && !currentValue.equals("construction")) {
+            return true;
+        }
+        else if (newValue.equals("house") && HOUSE_DETAILS.contains(currentValue)) {
             return true;
         }
         else if (newValue.equals("residential") && LIVING_BUILDINGS.contains(currentValue)) {

diff --git a/test/unit/org/openstreetmap/josm/plugins/plbuildings/BuildingValueSimplificationTest.java b/test/unit/org/openstreetmap/josm/plugins/plbuildings/BuildingValueSimplificationTest.java
@@ -34,6 +34,7 @@ void testNewPrimitiveEmptyValue() {
         "detached,house", "semidetached_house,house",
         "house,residential", "detached,residential",
         "garage,outbuilding", "barn,outbuilding",
+        "house,yes", "outbuilding,yes"
     })
     void testNewPrimitiveHasSimplifiedBuildingValue(String selectedValue, String newPrimitiveValue) {
         OsmPrimitive selected = new Way();
@@ -45,7 +46,7 @@ void testNewPrimitiveHasSimplifiedBuildingValue(String selectedValue, String new
     }
 
     @ParameterizedTest
-    @CsvSource({"yes,house", "house,detached", "residential,house", "yes,outbuilding"})
+    @CsvSource({"house,detached", "residential,house", "construction,yes", "yes,yes"})
     public void testNewPrimitiveHasNotSimplifiedBuildingValue(String selectedValue, String newPrimitiveValue) {
         OsmPrimitive selected = new Way();
         OsmPrimitive newPrimitive = new Way();