Remove duplicate code

breki · Jun 3, 2024 · 62a7042 · 62a7042
1 parent 1b85716
commit 62a7042
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 50 deletions.
diff --git a/Demeton.Tests/Aw3d/AW3D experiments.fs b/Demeton.Tests/Aw3d/AW3D experiments.fs
@@ -3,14 +3,10 @@
 
 open Demeton.Commands
 open Demeton.Geometry.Common
-open Demeton.Dem.Funcs
 open Demeton.Projections.PROJParsing
 open Demeton.Shaders
-open Demeton.Aw3d.Types
-open Demeton.Aw3d.Funcs
 open FsUnit
 open Png
-open Raster
 open Tests.Shaders
 open Xunit
 open TestHelp
@@ -44,50 +40,6 @@ let options: ShadeCommand.Options =
           IgnoredParameters = [] } }
 
 
-// todo 10: move this to the command module?
-let fetchAw3dHeightsArray _ _ =
-    let tileDownloadingResult = ensureAw3dTiles CacheDir area
-
-    match tileDownloadingResult with
-    | Ok tilesIds ->
-        let tilesHeightsArrays =
-            tilesIds |> Seq.map (readAw3dTile CacheDir) |> Seq.toList
-
-        // calculate mergedArrayBounds for the given area
-        let projectedCoveragePoints =
-            coveragePoints
-            |> List.map (fun (lon, lat) ->
-                mapProjection.Proj (lon |> degToRad) (lat |> degToRad))
-            |> List.choose id
-
-        let deprojectedCoveragePoints =
-            projectedCoveragePoints
-            |> List.map (fun (x, y) -> mapProjection.Invert x y)
-            |> List.choose id
-
-        let cellsPerDegree = Aw3dTileSize
-
-        // now convert lon, lat to DEM coordinates
-        let coveragePointsInDemCoords =
-            deprojectedCoveragePoints
-            |> List.map (fun (lon, lat) ->
-                let cellX = lon |> radToDeg |> longitudeToCellX cellsPerDegree
-                let cellY = lat |> radToDeg |> latitudeToCellY cellsPerDegree
-                (cellX, cellY))
-
-        let demMbr = Demeton.Geometry.Bounds.mbrOf coveragePointsInDemCoords
-
-        let mergedArrayBounds =
-            Rect.asMinMax
-                ((demMbr.MinX |> floor |> int) - 1)
-                ((demMbr.MinY |> floor |> int) - 1)
-                ((demMbr.MaxX |> ceil |> int) + 1)
-                ((demMbr.MaxY |> ceil |> int) + 1)
-
-        merge mergedArrayBounds tilesHeightsArrays |> Result.Ok
-    | Error message -> Result.Error message
-
-
 [<Fact(Skip = "downloads the tile so it takes too long")>]
 let ``Generate hillshading from AW3D`` () =
     let pixelShader =
@@ -102,7 +54,7 @@ let ``Generate hillshading from AW3D`` () =
 
     let generateTile =
         ShadeCommand.generateShadedRasterTile
-            [| fetchAw3dHeightsArray |]
+            [| TileShadeCommand.fetchAw3dHeightsArray mapProjection CacheDir |]
             createShaderFunction
 
     let saveTile =

diff --git a/Demeton.Tests/WorldCover/WorldCover experiments.fs b/Demeton.Tests/WorldCover/WorldCover experiments.fs
@@ -118,7 +118,7 @@ let ``Render hillshading with WorldCover water bodies`` () =
             waterBodiesHeightsArray |> Some |> Result.Ok
 
         let heightsArraysFetchers =
-            [| Tests.Aw3d.``AW3D experiments``.fetchAw3dHeightsArray
+            [| TileShadeCommand.fetchAw3dHeightsArray mapProjection cacheDir
                fetchWorldCoverHeightsArray |]
 
         let createShaderFunction shaderFunctionName =