Commit c20bd8a3 authored by liebigan's avatar liebigan
Browse files

Simplify service boundary list

parent 83de66ed

test_purposes/ecrf.tplan2

+19 −22
Original line number Diff line number Diff line
@@ -58,29 +58,29 @@ Package NG112_ECRF { 
//          \"coordinates\": [

//          [

//            [

//              7.066655158996581,

//              43.61676861074268

//              7.06665,

//              43.61676

//            ],

//            [

//              7.075624465942383,

//              43.61676861074268

//              7.07562,

//              43.61676

//            ],

//            [

//              7.075624465942383,

//              43.623494764336684

//              7.07562,

//              43.62349

//            ],

//            [

//              7.066655158996581,

//              43.623494764336684

//              7.06665,

//              43.62349

//            ],

//            [

//              7.066655158996581,

//              43.61676861074268

//              7.06665,

//              43.61676

//            ]

//          ]

//        ]

//        }"; // (geoJson)

//        E_POLICE_SERVICE_BOUNDARY_POS_LIST: "43.61676861074268 77.066655158996581 43.61676861074268 7.075624465942383 43.623494764336684 7.075624465942383 43.623494764336684 7.066655158996581 43.61676861074268 7.066655158996581"

//        E_POLICE_SERVICE_BOUNDARY_POS_LIST: "43.61676 7.06665 43.61676 7.07562 43.62349 7.07562 43.62349 7.06665 43.61676 7.06665"

//        V_FIRE_SERVICE_URN: "urn:service:sos.fire";

//        V_FIRE_SIP_URI: "sip:fire@vienna.com";

//        V_FIRE_SERVICE_BOUNDARY: "{
@@ -169,12 +169,13 @@ Package NG112_ECRF { 
//          ]"; // (geoJson)

//

//

//        POINT_IN_E_POLICE_SERVICE_BOUNDARY: "43.620232751485744 7.071032524108886"; // (lat lon)

//        CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_POS: "48.221927869614504 16.34010314941406"; // (lat lon)

//        POINT_IN_E_POLICE_SERVICE_BOUNDARY: "43.62023 7.071032"; // (lat lon)

//        POINT_IN_V_POLICE_SERVICE_BOUNDARY: "48.22192 16.34010"; // (lat lon)

//        CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_POS: "48.22192 16.34010"; // (lat lon)

//        CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_RADIUS: "2";

//        CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_POS: "48.221927869614504 16.34010314941406"; // (lat lon)

//        CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_POS: "48.22192 16.34010"; // (lat lon)

//        CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_RADIUS: "2";

//        CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_POS: "48.30260863571332 16.351604461669922"; // (lat lon)

//        CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_POS: "48.30260 16.35160"; // (lat lon)

//        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";
@@ -597,7 +598,7 @@ Expected behaviour 
Test Purpose {

TP Id TP_ECRF_HTTP_POST_BV_06

Test objective 

    "IUT successfully responds with a service URI for a Circle that intersects service boundary" 

    "IUT successfully responds with a service URI for a Circle that intersects the service boundary" 

Reference 

    "ETSI TS 103 479 [1], clause XXXX",

    "EENA Next Generation 112 LTD [2], clause 4.4",
@@ -866,13 +867,9 @@ Expected behaviour 
                            element "location" containing

                                attribute "profile" indicating value "geodetic-2d",

                                attribute "id" indicating value LOCATION_ID,

                                element "Circle" inNamespace "http://www.opengis.net/pidflo/1.0" containing

                                element "Point" inNamespace "http://www.opengis.net/gml" 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,

                                    element "radius" indicating value CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_RADIUS containing

                                        attribute "uom" indicating value "urn:ogc:def:uom:EPSG::9001"

                                    ;

                                ;

                                    element "pos" indicating value POINT_IN_V_POLICE_SERVICE_BOUNDARY;

                            ,

                            element "service" indicating value "urn:service:sos";

                        ;