Merge pull request #194 from inspire-eu-validation/bugfix-1.1

Modifications in ETS for issues #180, #189 and #182

data-ad/ad-gml/ets-ad-gml-bsxets.xml

@@ -11,7 +11,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-ad/3.1/ad-gml" target="
 Pre-requisite conformance classes:
 <ul><li><a href="http://inspire.ec.europa.eu/id/ats/data/3.0rc3/schemas" target="_blank">Conformance Class 'INSPIRE GML application schemas'</a></li></ul>]]></description>
   <reference>../../inspire-noggeo-bsxets.xq</reference>
-	<version>0.2.1</version>
+	<version>0.2.2</version>
 	<author>PwC</author>
 	<creationDate>2016-11-28T00:00:00Z</creationDate>
 	<lastEditor>interactive instruments GmbH</lastEditor>
@@ -66,7 +66,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-ad/3.1/ad-gml/basic" ta
 									<parent ref="EIDc41b96c7-1a23-4953-aa42-d2e71faf0c84"/>
 									<expectedResult>NOT_APPLICABLE</expectedResult>
 									<expression>
-let $featuresFromAppSchema := $features[self::*:Address | self::*:AddressAreaName | self::*:AddressComponent | self::*:AdminUnitName | self::*:PostalDescriptor | self::*:ThoroughfareName]
+let $featuresFromAppSchema := $features[descendant-or-self::*:Address | descendant-or-self::*:AddressAreaName | descendant-or-self::*:AddressComponent | descendant-or-self::*:AdminUnitName | descendant-or-self::*:PostalDescriptor | descendant-or-self::*:ThoroughfareName]
 return
  (if ($featuresFromAppSchema) then 'PASSED' else 'FAILED',
   if (not($featuresFromAppSchema)) then local:addMessage('TR.noFeature', map { 'theme': 'Addresses' }) else ())

data-au/au-gml/ets-au-gml-bsxets.xml

@@ -11,7 +11,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-au/3.1/au-gml" target="
 Pre-requisite conformance classes:
 <ul><li><a href="http://inspire.ec.europa.eu/id/ats/data/3.0rc3/schemas" target="_blank">Conformance Class 'INSPIRE GML application schemas'</a></li></ul>]]></description>
 	<reference>../../inspire-noggeo-bsxets.xq</reference>
-	<version>0.2.1</version>
+	<version>0.2.2</version>
 	<author>PwC</author>
 	<creationDate>2016-10-24T00:00:00Z</creationDate>
 	<lastEditor>interactive instruments GmbH</lastEditor>
@@ -66,7 +66,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-au/3.1/au-gml/basic" ta
 									<parent ref="EIDd21eedfd-dadb-469a-b8b3-878605550d20"/>
 									<expectedResult>NOT_APPLICABLE</expectedResult>
 									<expression>
-let $featuresFromAppSchema := $features[self::*:AdministrativeBoundary | self::*:AdministrativeUnit | self::*:Condominium | self::*:Baseline | self::*:MaritimeBoundary | self::*:MaritimeZone]
+let $featuresFromAppSchema := $features[descendant-or-self::*:AdministrativeBoundary | descendant-or-self::*:AdministrativeUnit | descendant-or-self::*:Condominium | descendant-or-self::*:Baseline | descendant-or-self::*:MaritimeBoundary | descendant-or-self::*:MaritimeZone]
 return
  (if ($featuresFromAppSchema) then 'PASSED' else 'FAILED',
   if (not($featuresFromAppSchema)) then local:addMessage('TR.noFeature', map { 'theme': 'Administrative Units' }) else ())

data-cp/cp-gml/ets-cp-gml-bsxets.xml

@@ -11,7 +11,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-cp/3.1/cp-gml" target="
 Pre-requisite conformance classes:
 <ul><li><a href="http://inspire.ec.europa.eu/id/ats/data/3.0rc3/schemas" target="_blank">Conformance Class 'INSPIRE GML application schemas'</a></li></ul>]]></description>
 	<reference>../../inspire-noggeo-bsxets.xq</reference>
-	<version>0.2.1</version>
+	<version>0.2.2</version>
 	<author>PwC</author>
 	<creationDate>2016-10-24T00:00:00Z</creationDate>
 	<lastEditor>interactive instruments GmbH</lastEditor>
@@ -66,7 +66,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-cp/3.1/cp-gml/basic" ta
 									<parent ref="EID32d32843-6013-47e2-878e-f41814ba1946"/>
 									<expectedResult>NOT_APPLICABLE</expectedResult>
 									<expression>
-let $featuresFromAppSchema := $features[self::*:CadastralParcel]
+let $featuresFromAppSchema := $features[descendant-or-self::*:CadastralParcel]
 return
  (if ($featuresFromAppSchema) then 'PASSED' else 'FAILED',
   if (not($featuresFromAppSchema)) then local:addMessage('TR.noCadastralParcel', map { 'theme': 'Cadastral Parcels' }) else ())

data-gn/gn-gml/ets-gn-gml-bsxets.xml

@@ -11,7 +11,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-gn/3.1/gn-gml" target="
 Pre-requisite conformance classes:
 <ul><li><a href="http://inspire.ec.europa.eu/id/ats/data/3.0rc3/schemas" target="_blank">Conformance Class 'INSPIRE GML application schemas'</a></li></ul>]]></description>
 	<reference>../../inspire-noggeo-bsxets.xq</reference>
-	<version>0.2.1</version>
+	<version>0.2.2</version>
 	<author>PwC</author>
 	<creationDate>2016-10-24T00:00:00Z</creationDate>
 	<lastEditor>interactive instruments GmbH</lastEditor>
@@ -66,7 +66,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-gn/3.1/gn-gml/basic" ta
 									<parent ref="EID4b62df65-c573-4af5-94ec-0009f1e84447"/>
 									<expectedResult>NOT_APPLICABLE</expectedResult>
 									<expression>
-let $featuresFromAppSchema := $features[self::*:NamedPlace]
+let $featuresFromAppSchema := $features[descendant-or-self::*:NamedPlace]
 return
  (if ($featuresFromAppSchema) then 'PASSED' else 'FAILED',
   if (not($featuresFromAppSchema)) then local:addMessage('TR.noFeature', map { 'theme': 'Geographical Names' }) else ())

data-hy/hy-gml/ets-hy-gml-bsxets.xml

@@ -11,7 +11,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-hy/3.1/hy-gml" target="
 Pre-requisite conformance classes:
 <ul><li><a href="http://inspire.ec.europa.eu/id/ats/data/3.0rc3/schemas" target="_blank">Conformance Class 'INSPIRE GML application schemas'</a></li></ul>]]></description>
 	<reference>../../inspire-noggeo-bsxets.xq</reference>
-	<version>0.2.1</version>
+	<version>0.2.2</version>
 	<author>interactive instruments GmbH</author>
 	<creationDate>2016-08-15T00:00:00Z</creationDate>
 	<lastEditor>interactive instruments GmbH</lastEditor>
@@ -66,7 +66,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-hy/3.1/hy-gml/basic" ta
 									<parent ref="EID8300e1a1-52f6-4ccc-a5f8-dbbe4bb44768"/>
 									<expectedResult>NOT_APPLICABLE</expectedResult>
 									<expression>
-let $featuresFromAppSchema := $features[self::*:HydroNode | self::*:WatercourseLink | self::*:WatercourseLinkSequence | self::*:WatercourseSeparatedCrossing | self::*:Watercourse | self::*:StandingWater | self::*:Wetland | self::*:GlacierSnowfield | self::*:Shore | self::*:DrainageBasin | self::*:RiverBasin | self::*:LandWaterBoundary | self::*:Embankment | self::*:Ford | self::*:Lock | self::*:Sluice | self::*:DamOrWeir | self::*:ShorelineConstruction | self::*:Crossing | self::*:SpringOrSeep | self::*:VanishingPoint | self::*:Rapids | self::*:Falls]
+let $featuresFromAppSchema := $features[descendant-or-self::*:HydroNode | descendant-or-self::*:WatercourseLink | descendant-or-self::*:WatercourseLinkSequence | descendant-or-self::*:WatercourseSeparatedCrossing | descendant-or-self::*:Watercourse | descendant-or-self::*:StandingWater | descendant-or-self::*:Wetland | descendant-or-self::*:GlacierSnowfield | descendant-or-self::*:Shore | descendant-or-self::*:DrainageBasin | descendant-or-self::*:RiverBasin | descendant-or-self::*:LandWaterBoundary | descendant-or-self::*:Embankment | descendant-or-self::*:Ford | descendant-or-self::*:Lock | descendant-or-self::*:Sluice | descendant-or-self::*:DamOrWeir | descendant-or-self::*:ShorelineConstruction | descendant-or-self::*:Crossing | descendant-or-self::*:SpringOrSeep | descendant-or-self::*:VanishingPoint | descendant-or-self::*:Rapids | descendant-or-self::*:Falls]
 return
  (if ($featuresFromAppSchema) then 'PASSED' else 'FAILED',
   if (not($featuresFromAppSchema)) then local:addMessage('TR.noFeature', map { 'theme': 'Hydrography' }) else ())

data-ps/ps-gml/ets-ps-gml-bsxets.xml

@@ -11,7 +11,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-ps/3.1/ps-gml" target="
 Pre-requisite conformance classes:
 <ul><li><a href="http://inspire.ec.europa.eu/id/ats/data/3.0rc3/schemas" target="_blank">Conformance Class 'INSPIRE GML application schemas'</a></li></ul>]]></description>
   <reference>../../inspire-noggeo-bsxets.xq</reference>
-	<version>0.2.1</version>
+	<version>0.2.2</version>
 	<author>interactive instruments GmbH</author>
 	<creationDate>2016-08-15T00:00:00Z</creationDate>
 	<lastEditor>interactive instruments GmbH</lastEditor>
@@ -66,7 +66,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-ps/3.1/ps-gml/basic" ta
 									<parent ref="EIDdc081c43-2c86-4080-917d-5cd7953159e0"/>
 									<expectedResult>NOT_APPLICABLE</expectedResult>
 									<expression>
-let $featuresFromAppSchema := $features[self::*:ProtectedSite]
+let $featuresFromAppSchema := $features[descendant-or-self::*:ProtectedSite]
 return
  (if ($featuresFromAppSchema) then 'PASSED' else 'FAILED',
   if (not($featuresFromAppSchema)) then local:addMessage('TR.noFeature', map { 'theme': 'Protected Sites' }) else ())

data-tn/tn-gml/ets-tn-gml-bsxets.xml

@@ -11,7 +11,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-tn/3.2/tn-gml" target="
 Pre-requisite conformance classes:
 <ul><li><a href="http://inspire.ec.europa.eu/id/ats/data/3.0rc3/schemas" target="_blank">Conformance Class 'INSPIRE GML application schemas'</a></li></ul>]]></description>
   <reference>../../inspire-bsxets.xq</reference>
-	<version>0.2.1</version>
+	<version>0.2.2</version>
 	<author>PwC</author>
 	<creationDate>2016-12-09T00:00:00Z</creationDate>
 	<lastEditor>interactive instruments GmbH</lastEditor>
@@ -66,7 +66,7 @@ Source: <a href="http://inspire.ec.europa.eu/id/ats/data-tn/3.2/tn-gml/basic" ta
 									<parent ref="EIDcbc1ae16-3ac4-4c46-bd48-56a94fae5d94"/>
 									<expectedResult>NOT_APPLICABLE</expectedResult>
 									<expression>
-let $featuresFromAppSchema := $features[self::*:AccessRestriction | self::*:ConditionOfFacility | self::*:MaintenanceAuthority | self::*:MarkerPost | self::*:OwnerAuthority | self::*:RestrictionForVehicles | self::*:TrafficFlowDirection | self::*:TransportNetwork | self::*:VerticalPosition | self::*:ERoad | self::*:FormOfWay | self::*:FunctionalRoadClass | self::*:NumberOfLanes | self::*:Road | self::*:RoadArea | self::*:RoadLink | self::*:RoadLinkSequence | self::*:RoadName | self::*:RoadNode | self::*:RoadServiceArea | self::*:RoadServiceType | self::*:RoadServiceCategory | self::*:RoadWidth | self::*:SpeedLimit | self::*:VehicleTrafficArea | self::*:DesignSpeed | self::*:NominalTrackGauge | self::*:NumberOfTracks | self::*:RailwayArea | self::*:RailwayElectrification | self::*:RailwayLine | self::*:RailwayLink | self::*:RailwayLinkSequence | self::*:RailwayNode | self::*:RailwayStationArea | self::*:RailwayStationCode | self::*:RailwayStationNode | self::*:RailwayType | self::*:RailwayUse | self::*:RailwayYardArea | self::*:RailwayYardNode | self::*:CablewayLink | self::*:CablewayLinkSequence | self::*:CablewayLinkSet | self::*:CablewayNode | self::*:Beacon | self::*:Buoy | self::*:CEMTClass | self::*:ConditionOfWaterFacility | self::*:FairwayArea | self::*:FerryCrossing | self::*:FerryUse | self::*:InlandWaterway | self::*:MarineWaterway | self::*:PortArea | self::*:PortNode | self::*:RestrictionForWaterVehicles | self::*:TrafficSeparationSchemeCrossing | self::*:TrafficSeparationSchemeLane | self::*:TrafficSeparationSchemeRoundabout | self::*:TrafficSeparationSchemeSeparator | self::*:WaterLinkSequence | self::*:WaterTrafficFlowDirection | self::*:WaterwayLink | self::*:WaterwayNode | self::*:Type | self::*:AerodromeArea | self::*:AerodromeCategory | self::*:AerodromeNode | self::*:AerodromeType | self::*:AirLinkSequence | self::*:AirRoute | self::*:AirRouteLink | self::*:AirspaceArea | self::*:ApronArea | self::*:ConditionOfAirFacility | self::*:DesignatedPoint | self::*:ElementLength | self::*:ElementWidth | self::*:FieldElevation | self::*:InstrumentApproachProcedure | self::*:LowerAltitudeLimit | self::*:Navaid | self::*:ProcedureLink | self::*:RunwayArea | self::*:RunwayCentrelinePoint | self::*:StandardInstrumentArrival | self::*:StandardInstrumentDeparture | self::*:SurfaceComposition | self::*:TaxiwayArea | self::*:TouchDownLiftOff | self::*:UpperAltitudeLimit | self::*:UseRestriction]
+let $featuresFromAppSchema := $features[descendant-or-self::*:AccessRestriction | descendant-or-self::*:ConditionOfFacility | descendant-or-self::*:MaintenanceAuthority | descendant-or-self::*:MarkerPost | descendant-or-self::*:OwnerAuthority | descendant-or-self::*:RestrictionForVehicles | descendant-or-self::*:TrafficFlowDirection | descendant-or-self::*:TransportNetwork | descendant-or-self::*:VerticalPosition | descendant-or-self::*:ERoad | descendant-or-self::*:FormOfWay | descendant-or-self::*:FunctionalRoadClass | descendant-or-self::*:NumberOfLanes | descendant-or-self::*:Road | descendant-or-self::*:RoadArea | descendant-or-self::*:RoadLink | descendant-or-self::*:RoadLinkSequence | descendant-or-self::*:RoadName | descendant-or-self::*:RoadNode | descendant-or-self::*:RoadServiceArea | descendant-or-self::*:RoadServiceType | descendant-or-self::*:RoadServiceCategory | descendant-or-self::*:RoadWidth | descendant-or-self::*:SpeedLimit | descendant-or-self::*:VehicleTrafficArea | descendant-or-self::*:DesignSpeed | descendant-or-self::*:NominalTrackGauge | descendant-or-self::*:NumberOfTracks | descendant-or-self::*:RailwayArea | descendant-or-self::*:RailwayElectrification | descendant-or-self::*:RailwayLine | descendant-or-self::*:RailwayLink | descendant-or-self::*:RailwayLinkSequence | descendant-or-self::*:RailwayNode | descendant-or-self::*:RailwayStationArea | descendant-or-self::*:RailwayStationCode | descendant-or-self::*:RailwayStationNode | descendant-or-self::*:RailwayType | descendant-or-self::*:RailwayUse | descendant-or-self::*:RailwayYardArea | descendant-or-self::*:RailwayYardNode | descendant-or-self::*:CablewayLink | descendant-or-self::*:CablewayLinkSequence | descendant-or-self::*:CablewayLinkSet | descendant-or-self::*:CablewayNode | descendant-or-self::*:Beacon | descendant-or-self::*:Buoy | descendant-or-self::*:CEMTClass | descendant-or-self::*:ConditionOfWaterFacility | descendant-or-self::*:FairwayArea | descendant-or-self::*:FerryCrossing | descendant-or-self::*:FerryUse | descendant-or-self::*:InlandWaterway | descendant-or-self::*:MarineWaterway | descendant-or-self::*:PortArea | descendant-or-self::*:PortNode | descendant-or-self::*:RestrictionForWaterVehicles | descendant-or-self::*:TrafficSeparationSchemeCrossing | descendant-or-self::*:TrafficSeparationSchemeLane | descendant-or-self::*:TrafficSeparationSchemeRoundabout | descendant-or-self::*:TrafficSeparationSchemeSeparator | descendant-or-self::*:WaterLinkSequence | descendant-or-self::*:WaterTrafficFlowDirection | descendant-or-self::*:WaterwayLink | descendant-or-self::*:WaterwayNode | descendant-or-self::*:Type | descendant-or-self::*:AerodromeArea | descendant-or-self::*:AerodromeCategory | descendant-or-self::*:AerodromeNode | descendant-or-self::*:AerodromeType | descendant-or-self::*:AirLinkSequence | descendant-or-self::*:AirRoute | descendant-or-self::*:AirRouteLink | descendant-or-self::*:AirspaceArea | descendant-or-self::*:ApronArea | descendant-or-self::*:ConditionOfAirFacility | descendant-or-self::*:DesignatedPoint | descendant-or-self::*:ElementLength | descendant-or-self::*:ElementWidth | descendant-or-self::*:FieldElevation | descendant-or-self::*:InstrumentApproachProcedure | descendant-or-self::*:LowerAltitudeLimit | descendant-or-self::*:Navaid | descendant-or-self::*:ProcedureLink | descendant-or-self::*:RunwayArea | descendant-or-self::*:RunwayCentrelinePoint | descendant-or-self::*:StandardInstrumentArrival | descendant-or-self::*:StandardInstrumentDeparture | descendant-or-self::*:SurfaceComposition | descendant-or-self::*:TaxiwayArea | descendant-or-self::*:TouchDownLiftOff | descendant-or-self::*:UpperAltitudeLimit | descendant-or-self::*:UseRestriction]
 return
  (if ($featuresFromAppSchema) then 'PASSED' else 'FAILED',
   if (not($featuresFromAppSchema)) then local:addMessage('TR.noFeature', map { 'theme': 'Transport Networks' }) else ())