titanization.patch 518 KB
Newer Older
                         latitude                                    := 435574984,                               // Z5-D1-EP/latitude
                         longitude                                   := 103061238,                               // Z5-D1-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z5_D1_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -2058,10 +2061,10 @@
                     }; // End of PICS_Z5_D1_Tx
                         
                     modulepar DenmParm PICS_Z5_D1 := {
-                        eventPosition                               := PICS_Z5_D1_EP,
+                        eventPosition                               := c_PICS_Z5_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z5_D1_Hx,
-                        traces                                      := PICS_Z5_D1_Tx,
+                        eventHistory                                := c_PICS_Z5_D1_Hx,
+                        traces                                      := c_PICS_Z5_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -2069,10 +2072,10 @@
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z5_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z5_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
garciay's avatar
garciay committed
@@ -2088,8 +2091,8 @@
                     modulepar ReferencePosition PICS_Z5_D2_EP := {
                         latitude                                    := 435568551,                               // Z5-D2-EP/latitude
                         longitude                                   := 103052438,                               // Z5-D2-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z5_D2_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -2165,10 +2168,10 @@
                     }; // End of PICS_Z5_D2_Tx
                         
                     modulepar DenmParm PICS_Z5_D2 := {
-                        eventPosition                               := PICS_Z5_D2_EP,
+                        eventPosition                               := c_PICS_Z5_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z5_D2_Hx,
-                        traces                                      := PICS_Z5_D2_Tx,
+                        eventHistory                                := c_PICS_Z5_D2_Hx,
+                        traces                                      := c_PICS_Z5_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -2176,7 +2179,7 @@
                                 drivingLaneStatus                   := '0011'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
garciay's avatar
garciay committed
@@ -2196,8 +2199,8 @@
                     modulepar ReferencePosition PICS_Z5_D3_EP := {
                         latitude                                    := 435565175,                               // Z5-D3-EP/latitude
                         longitude                                   := 103041136,                               // Z5-D3-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z5_D3_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -2265,10 +2268,10 @@
                     }; // End of PICS_Z5_D3_Tx
                         
                     modulepar DenmParm PICS_Z5_D3 := {
-                        eventPosition                               := PICS_Z5_D3_EP,
+                        eventPosition                               := c_PICS_Z5_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z5_D3_Hx,
-                        traces                                      := PICS_Z5_D3_Tx,
+                        eventHistory                                := c_PICS_Z5_D3_Hx,
+                        traces                                      := c_PICS_Z5_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -2276,7 +2279,7 @@
                                 drivingLaneStatus                   := '0100'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
garciay's avatar
garciay committed
@@ -2308,8 +2311,8 @@
                     modulepar ReferencePosition PICS_Z6_D1_EP := {
                         latitude                                    := 435549548,                               // Z6-D1-EP/latitude
                         longitude                                   := 103036609,                               // Z6-D1-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z6_D1_EP
                     
                     /**
garciay's avatar
garciay committed
@@ -2385,10 +2388,10 @@
                     }; // End of PICS_Z6_D1_Tx
                         
                     modulepar DenmParm PICS_Z6_D1 := {
-                        eventPosition                               := PICS_Z6_D1_EP,
+                        eventPosition                               := c_PICS_Z6_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z6_D1_Hx,
-                        traces                                      := PICS_Z6_D1_Tx,
+                        eventHistory                                := c_PICS_Z6_D1_Hx,
+                        traces                                      := c_PICS_Z6_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -2396,10 +2399,10 @@
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z6_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z6_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
garciay's avatar
garciay committed
@@ -2415,8 +2418,8 @@
                     modulepar ReferencePosition PICS_Z6_D2_EP := {
                         latitude                                    := 435542600,                               // Z6-D2-EP/latitude
                         longitude                                   := 103032647,                               // Z6-D2-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z6_D2_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -2492,10 +2495,10 @@
                     }; // End of PICS_Z6_D2_Tx
                         
                     modulepar DenmParm PICS_Z6_D2 := {
-                        eventPosition                               := PICS_Z6_D2_EP,
+                        eventPosition                               := c_PICS_Z6_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z6_D2_Hx,
-                        traces                                      := PICS_Z6_D2_Tx,
+                        eventHistory                                := c_PICS_Z6_D2_Hx,
+                        traces                                      := c_PICS_Z6_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -2503,7 +2506,7 @@
                                 drivingLaneStatus                   := '0011'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
garciay's avatar
garciay committed
@@ -2523,8 +2526,8 @@
                     modulepar ReferencePosition PICS_Z6_D3_EP := {
                         latitude                                    := 435536760,                               // Z6-D3-EP/latitude
                         longitude                                   := 103024345,                               // Z6-D3-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     } // End of PICS_Z6_D3_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -2592,10 +2595,10 @@
                     }; // End of PICS_Z6_D3_Tx
                         
                     modulepar DenmParm PICS_Z6_D3 := {
-                        eventPosition                               := PICS_Z6_D3_EP,
+                        eventPosition                               := c_PICS_Z6_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z6_D3_Hx,
-                        traces                                      := PICS_Z6_D3_Tx,
+                        eventHistory                                := c_PICS_Z6_D3_Hx,
+                        traces                                      := c_PICS_Z6_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -2603,7 +2606,7 @@
                                 drivingLaneStatus                   := '0100'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
garciay's avatar
garciay committed
@@ -2618,34 +2621,34 @@
             
             modulepar DenmEventsParmsUseCase PICS_DENM_PARMS_UC1_RWW := {
                 { // Zone 1
-                    PICS_Z1_D1,
-                    PICS_Z1_D2,
-                    PICS_Z1_D3
+                    c_PICS_Z1_D1,
+                    c_PICS_Z1_D2,
+                    c_PICS_Z1_D3
                 },
                 { // Zone 2
-                    PICS_Z2_D1,
-                    PICS_Z2_D2,
-                    PICS_Z2_D3
+                    c_PICS_Z2_D1,
+                    c_PICS_Z2_D2,
+                    c_PICS_Z2_D3
                 },
                 { // Zone 3
-                    PICS_Z3_D1,
-                    PICS_Z3_D2,
-                    PICS_Z3_D3
+                    c_PICS_Z3_D1,
+                    c_PICS_Z3_D2,
+                    c_PICS_Z3_D3
                 },
                 { // Zone 4
-                    PICS_Z4_D1,
-                    PICS_Z4_D2,
-                    PICS_Z4_D3
+                    c_PICS_Z4_D1,
+                    c_PICS_Z4_D2,
+                    c_PICS_Z4_D3
                 },
                 { // Zone 5
-                    PICS_Z5_D1,
-                    PICS_Z5_D2,
-                    PICS_Z5_D3
+                    c_PICS_Z5_D1,
+                    c_PICS_Z5_D2,
+                    c_PICS_Z5_D3
                 },
                 { // Zone 6
-                    PICS_Z6_D1,
-                    PICS_Z6_D2,
-                    PICS_Z6_D3
+                    c_PICS_Z6_D1,
+                    c_PICS_Z6_D2,
+                    c_PICS_Z6_D3
                 }
             } // End of PICS_DENM_PARMS_UC1_RWW
             
garciay's avatar
garciay committed
@@ -2652,9 +2655,9 @@
         } // End of group denmUseCase1 
         
         modulepar DenmEventsParmsUseCaseRsu PICS_DENM_EVENTS_RSU := {
-            PICS_DENM_PARMS_UC1_RWW,
-            PICS_DENM_PARMS_UC1_RWW,
-            PICS_DENM_PARMS_UC1_RWW
+            c_PICS_DENM_PARMS_UC1_RWW,
+            c_PICS_DENM_PARMS_UC1_RWW,
+            c_PICS_DENM_PARMS_UC1_RWW
         } // End of PICS_DENM_EVENTS_RSU
         
     } // End of group denmEvents 
garciay's avatar
garciay committed
@@ -2762,9 +2765,9 @@
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z1_M1_SL",
-                        id                                  := PICS_Z1_M1_SL_IDX,
+                        id                                  := c_PICS_Z1_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z1_M1_SL_RP,
+                        refPoint                            := c_PICS_Z1_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
garciay's avatar
garciay committed
@@ -2782,7 +2785,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z1_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z1_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
garciay's avatar
garciay committed
@@ -2812,7 +2815,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z1_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z1_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
garciay's avatar
garciay committed
@@ -2918,9 +2921,9 @@
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z2_M1_SL",
-                        id                                  := PICS_Z2_M1_SL_IDX,
+                        id                                  := c_PICS_Z2_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z2_M1_SL_RP,
+                        refPoint                            := c_PICS_Z2_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
garciay's avatar
garciay committed
@@ -2938,7 +2941,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z2_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z2_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
garciay's avatar
garciay committed
@@ -2968,7 +2971,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z2_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z2_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
garciay's avatar
garciay committed
@@ -3074,9 +3077,9 @@
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z3_M1_SL",
-                        id                                  := PICS_Z3_M1_SL_IDX,
+                        id                                  := c_PICS_Z3_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z3_M1_SL_RP,
+                        refPoint                            := c_PICS_Z3_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
garciay's avatar
garciay committed
@@ -3094,7 +3097,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z3_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z3_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
garciay's avatar
garciay committed
@@ -3124,7 +3127,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z3_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z3_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
garciay's avatar
garciay committed
@@ -3230,9 +3233,9 @@
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z4_M1_SL",
-                        id                                  := PICS_Z4_M1_SL_IDX,
+                        id                                  := c_PICS_Z4_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z4_M1_SL_RP,
+                        refPoint                            := c_PICS_Z4_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
garciay's avatar
garciay committed
@@ -3250,7 +3253,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z4_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z4_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
garciay's avatar
garciay committed
@@ -3280,7 +3283,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z4_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z4_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
garciay's avatar
garciay committed
@@ -3386,9 +3389,9 @@
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z5_M1_SL",
-                        id                                  := PICS_Z5_M1_SL_IDX,
+                        id                                  := c_PICS_Z5_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z5_M1_SL_RP,
+                        refPoint                            := c_PICS_Z5_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
garciay's avatar
garciay committed
@@ -3406,7 +3409,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z5_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z5_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
garciay's avatar
garciay committed
@@ -3436,7 +3439,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z5_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z5_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
garciay's avatar
garciay committed
@@ -3542,9 +3545,9 @@
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z6_M1_SL",
-                        id                                  := PICS_Z6_M1_SL_IDX,
+                        id                                  := c_PICS_Z6_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z6_M1_SL_RP,
+                        refPoint                            := c_PICS_Z6_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
garciay's avatar
garciay committed
@@ -3562,7 +3565,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z6_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z6_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
garciay's avatar
garciay committed
@@ -3592,7 +3595,7 @@
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z6_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z6_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
garciay's avatar
garciay committed
@@ -3608,20 +3611,20 @@
         } // End of group mapemZone6 
         
         modulepar MapemParmListRsu PICS_MAPEM_PARMS_RSUs := {
-            PICS_Z1_M1_SL,                 // RSU #1
-            PICS_Z2_M1_SL/*{
+            c_PICS_Z1_M1_SL,                 // RSU #1
+            c_PICS_Z2_M1_SL/*{
                 intersections := omit,
                 roadSegments  := omit
             }*/,                              // RSU #2
-            PICS_Z2_M1_SL,                  // RSU #3
-            PICS_Z5_M1_SL,                  // RSU #4
-            PICS_Z4_M1_SL,                  // RSU #5
+            c_PICS_Z2_M1_SL,                  // RSU #3
+            c_PICS_Z5_M1_SL,                  // RSU #4
+            c_PICS_Z4_M1_SL,                  // RSU #5
             {
                 intersections := omit,
                 roadSegments  := omit
             },                              // RSU #6
-            PICS_Z6_M1_SL,                  // RSU #7
-            PICS_Z3_M1_SL                   // RSU #8
+            c_PICS_Z6_M1_SL,                  // RSU #7
+            c_PICS_Z3_M1_SL                   // RSU #8
         } // End of PICS_MAPEM_PARMS_RSU
         
     } // End of group mapemEvents 
garciay's avatar
garciay committed
@@ -3655,7 +3658,7 @@
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z1_M1_SL_IDX,
+                        id                                  := c_PICS_Z1_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
garciay's avatar
garciay committed
                         moy                                 := 0, // To be updated in real-time
garciay's avatar
garciay committed
@@ -3733,7 +3736,7 @@
             } // End of type PICS_Z1_S1_SL
             
             modulepar SignalGroupParmList PICS_Z1_S1_SL_LIST := {
-                PICS_Z1_S1_SL
+                c_PICS_Z1_S1_SL
             } // End of type PICS_Z1_S1_SL_LIST
             
         } // End of group spatemZone1
garciay's avatar
garciay committed
@@ -3745,7 +3748,7 @@
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z2_M1_SL_IDX,
+                        id                                  := c_PICS_Z2_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
garciay's avatar
garciay committed
                         moy                                 := 0, // To be updated in real-time
garciay's avatar
garciay committed
@@ -3823,7 +3826,7 @@
             } // End of type PICS_Z2_S1_SL
             
             modulepar SignalGroupParmList PICS_Z2_S1_SL_LIST := {
-                PICS_Z2_S1_SL
+                c_PICS_Z2_S1_SL
             } // End of type PICS_Z2_S1_SL_LIST
             
         } // End of group spatemZone2
garciay's avatar
garciay committed
@@ -3835,7 +3838,7 @@
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z3_M1_SL_IDX,
+                        id                                  := c_PICS_Z3_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
garciay's avatar
garciay committed
                         moy                                 := 0, // To be updated in real-time
garciay's avatar
garciay committed
@@ -3913,7 +3916,7 @@
             } // End of type PICS_Z3_S1_SL
             
             modulepar SignalGroupParmList PICS_Z3_S1_SL_LIST := {
-                PICS_Z3_S1_SL
+                c_PICS_Z3_S1_SL
             } // End of type PICS_Z3_S1_SL_LIST
             
         } // End of group spatemZone3
garciay's avatar
garciay committed
@@ -3925,7 +3928,7 @@
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z4_M1_SL_IDX,
+                        id                                  := c_PICS_Z4_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
garciay's avatar
garciay committed
                         moy                                 := 0, // To be updated in real-time
garciay's avatar
garciay committed
@@ -4003,7 +4006,7 @@
             } // End of type PICS_Z4_S1_SL
             
             modulepar SignalGroupParmList PICS_Z4_S1_SL_LIST := {
-                PICS_Z4_S1_SL
+                c_PICS_Z4_S1_SL
             } // End of type PICS_Z4_S1_SL_LIST
             
         } // End of group spatemZone4
garciay's avatar
garciay committed
@@ -4015,7 +4018,7 @@
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z5_M1_SL_IDX,
+                        id                                  := c_PICS_Z5_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
garciay's avatar
garciay committed
                         moy                                 := 0, // To be updated in real-time
garciay's avatar
garciay committed
@@ -4093,7 +4096,7 @@
             } // End of type PICS_Z5_S1_SL
             
             modulepar SignalGroupParmList PICS_Z5_S1_SL_LIST := {
-                PICS_Z5_S1_SL
+                c_PICS_Z5_S1_SL
             } // End of type PICS_Z5_S1_SL_LIST
             
         } // End of group spatemZone5
garciay's avatar
garciay committed
@@ -4105,7 +4108,7 @@
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z6_M1_SL_IDX,
+                        id                                  := c_PICS_Z6_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
garciay's avatar
garciay committed
                         moy                                 := 0, // To be updated in real-time
garciay's avatar
garciay committed
@@ -4183,19 +4186,19 @@
             } // End of type PICS_Z6_S1_SL
             
             modulepar SignalGroupParmList PICS_Z6_S1_SL_LIST := {
-                PICS_Z6_S1_SL
+                c_PICS_Z6_S1_SL
             } // End of type PICS_Z6_S1_SL_LIST
             
         } // End of group spatemZone6
         
         modulepar SpatemParmRsu PICS_SPATEM_PARMS_RSUs := {
-            PICS_Z1_S1_SL_LIST,              // RSU #1
-            PICS_Z2_S1_SL_LIST/*{}*/,                              // RSU #2
-            PICS_Z2_S1_SL_LIST,              // RSU #3
-            PICS_Z5_S1_SL_LIST,              // RSU #4
-            PICS_Z4_S1_SL_LIST,              // RSU #5
+            c_PICS_Z1_S1_SL_LIST,              // RSU #1
+            c_PICS_Z2_S1_SL_LIST/*{}*/,                              // RSU #2
+            c_PICS_Z2_S1_SL_LIST,              // RSU #3
+            c_PICS_Z5_S1_SL_LIST,              // RSU #4
+            c_PICS_Z4_S1_SL_LIST,              // RSU #5
             {},                              // RSU #6
-            PICS_Z6_S1_SL_LIST,              // RSU #7
+            c_PICS_Z6_S1_SL_LIST,              // RSU #7
             {}                               // RSU #8
         } // End of PICS_SPATEM_PARMS_RSUs
         
garciay's avatar
garciay committed
@@ -4218,8 +4221,8 @@
             } // End of PICS_DENM_POSITION_CONFIDENCE_ELLIPSE
             
             modulepar Altitude PICS_IVIM_ALTITUDE := {
-                altitudeValue := AltitudeValue_referenceEllipsoidSurface_,
garciay's avatar
garciay committed
-                altitudeConfidence := alt_000_01
+                altitudeValue         := AltitudeValue_referenceEllipsoidSurface_,
garciay's avatar
garciay committed
+                altitudeConfidence    := alt_000_01
             } // End of PICS_DENM_ALTITUDE
             
         } // End of group ivimCommonParams
garciay's avatar
garciay committed
@@ -4229,8 +4232,8 @@
             modulepar ReferencePosition PICS_Z1_I1_POS1_RP := {
                 latitude                                       := 435527493,
                 longitude                                      := 103006446,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z1_I1_POS1_RP
             
             modulepar GlcPart PICS_Z1_I1_POS1_GP_1 := {
garciay's avatar
garciay committed
@@ -4314,13 +4317,13 @@
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z1_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z1_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z1_I1_POS1_GP_1,
-                                PICS_Z1_I1_POS1_GP_2
+                                c_PICS_Z1_I1_POS1_GP_1,
+                                c_PICS_Z1_I1_POS1_GP_2
                             } 
                         }
                     },
garciay's avatar
garciay committed
@@ -4462,8 +4465,8 @@
             modulepar ReferencePosition PICS_Z2_I1_POS1_RP := {
                 latitude                                       := 435512756,
                 longitude                                      := 103002535,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z2_I1_POS1_RP
             
             modulepar GlcPart PICS_Z2_I1_POS1_GP_1 := {
garciay's avatar
garciay committed
@@ -4547,13 +4550,13 @@
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z2_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z2_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z2_I1_POS1_GP_1,
-                                PICS_Z2_I1_POS1_GP_2
+                                c_PICS_Z2_I1_POS1_GP_1,
+                                c_PICS_Z2_I1_POS1_GP_2
                             } 
                         }
                     },
garciay's avatar
garciay committed
@@ -4695,8 +4698,8 @@
             modulepar ReferencePosition PICS_Z3_I1_POS1_RP := {
                 latitude                                       := 435533069,
                 longitude                                      := 103024528,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z3_I1_POS1_RP
             
             modulepar GlcPart PICS_Z3_I1_POS1_GP_1 := {
garciay's avatar
garciay committed
@@ -4780,13 +4783,13 @@
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z3_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z3_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z3_I1_POS1_GP_1,
-                                PICS_Z3_I1_POS1_GP_2
+                                c_PICS_Z3_I1_POS1_GP_1,
+                                c_PICS_Z3_I1_POS1_GP_2
                             } 
                         }
                     },
garciay's avatar
garciay committed
@@ -4928,8 +4931,8 @@
             modulepar ReferencePosition PICS_Z4_I1_POS1_RP := {
                 latitude                                       := 435563484,
                 longitude                                      := 103042973,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z4_I1_POS1_RP
             
             modulepar GlcPart PICS_Z4_I1_POS1_GP_1 := {
garciay's avatar
garciay committed
@@ -5013,13 +5016,13 @@
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z4_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z4_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z4_I1_POS1_GP_1,
-                                PICS_Z4_I1_POS1_GP_2
+                                c_PICS_Z4_I1_POS1_GP_1,
+                                c_PICS_Z4_I1_POS1_GP_2
                             } 
                         }
                     },
garciay's avatar
garciay committed
@@ -5161,8 +5164,8 @@
             modulepar ReferencePosition PICS_Z5_I1_POS1_RP := {
                 latitude                                       := 435582342,
                 longitude                                      := 103065544,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z5_I1_POS1_RP
             
             modulepar GlcPart PICS_Z5_I1_POS1_GP_1 := {
garciay's avatar
garciay committed
@@ -5246,13 +5249,13 @@
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z5_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z5_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z5_I1_POS1_GP_1,
-                                PICS_Z5_I1_POS1_GP_2
+                                c_PICS_Z5_I1_POS1_GP_1,
+                                c_PICS_Z5_I1_POS1_GP_2
                             } 
                         }
                     },
garciay's avatar
garciay committed
@@ -5394,8 +5397,8 @@
             modulepar ReferencePosition PICS_Z6_I1_POS1_RP := {
                 latitude                                       := 435551186,
                 longitude                                      := 103033248,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z6_I1_POS1_RP
             
             modulepar GlcPart PICS_Z6_I1_POS1_GP_1 := {
garciay's avatar
garciay committed
@@ -5479,13 +5482,13 @@
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z6_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z6_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z6_I1_POS1_GP_1,
-                                PICS_Z6_I1_POS1_GP_2
+                                c_PICS_Z6_I1_POS1_GP_1,
+                                c_PICS_Z6_I1_POS1_GP_2
                             } 
                         }
                     },
garciay's avatar
garciay committed
@@ -5623,20 +5626,20 @@
         } // End of group ivimZone6 
         
         modulepar IvimParmListRsu PICS_IVIM_PARMS_RSUs := {
-            PICS_Z1_I1_POS1,                             // RSU #1
-            PICS_Z2_I1_POS1,/*{ 
+            c_PICS_Z1_I1_POS1,                             // RSU #1
+            c_PICS_Z2_I1_POS1,/*{ 
                 provider := omit, 
                 iviIdentificationNumber := omit, 
                 iviContainers := omit 
             },*/                                           // RSU #2                             // RSU #3
-            PICS_Z5_I1_POS1,                             // RSU #4
-            PICS_Z4_I1_POS1,                             // RSU #5
+            c_PICS_Z5_I1_POS1,                             // RSU #4
+            c_PICS_Z4_I1_POS1,                             // RSU #5
             { 
                 provider := omit, 
                 iviIdentificationNumber := omit, 
                 iviContainers := omit 
             },                                           // RSU #6
-            PICS_Z6_I1_POS1,                             // RSU #7
+            c_PICS_Z6_I1_POS1,                             // RSU #7
             { 
                 provider := omit, 
                 iviIdentificationNumber := omit, 
garciay's avatar
garciay committed
@@ -5656,50 +5659,10 @@
garciay's avatar
garciay committed
             
             modulepar UInt32 PICS_EVCSN_ITS_AID                  := 100; // FIXME Find the correct value
             
-            modulepar ItsChargingSpotDataElements PICS_CHARGING_SPOT_DATA_01 := {
-	            type_			               := ChargingSpotType_standardOrFastChargeMode3_,
-	            evEquipmentID	               := omit,
-	            typeOfReceptacle	           := '000'B,
-	            energyAvailability	           := "all",
-	            parkingPlacesData	           := omit
-            } // End of PICS_CHARGING_SPOT_DATA_01
-            
         } // End of group poimCommonParams
         
-        group poimZone1 {
-            
-            modulepar ReferencePosition PICS_POI_LOCATION_01 := {
-                latitude                                    := 435582150,
-                longitude                                   := 103065170,
-                positionConfidenceEllipse                   := {
-                    semiMajorConfidence   := 100,
-                    semiMinorConfidence   := 100,
-                    semiMajorOrientation  := 0
-                },
-                altitude                                    := {
-                    altitudeValue := AltitudeValue_referenceEllipsoidSurface_,
-                    altitudeConfidence := alt_000_01
-                }
-            } // End of PICS_POI_LOCATION_01
-            
-            modulepar ItsChargingStationData PICS_ITS_CHARGING := {
-	            chargingStationID                   := 9876,
-	            utilityDistributorId  	            := omit,
-	            providerID            	            := omit,
-    	        chargingStationLocation	            := PICS_POI_LOCATION_01,
-	            address_               	            := omit,
-	            phoneNumber           	            := omit,
-	            accessibility         	            := "open",
-    	        digitalMap            	            := omit,
-	            openingDaysHours      	            := "full",
-	            pricing               	            := "2.00",
-	            bookingContactInfo    	            := omit,
-    	        payment               	            := omit,
-	            chargingSpotsAvailable              := { PICS_CHARGING_SPOT_DATA_01 }
-            }
-        }
         modulepar PoimParmListRsu PICS_EVCSN_PARMS_RSUs := {
-            PICS_ITS_CHARGING                              // RSU #1
+            c_PICS_ITS_CHARGING                              // RSU #1
         }
         
     } // End of group poimEvents 
garciay's avatar
garciay committed
@@ -5747,7 +5710,7 @@
         /**
          * @desc DENM frequency timer
          */
-        modulepar float PICS_DENM_FREQUENCY      := int2float(PICS_DENM_REPETITION_INTERVAL) / 1000.0;
+        modulepar float PICS_DENM_FREQUENCY      := int2float(c_PICS_DENM_REPETITION_INTERVAL) / 1000.0;
         
         /**
          * @desc MAPEM frequency timer
garciay's avatar
garciay committed
Index: AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn	(revision 2630)
garciay's avatar
garciay committed
+++ AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn	(working copy)
@@ -2,6 +2,7 @@
     
     // LibCommon
     import from LibCommon_BasicTypesAndValues all;
+    import from LibCommon_DataStrings all;
     
     // LibIts
     import from ITS_Container language "ASN.1:1997" all;
@@ -13,11 +14,11 @@
     import from IVI language "ASN.1:1997" all;
garciay's avatar
garciay committed
     import from EVCSN_PDU_Descriptions language "ASN.1:1997" all;
     import from SSEM_PDU_Descriptions language "ASN.1:1997" all;
-    import from DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
     
     // LibItsCommon
     import from LibItsCommon_Functions all;
-    import from LibCommon_DataStrings all;
+    import from LibItsCommon_ASN1_NamedNumbers all;
     
     // LibItsGeoNetworking
     import from LibItsGeoNetworking_TestSystem all;
garciay's avatar
garciay committed
@@ -400,21 +401,21 @@
         }
         
         template (value) ItsPOIHeader m_itsPOIHeader(
-	                                                  in template (value) POIType p_poiType := 1,
+                                                      in template (value) POIType p_poiType := 1,
                                                       in template (value) TimestampIts p_timeStamp,
-	                                                  in template (value) boolean p_relayCapable := true
+                                                      in template (value) boolean p_relayCapable := true
         ) := {
-	        poiType       := p_poiType,
+            poiType       := p_poiType,
             timeStamp     := p_timeStamp,
-	        relayCapable  := p_relayCapable
+            relayCapable  := p_relayCapable
         }
         
         template (value) ItsEVCSNData m_itsEVCSNData( 
-	                                                 in template (value) NumberStations p_totalNumberOfStations := 1,
-	                                                 in template (value) ItsChargingStationDatas p_itsChargingStationDatas
+                                                     in template (value) NumberStations p_totalNumberOfStations := 1,
+                                                     in template (value) ItsEVCSNData.chargingStationsData p_chargingStationsData
         ) := {
-	        totalNumberOfStations   := p_totalNumberOfStations,
-	        chargingStationsData    := p_itsChargingStationDatas
+            totalNumberOfStations   := p_totalNumberOfStations,
+            chargingStationsData    := p_chargingStationsData
         }
         
     } // End of group evcsnTemplates
Index: AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn	(revision 2630)
garciay's avatar
garciay committed
+++ AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn	(working copy)
garciay's avatar
garciay committed
@@ -140,7 +140,7 @@
             [vc_spatem == true] tc_spatem.timeout {
                 log("*** " & testcasename() & ": DEBUG: Processing SPATEM ***");
                 for (var integer v_counter := 0; v_counter < lengthof(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems); v_counter := v_counter + 1) {
-                    f_prepare_spatem(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems[v_counter], v_payload);
+                    f_prepare_spatem(valueof(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems[v_counter]), v_payload);
                     f_send(v_payload, PICS_SPATEM_ITS_AID);
                 }
                 tc_spatem.start;
garciay's avatar
garciay committed
@@ -180,7 +180,7 @@
      */
     testcase TC_RSUSIMU_BV_02() runs on ItsRSUsSimulator system ItsRSUsSimulatorSystem {
         // Local variables
-        const RectangularRegions c_detectionArea := { PICS_UC6_CAM_DETECTION_AREA_Z2 }; // PICS_UC6_CAM_DETECTION_AREA_Z1
garciay's avatar
garciay committed
+//        const RectangularRegions c_detectionArea := { PICS_UC6_CAM_DETECTION_AREA_Z2 }; // PICS_UC6_CAM_DETECTION_AREA_Z1
garciay's avatar
garciay committed
         var VehiclesSimulator v_vehicles := {};
         var integer v_stationID;
         var boolean v_isInDetectionZone;
garciay's avatar
garciay committed
@@ -191,7 +191,7 @@
         var CfEvent v_cfEvent;
         
         // Test control
-        if (f_isLocationInsideRectangularRegion(c_detectionArea, PICS_UC6_COLLISION_POINT_Z2) == false) { //PICS_UC6_COLLISION_POINT_Z1
+        if (f_isLocationInsideRectangularRegion({ PICS_UC6_CAM_DETECTION_AREA_Z2 }/*c_detectionArea*/, PICS_UC6_COLLISION_POINT_Z2) == false) { //PICS_UC6_COLLISION_POINT_Z1
             log("Collision location is outside of the area");
             stop;
         }
garciay's avatar
garciay committed
@@ -339,7 +339,7 @@
         ) runs on ItsRSUsSimulator {
             
             // Local variables
-            const RectangularRegions c_detectionArea := { PICS_UC6_CAM_DETECTION_AREA_Z2 }; // PICS_UC6_CAM_DETECTION_AREA_Z1
garciay's avatar
garciay committed
+//            const RectangularRegions c_detectionArea := { valueof(PICS_UC6_CAM_DETECTION_AREA_Z2) }; // PICS_UC6_CAM_DETECTION_AREA_Z1
garciay's avatar
garciay committed
             var GeoNetworkingInd v_gnInd;
             var template (value) CAM v_camSimu;
             var ThreeDLocation v_location;
Index: AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn	(revision 2630)
garciay's avatar
garciay committed
+++ AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn	(working copy)
@@ -2,7 +2,7 @@
     
     // LibIts
     import from ITS_Container language "ASN.1:1997" all;
-    import from DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
     
     // LibItsGeoNetworking
     import from LibItsGeoNetworking_TestSystem all;
@@ -53,7 +53,7 @@
         /**
          * @desc List of MovementState per intersection and per RSU 
          */
-        var template (value) MovementListPerIntersectionRsu vc_states;
+        var template (omit) MovementListPerIntersectionRsu vc_states;
         /**
          * @desc The SPATEM message to use in SignalGroupParmList
          */
garciay's avatar
garciay committed
Index: AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn	(revision 2630)
garciay's avatar
garciay committed
+++ AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn	(working copy)
@@ -13,7 +13,8 @@
     import from IVI language "ASN.1:1997" all;