extend locationUsed element (2c42057c) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

test_purposes/ecrf.tplan2

+29 −19

Original line number	Diff line number	Diff line
		@@ -155,6 +155,7 @@ Package NG112_ECRF {
		// CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_RADIUS: "5000";
		// CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_AND_H_FIRE_SERVICE_BOUNDARY_POS: "48.20688615019928, 16.22955322265625"; // (lat, lon)
		// CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_AND_H_FIRE_SERVICE_BOUNDARY_RADIUS: "5000";
		// LOCATION_ID: "locationId";
		// }

		Data {
		@@ -204,7 +205,7 @@ Expected behaviour
		element "findService" inNamespace "urn:ietf:params:xml:ns:lost1" containing
		element "location" containing
		attribute "profile" indicating value "geodetic-2d",
		attribute "id",
		attribute "id" indicating value LOCATION_ID,
		element "Point" inNamespace "http://www.opengis.net/gml" containing
		attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",
		element "pos" indicating value POINT_IN_E_POLICE_SERVICE_BOUNDARY;
		@@ -235,7 +236,8 @@ Expected behaviour
		element "path" containing
		element via containing attribute "source";
		;,
		element "locationUsed"
		element "locationUsed" containing
		attribute "id" indicating value LOCATION_ID;
		;
		;
		;
		@@ -278,7 +280,7 @@ Expected behaviour
		element "findService" inNamespace "urn:ietf:params:xml:ns:lost1" containing
		element "location" containing
		attribute "profile" indicating value "geodetic-2d",
		attribute "id",
		attribute "id" indicating value LOCATION_ID,
		element "Circle" inNamespace "http://www.opengis.net/pidflo/1.0" containing
		attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",
		element "pos" inNamespace "http://www.opengis.net/gml" indicating value CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_POS,
		@@ -313,7 +315,8 @@ Expected behaviour
		element "path" containing
		element via containing attribute "source";
		;,
		element "locationUsed"
		element "locationUsed" containing
		attribute "id" indicating value LOCATION_ID;
		;
		;
		;
		@@ -356,7 +359,7 @@ Expected behaviour
		element "findService" inNamespace "urn:ietf:params:xml:ns:lost1" containing
		element "location" containing
		attribute "profile" indicating value "geodetic-2d",
		attribute "id",
		attribute "id" indicating value LOCATION_ID,
		element "Point" inNamespace "http://www.opengis.net/gml" containing
		attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",
		element "pos" indicating value POINT_IN_E_POLICE_SERVICE_BOUNDARY;
		@@ -419,7 +422,7 @@ Expected behaviour
		element "findService" inNamespace "urn:ietf:params:xml:ns:lost1" containing
		element "location" containing
		attribute "profile" indicating value "someUnknownProfile",
		attribute "id",
		attribute "id" indicating value LOCATION_ID,
		element "Point" inNamespace "http://www.opengis.net/gml" containing
		attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",
		element "pos" indicating value POINT_IN_E_POLICE_SERVICE_BOUNDARY;
		@@ -479,7 +482,7 @@ Expected behaviour
		attribute "serviceBoundary" indicating value "value"
		element "location" containing
		attribute "profile" indicating value "geodetic-2d",
		attribute "id",
		attribute "id" indicating value LOCATION_ID,
		element "Point" inNamespace "http://www.opengis.net/gml" containing
		attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",
		element "pos" indicating value POINT_IN_E_POLICE_SERVICE_BOUNDARY;
		@@ -521,7 +524,8 @@ Expected behaviour
		element "path" containing
		element via containing attribute "source";
		;,
		element "locationUsed"
		element "locationUsed" containing
		attribute "id" indicating value LOCATION_ID;
		;
		;
		;
		@@ -557,7 +561,8 @@ Expected behaviour
		;,
		element "uri" indicating value V_FIRE_SIP_URI;
		,
		element "locationUsed"
		element "locationUsed" containing
		attribute "id" indicating value LOCATION_ID;
		;
		;
		;
		@@ -600,7 +605,7 @@ Expected behaviour
		element "findService" inNamespace "urn:ietf:params:xml:ns:lost1" containing
		element "location" containing
		attribute "profile" indicating value "geodetic-2d",
		attribute "id",
		attribute "id" indicating value LOCATION_ID,
		element "Circle" inNamespace "http://www.opengis.net/pidflo/1.0" containing
		attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",
		element "pos" inNamespace "http://www.opengis.net/gml" indicating value CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_POS,
		@@ -635,7 +640,8 @@ Expected behaviour
		element "path" containing
		element via containing attribute "source";
		;,
		element "locationUsed"
		element "locationUsed" containing
		attribute "id" indicating value LOCATION_ID;
		;
		;
		;
		@@ -678,7 +684,7 @@ Expected behaviour
		element "findService" inNamespace "urn:ietf:params:xml:ns:lost1" containing
		element "location" containing
		attribute "profile" indicating value "geodetic-2d",
		attribute "id",
		attribute "id" indicating value LOCATION_ID,
		element "Circle" inNamespace "http://www.opengis.net/pidflo/1.0" containing
		attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",
		element "pos" inNamespace "http://www.opengis.net/gml" indicating value CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_AND_H_FIRE_SERVICE_BOUNDARY_POS,
		@@ -713,7 +719,8 @@ Expected behaviour
		element "path" containing
		element via containing attribute "source";
		;,
		element "locationUsed"
		element "locationUsed" containing
		attribute "id" indicating value LOCATION_ID;
		;
		;
		;
		@@ -756,7 +763,7 @@ Expected behaviour
		element "findService" inNamespace "urn:ietf:params:xml:ns:lost1" containing
		element "location" containing
		attribute "profile" indicating value "geodetic-2d",
		attribute "id",
		attribute "id" indicating value LOCATION_ID,
		element "Circle" inNamespace "http://www.opengis.net/pidflo/1.0" containing
		attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",
		element "pos" inNamespace "http://www.opengis.net/gml" indicating value CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_POS,
		@@ -791,7 +798,8 @@ Expected behaviour
		element "path" containing
		element via containing attribute "source";
		;,
		element "locationUsed"
		element "locationUsed" containing
		attribute "id" indicating value LOCATION_ID;
		;
		;
		;
		@@ -834,7 +842,7 @@ Expected behaviour
		element "findService" inNamespace "urn:ietf:params:xml:ns:lost1" containing
		element "location" containing
		attribute "profile" indicating value "geodetic-2d",
		attribute "id",
		attribute "id" indicating value LOCATION_ID,
		element "Circle" inNamespace "http://www.opengis.net/pidflo/1.0" containing
		attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",
		element "pos" inNamespace "http://www.opengis.net/gml" indicating value CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_POS,
		@@ -877,7 +885,8 @@ Expected behaviour
		element "path" containing
		element via containing attribute "source";
		;,
		element "locationUsed"
		element "locationUsed" containing
		attribute "id" indicating value LOCATION_ID;
		;
		;
		;
		@@ -979,7 +988,7 @@ Expected behaviour
		element "listServicesByLocation" inNamespace "urn:ietf:params:xml:ns:lost1" containing
		element "location" containing
		attribute "profile" indicating value "geodetic-2d",
		attribute "id",
		attribute "id" indicating value LOCATION_ID,
		element "Point" inNamespace "http://www.opengis.net/gml" containing
		attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",
		element "pos" indicating value POINT_IN_E_POLICE_SERVICE_BOUNDARY;
		@@ -1003,7 +1012,8 @@ Expected behaviour
		element "path" containing
		element via containing attribute "source";
		;,
		element "locationUsed"
		element "locationUsed" containing
		attribute "id" indicating value LOCATION_ID;
		;
		;
		;