Adjustment to keep openPASS compatibility

RelativeLanePosition is the better choice but not yet supported by OpenPASS. But with the update to OpenSCENARIO 1.1 the initial distance of the lead vehicle will be calculated anyway by an expression. So then this will be refactored again.
asam-oss · Apr 19, 2021 · 6185a87 · 6185a87
1 parent 676f238
commit 6185a87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Scenarios/ALKS_Scenario_4.5_1_CutOutFullyBlocking_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.5_1_CutOutFullyBlocking_TEMPLATE.xosc
@@ -6,7 +6,7 @@
     <ParameterDeclaration name="Ego_InitPosition_LaneId" parameterType="string" value="-4" />
     <ParameterDeclaration name="Ego_InitSpeed_Ve0" parameterType="double" value="16.66666667" />
     <ParameterDeclaration name="Duration" parameterType="double" value="40" />
-    <ParameterDeclaration name="LeadVehicle_InitDistance_dx0" parameterType="double" value="33.33333333" />
+    <ParameterDeclaration name="LeadVehicle_InitDistance_dx0" parameterType="double" value="38.33333333" />
     <ParameterDeclaration name="FrontOfLead_Distance_dx0_f" parameterType="double" value="50.0" />
     <ParameterDeclaration name="Lateral_Velocity_Vy" parameterType="double" value="2.0" />
     <ParameterDeclaration name="TargetBlocking_Catalog" parameterType="string" value="PedestrianCatalog" />
@@ -80,7 +80,7 @@
           <PrivateAction>
             <TeleportAction>
               <Position>
-                <RelativeLanePosition entityRef="Ego" dLane="0" ds="$LeadVehicle_InitDistance_dx0" offset="0.0" />
+                <LanePosition roadId="0" laneId="$Ego_InitPosition_LaneId" offset="0.0" s="$LeadVehicle_InitDistance_dx0"></LanePosition>
               </Position>
             </TeleportAction>
           </PrivateAction>

diff --git a/Scenarios/ALKS_Scenario_4.5_2_CutOutMultipleBlockingTargets_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.5_2_CutOutMultipleBlockingTargets_TEMPLATE.xosc
@@ -6,7 +6,7 @@
     <ParameterDeclaration name="Ego_InitPosition_LaneId" parameterType="string" value="-4" />
     <ParameterDeclaration name="Ego_InitSpeed_Ve0" parameterType="double" value="16.66666667" />
     <ParameterDeclaration name="Duration" parameterType="double" value="40" />
-    <ParameterDeclaration name="LeadVehicle_InitDistance_dx0" parameterType="double" value="33.33333333" />
+    <ParameterDeclaration name="LeadVehicle_InitDistance_dx0" parameterType="double" value="38.33333333" />
     <ParameterDeclaration name="FrontOfLead_Distance_dx0_f" parameterType="double" value="50.0" />
     <ParameterDeclaration name="Lateral_Velocity_Vy" parameterType="double" value="2.0" />
     <ParameterDeclaration name="TargetBlocking_Catalog" parameterType="string" value="PedestrianCatalog" />
@@ -91,7 +91,7 @@
           <PrivateAction>
             <TeleportAction>
               <Position>
-                <RelativeLanePosition entityRef="Ego" dLane="0" ds="$LeadVehicle_InitDistance_dx0" offset="0.0" />
+                <LanePosition roadId="0" laneId="$Ego_InitPosition_LaneId" offset="0.0" s="$LeadVehicle_InitDistance_dx0"></LanePosition>
               </Position>
             </TeleportAction>
           </PrivateAction>