Merge pull request #559 from pro3d-space/bugs/support-old-waypoint-traverse-files

Support old waypoint traverse files

Author: haraldsteinlechner

Build.fs

@@ -622,9 +622,9 @@ Target.create "CopyJRWRapper" (fun _ ->
 
 Target.create "GitHubRelease" (fun _ ->
     let newVersion = notes.NugetVersion
+    let tagName = "v" + newVersion
     try
         try
-            let tagName = "v" + newVersion
             Branches.tag "." tagName
             let token =
                 match Environment.environVarOrDefault "GH_TOKEN" "" with
@@ -633,7 +633,10 @@ Target.create "GitHubRelease" (fun _ ->
 
             //let files = System.IO.Directory.EnumerateFiles("bin/publish") 
             let release = sprintf "bin/PRo3D.Viewer-standalone.%s.zip" notes.NugetVersion
-            let z = System.IO.Compression.ZipFile.CreateFromDirectory("bin/publish/win-x64", release)
+            let z = 
+                if File.Exists release then
+                    File.Delete(release)
+                System.IO.Compression.ZipFile.CreateFromDirectory("bin/publish/win-x64", release)
 
             let release =
                 GitHub.createClientWithToken token
@@ -642,11 +645,11 @@ Target.create "GitHubRelease" (fun _ ->
                 //|> GitHub.publishDraft
                 |> Async.RunSynchronously
 
-            try Branches.pushTag "." "origin" newVersion with e -> Trace.logf "could not create tag: %A" e
+            try Branches.pushTag "." "origin" tagName with e -> Trace.logf "could not create tag: %A" e
 
         with e -> 
             Trace.logf "failed to create github release: %A" e
-            Branches.deleteTag "." newVersion
+            Branches.deleteTag "." tagName
     finally
         ()
 

src/PRo3D.Core/Traverse-Model.fs

@@ -546,7 +546,7 @@ module Traverse =
     let empty() = {
         version = current
         guid = Guid.NewGuid()
-        traverseType = TraverseType.Rover
+        traverseType = TraverseType.WayPoints
         showRimfaxSurfaces = true
         tName = ""
         sols = []
@@ -656,7 +656,29 @@ module Traverse =
             let! color = Json.readWith Ext.fromJson<ColorInput, Ext> "color"
             let! heightOffset = Json.tryRead "heightOffset"
             let! priorityEnabled = Json.tryRead "priorityEnabled"
-            let! traverseType = Json.read "traverseType"
+            let! readTraverseType = Json.read "traverseType"
+
+            let traverseType =
+                // some legacy data have "wrong" traverse type in file. this one tries to find it out and repair if necessary
+                // (don't know how we arrived in this situation... :/)
+                let firstSolMetricType = sols |> List.tryHead |> Option.bind _.solMetrics
+                let changeTraverseType = // None if no change is needed 
+                    match firstSolMetricType,readTraverseType  with
+                    | Some (SolMetrics.RimfaxM _), TraverseType.Rimfax -> None
+                    | Some (SolMetrics.RoverM _), TraverseType.Rover -> None
+                    | Some (SolMetrics.WaypointM _), TraverseType.WayPoints -> None
+                    | Some (SolMetrics.RimfaxM _), _ -> Some TraverseType.Rimfax
+                    | Some (SolMetrics.RoverM _), _ -> Some TraverseType.Rover
+                    | Some (SolMetrics.WaypointM _), _ -> Some TraverseType.WayPoints
+                    | None, _ -> None
+
+                match changeTraverseType with
+                | None -> readTraverseType
+                | Some inferredTraverseType -> 
+                    Log.warn $"needed to change traverse type to match sols from {readTraverseType} to {inferredTraverseType} because of {firstSolMetricType} being found in first sol"
+                    inferredTraverseType
+
+
             let! showRimfaxSurfaces = Json.read "showRimfaxSurfaces"
             let! rimfaxRootDirectory = Json.read "rimfaxRootDirectory"
 

src/PRo3D.Viewer/Traverse/RIMFAXTraverse.fs

@@ -264,6 +264,9 @@ module RimfaxTraverseApp =
                                 ]
                             ]
                         | _ -> 
+                            Log.warn "[RoverTraverseApp] inconsistent traverse metrics: %A, should be rimfaxM)" (
+                                reversedSols |> List.tryHead |> Option.map (string << _.solMetrics) |> Option.defaultValue "unknown"
+                            )
                             yield div [clazz "item"; style white] [
                                 yield div [clazz "header";] [
                                     span [] [text "Inconsistent Data"]

src/PRo3D.Viewer/Traverse/RoverTraverse.fs

@@ -242,6 +242,9 @@ module RoverTraverseApp =
                                 ]
                             ]
                         | _ -> 
+                            Log.warn "[RoverTraverseApp] inconsistent traverse metrics: %A, should be RoverM)" (
+                                reversedSols |> List.tryHead |> Option.map (string << _.solMetrics) |> Option.defaultValue "unknown"
+                            )
                             yield div [clazz "item"; style white] [
                                 yield div [clazz "header";] [
                                     span [] [text "Inconsistent Data"]

src/PRo3D.Viewer/Traverse/WayPointsTraverse.fs

@@ -272,6 +272,9 @@ module WayPointsTraverseApp =
                                 ]
                             ]
                         | _ -> 
+                            Log.warn "[RoverTraverseApp] inconsistent traverse metrics: %A, should be WaypointM)" (
+                                reversedSols |> List.tryHead |> Option.map (string << _.solMetrics) |> Option.defaultValue "unknown"
+                            )
                             yield div [clazz "item"; style white] [
                                 yield div [clazz "header";] [
                                     span [] [text "Inconsistent Data"]

src/PRo3D.Viewer/TraverseApp.fs

@@ -130,8 +130,19 @@ module TraverseApp =
                     | t -> failwithf "Traverse file does not define a valid traverseType. Valid types are WayPoints, Rover, Rimfax, PlannedTargets and StrategicAnnotations. The given traverseType is: %s" t
                 Some (sols, traverseType, showLines, showText, showDots)
             | None -> 
-                Log.warn "[TraverseApp] Error parsing traverse %s : Missing properties" name
-                None
+                match traverse.features with 
+                    | [] -> 
+                        Log.error "[TraverseApp] Missing properties for traverse %s; Empty feature list. Not able to load traverse. " name
+                        None 
+                    | h::_ -> 
+                        match h.geometry with
+                        | GeoJsonGeometry.Point p -> 
+                            Log.warn "[TraverseApp] Missing properties for traverse %s. Fallback waypoint traverse " name
+                            Some (WayPointsTraverseApp.parseTraverse (traverse), TraverseType.WayPoints, false, true, true)
+                        | e -> 
+                            Log.warn "[TraverseApp] Missing properties for traverse %s; Features not having waypoint geometry type. Not able to load traverse. " name
+                            None
+
 
     let assignColorsToTraverse (traverses : List<string>) : List<string * C4b> =
         // this function is not in use at the moment