Also allow numeric types for IsInsideAreaByCode

GeoWerkstatt · Feb 26, 2024 · 27c7928 · 27c7928
1 parent 1a0e4f5
commit 27c7928
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 24 deletions.
diff --git a/...va/ch/geowerkstatt/ilivalidator/extensions/functions/ngk/IsInsideAreaByCodeIoxPlugin.java b/...va/ch/geowerkstatt/ilivalidator/extensions/functions/ngk/IsInsideAreaByCodeIoxPlugin.java
@@ -2,6 +2,7 @@
 
 import ch.ehi.basics.types.OutParam;
 import ch.interlis.ili2c.metamodel.EnumerationType;
+import ch.interlis.ili2c.metamodel.NumericType;
 import ch.interlis.ili2c.metamodel.PathEl;
 import ch.interlis.ili2c.metamodel.Type;
 import ch.interlis.ili2c.metamodel.Viewable;
@@ -69,19 +70,24 @@ private Value isInsideArea(String usageScope, Collection<IomObject> objects, Pat
                         Geometry::union
                 ));
 
+        List<Geometry> sortedGeometries;
         ValueKey firstKey = geometriesByCodeValue.keySet().iterator().next();
         Type keyType = firstKey.getType();
-        if (!(keyType instanceof EnumerationType)) {
-            logger.addEvent(logger.logErrorMsg("{0}: Enumeration type expected.", usageScope));
-            return Value.createSkipEvaluation();
-        }
-        EnumerationType enumType = (EnumerationType) keyType;
-        if (!enumType.isOrdered()) {
-            logger.addEvent(logger.logErrorMsg("{0}: Enumeration type must be ordered.", usageScope));
+
+        if (keyType instanceof EnumerationType) {
+            EnumerationType enumType = (EnumerationType) keyType;
+            if (!enumType.isOrdered()) {
+                logger.addEvent(logger.logErrorMsg("{0}: Enumeration type must be ordered.", usageScope));
+                return Value.createSkipEvaluation();
+            }
+            sortedGeometries = sortByEnumValues(geometriesByCodeValue, enumType);
+        } else if (keyType instanceof NumericType) {
+            sortedGeometries = sortByNumericValues(geometriesByCodeValue);
+        } else {
+            logger.addEvent(logger.logErrorMsg("{0}: Unsupported type {1} for {2}.", usageScope, keyType.toString(), getQualifiedIliName()));
             return Value.createSkipEvaluation();
         }
 
-        List<Geometry> sortedGeometries = sortByEnumValues(geometriesByCodeValue, enumType);
         for (int i = 0; i < sortedGeometries.size() - 1; i++) {
             Geometry current = sortedGeometries.get(i);
             Geometry next = sortedGeometries.get(i + 1);
@@ -104,6 +110,14 @@ private List<Geometry> sortByEnumValues(Map<ValueKey, Geometry> map, Enumeration
                 .collect(Collectors.toList());
     }
 
+    private List<Geometry> sortByNumericValues(Map<ValueKey, Geometry> map) {
+        return map.entrySet()
+                .stream()
+                .sorted(Comparator.comparingDouble(entry -> entry.getKey().getNumericValue()))
+                .map(Map.Entry::getValue)
+                .collect(Collectors.toList());
+    }
+
     private ValueKey getCodeValue(IomObject object, PathEl[] enumPath) {
         Value value = validator.getValueFromObjectPath(null, object, enumPath, null);
         return new ValueKey(value);
@@ -147,6 +161,10 @@ public String getStringValue() {
             return value.getValue();
         }
 
+        public double getNumericValue() {
+            return value.getNumeric();
+        }
+
         @Override
         public boolean equals(Object o) {
             if (this == o) {

diff --git a/src/model/NGK_SO_FunctionsExt.ili b/src/model/NGK_SO_FunctionsExt.ili
@@ -1,8 +1,8 @@
 INTERLIS 2.4;
 MODEL NGK_SO_FunctionsExt
   AT "mailto:[email protected]" VERSION "2024-01-23" =
-    !!@ fn.description = "Prüft bei der Objektmenge, dass die gemäss dem geordneten Enum jeweils kleineren Flächen innerhalb der grösseren Flächen liegen. Die Sortierung des Enums muss von der kleinsten zur grössten Fläche erfolgen.";
-    !!@ fn.param = "Objects: Zu prüfende Objektmenge. GeometryAttr: Pfad zur Geometrie. CodeAttr: Pfad zum Enum";
+    !!@ fn.description = "Prüft bei der Objektmenge, dass die gemäss dem geordneten Enum oder Zahlen-Code jeweils kleineren Flächen innerhalb der grösseren Flächen liegen. Die Sortierung des Codes muss von der kleinsten zur grössten Fläche erfolgen.";
+    !!@ fn.param = "Objects: Zu prüfende Objektmenge. GeometryAttr: Pfad zur Geometrie. CodeAttr: Pfad zum geordneten Enum oder Zahlen-Code";
     !!@ fn.return = "Boolean";
     !!@ fn.since = "2024-01-23";
     FUNCTION IsInsideAreaByCode (Objects: OBJECTS OF ANYCLASS; GeometryAttr: TEXT; CodeAttr: TEXT): BOOLEAN;

diff --git a/src/test/data/IsInsideAreaByCode/SetConstraints.ili b/src/test/data/IsInsideAreaByCode/SetConstraints.ili
@@ -7,23 +7,26 @@ MODEL TestSuite
   TOPIC FunctionTestTopic =
 
     DOMAIN
-      Code = (
+      CodeEnum = (
         code_1,
         code_2,
         code_3,
         code_4
       ) ORDERED;
+      CodeNumeric = 0 .. 999;
 
       !!@CRS=EPSG:2056
       CHKoord = COORD 2460000.000 .. 2870000.000 [INTERLIS.m],
                       1045000.000 .. 1310000.000 [INTERLIS.m],
                       ROTATION 2 -> 1;
 
     CLASS BaseClass =
-      code : Code;
+      codeEnum : CodeEnum;
+      codeNumeric : CodeNumeric;
       surface : SURFACE WITH (STRAIGHTS) VERTEX CHKoord WITHOUT OVERLAPS > 0.001;
 
-      SET CONSTRAINT insideAreaConstraint: NGK_SO_FunctionsExt.IsInsideAreaByCode(ALL, "surface", "code");
+      SET CONSTRAINT insideAreaConstraintEnum: NGK_SO_FunctionsExt.IsInsideAreaByCode(ALL, "surface", "codeEnum");
+      SET CONSTRAINT insideAreaConstraintNumeric: NGK_SO_FunctionsExt.IsInsideAreaByCode(ALL, "surface", "codeNumeric");
     END BaseClass;
 
   END FunctionTestTopic;

diff --git a/src/test/data/IsInsideAreaByCode/TestData_Fail.xtf b/src/test/data/IsInsideAreaByCode/TestData_Fail.xtf
@@ -11,7 +11,8 @@
     <ili:datasection>
         <TestSuite:FunctionTestTopic ili:bid="TestSuite.FunctionTestTopic">
             <TestSuite:BaseClass ili:tid="1">
-                <TestSuite:code>code_1</TestSuite:code>
+                <TestSuite:codeEnum>code_1</TestSuite:codeEnum>
+                <TestSuite:codeNumeric>11</TestSuite:codeNumeric>
                 <TestSuite:surface>
                     <geom:surface>
                         <geom:exterior>
@@ -134,7 +135,8 @@
                 </TestSuite:surface>
             </TestSuite:BaseClass>
             <TestSuite:BaseClass ili:tid="2">
-                <TestSuite:code>code_2</TestSuite:code>
+                <TestSuite:codeEnum>code_2</TestSuite:codeEnum>
+                <TestSuite:codeNumeric>22</TestSuite:codeNumeric>
                 <TestSuite:surface>
                     <geom:surface>
                         <geom:exterior>
@@ -289,7 +291,8 @@
                 </TestSuite:surface>
             </TestSuite:BaseClass>
             <TestSuite:BaseClass ili:tid="3">
-                <TestSuite:code>code_3</TestSuite:code>
+                <TestSuite:codeEnum>code_3</TestSuite:codeEnum>
+                <TestSuite:codeNumeric>33</TestSuite:codeNumeric>
                 <TestSuite:surface>
                     <geom:surface>
                         <geom:exterior>
@@ -420,7 +423,8 @@
                 </TestSuite:surface>
             </TestSuite:BaseClass>
             <TestSuite:BaseClass ili:tid="4">
-                <TestSuite:code>code_4</TestSuite:code>
+                <TestSuite:codeEnum>code_4</TestSuite:codeEnum>
+                <TestSuite:codeNumeric>44</TestSuite:codeNumeric>
                 <TestSuite:surface>
                     <geom:surface>
                         <geom:exterior>

diff --git a/src/test/data/IsInsideAreaByCode/TestData_Ok.xtf b/src/test/data/IsInsideAreaByCode/TestData_Ok.xtf
@@ -10,8 +10,9 @@
     </ili:headersection>
     <ili:datasection>
         <TestSuite:FunctionTestTopic ili:bid="TestSuite.FunctionTestTopic">
-            <TestSuite:BaseClass ili:tid="a"><!-- Code ordered 2, 1, 4 to test sorting and gap in codes -->
-                <TestSuite:code>code_2</TestSuite:code>
+            <TestSuite:BaseClass ili:tid="a"><!-- Code enum ordered 2, 1, 4 and numeric 1, 0, 440 to test sorting and gap in codes -->
+                <TestSuite:codeEnum>code_2</TestSuite:codeEnum>
+                <TestSuite:codeNumeric>1</TestSuite:codeNumeric>
                 <TestSuite:surface>
                     <geom:surface>
                         <geom:exterior>
@@ -74,7 +75,8 @@
                 </TestSuite:surface>
             </TestSuite:BaseClass>
             <TestSuite:BaseClass ili:tid="b">
-                <TestSuite:code>code_1</TestSuite:code>
+                <TestSuite:codeEnum>code_1</TestSuite:codeEnum>
+                <TestSuite:codeNumeric>0</TestSuite:codeNumeric>
                 <TestSuite:surface>
                     <geom:surface>
                         <geom:exterior>
@@ -149,7 +151,8 @@
                 </TestSuite:surface>
             </TestSuite:BaseClass>
             <TestSuite:BaseClass ili:tid="c">
-                <TestSuite:code>code_4</TestSuite:code>
+                <TestSuite:codeEnum>code_4</TestSuite:codeEnum>
+                <TestSuite:codeNumeric>440</TestSuite:codeNumeric>
                 <TestSuite:surface>
                     <geom:surface>
                         <geom:exterior>

diff --git a/...h/geowerkstatt/ilivalidator/extensions/functions/ngk/IsInsideAreaByCodeIoxPluginTest.java b/...h/geowerkstatt/ilivalidator/extensions/functions/ngk/IsInsideAreaByCodeIoxPluginTest.java
@@ -22,13 +22,15 @@ public void setUp() {
     public void setConstraintOk() throws Ili2cFailure, IoxException {
         vh.runValidation(new String[]{TEST_DATA_OK}, new String[]{ILI_FILE});
         Assert.equals(0, vh.getErrs().size());
-        AssertionHelper.assertNoConstraintError(vh, "insideAreaConstraint");
+        AssertionHelper.assertNoConstraintError(vh, "insideAreaConstraintEnum");
+        AssertionHelper.assertNoConstraintError(vh, "insideAreaConstraintNumeric");
     }
 
     @Test
     public void setConstraintFail() throws Ili2cFailure, IoxException {
         vh.runValidation(new String[]{TEST_DATA_FAIL}, new String[]{ILI_FILE});
-        Assert.equals(1, vh.getErrs().size());
-        AssertionHelper.assertConstraintErrors(vh, 1, "insideAreaConstraint");
+        Assert.equals(2, vh.getErrs().size());
+        AssertionHelper.assertConstraintErrors(vh, 1, "insideAreaConstraintEnum");
+        AssertionHelper.assertConstraintErrors(vh, 1, "insideAreaConstraintNumeric");
     }
 }