Commit 0c65cf1c authored by Reinhard Biegel's avatar Reinhard Biegel
Browse files

Merge branch '121-various-improvements-and-fixes-to-simulation-core' into 'develop'

Resolve "Various improvements and fixes to simulation core"

See merge request !75
parents e139e0b8 31f16911
Pipeline #4296 canceled with stage
in 0 seconds
......@@ -77,4 +77,6 @@ if(INSTALL_SYSTEM_RUNTIME_DEPS OR INSTALL_EXTRA_RUNTIME_DEPS)
include(install_deps)
endif()
include(install_xmlSchemas)
include(CPack)
################################################################################
# Copyright (c) 2020-2021 in-tech GmbH
# 2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
......@@ -32,26 +33,26 @@ foreach(SEARCH_DIR IN LISTS SEARCH_DIRS)
message(STATUS "processing ${SEARCH_DIR}")
if(WIN32 AND NOT MSVC)
# CMake uses OS API calls to spawn processes using `execute_process()`.
# Even if MSYS is the first entry in PATH, a potentially available `bash` from a WSL installation will be found first.
# Thus, the environment variable SHELL is read here, which will have an absolute path if it is set.
# Otherwiswe, the fallback to hardcoded `bash` will at least work on systems without WSL setup.
if(DEFINED ENV{SHELL})
set(SHELL $ENV{SHELL})
else()
set(SHELL bash)
endif()
# CMake uses OS API calls to spawn processes using `execute_process()`.
# Even if MSYS is the first entry in PATH, a potentially available `bash` from a WSL installation will be found first.
# Thus, the environment variable SHELL is read here, which will have an absolute path if it is set.
# Otherwiswe, the fallback to hardcoded `sh` will at least work on systems without WSL setup (and Linux).
if(DEFINED ENV{SHELL})
set(SHELL $ENV{SHELL})
else()
set(SHELL sh)
endif()
if(WIN32 AND NOT MSVC)
execute_process (
WORKING_DIRECTORY ${SEARCH_DIR}
COMMAND ${SHELL} -c "for f in \$(find -iname \'*.dll\'); do cygpath -a -m \$(dirname \$f); done | sort -u"
COMMAND "${SHELL}" "-c" "for f in \$(find -iname \'*.dll\'); do cygpath -a -m \$(dirname \$f); done | sort -u"
OUTPUT_VARIABLE DETECTED_LIBRARY_DIRS
)
else()
execute_process (
WORKING_DIRECTORY ${SEARCH_DIR}
COMMAND $ENV{SHELL} -lc "for f in \$(find -iname \'*.so\'); do realpath \$(dirname \$f); done | sort -u"
COMMAND "${SHELL}" "-c" "for f in \$(find -iname \'*.so\'); do realpath \$(dirname \$f); done | sort -u"
OUTPUT_VARIABLE DETECTED_LIBRARY_DIRS
)
endif()
......@@ -104,10 +105,3 @@ install(CODE
"
)
# install schema files into install directory
file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/schemas/ SCHEMA_SRC)
file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/schemas/ SCHEMA_DEST)
install(DIRECTORY ${SCHEMA_SRC}
DESTINATION ${SCHEMA_DEST})
message("schemas installed from ${SCHEMA_SRC} to ${SCHEMA_DEST}")
################################################################################
# Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
#
# This program and the accompanying materials are made
# available under the terms of the Eclipse Public License 2.0
# which is available at https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
################################################################################
# sets install command to copy xml Schema files from repository to installation directory
install(DIRECTORY ${CMAKE_SOURCE_DIR}/schemas DESTINATION .)
message("-- xml schema file will be installed in the schema folder of the installation directory")
\ No newline at end of file
......@@ -163,9 +163,11 @@ Traffic Signs and Road Markings
The world currently supports a variety of traffic signs and road markings.
Both are defined in OpenDRIVE as "RoadSignal".
At the moment it can only interpret traffic signs according to the German regulations "StVo".
At the moment it can only interpret traffic signs according to the German regulations and US regulations.
Traffic signs can contain optional supplementary traffic signs. Supplementary signs are dependent on a main traffic sign and contain additional information.
The following traffic signs are supported:
For Germany the types are based on the StVO (see: https://www.bast.de/BASt_2017/DE/Verkehrstechnik/Fachthemen/v1-verkehrszeichen/vz-download.html).
The following traffic signs are supported for Germany:
.. table::
:class: tight-table
......@@ -219,7 +221,7 @@ The following traffic signs are supported:
Subtype 32 has a STOP in 100m.
============================================= ========= =========== =================================================================================
The following road markings are supported:
The following road markings are supported for Germany:
.. table::
:class: tight-table
......@@ -233,6 +235,22 @@ The following road markings are supported:
The pedestrian crossing can also be defined in OpenDRIVE as object with type "crosswalk".
For the United States the types are based on the "Manual on Uniform Traffic Control Devices" (see: https://mutcd.fhwa.dot.gov/pdfs/2009r1r2/pdf_index.htm).
The following traffic signs are supported for the United States:
.. table::
============================================= ========= ========================================================
TrafficSign Type Value and Units
============================================= ========= ========================================================
HighWayExit E5-1
Stop R1-1
GiveWay R1-2
MaximumSpeedLimit R2-1 as defined via the "value" and "unit" attributes
DoNotPass (OvertakingBan) R4-1
DoNotEnter R5-1
============================================= ========= ========================================================
.. _world_lanemarkings:
Lane Markings
......
......@@ -273,6 +273,10 @@ VisibilityAction is an optional attribute, which allows easy parameterization of
.. note:: If VisibilityAction **is not defined** the according entity agent **will be spawned**.
**Follow Route Action**
This action is defined here in the init part of the Storyboard. See :ref:`scenario_followfouteaction`
**Stochastic Values**
Unlike OpenSCENARIO, |op| allows some of the aforementioned values to be stochastic.
......@@ -565,6 +569,7 @@ Actions define what happens if all conditions of the maneuver are fulfilled and
The following openSCENARIO actions are supported:
- :ref:`scenario_followrouteaction`
- :ref:`scenario_lanechange`
- :ref:`scenario_followtrajectory`
- :ref:`scenario_acquireposition`
......@@ -579,6 +584,23 @@ In addition, the following user defined actions are interpreted:
.. todo:: Write a paragraph about the concept "Trajectories, OSC Actions, and so" in the developer zone.
.. _scenario_followrouteaction:
FollowRouteAction
+++++++++++++++++
The FollowRouteAction is a private Action which is added to the Init part of the Storyboard. It defines Waypoints,
which are located by road_id and further with s and t coordinates.
The Agent will try to follow the specified points.
**Example** *Right turn, by specifying three waypoints*
.. literalinclude:: @OP_REL_SIM@/contrib/examples/Configurations/OSCAction_FollowRouteAction/Scenario.xosc
:language: xml
:dedent: 2
:start-at: <RoutingAction>
:end-at: </RoutingAction>
.. _scenario_lanechange:
LaneChange
......
......@@ -155,6 +155,24 @@ They are used to track special behavior in the simulation.
Parameters List of generic key/value string pairs.
====================== =====================================================================================
Important Events
------
Some of the Events are logged for other applications to use, for instance the |op| Visualizer.
These Events can be identified by their Name and are listed below:
.. table::
:class: tight-table
====================== =====================================================================================
Attribute Description
====================== =====================================================================================
TrafficLight TrafficLight Events are triggered once a TrafficLightController changes the state of it's
Trafficlight bulbs. Parameters include the traffic_light_state and the opendrive_id which
links to a dynamic signal in the scenery configuration. traffic_light_state is going to
be used by the |op| Visualizer. The initial state of the ThreeSignalsTrafficLight is posted too.
====================== =====================================================================================
.. _observationlog_agents:
Agents
......
<Profiles SchemaVersion="0.4.6">
<Profiles SchemaVersion="0.4.8">
<AgentProfiles>
<AgentProfile Name="LuxuryClassCarAgent" Type="Dynamic">
<DriverProfiles>
......@@ -184,6 +184,8 @@
<ProfileGroup Type="TrafficRules">
<Profile Name="Germany">
<Double Key="OpenSpeedLimit" Value="INF"/>
<Double Key="OpenSpeedLimitTrucks" Value="22.2222222"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="true"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -191,6 +193,8 @@
</Profile>
<Profile Name="USA">
<Double Key="OpenSpeedLimit" Value="31.2928"/>
<Double Key="OpenSpeedLimitTrucks" Value="26.8224"/>
<Double Key="OpenSpeedLimitBuses" Value="26.8224"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="false"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -198,6 +202,8 @@
</Profile>
<Profile Name="China">
<Double Key="OpenSpeedLimit" Value="33.3333"/>
<Double Key="OpenSpeedLimitTrucks" Value="25.0"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="false"/>
......
<Profiles SchemaVersion="0.4.6">
<Profiles SchemaVersion="0.4.8">
<AgentProfiles>
<AgentProfile Name="EgoAgent" Type="Dynamic">
<DriverProfiles>
......@@ -235,6 +235,8 @@
<ProfileGroup Type="TrafficRules">
<Profile Name="Germany">
<Double Key="OpenSpeedLimit" Value="INF"/>
<Double Key="OpenSpeedLimitTrucks" Value="22.2222222"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="true"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -242,6 +244,8 @@
</Profile>
<Profile Name="USA">
<Double Key="OpenSpeedLimit" Value="31.2928"/>
<Double Key="OpenSpeedLimitTrucks" Value="26.8224"/>
<Double Key="OpenSpeedLimitBuses" Value="26.8224"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="false"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -249,6 +253,8 @@
</Profile>
<Profile Name="China">
<Double Key="OpenSpeedLimit" Value="33.3333"/>
<Double Key="OpenSpeedLimitTrucks" Value="25.0"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="false"/>
......
<Profiles SchemaVersion="0.4.6">
<Profiles SchemaVersion="0.4.8">
<AgentProfiles>
<AgentProfile Name="MiddleClassCarAgent" Type="Dynamic">
<DriverProfiles>
......@@ -88,6 +88,8 @@
<ProfileGroup Type="TrafficRules">
<Profile Name="Germany">
<Double Key="OpenSpeedLimit" Value="INF"/>
<Double Key="OpenSpeedLimitTrucks" Value="22.2222222"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="true"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -95,6 +97,8 @@
</Profile>
<Profile Name="USA">
<Double Key="OpenSpeedLimit" Value="31.2928"/>
<Double Key="OpenSpeedLimitTrucks" Value="26.8224"/>
<Double Key="OpenSpeedLimitBuses" Value="26.8224"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="false"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -102,6 +106,8 @@
</Profile>
<Profile Name="China">
<Double Key="OpenSpeedLimit" Value="33.3333"/>
<Double Key="OpenSpeedLimitTrucks" Value="25.0"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="false"/>
......
<Profiles SchemaVersion="0.4.6">
<Profiles SchemaVersion="0.4.8">
<AgentProfiles>
<AgentProfile Name="EgoAgent" Type="Dynamic">
<DriverProfiles>
......@@ -286,6 +286,8 @@
<ProfileGroup Type="TrafficRules">
<Profile Name="Germany">
<Double Key="OpenSpeedLimit" Value="INF"/>
<Double Key="OpenSpeedLimitTrucks" Value="22.2222222"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="true"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -293,6 +295,8 @@
</Profile>
<Profile Name="USA">
<Double Key="OpenSpeedLimit" Value="31.2928"/>
<Double Key="OpenSpeedLimitTrucks" Value="26.8224"/>
<Double Key="OpenSpeedLimitBuses" Value="26.8224"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="false"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -300,6 +304,8 @@
</Profile>
<Profile Name="China">
<Double Key="OpenSpeedLimit" Value="33.3333"/>
<Double Key="OpenSpeedLimitTrucks" Value="25.0"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="false"/>
......
......@@ -459,13 +459,13 @@
</laneSection>
</lanes>
<signals xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<signal s="0.28" t="4" id="1009" name="Priority_road" orientation="-" zOffset="3.5" country="DEU" type="306" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.41" t="4" id="1012" name="Traffic_light_signal right bottom" orientation="-" zOffset="2.1" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.4" t="1.3" id="1013" name="Traffic_light_signal right top" orientation="-" zOffset="4.05" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.41" t="-4" id="1003" name="Traffic_light_signal left" orientation="-" zOffset="2.1" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-6.2831853071795862" pitch="0" roll="0"/>
<signal s="0.28" t="-4" id="1008" name="Priority_road" orientation="-" zOffset="3.5" country="DEU" type="306" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.25" t="-3.85" id="1028" name="Traffic_light_signal pedestrian left" orientation="+" zOffset="2" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-1.5707963267948966" pitch="0" roll="0"/>
<signal s="0.25" t="3.85" id="1029" name="Traffic_light_signal pedestrian right" orientation="+" zOffset="2" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="1.5707963267948966" pitch="0" roll="0"/>
<signal s="0.28" t="4" id="1009" name="Priority_road" orientation="-" zOffset="3.5" country="DE" type="306" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.41" t="4" id="1012" name="Traffic_light_signal right bottom" orientation="-" zOffset="2.1" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.4" t="1.3" id="1013" name="Traffic_light_signal right top" orientation="-" zOffset="4.05" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.41" t="-4" id="1003" name="Traffic_light_signal left" orientation="-" zOffset="2.1" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-6.2831853071795862" pitch="0" roll="0"/>
<signal s="0.28" t="-4" id="1008" name="Priority_road" orientation="-" zOffset="3.5" country="DE" type="306" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.25" t="-3.85" id="1028" name="Traffic_light_signal pedestrian left" orientation="+" zOffset="2" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-1.5707963267948966" pitch="0" roll="0"/>
<signal s="0.25" t="3.85" id="1029" name="Traffic_light_signal pedestrian right" orientation="+" zOffset="2" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="1.5707963267948966" pitch="0" roll="0"/>
</signals>
</road>
<road name="Road 2" length="128" id="1875842603" junction="-1">
......@@ -519,13 +519,13 @@
</laneSection>
</lanes>
<signals xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<signal s="0.41" t="4" id="1015" name="Traffic_light_signal right bottom" orientation="-" zOffset="2.1" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.4" t="1.3" id="1016" name="Traffic_light_signal right top" orientation="-" zOffset="4.05" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.28" t="4" id="1005" name="Yield" orientation="-" zOffset="3.5" country="DEU" type="205" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.41" t="-4" id="1023" name="Traffic_light_signal left" orientation="-" zOffset="2.1" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.28" t="-4" id="1025" name="Yield" orientation="-" zOffset="3.5" country="DEU" type="205" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.25" t="-3.85" id="1032" name="Traffic_light_signal pedestrian left" orientation="+" zOffset="2" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-1.5707963267948966" pitch="0" roll="0"/>
<signal s="0.25" t="3.85" id="1033" name="Traffic_light_signal pedestrian right" orientation="+" zOffset="2" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="1.5707963267948966" pitch="0" roll="0"/>
<signal s="0.41" t="4" id="1015" name="Traffic_light_signal right bottom" orientation="-" zOffset="2.1" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.4" t="1.3" id="1016" name="Traffic_light_signal right top" orientation="-" zOffset="4.05" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.28" t="4" id="1005" name="Yield" orientation="-" zOffset="3.5" country="DE" type="205" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.41" t="-4" id="1023" name="Traffic_light_signal left" orientation="-" zOffset="2.1" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.28" t="-4" id="1025" name="Yield" orientation="-" zOffset="3.5" country="DE" type="205" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.25" t="-3.85" id="1032" name="Traffic_light_signal pedestrian left" orientation="+" zOffset="2" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-1.5707963267948966" pitch="0" roll="0"/>
<signal s="0.25" t="3.85" id="1033" name="Traffic_light_signal pedestrian right" orientation="+" zOffset="2" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="1.5707963267948966" pitch="0" roll="0"/>
</signals>
</road>
<road name="Road 6" length="308.68617032731771" id="93525865" junction="-1">
......@@ -591,13 +591,13 @@
</laneSection>
</lanes>
<signals xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<signal s="0.28" t="4" id="1001" name="Priority_road" orientation="-" zOffset="3.5" country="DEU" type="306" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.41" t="4" id="1010" name="Traffic_light_signal right bottom" orientation="-" zOffset="2.1" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.4" t="1.3" id="1014" name="Traffic_light_signal right top" orientation="-" zOffset="4.05" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.41" t="-4" id="1020" name="Traffic_light_signal left" orientation="-" zOffset="2.1" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-6.2831853071795862" pitch="0" roll="0"/>
<signal s="0.28" t="-4" id="1021" name="Priority_road" orientation="-" zOffset="3.5" country="DEU" type="306" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.25" t="-3.85" id="1030" name="Traffic_light_signal pedestrian left" orientation="+" zOffset="2" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-1.5707963267948966" pitch="0" roll="0"/>
<signal s="0.25" t="3.85" id="1031" name="Traffic_light_signal pedestrian right" orientation="+" zOffset="2" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="1.5707963267948966" pitch="0" roll="0"/>
<signal s="0.28" t="4" id="1001" name="Priority_road" orientation="-" zOffset="3.5" country="DE" type="306" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.41" t="4" id="1010" name="Traffic_light_signal right bottom" orientation="-" zOffset="2.1" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.4" t="1.3" id="1014" name="Traffic_light_signal right top" orientation="-" zOffset="4.05" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.41" t="-4" id="1020" name="Traffic_light_signal left" orientation="-" zOffset="2.1" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-6.2831853071795862" pitch="0" roll="0"/>
<signal s="0.28" t="-4" id="1021" name="Priority_road" orientation="-" zOffset="3.5" country="DE" type="306" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="0.25" t="-3.85" id="1030" name="Traffic_light_signal pedestrian left" orientation="+" zOffset="2" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-1.5707963267948966" pitch="0" roll="0"/>
<signal s="0.25" t="3.85" id="1031" name="Traffic_light_signal pedestrian right" orientation="+" zOffset="2" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="1.5707963267948966" pitch="0" roll="0"/>
</signals>
</road>
<road name="Road 7" length="322.76098332942013" id="1472558076" junction="-1">
......@@ -651,13 +651,13 @@
</laneSection>
</lanes>
<signals xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<signal s="322.35" t="-4" id="1017" name="Traffic_light_signal right bottom" orientation="+" zOffset="2.1" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="322.36" t="-1.3" id="1018" name="Traffic_light_signal right top" orientation="+" zOffset="4.05" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="322.48" t="-4" id="1007" name="Yield" orientation="+" zOffset="3.5" country="DEU" type="205" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="322.35" t="4" id="1026" name="Traffic_light_signal left" orientation="+" zOffset="2.1" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="322.48" t="4" id="1027" name="Yield" orientation="+" zOffset="3.5" country="DEU" type="205" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="322.51" t="-3.85" id="1034" name="Traffic_light_signal pedestrian left" orientation="+" zOffset="2" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-1.5707963267948966" pitch="0" roll="0"/>
<signal s="322.51" t="3.85" id="1035" name="Traffic_light_signal pedestrian right" orientation="+" zOffset="2" country="DEU" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="1.5707963267948966" pitch="0" roll="0"/>
<signal s="322.35" t="-4" id="1017" name="Traffic_light_signal right bottom" orientation="+" zOffset="2.1" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="322.36" t="-1.3" id="1018" name="Traffic_light_signal right top" orientation="+" zOffset="4.05" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="322.48" t="-4" id="1007" name="Yield" orientation="+" zOffset="3.5" country="DE" type="205" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="322.35" t="4" id="1026" name="Traffic_light_signal left" orientation="+" zOffset="2.1" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="322.48" t="4" id="1027" name="Yield" orientation="+" zOffset="3.5" country="DE" type="205" subtype="0" value="0" unit="km/h" text="" hOffset="0" pitch="0" roll="0"/>
<signal s="322.51" t="-3.85" id="1034" name="Traffic_light_signal pedestrian left" orientation="+" zOffset="2" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="-1.5707963267948966" pitch="0" roll="0"/>
<signal s="322.51" t="3.85" id="1035" name="Traffic_light_signal pedestrian right" orientation="+" zOffset="2" country="DE" type="1000001" subtype="0" value="0" unit="km/h" text="" hOffset="1.5707963267948966" pitch="0" roll="0"/>
</signals>
</road>
<junction xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Junction 2" id="1">
......
<Profiles SchemaVersion="0.4.6">
<Profiles SchemaVersion="0.4.8">
<AgentProfiles>
<AgentProfile Name="TFAgent" Type="Dynamic">
<DriverProfiles>
......@@ -68,6 +68,8 @@
<ProfileGroup Type="TrafficRules">
<Profile Name="Germany">
<Double Key="OpenSpeedLimit" Value="INF"/>
<Double Key="OpenSpeedLimitTrucks" Value="22.2222222"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="true"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -75,6 +77,8 @@
</Profile>
<Profile Name="USA">
<Double Key="OpenSpeedLimit" Value="31.2928"/>
<Double Key="OpenSpeedLimitTrucks" Value="26.8224"/>
<Double Key="OpenSpeedLimitBuses" Value="26.8224"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="false"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -82,6 +86,8 @@
</Profile>
<Profile Name="China">
<Double Key="OpenSpeedLimit" Value="33.3333"/>
<Double Key="OpenSpeedLimitTrucks" Value="25.0"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="false"/>
......
<Profiles SchemaVersion="0.4.6">
<Profiles SchemaVersion="0.4.8">
<AgentProfiles>
<AgentProfile Name="TFAgent" Type="Dynamic">
<DriverProfiles>
......@@ -68,6 +68,8 @@
<ProfileGroup Type="TrafficRules">
<Profile Name="Germany">
<Double Key="OpenSpeedLimit" Value="INF"/>
<Double Key="OpenSpeedLimitTrucks" Value="22.2222222"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="true"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -75,6 +77,8 @@
</Profile>
<Profile Name="USA">
<Double Key="OpenSpeedLimit" Value="31.2928"/>
<Double Key="OpenSpeedLimitTrucks" Value="26.8224"/>
<Double Key="OpenSpeedLimitBuses" Value="26.8224"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="false"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -82,6 +86,8 @@
</Profile>
<Profile Name="China">
<Double Key="OpenSpeedLimit" Value="33.3333"/>
<Double Key="OpenSpeedLimitTrucks" Value="25.0"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="false"/>
......
<Profiles SchemaVersion="0.4.6">
<Profiles SchemaVersion="0.4.8">
<AgentProfiles>
<AgentProfile Name="TFAgent" Type="Dynamic">
<DriverProfiles>
......@@ -44,6 +44,8 @@
<ProfileGroup Type="TrafficRules">
<Profile Name="Germany">
<Double Key="OpenSpeedLimit" Value="INF"/>
<Double Key="OpenSpeedLimitTrucks" Value="22.2222222"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="true"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -51,6 +53,8 @@
</Profile>
<Profile Name="USA">
<Double Key="OpenSpeedLimit" Value="31.2928"/>
<Double Key="OpenSpeedLimitTrucks" Value="26.8224"/>
<Double Key="OpenSpeedLimitBuses" Value="26.8224"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="false"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -58,6 +62,8 @@
</Profile>
<Profile Name="China">
<Double Key="OpenSpeedLimit" Value="33.3333"/>
<Double Key="OpenSpeedLimitTrucks" Value="25.0"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="false"/>
......
<Profiles SchemaVersion="0.4.6">
<Profiles SchemaVersion="0.4.8">
<AgentProfiles>
<AgentProfile Name="TFAgent" Type="Dynamic">
<DriverProfiles>
......@@ -68,6 +68,8 @@
<ProfileGroup Type="TrafficRules">
<Profile Name="Germany">
<Double Key="OpenSpeedLimit" Value="INF"/>
<Double Key="OpenSpeedLimitTrucks" Value="22.2222222"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="true"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -75,6 +77,8 @@
</Profile>
<Profile Name="USA">
<Double Key="OpenSpeedLimit" Value="31.2928"/>
<Double Key="OpenSpeedLimitTrucks" Value="26.8224"/>
<Double Key="OpenSpeedLimitBuses" Value="26.8224"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="false"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -82,6 +86,8 @@
</Profile>
<Profile Name="China">
<Double Key="OpenSpeedLimit" Value="33.3333"/>
<Double Key="OpenSpeedLimitTrucks" Value="25.0"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="false"/>
......
<Profiles SchemaVersion="0.4.6">
<Profiles SchemaVersion="0.4.8">
<AgentProfiles>
<AgentProfile Name="TFAgent" Type="Dynamic">
<DriverProfiles>
......@@ -68,6 +68,8 @@
<ProfileGroup Type="TrafficRules">
<Profile Name="Germany">
<Double Key="OpenSpeedLimit" Value="INF"/>
<Double Key="OpenSpeedLimitTrucks" Value="22.2222222"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="true"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -75,6 +77,8 @@
</Profile>
<Profile Name="USA">
<Double Key="OpenSpeedLimit" Value="31.2928"/>
<Double Key="OpenSpeedLimitTrucks" Value="26.8224"/>
<Double Key="OpenSpeedLimitBuses" Value="26.8224"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="false"/>
<Bool Key="FormRescueLane" Value="true"/>
......@@ -82,6 +86,8 @@
</Profile>
<Profile Name="China">
<Double Key="OpenSpeedLimit" Value="33.3333"/>
<Double Key="OpenSpeedLimitTrucks" Value="25.0"/>
<Double Key="OpenSpeedLimitBuses" Value="27.7777777"/>
<Bool Key="KeepToOuterLanes" Value="false"/>
<Bool Key="DontOvertakeOnOuterLanes" Value="true"/>
<Bool Key="FormRescueLane" Value="false"/>
......
......@@ -36,7 +36,7 @@
</lanes>
<objects/>
<signals>
<signal id="1" type="306" subtype="" s="200" t="-4.5" hOffset="0.0" pitch="0" roll="0" dynamic="no" country="DEU" name="" orientation="+" zOffset="0">
<signal id="1" type="306" subtype="" s="200" t="-4.5" hOffset="0.0" pitch="0" roll="0" dynamic="no" country="DE" name="" orientation="+" zOffset="0">
<validity toLane="-1" fromLane="-1"/>
</signal>
</signals>
......@@ -77,7 +77,7 @@
</lanes>
<objects/>
<signals>
<signal id="1" type="206" subtype="" s="200" t="-4.5" hOffset="0.0" pitch="0" roll="0" dynamic="no" country="DEU" name="" orientation="+" zOffset="0">
<signal id="1" type="206" subtype="" s="200" t="-4.5" hOffset="0.0" pitch="0" roll="0" dynamic="no" country="DE" name="" orientation="+" zOffset="0">
<validity toLane="-1" fromLane="-1"/>
</signal>
</signals>
......@@ -118,7 +118,7 @@
</lanes>
<objects/>
<signals>
<signal id="1" type="306" subtype="" s="200" t="-4.5" hOffset="0.0" pitch="0" roll="0" dynamic="no" country="DEU" name="" orientation="+" zOffset="0">
<signal id="1" type="306" subtype="" s="200" t="-4.5" hOffset="0.0" pitch="0" roll="0" dynamic="no" country="DE" name="" orientation="+" zOffset="0">