Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-29 19:17:28 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Remove static sectors (#2701)

Browse Source 
* [sectors] Remove static sectors.

* [sectors] Update conf.

* [sectors] Keep "type" in DTD and issue error.

* [generator] move inside sector functions out of NAV_C section

Co-authored-by: Gautier Hattenberger <gautier.hattenberger@enac.fr>
This commit is contained in:
Fabien-B
2021-05-04 16:51:34 +02:00
committed by GitHub
parent 4a3ae9fbb7
commit e9656391a2
13 changed files with 52 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/lib/ocaml/mapFP.ml
+2 -5
View File
@@ -261,7 +261,7 @@ class flight_plan = fun ?format_attribs ?editable ~show_moved geomap color fp_dt
w in
(* The sectors *)
(* Parse sectors and store dynamic ones *)
(* Parse and store sectors *)
let sectors =
let waypoints = ExtXml.child xml "waypoints" in
try
@@ -283,10 +283,7 @@ class flight_plan = fun ?format_attribs ?editable ~show_moved geomap color fp_dt
let color_sector = ExtXml.attrib_or_default x "color" color in
let segments = display_lines ~group:wpts_group#group color_sector geomap points in
let wp_names = List.map (fun wp -> Xml.attrib wp "name") (Xml.children x) in
if ExtXml.attrib_or_default x "type" "" = "dynamic" then
[(wp_names, segments, color_sector)] @ l
else
l
[(wp_names, segments, color_sector)] @ l
| _ -> failwith "Unknown sectors child")
[] (Xml.children (ExtXml.child xml "sectors"))
with Not_found -> [] in