Merge pull request #274 from entur/fix_service_link_validation

Fix validation ServiceLink rule
entur · Jan 9, 2025 · fd56306 · fd56306
2 parents fb404f0 + 8a00494
commit fd56306
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/...entur/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactory.java b/...entur/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactory.java
@@ -196,10 +196,10 @@ public ValidationTreeBuilder builder() {
       )
       .withRule(
         new ValidateNotExist(
-          "serviceLinks/ServiceLink/projections/LinkSequenceProjection/g:LineString[count(g:pos) < 2]",
+          "serviceLinks/ServiceLink/projections/LinkSequenceProjection/g:LineString[count(g:pos) = 1]",
           CODE_SERVICE_LINK_5,
           "ServiceLink less than 2 points",
-          "Less then 2 points on ServiceLink",
+          "Less than 2 points on ServiceLink",
           Severity.WARNING
         )
       )

diff --git a/...r/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactoryTest.java b/...r/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactoryTest.java
@@ -364,4 +364,17 @@ void testServiceLinkWithTwoPoints() {
     );
     assertTrue(validationIssues.isEmpty());
   }
+
+  @Test
+  void testServiceLinkWithPosList() {
+    XPathRuleValidationContext xpathValidationContext =
+      TestValidationContextBuilder
+        .ofNetexFragment(NETEX_FRAGMENT_SERVICE_LINK_VALID_COORDINATE_LIST)
+        .build();
+    List<ValidationIssue> validationIssues = validationTree.validate(
+      xpathValidationContext,
+      CODE_SERVICE_LINK_5
+    );
+    assertTrue(validationIssues.isEmpty());
+  }
 }