titanization.patch 518 KB
Newer Older
+                                laneStatus                     := omit,
+                                vehicleCharacteristics         := omit,
+                                driverCharacteristics          := omit,
+                                layoutId                       := omit,
+                                preStoredlayoutId              := omit,
+                                roadSignCodes := {
+                                    {
+                                        layoutComponentId      := omit,
+                                        code := {
+                                            iso14823 := {
+                                                pictogramCode := {  
+                                                    countryCode := omit, 
+                                                    serviceCategoryCode := { 
+                                                        trafficSignPictogram := regulatory
+                                                    },
+                                                    pictogramCategoryCode := {
+                                                        nature := 5,
+                                                        serialNumber := 57
+                                                    
+                                                    }
+                                                },
+                                                attributes := {
+                                                    {
+                                                        spe := {
+                                                            spm := 30,
+                                                            mns := omit,
+                                                            unit := 0
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                },
+                                extraText := omit
+                            },
+                            {
+                                  detectionZoneIds := {
+                                      1
+                                },
+                                its_Rrid                       := omit,
+                                relevanceZoneIds := {
+                                    2
+                                }, 
+                                direction                      := 0, //Direction_sameDirection_,
+                                driverAwarenessZoneIds         := omit, 
+                                minimumAwarenessTime           := 15,
+                                applicableLanes                := omit,
+                                iviType                        := 1, //IviType_regulatoryMessages_,
+                                iviPurpose                     := omit,
+                                laneStatus                     := omit,    
+                                vehicleCharacteristics := {
+                                    {
+                                        tractor                := omit,
+                                        trailer                := omit,
+                                        train := {
+                                            equalTo := {
+                                                {
+                                                    euVehicleCategoryCode := {
+                                                        euVehicleCategoryN := n2
+                                                    }
+                                                },
+                                                {
+                                                    euVehicleCategoryCode := {
+                                                        euVehicleCategoryN := n3
+                                                    }
+                                                }
+                                            },
+                                            notEqualTo         := omit, 
+                                            ranges := {
+                                                {
+                                                    comparisonOperator                  := 0, // greaterThan
+                                                    limits := {
+                                                        vehicleWeightLimits := {
+                                                            vehicleMaxLadenWeight       := 0,
+                                                            vehicleTrainMaximumWeight   := 750,
+                                                            vehicleWeightUnladen        := 0
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                },
+                                driverCharacteristics          := omit,
+                                layoutId                       := omit,
+                                preStoredlayoutId              := omit,
+                                roadSignCodes := {
+                                    {
+                                        layoutComponentId := omit,
+                                        code := {
+                                            iso14823 := {
+                                                pictogramCode := {  
+                                                    countryCode := omit, 
+                                                    serviceCategoryCode := { 
+                                                        trafficSignPictogram := regulatory
+                                                    },
+                                                    pictogramCategoryCode := {
+                                                        nature := 5,
+                                                        serialNumber := 44
+                                                    
+                                                    }
+                                                },
+                                                attributes := omit
+                                            }
+                                        }
+                                    }
+                                },
+                                extraText := omit
+                            }
+                        }
+                    }
+                }
+            } // End of c_PICS_Z6_I1_POS1
+            
+        } // End of group ivimZone6 
+        
+    } // End of group ivimEvents 
+    
garciay's avatar
garciay committed
+    group poimEvents {
+        
+        group poimCommonParams {
+            
+            const ItsChargingSpotDataElements c_PICS_CHARGING_SPOT_DATA_01 := {
+                type_                           := '0'B,//standardChargeMode1
+                evEquipmentID                   := omit,
+                typeOfReceptacle               := '000'B,
+                energyAvailability               := "all",
+                parkingPlacesData               := omit
+            } // End of c_PICS_CHARGING_SPOT_DATA_01
+            
+        } // End of group poimCommonParams
+        
+        group poimZone1 {
+            
+            const ReferencePosition c_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 c_PICS_POI_LOCATION_01
+            
+            const ItsChargingStationData c_PICS_ITS_CHARGING := {
+                chargingStationID                   := 9876,
+                utilityDistributorId                := omit,
+                providerID                          := omit,
+                chargingStationLocation             := c_PICS_POI_LOCATION_01,
+                address_                            := omit,
+                phoneNumber                         := omit,
+                accessibility                       := "open",
+                digitalMap                          := omit,
+                openingDaysHours                    := "full",
+                pricing                             := "2.00",
+                bookingContactInfo                  := omit,
+                payment                             := omit,
+                chargingSpotsAvailable              := { c_PICS_CHARGING_SPOT_DATA_01 }
+            } // End of c_PICS_ITS_CHARGING
+        } // End of group poimZone1
+        
+    } // End of group poimEvents 
+    
+    group ssemEvents {
+        
+        group ssemCommonParams {
+            
+            const BtpPortId c_PICS_SSEM_BTP_DESTINATION_PORT := 2008;
+            
+            const BtpPortId c_PICS_SSEM_BTP_SOURCE_PORT      := 0;
+            
+        } // End of group ssemCommonParams
+        
+    } // End of group ssemEvents
+    
+    group sremEvents {
+        
+        group sremCommonParams {
+            
+            const BtpPortId c_PICS_SREM_BTP_DESTINATION_PORT := 2007;
+            
+            const BtpPortId c_PICS_SREM_BTP_SOURCE_PORT      := 0;
+            
+        } // End of group sremCommonParams
+        
+    } // End of group sremEvents
+    
+    group generationFrequencies {
+        
+        /**
+         * @desc Beacon frequency timer
+         */
+        const float c_PICS_BEACON_FREQUENCY    := 1.0;
+        
+        /**
+         * @desc CAM frequency timer
+         */
+        const float c_PICS_CAM_FREQUENY        := 1.0;
+        
+        /**
+         * @desc DENM frequency timer
+         */
+        const float c_PICS_DENM_FREQUENY       := int2float(c_PICS_DENM_REPETITION_INTERVAL) / 1000.0;
+        
+        /**
+         * @desc MAPEM frequency timer
+         */
+        const float c_PICS_MAPEM_FREQUENY      := 1.0;
+        
+        /**
+         * @desc SPATEMM frequency timer
+         */
+        const float c_PICS_SPATEM_FREQUENY     := 1.0;
+        
+        /**
+         * @desc IVIM frequency timer
+         */
+        const float c_PICS_IVIM_FREQUENY       := 1.0;
+        
+    } // End of group generationFrequencies 
+    
+} // End of module ItsRSUsSimulator_Pics 
\ No newline at end of file
garciay's avatar
garciay committed
Index: AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn	(revision 2630)
garciay's avatar
garciay committed
+++ AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn	(working copy)
@@ -17,7 +17,7 @@
     import from EVCSN_PDU_Descriptions language "ASN.1:1997" all;
     import from SREM_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;
garciay's avatar
garciay committed
@@ -238,14 +238,14 @@
             v_ivim := 
                 m_ivimParm(
                     PICS_RSU_PARAMS[p_rsu_id].stationID,
-                    m_ivimStructure(
-                        m_iviManagementContainer(
+                    valueof(m_ivimStructure(
+                        valueof(m_iviManagementContainer(
                             PICS_IVIM_PARMS_RSUs[p_rsu_id].provider,
                             PICS_IVIM_PARMS_RSUs[p_rsu_id].iviIdentificationNumber,
                             0//IviStatus_new_
-                        ),
+                        )),
                         PICS_IVIM_PARMS_RSUs[p_rsu_id].iviContainers
-            ));
+            )));
             // Update ivi status
             v_ivim.ivi.mandatory.validFrom := f_getCurrentTime();
             v_ivim.ivi.mandatory.validTo := valueof(v_ivim.ivi.mandatory.validFrom) + 43200000; // 12hours
garciay's avatar
garciay committed
@@ -266,7 +266,7 @@
                         ),
                         m_itsEVCSNData(
                             -,
-                            { PICS_ITS_CHARGING }
+                            { PICS_EVCSN_PARMS_RSUs[p_rsu_id] }
                         )
             ));
             // Update poi status
garciay's avatar
garciay committed
@@ -295,7 +295,7 @@
                     m_denmPdu_rsu(
                         PICS_RSU_PARAMS[p_rsu_id].stationID,
                         m_denm(
-                               v_denmParmContainers.managementContainer, 
+                               valueof(v_denmParmContainers.managementContainer), 
                                v_denmParmContainers.situationContainer,
                                v_denmParmContainers.locationContainer
                 )));
@@ -380,7 +380,7 @@
         } 
         // Build the messages value list for this RSU
         vc_rsuMessagesValueList[p_rsu_id] := 
-            m_rsuProfile(
+            valueof(m_rsuProfile(
                 v_beacon,
                 v_cam, 
                 v_denms,
@@ -389,7 +389,7 @@
                 v_ivim,
                 v_evcsn,
                 v_ssem
-        );
+        ));
         if (PICS_RSU_PARAMS[p_rsu_id].geoShape == e_geoCircle) {
             vc_geoArea := {
                 shape := e_geoCircle,
@@ -449,7 +449,7 @@
         
         p_payload := valueof(
             f_adaptPayload(
-                vc_rsuMessagesValueList[vc_rsu_id].beacon,
+                valueof(vc_rsuMessagesValueList[vc_rsu_id].beacon),
                 0,
                 -,
                 e_any
@@ -631,7 +631,7 @@
     ) runs on ItsRSUsSimulator {
         
         vc_rsuMessagesValueList[vc_rsu_id].evcsn.evcsn.poiHeader.timeStamp := f_getCurrentTime(); // Check if it is ITS or UTC time
-        log("vc_rsuMessagesValueList[vc_rsu_id].evcsn", valueof(vc_rsuMessagesValueList[vc_rsu_id].evcsn));
+        log("vc_rsuMessagesValueList[vc_rsu_id].evcsn", vc_rsuMessagesValueList[vc_rsu_id].evcsn);
         p_payload := valueof(
             f_adaptPayload(
                 bit2oct(
garciay's avatar
garciay committed
Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn	(revision 2630)
garciay's avatar
garciay committed
+++ AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn	(working copy)
@@ -14,9 +14,12 @@
     import from EVCSN_PDU_Descriptions language "ASN.1:1997" all;
     import from SREM_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;
     import from ElectronicRegistrationIdentificationVehicleDataModule language "ASN.1:1997" all;
     
+    // LibItsCommon
+    import from LibItsCommon_ASN1_NamedNumbers all;
+
     // LibItsBtp
     import from LibItsBtp_TypesAndValues all;
     import from LibItsBtp_Templates all;
@@ -29,6 +32,7 @@
     
     // ItsRSUsSimulator
     import from ItsRSUsSimulator_TypesAndValues all;
+    import from ItsRSUSimulator_PicsInitConsts all;
     
     /**
      * @desc This group describes the RSUs installed on the track
garciay's avatar
garciay committed
@@ -53,7 +57,7 @@
             
             modulepar RsuParm PICS_RSU1 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU1,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU1,
                     timestamp_    := 0,
                     latitude      := 435529150,
                     longitude     := 103010520,
garciay's avatar
garciay committed
@@ -68,7 +72,7 @@
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU1
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU1
             } // End of PICS_RSU1
             
             /**
garciay's avatar
garciay committed
@@ -96,7 +100,7 @@
             
             modulepar RsuParm PICS_RSU2 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU2,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU2,
                     timestamp_    := 0,
                     latitude      := 435512090,
                     longitude     := 103002510,
garciay's avatar
garciay committed
@@ -111,7 +115,7 @@
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU2
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU2
             } // End of PICS_RSU2
             
             /**
garciay's avatar
garciay committed
@@ -139,7 +143,7 @@
             
             modulepar RsuParm PICS_RSU3 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU3,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU3,
                     timestamp_    := 0,
                     latitude      := 435546630,
                     longitude     := 103041900,
garciay's avatar
garciay committed
@@ -154,7 +158,7 @@
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU3
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU3
             } // End of PICS_RSU3
             
             /**
garciay's avatar
garciay committed
@@ -182,7 +186,7 @@
             
             modulepar RsuParm PICS_RSU4 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU4,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU4,
                     timestamp_    := 0,
                     latitude      := 435582150,
                     longitude     := 103065170,
garciay's avatar
garciay committed
@@ -197,7 +201,7 @@
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU4
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU4
             } // End of PICS_RSU4
             
             /**
garciay's avatar
garciay committed
@@ -225,7 +229,7 @@
             
             modulepar RsuParm PICS_RSU5 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU5,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU5,
                     timestamp_    := 0,
                     latitude      := 435838400,
                     longitude     := 103249780,
garciay's avatar
garciay committed
@@ -240,7 +244,7 @@
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU5
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU5
             } // End of PICS_RSU5
             
             /**
garciay's avatar
garciay committed
@@ -268,7 +272,7 @@
             
             modulepar RsuParm PICS_RSU6 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU6,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU6,
                     timestamp_    := 0,
                     latitude      := 435923480,
                     longitude     := 103375540,
garciay's avatar
garciay committed
@@ -283,7 +287,7 @@
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU6
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU6
             } // End of PICS_RSU6
             
             /**
garciay's avatar
garciay committed
@@ -310,7 +314,7 @@
             
             modulepar RsuParm PICS_RSU7 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU7,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU7,
                     timestamp_    := 0,
                     latitude      := 435550580,
                     longitude     := 103032980,
garciay's avatar
garciay committed
@@ -325,7 +329,7 @@
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU7
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU7
             } // End of PICS_RSU7
             
             /**
garciay's avatar
garciay committed
@@ -352,7 +356,7 @@
             
             modulepar RsuParm PICS_RSU8 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU8,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU8,
                     timestamp_    := 0,
                     latitude      := 435546630,
                     longitude     := 103041900,
garciay's avatar
garciay committed
@@ -367,7 +371,7 @@
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU8
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU8
             } // End of PICS_RSU8
             
             /**
garciay's avatar
garciay committed
@@ -378,14 +382,14 @@
         } // End of group rsu8
                 
         modulepar RsuParmList PICS_RSU_PARAMS := {
-            PICS_RSU1,
-            PICS_RSU2,
-            PICS_RSU3,
-            PICS_RSU4,
-            PICS_RSU5,
-            PICS_RSU6,
-            PICS_RSU7,
-            PICS_RSU8
+            c_PICS_RSU1,
+            c_PICS_RSU2,
+            c_PICS_RSU3,
+            c_PICS_RSU4,
+            c_PICS_RSU5,
+            c_PICS_RSU6,
+            c_PICS_RSU7,
+            c_PICS_RSU8
         } // End of PICS_RSU_PARAMS
         
     } // End of group rsuParameters 
garciay's avatar
garciay committed
@@ -430,23 +434,23 @@
                 
                 modulepar integer SIMULTANEOUS_VEHICLE_NUM        := 10;
                 
+                modulepar LongPosVector PICS_UC6_VEHICLE_TEMPLATE_POSITION := {
+                    gnAddr := {
+                        typeOfAddress         := e_manual,
+                        stationType           := e_passengerCar,
+                        stationCountryCode    := 33,
+                        mid                   := '001C6B0D02FF'O
+                    },
+                    timestamp_                                    := 0,
+                    latitude                                      := 0,
+                    longitude                                     := 0,
+                    pai                                           := '0'B,
+                    speed                                         := 30,
+                    heading                                       := 0
+                } // End of PICS_UC6_VEHICLE_POSITION
+                
                 group camUseCase6VehicleTemplateDescription {
                     
-                    modulepar LongPosVector PICS_UC6_VEHICLE_TEMPLATE_POSITION := {
-                        gnAddr := {
-                            typeOfAddress         := e_manual,
-                            stationType           := e_passengerCar,
-                            stationCountryCode    := 33,
-                            mid                   := '001C6B0D02FF'O
-                        },
-                        timestamp_                                    := 0,
-                        latitude                                      := 0,
-                        longitude                                     := 0,
-                        pai                                           := '0'B,
-                        speed                                         := 30,
-                        heading                                       := 0
-                    } // End of PICS_UC6_VEHICLE_POSITION
-                    
                     modulepar GeoArea PICS_UC6_VEHICLE_TEMPLATE_GEOAREA := {
                         shape := e_geoElip,
                         area := {
@@ -536,7 +540,7 @@
             
             modulepar RsuParm PICS_UC7_LPV := {
                 longPosVector := {
-                    gnAddr                                  := PICS_UC7_GN_ADDRESS,
+                    gnAddr                                  := c_PICS_UC7_GN_ADDRESS,
                     timestamp_                              := 0,
                     latitude                                := 435582150,
                     longitude                               := 103065170,
garciay's avatar
garciay committed
@@ -582,7 +586,7 @@
             } // End of PICS_UC9_PCZ_1
garciay's avatar
garciay committed
             modulepar ProtectedCommunicationZonesRSU PICS_UC9_PCZ := {
-                PICS_UC9_PCZ_1
+                c_PICS_USECASE9_PCZ_1
garciay's avatar
garciay committed
             } // End of PICS_UC9_PCZ
garciay's avatar
garciay committed
         } // End of group camUseCase9
@@ -667,8 +671,8 @@
                     modulepar ReferencePosition PICS_Z1_D1_EP := {
                         latitude                                    := 435525352,                               // Z1-D1-EP/latitude
                         longitude                                   := 103003415,                               // Z1-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_Z1_D1_EP
                     
                     /**
garciay's avatar
garciay committed
@@ -744,10 +748,10 @@
                     }; // End of PICS_Z1_D1_Tx
                     
                     modulepar DenmParm PICS_Z1_D1 := {
-                        eventPosition                               := PICS_Z1_D1_EP,
+                        eventPosition                               := c_PICS_Z1_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z1_D1_Hx,
-                        traces                                      := PICS_Z1_D1_Tx,
+                        eventHistory                                := c_PICS_Z1_D1_Hx,
+                        traces                                      := c_PICS_Z1_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -755,10 +759,10 @@
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z1_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z1_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
garciay's avatar
garciay committed
@@ -774,8 +778,8 @@
                     modulepar ReferencePosition PICS_Z1_D2_EP := {
                         latitude                                    := 435519107,                               // Z1-D2-EP/latitude
                         longitude                                   := 102993930,                               // Z1-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_Z1_D2_EP
                     
                     /**
garciay's avatar
garciay committed
@@ -851,10 +855,10 @@
                     }; // End of PICS_Z1_D2_Tx
                     
                     modulepar DenmParm PICS_Z1_D2 := {
-                        eventPosition                               := PICS_Z1_D2_EP,
+                        eventPosition                               := c_PICS_Z1_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z1_D2_Hx,
-                        traces                                      := PICS_Z1_D2_Tx,
+                        eventHistory                                := c_PICS_Z1_D2_Hx,
+                        traces                                      := c_PICS_Z1_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -862,7 +866,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
@@ -882,8 +886,8 @@
                     modulepar ReferencePosition PICS_Z1_D3_EP := {
                         latitude                                    := 435513421,                               // Z1-D3-EP/latitude
                         longitude                                   := 102986038,                               // Z1-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_Z1_D3_EP
                     
                     /**
garciay's avatar
garciay committed
@@ -951,10 +955,10 @@
                     }; // End of PICS_Z1_D3_Tx
                     
                     modulepar DenmParm PICS_Z1_D3 := {
-                        eventPosition                               := PICS_Z1_D3_EP,
+                        eventPosition                               := c_PICS_Z1_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z1_D3_Hx,
-                        traces                                      := PICS_Z1_D3_Tx,
+                        eventHistory                                := c_PICS_Z1_D3_Hx,
+                        traces                                      := c_PICS_Z1_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -962,7 +966,7 @@
                                 drivingLaneStatus                   := '0100'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit := {
garciay's avatar
garciay committed
@@ -971,8 +975,7 @@
                                 deltaAltitude                       := 0
                             },
                             trafficFlowRule                         := passToLeft,
-                            referenceDenms                          := {
-                            }
+                            referenceDenms                          := omit
                         }
                         
                     } // End of PICS_Z1_D3
@@ -1000,8 +1003,8 @@
                     modulepar ReferencePosition PICS_Z2_D1_EP := {
                         latitude                                    := 435512286,                               // Z2-D1-EP/latitude
                         longitude                                   := 102999675,                               // Z2-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_Z2_D1_EP
                     
                     /**
garciay's avatar
garciay committed
@@ -1077,10 +1080,10 @@
                     }; // End of PICS_Z2_D1_Tx
                     
                     modulepar DenmParm PICS_Z2_D1 := {
-                        eventPosition                               := PICS_Z2_D1_EP,
+                        eventPosition                               := c_PICS_Z2_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z2_D1_Hx,
-                        traces                                      := PICS_Z2_D1_Tx,
+                        eventHistory                                := c_PICS_Z2_D1_Hx,
+                        traces                                      := c_PICS_Z2_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -1088,10 +1091,10 @@
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z2_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z2_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
garciay's avatar
garciay committed
@@ -1107,8 +1110,8 @@
                     modulepar ReferencePosition PICS_Z2_D2_EP := {
                         latitude                                    := 435513581,                               // Z2-D2-EP/latitude
                         longitude                                   := 103012798,                               // Z2-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_Z2_D2_EP
                     
                     /**
garciay's avatar
garciay committed
@@ -1184,10 +1187,10 @@
                     }; // End of PICS_Z2_D2_Tx
                     
                     modulepar DenmParm PICS_Z2_D2 := {
-                        eventPosition                               := PICS_Z2_D2_EP,
+                        eventPosition                               := c_PICS_Z2_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z2_D2_Hx,
-                        traces                                      := PICS_Z2_D2_Tx,
+                        eventHistory                                := c_PICS_Z2_D2_Hx,
+                        traces                                      := c_PICS_Z2_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -1195,7 +1198,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
@@ -1215,8 +1218,8 @@
                     modulepar ReferencePosition PICS_Z2_D3_EP := {
                         latitude                                    := 435521014,                               // Z2-D3-EP/latitude
                         longitude                                   := 103020483,                               // Z2-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_Z2_D3_EP
                     
                     /**
garciay's avatar
garciay committed
@@ -1284,10 +1287,10 @@
                     }; // End of PICS_Z2_D3_Tx
                     
                     modulepar DenmParm PICS_Z2_D3 := {
-                        eventPosition                               := PICS_Z2_D3_EP,
+                        eventPosition                               := c_PICS_Z2_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z2_D3_Hx,
-                        traces                                      := PICS_Z2_D3_Tx,
+                        eventHistory                                := c_PICS_Z2_D3_Hx,
+                        traces                                      := c_PICS_Z2_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -1295,7 +1298,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
@@ -1327,8 +1330,8 @@
                     modulepar ReferencePosition PICS_Z3_D1_EP := {
                         latitude                                    := 435537393,                               // Z3-D1-EP/latitude
                         longitude                                   := 103003415,                               // Z3-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_Z3_D1_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -1404,10 +1407,10 @@
                     }; // End of PICS_Z3_D1_Tx
                         
                     modulepar DenmParm PICS_Z3_D1 := {
-                        eventPosition                               := PICS_Z3_D1_EP,
+                        eventPosition                               := c_PICS_Z3_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z3_D1_Hx,
-                        traces                                      := PICS_Z3_D1_Tx,
+                        eventHistory                                := c_PICS_Z3_D1_Hx,
+                        traces                                      := c_PICS_Z3_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -1415,10 +1418,10 @@
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z3_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z3_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
garciay's avatar
garciay committed
@@ -1434,8 +1437,8 @@
                     modulepar ReferencePosition PICS_Z3_D2_EP := {
                         latitude                                    := 435543599,                               // Z3-D2-EP/latitude
                         longitude                                   := 103041247,                               // Z3-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_Z3_D2_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -1511,10 +1514,10 @@
                     }; // End of PICS_Z3_D2_Tx
                         
                     modulepar DenmParm PICS_Z3_D2 := {
-                        eventPosition                               := PICS_Z3_D2_EP,
+                        eventPosition                               := c_PICS_Z3_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z3_D2_Hx,
-                        traces                                      := PICS_Z3_D2_Tx,
+                        eventHistory                                := c_PICS_Z3_D2_Hx,
+                        traces                                      := c_PICS_Z3_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -1522,7 +1525,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
@@ -1542,8 +1545,8 @@
                     modulepar ReferencePosition PICS_Z3_D3_EP := {
                         latitude                                    := 435550184,                               // Z3-D3-EP/latitude
                         longitude                                   := 103037351,                               // Z3-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_Z3_D3_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -1611,10 +1614,10 @@
                     }; // End of PICS_Z3_D3_Tx
                         
                     modulepar DenmParm PICS_Z3_D3 := {
-                        eventPosition                               := PICS_Z3_D3_EP,
+                        eventPosition                               := c_PICS_Z3_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z3_D3_Hx,
-                        traces                                      := PICS_Z3_D3_Tx,
+                        eventHistory                                := c_PICS_Z3_D3_Hx,
+                        traces                                      := c_PICS_Z3_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -1622,7 +1625,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
@@ -1654,8 +1657,8 @@
                     modulepar ReferencePosition PICS_Z4_D1_EP := {
                         latitude                                    := 435562873,                               // Z4-D1-EP/latitude
                         longitude                                   := 103041679,                               // Z4-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_Z4_D1_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -1731,10 +1734,10 @@
                     }; // End of PICS_Z4_D1_Tx
                         
                     modulepar DenmParm PICS_Z4_D1 := {
-                        eventPosition                               := PICS_Z4_D1_EP,
+                        eventPosition                               := c_PICS_Z4_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z4_D1_Hx,
-                        traces                                      := PICS_Z4_D1_Tx,
+                        eventHistory                                := c_PICS_Z4_D1_Hx,
+                        traces                                      := c_PICS_Z4_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -1742,10 +1745,10 @@
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z4_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z4_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
garciay's avatar
garciay committed
@@ -1761,8 +1764,8 @@
                     modulepar ReferencePosition PICS_Z4_D2_EP := {
                         latitude                                    := 435567174,                               // Z4-D2-EP/latitude
                         longitude                                   := 103052073,                               // Z4-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_Z4_D2_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -1838,10 +1841,10 @@
                     }; // End of PICS_Z4_D2_Tx
                         
                     modulepar DenmParm PICS_Z4_D2 := {
-                        eventPosition                               := PICS_Z4_D2_EP,
+                        eventPosition                               := c_PICS_Z4_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z4_D2_Hx,
-                        traces                                      := PICS_Z4_D2_Tx,
+                        eventHistory                                := c_PICS_Z4_D2_Hx,
+                        traces                                      := c_PICS_Z4_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -1849,7 +1852,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
@@ -1869,8 +1872,8 @@
                     modulepar ReferencePosition PICS_Z4_D3_EP := {
                         latitude                                    := 435573552,                               // Z4-D3-EP/latitude
                         longitude                                   := 103060751,                               // Z4-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_Z4_D3_EP
                         
                     /**
garciay's avatar
garciay committed
@@ -1938,10 +1941,10 @@
                     }; // End of PICS_Z4_D3_Tx
                         
                     modulepar DenmParm PICS_Z4_D3 := {
-                        eventPosition                               := PICS_Z4_D3_EP,
+                        eventPosition                               := c_PICS_Z4_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z4_D3_Hx,
-                        traces                                      := PICS_Z4_D3_Tx,
+                        eventHistory                                := c_PICS_Z4_D3_Hx,
+                        traces                                      := c_PICS_Z4_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
garciay's avatar
garciay committed
@@ -1949,7 +1952,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
@@ -1981,8 +1984,8 @@
                     modulepar ReferencePosition PICS_Z5_D1_EP := {