updated example world yamls to the new format

ctu-mrs · Oct 30, 2023 · 9574acd · 9574acd
1 parent fdd6005
commit 9574acd
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 82 deletions.
diff --git a/tmux/mrs_more_drones/config/world_config.yaml b/tmux/mrs_more_drones/config/world_config.yaml
@@ -1,46 +1,34 @@
-#
-## DEFINITION OF THE ARENA
-#
+world_origin:
 
-world_origin_units: "LATLON" # {"UTM, "LATLON"}
+  units: "LATLON" # {"UTM, "LATLON"}
 
-world_origin_x: 47.397743
-world_origin_y: 8.545594
+  origin_x: 47.397743
+  origin_y: 8.545594
 
 safety_area:
 
-  use_safety_area: true
-
-  frame_name: "world_origin"
-
-  # convex polygon CCW
-  safety_area: [
-    -50, -50,
-    50,  -50,
-    50,  50,
-    -50, 50
-  ]
-
-  max_z: 15.0
-  min_z: 0.5
-
-  polygon_obstacles:
-    # loaded as a vector of matrices
-    # each matrix has polygon vertices in columns
-    # [[M1], [M2]]
-    enabled: false
-    data: [8.6, 18.61, 20.35, 6.82, -3.14, 10.7,
-           -22.5, -22.71, 1.02, 17.68, 11.1, -4.1]
-    rows: 2 # each matrix has two rows
-    cols: [6] # nums of cols of each matrix
-
-  point_obstacles:
-    # loaded as a vector of matrices
-    # x, y, radius
-    enabled: false
-    # [x1, y1, radisu1, height1,
-    #  x2, y2, radius2, height2]
-    data: [-5.0, -5.0, 2, 2,
-           -10.0, -10.0, 4, 2]
-    rows: 1 # each matrix has a single row
-    cols: [4, 4] # nums of cols of each matrix
+  enabled: true
+
+  horizontal:
+
+    # the frame of reference in which the points are expressed
+    frame_name: "world_origin"
+
+    # polygon
+    #
+    # x, y [m] for any frame_name except latlon_origin
+    # x = latitude, y = longitude [deg]  for frame_name=="latlon_origin"
+    points: [
+      -50, -50,
+      50,  -50,
+      50,  50,
+      -50, 50
+    ]
+
+  vertical:
+
+    # the frame of reference in which the max&min z is expressed
+    frame_name: "world_origin"
+
+    max_z: 15.0
+    min_z: 0.5
diff --git a/tmux/mrs_one_drone/config/world_config.yaml b/tmux/mrs_one_drone/config/world_config.yaml
@@ -1,46 +1,34 @@
-#
-## DEFINITION OF THE ARENA
-#
+world_origin:
 
-world_origin_units: "LATLON" # {"UTM, "LATLON"}
+  units: "LATLON" # {"UTM, "LATLON"}
 
-world_origin_x: 47.397743
-world_origin_y: 8.545594
+  origin_x: 47.397743
+  origin_y: 8.545594
 
 safety_area:
 
-  use_safety_area: true
-
-  frame_name: "world_origin"
-
-  # convex polygon CCW
-  safety_area: [
-    -50, -50,
-    50,  -50,
-    50,  50,
-    -50, 50
-  ]
-
-  max_z: 15.0
-  min_z: 0.5
-
-  polygon_obstacles:
-    # loaded as a vector of matrices
-    # each matrix has polygon vertices in columns
-    # [[M1], [M2]]
-    enabled: false
-    data: [8.6, 18.61, 20.35, 6.82, -3.14, 10.7,
-           -22.5, -22.71, 1.02, 17.68, 11.1, -4.1]
-    rows: 2 # each matrix has two rows
-    cols: [6] # nums of cols of each matrix
-
-  point_obstacles:
-    # loaded as a vector of matrices
-    # x, y, radius
-    enabled: false
-    # [x1, y1, radisu1, height1,
-    #  x2, y2, radius2, height2]
-    data: [-5.0, -5.0, 2, 2,
-           -10.0, -10.0, 4, 2]
-    rows: 1 # each matrix has a single row
-    cols: [4, 4] # nums of cols of each matrix
+  enabled: true
+
+  horizontal:
+
+    # the frame of reference in which the points are expressed
+    frame_name: "world_origin"
+
+    # polygon
+    #
+    # x, y [m] for any frame_name except latlon_origin
+    # x = latitude, y = longitude [deg]  for frame_name=="latlon_origin"
+    points: [
+      -50, -50,
+      50,  -50,
+      50,  50,
+      -50, 50
+    ]
+
+  vertical:
+
+    # the frame of reference in which the max&min z is expressed
+    frame_name: "world_origin"
+
+    max_z: 15.0
+    min_z: 0.5