Skip to content

GitLab

Commit 47bd1e8d authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
1 Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

parents 0f125d7a 9bcf02f7
Pipeline #52954 passed with stage
    in 53 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 216 additions and 0 deletions
    VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1.scenario
    View file @ 47bd1e8d
    ......@@ -330,6 +330,150 @@
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 35.0001,
    "y" : -1.0E-4
    }, {
    "x" : 35.0001,
    "y" : 0.5001
    }, {
    "x" : -1.0E-4,
    "y" : 0.5001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 35.0001,
    "y" : -1.0E-4
    }, {
    "x" : 35.0001,
    "y" : 60.0001
    }, {
    "x" : 34.4999,
    "y" : 60.0001
    }, {
    "x" : 34.4999,
    "y" : -1.0E-4
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 35.0001,
    "y" : 60.0001
    }, {
    "x" : -1.0E-4,
    "y" : 60.0001
    }, {
    "x" : -1.0E-4,
    "y" : 59.4999
    }, {
    "x" : 35.0001,
    "y" : 59.4999
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : 60.0001
    }, {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : 60.0001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 35.0001,
    "y" : -1.0E-4
    }, {
    "x" : 35.0001,
    "y" : 0.5001
    }, {
    "x" : -1.0E-4,
    "y" : 0.5001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 35.0001,
    "y" : -1.0E-4
    }, {
    "x" : 35.0001,
    "y" : 60.0001
    }, {
    "x" : 34.4999,
    "y" : 60.0001
    }, {
    "x" : 34.4999,
    "y" : -1.0E-4
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 35.0001,
    "y" : 60.0001
    }, {
    "x" : -1.0E-4,
    "y" : 60.0001
    }, {
    "x" : -1.0E-4,
    "y" : 59.4999
    }, {
    "x" : 35.0001,
    "y" : 59.4999
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : 60.0001
    }, {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : 60.0001
    } ]
    },
    "id" : -1
    } ],
    "stairs" : [ ],
    "targets" : [ {
    ......
    VadereModelTests/TestOSM/scenarios/queueing_floor_field_osm1.scenario
    View file @ 47bd1e8d
    ......@@ -324,6 +324,78 @@
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 50.0001,
    "y" : -1.0E-4
    }, {
    "x" : 50.0001,
    "y" : 0.5001
    }, {
    "x" : -1.0E-4,
    "y" : 0.5001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 50.0001,
    "y" : -1.0E-4
    }, {
    "x" : 50.0001,
    "y" : 10.0001
    }, {
    "x" : 49.4999,
    "y" : 10.0001
    }, {
    "x" : 49.4999,
    "y" : -1.0E-4
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 50.0001,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : 9.4999
    }, {
    "x" : 50.0001,
    "y" : 9.4999
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : 10.0001
    } ]
    },
    "id" : -1
    } ],
    "stairs" : [ ],
    "targets" : [ {
    ......
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment