Merge pull request #857 from inspire-eu-validation/issue-1128-staging

ef-ia.b.16 procedure path exception added
inspire-eu-validation · Nov 7, 2024 · e186374 · e186374
2 parents 48d7290 + dac396a
commit e186374
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/data-ef/ef-ia/ets-ef-ia-bsxets.xml b/data-ef/ef-ia/ets-ef-ia-bsxets.xml
@@ -1496,6 +1496,7 @@ let $messages :=
 	for $feature in $this_features
 
 		let $envDom := $feature/ef:procedure
+		let $envDom2:= $feature/ef:procedure/ompr:Process/@gml:id
 		let $urls := 
 			for $x in $envDom/@xlink:href
 				return
@@ -1531,9 +1532,9 @@ let $messages :=
 				local:addMessage('TR.wrongMultiplicityEnvFacilities',  map {'filename': local:filename($feature/../..), 'featureType':local-name($feature/../..), 'gmlid': string($feature/../../@*:id), 'property': $property_string, 'multiplicity': 1, 'count': count($envDom)})
 			else if (name($feature) = 'ef:ObservingCapability' and count($envDom) > 1) then
 				local:addMessage('TR.wrongMultiplicityEnvFacilities',  map {'filename': local:filename($feature), 'featureType':local-name($feature), 'gmlid': string($feature/@*:id), 'property': $property_string, 'multiplicity': 1, 'count': count($envDom)})
-			else if ((name($feature/../..) = 'ef:EnvironmentalMonitoringFacility' or name($feature/../..) = 'ef:EnvironmentalMonitoringNetwork') and exists($feature/ef:observedProperty) and not(count($envDom) = count($envDom/@xlink:href))) then
+			else if ((name($feature/../..) = 'ef:EnvironmentalMonitoringFacility' or name($feature/../..) = 'ef:EnvironmentalMonitoringNetwork') and exists($feature/ef:observedProperty) and not(count($envDom) = count($envDom/@xlink:href)) and (count($envDom2) = 0)) then
 				local:addMessage('TR.missingAttributeEnvFacilities',  map {'filename': local:filename($feature/../..), 'featureType':local-name($feature/../..), 'gmlid': string($feature/../../@*:id), 'property': $property_string, 'attribute': 'xlink:href'})
-			else if ( name($feature) = 'ef:ObservingCapability' and exists($feature/ef:observedProperty) and not(count($envDom) = count($envDom/@xlink:href))) then
+			else if ( name($feature) = 'ef:ObservingCapability' and exists($feature/ef:observedProperty) and not(count($envDom) = count($envDom/@xlink:href)) and (count($envDom2) = 0)) then
 				local:addMessage('TR.missingAttributeEnvFacilities',  map {'filename': local:filename($feature), 'featureType':local-name($feature), 'gmlid': string($feature/@*:id), 'property': $property_string, 'attribute': 'xlink:href'})
 			else if ((name($feature/../..) = 'ef:EnvironmentalMonitoringFacility' or name($feature/../..) = 'ef:EnvironmentalMonitoringNetwork') and count($invalid_urls) > 0) then
 				local:addMessage('TR.brokenLinkEnvFacilities', map {'filename': local:filename($feature/../..), 'featureType':local-name($feature/../..), 'gmlid': string($feature/../../@*:id), 'property': $property_string, 'value': string-join($invalid_urls, ',')})

diff --git a/testquery-noggeo.xq b/testquery-noggeo.xq
@@ -58,6 +58,7 @@ declare namespace mu='http://inspire.ec.europa.eu/schemas/mu/4.0';
 declare namespace om='http://www.opengis.net/om/2.0';
 declare namespace oi='http://inspire.ec.europa.eu/schemas/oi/4.0';
 declare namespace omor='http://inspire.ec.europa.eu/schemas/omor/3.0';
+declare namespace ompr='http://inspire.ec.europa.eu/schemas/ompr/3.0';
 declare namespace omso='http://inspire.ec.europa.eu/schemas/omso/3.0';
 declare namespace pd='http://inspire.ec.europa.eu/schemas/pd/4.0'; 
 declare namespace ps='http://inspire.ec.europa.eu/schemas/ps/5.0';