use fw length. radius from cli file

stronnag · Jun 9, 2024 · a5747bf · a5747bf
1 parent ed14c1e
commit a5747bf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/meson.build b/meson.build
@@ -1,4 +1,4 @@
-project('flightlog2kml', version : '1.0.21')
+project('flightlog2kml', version : '1.0.22')
 meson.add_install_script('meson/post_install.py')
 version = get_option('version')
 commit = get_option('commit')

diff --git a/pkg/cli/fwapproach.go b/pkg/cli/fwapproach.go
@@ -167,8 +167,10 @@ func add_approach(dref string, dirn int, lpath []kml.Coordinate) []kml.Coordinat
 	}
 
 	fwax := Fwapproach_length / 2.0
-	if 4.0*Fwloiter_radius > fwax {
-		fwax = 4.0 * Fwloiter_radius
+	fwlr := Fwloiter_radius * 4.0
+
+	if fwax < fwlr {
+		fwax = fwlr
 	}
 
 	lax, lox := geo.Posit(lpath[iap].Lat, lpath[iap].Lon, float64(xdir), fwax)

diff --git a/pkg/kmlgen/kmlbuilder.go b/pkg/kmlgen/kmlbuilder.go
@@ -506,13 +506,18 @@ func GenerateCliOnly(outfn string, gv func() string) {
 }
 
 func GenerateMissionOnly(outfn string, gv func() string) {
+	var sfx []kml.Element
+
+	fb := geo.Getfrobnication()
+	if len(options.Config.Cli) > 0 {
+		sfx = Generate_cli_kml(options.Config.Cli, fb)
+	}
 	kname := filepath.Base(options.Config.Mission)
 	desc := fmt.Sprintf("Generator: %s", gv())
 	d := kml.Folder(kml.Name(kname)).Add(kml.Description(desc)).Add(kml.Open(true))
 	_, mm, err := mission.Read_Mission_File(options.Config.Mission)
 	if err == nil {
 		isviz := true
-		fb := geo.Getfrobnication()
 		for nm, _ := range mm.Segment {
 			nmx := nm + 1
 			if options.Config.MissionIndex == 0 || nmx == options.Config.MissionIndex {
@@ -541,7 +546,6 @@ func GenerateMissionOnly(outfn string, gv func() string) {
 			}
 		}
 		if len(options.Config.Cli) > 0 {
-			sfx := Generate_cli_kml(options.Config.Cli, fb)
 			for _, s := range sfx {
 				d.Add(s)
 			}

diff --git a/pkg/mission/to_kml.go b/pkg/mission/to_kml.go
@@ -194,7 +194,8 @@ func (m *Mission) To_kml(hpos types.HomeRec, dms bool, fake bool, mmidx int, isv
 	kelem := kml.Folder(kml.Name(fldnam)).Add(kml.Description(desc)).
 		Add(kml.Visibility(isvis)).Add(styles.Get_mission_styles()...).Add(track).Add(wps...)
 
-	if landid != -1 && m.FWApproach.No == int8(mmidx+7) && m.FWApproach.Dirn1 != 0 && m.FWApproach.Dirn2 != 0 {
+	if landid != -1 && m.FWApproach.No == int8(mmidx+7) &&
+		(m.FWApproach.Dirn1 != 0 || m.FWApproach.Dirn2 != 0) {
 		f := kml.Folder(kml.Name("Approaches")).Add(kml.Open(true))
 		f.Add(styles.Get_approach_styles()...)
 		for _, ll := range cli.AddLaylines(m.MissionItems[landid].Lat, m.MissionItems[landid].Lon, addAlt, m.FWApproach, isvis) {