titanization_ats.patch 435 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 2639)
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 2639)
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;
garciay's avatar
garciay committed
@@ -433,23 +436,23 @@
garciay's avatar
garciay committed
                 
                 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 := {
garciay's avatar
garciay committed
@@ -585,7 +588,7 @@
garciay's avatar
garciay committed
             } // End of PICS_UC9_PCZ_1
garciay's avatar
garciay committed
         
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
         
garciay's avatar
garciay committed
         } // End of group camUseCase9
garciay's avatar
garciay committed
@@ -974,8 +977,7 @@
garciay's avatar
garciay committed
                                 deltaAltitude                       := 0
                             },
                             trafficFlowRule                         := passToLeft,
-                            referenceDenms                          := {
-                            }
+                            referenceDenms                          := omit
                         }
garciay's avatar
garciay committed
                     } // End of PICS_Z1_D3
@@ -4221,8 +4223,8 @@
             } // End of PICS_DENM_POSITION_CONFIDENCE_ELLIPSE
garciay's avatar
garciay committed
         
             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
         
garciay's avatar
garciay committed
         } // End of group ivimCommonParams
@@ -5661,50 +5663,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
@@ -5750,7 +5712,7 @@
garciay's avatar
garciay committed
         /**
          * @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;
garciay's avatar
garciay committed
     
garciay's avatar
garciay committed
         /**
          * @desc MAPEM frequency timer
garciay's avatar
garciay committed
Index: AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn	(revision 2639)
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 2639)
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 2639)
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 2639)
garciay's avatar
garciay committed
+++ AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn	(working copy)
@@ -13,7 +13,8 @@
     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;
+    import from IS_DSRC_REGION_noCircular language "ASN.1:1997" all;
     import from EfcDsrcApplication language "ASN.1:1997" all;
     
     // LibItsGeoNetworking
garciay's avatar
garciay committed
@@ -180,8 +181,6 @@
          */
         group ivimDataStructures {
             
-            type record length (1 .. 8) of IviContainer IviContainers;
-            
             /**
              * @desc Describe the parameter for each IVIM event
              */
@@ -188,7 +187,7 @@
             type record IvimParm {
                 Provider                 provider optional,
                 IviIdentificationNumber  iviIdentificationNumber optional,
-                IviContainers            iviContainers optional
+                IviStructure.optional_   iviContainers optional
             } // End of type IvimParm
             
             /** 
@@ -206,8 +205,6 @@
          */
         group evcsnDataStructures {
             
-            type record length (1 .. 256) of ItsChargingStationData ItsChargingStationDatas;
-            
             /** 
              * @desc List of evcsn parms per RSU
              * <pre>