Added handling of M values in OgrConverter

.github/workflows/msbuild.yml

@@ -14,7 +14,7 @@ on:
       - 'docs/**'
 env:
   # Path to the solution files relative to the root of the project.
-  SUPPORTLIBS_SOLUTION_FILE_PATH: ./Support/SupportLibs.sln
+  SUPPORTLIBS_SOLUTION_FILE_PATH: ./Support/SupportLibs-toolset143.sln
   MAPWINGIS_SOLUTION_FILE_PATH: ./src/MapWinGIS.sln
   UNITTESTS_SOLUTION_FILE_PATH: ./MapWinGisTests-net6/MapWinGisTests-net6.sln
 
@@ -24,26 +24,25 @@ env:
 jobs:
   build:
     name: Build MapWinGIS
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     strategy:
       matrix:
-        platform: ['Win32', 'x64']
-        # platform: ['Win32']
+        platform: ['x64']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
     # Setup MSBuild
     - name: setup-msbuild
-      uses: microsoft/setup-msbuild@v1.1   
+      uses: microsoft/setup-msbuild@v2   
       if: ${{matrix.platform == 'x64' }}
       with:
         msbuild-architecture: x64
     - name: setup-msbuild
-      uses: microsoft/setup-msbuild@v1.1 
+      uses: microsoft/setup-msbuild@v2 
       if: ${{matrix.platform == 'Win32' }}
       with:
         msbuild-architecture: x86
@@ -64,11 +63,11 @@ jobs:
            echo ("VCPKG_INSTALLED_DIR=${{ github.workspace }}/src/vcpkg_installed/x64-windows/") >> $env:GITHUB_ENV
            mkdir $[env.VCPKG_INSTALLED_DIR]
 
-    # Install VCPCK
+    # Install VCPKG
     - name: run-vcpkg    
-      # You may pin to the exact commit or the version.
-      # uses: lukka/run-vcpkg@c5ce6a7de6e5ce834a25f7d55b6c250a275a6732
-      uses: lukka/run-vcpkg@v10
+      uses: lukka/run-vcpkg@v11
+      env:
+        VCPKG_BINARY_SOURCES: clear
       with:
         runVcpkgInstall: true
         vcpkgDirectory:  ${{ github.workspace }}\src\vcpkg\
@@ -96,32 +95,30 @@ jobs:
       with:
         # Specify the Az PowerShell script here.
         inlineScript: |
-          Invoke-WebRequest -Uri "https://github.com/MapWindow/Dependencies/raw/main/GisInternals/release-1928-gdal-3-5-mapserver-8-0.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30 -OutFile ".\Support\release-1928-gdal-3-5-mapserver-8-0.zip"
-          Invoke-WebRequest -Uri "https://github.com/MapWindow/Dependencies/raw/main/GisInternals/release-1928-gdal-3-5-mapserver-8-0-libs.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30  -OutFile ".\Support\release-1928-gdal-3-5-mapserver-8-0-libs.zip"
-          Invoke-WebRequest -Uri "https://github.com/MapWindow/Dependencies/raw/main/GisInternals/release-1928-x64-gdal-3-5-mapserver-8-0.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30  -OutFile ".\Support\release-1928-x64-gdal-3-5-mapserver-8-0.zip"
-          Invoke-WebRequest -Uri "https://github.com/MapWindow/Dependencies/raw/main/GisInternals/release-1928-x64-gdal-3-5-mapserver-8-0-libs.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30  -OutFile ".\Support\release-1928-x64-gdal-3-5-mapserver-8-0-libs.zip"
+          Invoke-WebRequest -Uri "https://github.com/sweco-sedahd/Dependencies/raw/main/GisInternals/release-1930-x64-gdal-3-10-3-mapserver-8-2-2.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30  -OutFile ".\Support\release-1930-x64-gdal-3-10-3-mapserver-8-2-2.zip"
+          Invoke-WebRequest -Uri "https://github.com/sweco-sedahd/Dependencies/raw/main/GisInternals/release-1930-x64-gdal-3-10-3-mapserver-8-2-2-libs.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30  -OutFile ".\Support\release-1930-x64-gdal-3-10-3-mapserver-8-2-2-libs.zip"
           ls .\Support\
         # Azure PS version to be used to execute the script, example: 1.8.0, 2.8.0, 3.4.0. To use the latest version, specify "latest".
         azPSVersion: "latest"
         # Select the value of the ErrorActionPreference variable for executing the script. Options: stop, continue, silentlyContinue. Default is Stop.
         errorActionPreference: Stop
         # If this is true, this task will fail if any errors are written to the error pipeline, or if any data is written to the Standard Error stream.
         failOnStandardError: true
-    
+
     # Unzip zips by calling powershell script
     - name: Unzip
       working-directory: ./Support/
       shell: pwsh
-      run: .\unpackGdal3-Toolset142-GISInternals.ps1
-             
+      run: .\unpackGdal3-Toolset143-GISInternals.ps1
+
     # Build support libs
     - name: Build SupportLibs ${{matrix.platform}}
       working-directory: ${{env.GITHUB_WORKSPACE}}
       # Add additional options to the MSBuild command line here (like platform or verbosity level).
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
       # MSBuild SupportLibs.sln /t:Rebuild /p:Configuration=Release /p:Platform="Win32"
       run: msbuild /m /p:Configuration=Release /p:Platform=${{matrix.platform}} ${{env.SUPPORTLIBS_SOLUTION_FILE_PATH}}
-      
+
     # Build MapWinGIS
     - name: Build MapWinGIS ${{matrix.platform}}
       working-directory: ${{env.GITHUB_WORKSPACE}}
@@ -132,11 +129,11 @@ jobs:
 
     # Save artifacts:
     - name: Archive production artifacts
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4
       with:
         name: binaries-${{matrix.platform}}
         path: .\src\bin\${{env.BUILD_CONFIGURATION}}\${{matrix.platform}}\**\*
-        
+
   unit-tests:
     name: Unit Testing
     needs: build
@@ -145,24 +142,18 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        platform: ['x64', 'Win32']
-        # platform: ['Win32']
-
+        platform: ['x64']
+
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Setup dotnet 6
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.x'
+    - uses: actions/checkout@v4
 
-    - name: Setup dotnet 7
-      uses: actions/setup-dotnet@v1
+    - name: Setup dotnet 8
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '6.x'        
+        dotnet-version: '8.x'
 
     - name: Download MapWinGIS (${{matrix.platform}}) binaries
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
         name: binaries-${{matrix.platform}}
         path: .\src\bin\${{env.BUILD_CONFIGURATION}}\${{matrix.platform}}\
@@ -179,9 +170,9 @@ jobs:
             3 = "FAIL_LOAD - LoadLibrary Failed";
             4 = "FAIL_ENTRY - GetProcAddress failed";
             5 = "FAIL_REG - DllRegisterServer or DllUnregisterServer failed.";
-          }        
-          $regsvrp = Start-Process C:\Windows\SysWOW64\regsvr32.exe -ArgumentList "/s ${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\${{matrix.platform}}\MapWinGIS.ocx" -PassThru
-          
+          }
+          $regsvrp = Start-Process C:\Windows\System32\regsvr32.exe -ArgumentList "/s ${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\${{matrix.platform}}\MapWinGIS.ocx" -PassThru
+
           $regsvrp.WaitForExit(5000) # Wait (up to) 5 seconds
           if($regsvrp.ExitCode -ne 0)
           {
@@ -197,32 +188,32 @@ jobs:
 
     # Build test solution
     - name: setup-msbuild
-      uses: microsoft/setup-msbuild@v1.1   
+      uses: microsoft/setup-msbuild@v2
       if: ${{matrix.platform == 'x64' }}
       with:
         msbuild-architecture: x64
     - name: setup-msbuild
-      uses: microsoft/setup-msbuild@v1.1 
+      uses: microsoft/setup-msbuild@v2
       if: ${{matrix.platform == 'Win32' }}
       with:
         msbuild-architecture: x86
-        
+
     - name: Build test solution ${{matrix.platform}}
       working-directory: ${{env.GITHUB_WORKSPACE}}
       # Add additional options to the MSBuild command line here (like platform or verbosity level).
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
       # MSBuild SupportLibs.sln /t:Rebuild /p:Configuration=Release /p:Platform="Win32"
-      run: msbuild /m:2 /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{matrix.platform}} -restore /v:m ${{env.UNITTESTS_SOLUTION_FILE_PATH}}      
+      run: msbuild /m:2 /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{matrix.platform}} -restore /v:m ${{env.UNITTESTS_SOLUTION_FILE_PATH}}
 
     # Run unit tests
     - name: Setup VSTest.console.exe
       uses: darenm/Setup-VSTest@v1  
     - name: Unit Testing x86
       if: ${{matrix.platform == 'Win32' }}
-      run: vstest.console.exe /Blame /Diag:logs\log.txt /Platform:x86 -e:PROJ_LIB="${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\Win32\proj7\share\" .\MapWinGisTests-net6\MapWinGisTests\bin\x86\${{env.BUILD_CONFIGURATION}}\net6.0-windows8.0\MapWinGisTests.dll
+      run: vstest.console.exe /Blame /Diag:logs\log.txt /Platform:x86 -e:PROJ_LIB="${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\Win32\proj9\share\" .\MapWinGisTests-net6\MapWinGisTests\bin\x86\${{env.BUILD_CONFIGURATION}}\net8.0-windows8.0\MapWinGisTests.dll
     - name: Unit Testing x64
       if: ${{matrix.platform == 'x64' }}
-      run: vstest.console.exe /Blame /Diag:logs\log.txt /Platform:x64 -e:PROJ_LIB="${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\x64\proj7\share\" .\MapWinGisTests-net6\MapWinGisTests\bin\x64\${{env.BUILD_CONFIGURATION}}\net6.0-windows8.0\MapWinGisTests.dll
+      run: vstest.console.exe /Blame /Diag:logs\log.txt /Platform:x64 -e:PROJ_LIB="${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\x64\proj9\share\" .\MapWinGisTests-net6\MapWinGisTests\bin\x64\${{env.BUILD_CONFIGURATION}}\net8.0-windows8.0\MapWinGisTests.dll
 
    # TODO: Create installer using innosetup   
    # TODO: Publish installer to GitHub Releases      

MapWinGisTests-net6/MapWinGisTests-net6.sln.DotSettings

@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gdal/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Polyline/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

MapWinGisTests-net6/MapWinGisTests/AxMapTests.cs

@@ -19,7 +19,7 @@ public void VersionTest()
         var version = form.GetMapWinGisVersion();
         version.ShouldNotBeNull();
         version.Major.ShouldBe(5);
-        version.Minor.ShouldBe(4);
+        version.Minor.ShouldBe(5);
         version.Build.ShouldBeGreaterThanOrEqualTo(0);
         _testOutputHelper.WriteLine("Version: {0}", version);
     }
@@ -28,6 +28,7 @@ public void VersionTest()
     public void MapProjectionTest()
     {
         using var form = new WinFormsApp1.Form1();
+        form.Show(); // We need to show the form to have a valid map control
         form.ShouldNotBeNull();
 
         var sfLocation = Helpers.GetTestFilePath("UnitedStates-3857.shp");
@@ -69,7 +70,8 @@ public void ShapefileKeyTest()
         // AS mentioned at https://mapwindow.discourse.group/t/key-property-of-shape-object-not-work/1250
 
         using var form = new WinFormsApp1.Form1();
-        form.ShouldNotBeNull();
+        form.Show(); // We need to show the form to have a valid map control
+		form.ShouldNotBeNull();
 
         // Create shapefile:
         var sfPolygon = Helpers.CreateTestPolygonShapefile();

MapWinGisTests-net6/MapWinGisTests/FunctionalTests/GdalUtils/GdalUtilsTests.cs

@@ -90,8 +90,12 @@ public void Progress(string keyOfSender, int percent, string message)
 
     public void Error(string keyOfSender, string errorMsg)
     {
-        _testOutputHelper.WriteLine($"Error of {keyOfSender}: {errorMsg}");
-    }
+	    try {
+		    _testOutputHelper.WriteLine($"Error of {keyOfSender}: {errorMsg}");
+		} catch {
+		    // ignore
+	    }
+	}
 #pragma warning restore xUnit1013
     #endregion
 }

MapWinGisTests-net6/MapWinGisTests/FunctionalTests/Projections/GeoProjectionsTests.cs

@@ -72,8 +72,10 @@ public void IsEmptyTest()
     [Fact]
     public void IsSameTest()
     {
-        // Setup:
-        var geoProjection3857 = new GeoProjection();
+	    System.Diagnostics.Debug.WriteLine("IsSameTest() start");
+
+		// Setup:
+		var geoProjection3857 = new GeoProjection();
         geoProjection3857.ShouldNotBeNull();
 
         var geoProjection28992 = new GeoProjection();
@@ -113,7 +115,9 @@ public void IsSameTest()
         geoProjection3857.IsSame[geoProjectionPrj].ShouldBeFalse("GeoProjections should not be the same.");
         geoProjection28992.IsSame[geoProjectionPrj].ShouldBeTrue("GeoProjections should be the same.");
         geoProjectionPrj.IsSame[geoProjection28992].ShouldBeTrue("GeoProjections should be the same.");
-    }
+
+        System.Diagnostics.Debug.WriteLine("IsSameTest() end");
+	}
 
     [Fact]
     public void ImportFromAutoDetectTest()

MapWinGisTests-net6/MapWinGisTests/FunctionalTests/Projections/UtilsProjectionTests.cs

@@ -13,19 +13,21 @@ public UtilsProjectionTests(ITestOutputHelper testOutputHelper)
     [Fact]
     public void UtilsReprojectShapefileTest()
     {
-        // RD (Amersfoort, The Neterlands) to WGS84:
-        // https://geodata.nationaalgeoregister.nl/locatieserver/v3/free?q=a325
-        // "centroide_rd": "POINT(187816.756 433912.801)",
-        // "centroide_ll": "POINT(5.86394184 51.89276528)"
+	    System.Diagnostics.Debug.WriteLine("UtilsReprojectShapefileTest() start");
+		// RD (Amersfoort, The Neterlands) to WGS84:
+		// https://geodata.nationaalgeoregister.nl/locatieserver/v3/free?q=a325
+		// "centroide_rd": "POINT(187816.756 433912.801)",
+		// "centroide_ll": "POINT(5.86394184 51.89276528)"
 
-        UtilsReprojectPointShapefile(187816.756, 433912.801, 5.86394184, 51.89276528, 0.0000001, 28992, 4326);
+		UtilsReprojectPointShapefile(187816.756, 433912.801, 5.86394184, 51.89276528, 0.0000001, 28992, 4326);
         // The other way round:
         UtilsReprojectPointShapefile(5.86394184, 51.89276528, 187816.756, 433912.801, 0.05, 4326, 28992);
 
         // Amersfoort Geodetic to ETRS89 (EPSG:4258)
         UtilsReprojectPointShapefile(4.5703125, 51.944265, 4.5706292, 51.945227, 0.000001, 4258, 4289);
         // Swap:
         UtilsReprojectPointShapefile(4.5706292, 51.945227, 4.5703125, 51.944265, 0.000001, 4289, 4258);
+        System.Diagnostics.Debug.WriteLine("UtilsReprojectShapefileTest() end");
     }
 
     private void UtilsReprojectPointShapefile(double srcX, double srcY, double dstX, double dstY, double tolerance, int srcEpsgCode, int dstEpsgCode)

MapWinGisTests-net6/MapWinGisTests/Helpers.cs

@@ -98,6 +98,19 @@ internal static Shapefile LoadSfUsingFileManager(string filename)
         return sf;
     }
 
+    internal static Shapefile CreateTestPolylineShapefile()
+    {
+		var sfPolyline = MakeShapefile(ShpfileType.SHP_POLYLINE);
+		AddShape(sfPolyline, "LINESTRING (330695.973322992 5914896.16305817, 330711.986129861 5914867.19586245, 330713.350435287 5914867.56644015, 330716.510827627 5914862.28973662, 330715.632568651 5914860.60107999, 330652.234582712 5914803.80510632, 330553.749382483 5914715.80328169, 330551.979355848 5914714.83347535, 330549.911988583 5914715.86502807, 330545.027807355 5914724.05916443, 330544.592985976 5914725.93531509, 330544.30963704 5914726.72754692, 330543.612620707 5914726.14904553, 330543.271515787 5914727.06633931, 330542.234090059 5914729.85597723, 330542.959654761 5914730.50411962, 330530.319252794 5914765.86064153, 330505.294840402 5914836.7930124, 330471.411812074 5914931.61558331, 330486.074748666 5914941.33795239, 330585.983154737 5915010.32749106, 330618.427962455 5915031.20447119, 330653.234601917 5914970.37328093, 330695.973322992 5914896.16305817)");
+
+		sfPolyline.NumShapes.ShouldBe(1);
+
+		// Set projection:
+		sfPolyline.GeoProjection = MakeProjection(28992);
+
+		return sfPolyline;
+    }
+
     internal static Shapefile CreateTestPolygonShapefile()
     {
         var sfPolygon = MakeShapefile(ShpfileType.SHP_POLYGON);
@@ -153,7 +166,14 @@ internal static Shape MakeShape(ShpfileType shpType)
         return shp;
     }
 
-    internal static void AddShape(Shapefile sf, string wktSting)
+    internal static Shape MakeShape(Point pt)
+    {
+	    var shape = MakeShape(ShpfileType.SHP_POINT);
+	    shape.AddPoint(pt.x, pt.y);
+	    return shape;
+    }
+
+	internal static void AddShape(Shapefile sf, string wktSting)
     {
         // Create shape
         var shp = new Shape();

MapWinGisTests-net6/MapWinGisTests/MapWinGisTests.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0-windows8.0</TargetFramework>
+		<TargetFramework>net8.0-windows8.0</TargetFramework>
 		<RootNamespace>MapWinGisTests</RootNamespace>
 		<Nullable>enable</Nullable>
 
@@ -14,36 +14,34 @@
 
 		<ImplicitUsings>enable</ImplicitUsings>
 
+		<EnableNativeDebugging>true</EnableNativeDebugging>
 	</PropertyGroup>
 
-	<ItemGroup>
-	  <Compile Remove="TestData\**" />
-	  <EmbeddedResource Remove="TestData\**" />
-	  <None Remove="TestData\**" />
-	</ItemGroup>
-
 	<ItemGroup>
 	  <COMReference Include="MapWinGIS">
 	    <WrapperTool>tlbimp</WrapperTool>
-	    <VersionMinor>4</VersionMinor>
+	    <VersionMinor>5</VersionMinor>
 	    <VersionMajor>5</VersionMajor>
 	    <Guid>c368d713-cc5f-40ed-9f53-f84fe197b96a</Guid>
 	    <Lcid>0</Lcid>
 	    <Isolated>false</Isolated>
-	    <EmbedInteropTypes>False</EmbedInteropTypes>
+	    <EmbedInteropTypes>true</EmbedInteropTypes>
 	  </COMReference>
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-		<PackageReference Include="Shouldly" Version="4.1.0" />
-		<PackageReference Include="xunit" Version="2.4.2" />
-		<PackageReference Include="xunit.analyzers" Version="1.1.0" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="Shouldly" Version="4.2.1" />
+		<PackageReference Include="xunit" Version="2.9.2" />
+		<PackageReference Include="xunit.analyzers" Version="1.17.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="3.2.0">
+		<PackageReference Include="coverlet.collector" Version="6.0.2">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>