Merge branch 'master' of https://gitlab.lrz.de/vadere/vadere

.gitignore

@@ -43,6 +43,8 @@ VadereSimulator/testResources/**/*.legacy
 
 #model test output
 VadereModelTests/**/output
+VadereModelTests/*_private
+VadereModelCalibration/**/output
 VadereModelTests/**/legacy
 VadereUtils/output/**
 

VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11.scenario

@@ -259,7 +259,16 @@
         "maximumSpeed" : 2.2,
         "acceleration" : 2.0
       },
-      "teleporter" : null,
+      "teleporter" : {
+              "shift" : {
+                "x" : -40.0,
+                "y" : 0.0
+              },
+              "position" : {
+                "x" : 42.0,
+                "y" : 0.0
+              }
+            },
       "attributesCar" : null
     },
     "eventInfos" : [ ]

VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario

@@ -259,7 +259,16 @@
         "maximumSpeed" : 2.2,
         "acceleration" : 2.0
       },
-      "teleporter" : null,
+      "teleporter" : {
+              "shift" : {
+                "x" : -40.0,
+                "y" : 0.0
+              },
+              "position" : {
+                "x" : 42.0,
+                "y" : 0.0
+              }
+            },
       "attributesCar" : null
     },
     "eventInfos" : [ ]

VadereSimulator/resources/identity_v0.7.json

@@ -436,6 +436,16 @@
               "groupIds": "scenario.&3.&2.[&1].&0",
               "type": "scenario.&3.&2.[&1].&0"
             }
+          },
+          "teleporter" : {
+            "shift" : {
+              "x" : "scenario.&3.&2.&1.&0",
+              "y" : "scenario.&3.&2.&1.&0"
+            },
+            "position" : {
+              "x" : "scenario.&3.&2.&1.&0",
+              "y" : "scenario.&3.&2.&1.&0"
+            }
           }
         }
       }
@@ -494,7 +504,8 @@
             "maximumSpeed": "3.0",
             "acceleration": "2.0"
           },
-          "attributesCar": null
+          "attributesCar": null,
+          "teleporter" : null
         }
       }
     }

VadereSimulator/resources/transform_v0.6_to_v0.7.json

@@ -442,6 +442,16 @@
               "groupIds": "scenario.&3.&2.[&1].&0",
               "type": "scenario.&3.&2.[&1].&0"
             }
+          },
+          "teleporter" : {
+            "shift" : {
+              "x" : "scenario.&3.&2.&1.&0",
+              "y" : "scenario.&3.&2.&1.&0"
+            },
+            "position" : {
+              "x" : "scenario.&3.&2.&1.&0",
+              "y" : "scenario.&3.&2.&1.&0"
+            }
           }
         }
       }
@@ -500,7 +510,8 @@
             "maximumSpeed": "3.0",
             "acceleration": "2.0"
           },
-          "attributesCar": null
+          "attributesCar": null,
+          "teleporter" : null
         }
       }
     }