reactivated masterKdTree path & version bump

aardvark-platform · Jun 11, 2024 · e401124 · e401124
1 parent 9241aeb
commit e401124
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 1.7.1
+- reactivated master kdtree path
+
 ### 1.7.0
 - Optimized KdTree loading
 

diff --git a/src/OPCViewer.Base/KdTrees.fs b/src/OPCViewer.Base/KdTrees.fs
@@ -112,6 +112,7 @@ module KdTrees =
             // try fixing relative paths.
             match tryExpandKdTreePath paths.Opc_DirAbsPath l with
             | Some o -> 
+                Log.warn "[KdTrees] repaired KdTree path %s => %s." l.kdtreePath o.kdtreePath
                 o
             | None -> 
                 failwithf "[KdTrees] could not fix KdTree path: %s" l.kdtreePath
@@ -231,9 +232,7 @@ module KdTrees =
             if missingKd0Paths.Length > 0 then
                 Log.line "[KdTrees] missing kd0 paths: %d/%d" missingKd0Paths.Length kd0Paths.Length
 
-            let allKd0Available = Array.isEmpty missingKd0Paths
-
-            if allKd0Available || ignoreMasterKdTree || forceRebuild then
+            if ignoreMasterKdTree || forceRebuild || (tryFixPatchFileIfNeeded masterKdPath).IsNone  then
                 Log.line "Found master kdtree and patch trees"
                 Log.startTimed "building lazy kdtree cache"
 
@@ -291,7 +290,7 @@ module KdTrees =
                                             if File.Exists kdPath then Some kdPath else None
                                 elif forceRebuild then
                                     createConcreteTree() |> ignore
-                                    if File.Exists kdPath then Some kdPath else None
+                                    Some kdPath
                                 else
                                     Some kdPath
                             else