Dotspatial: update

RotorsAndCams · Dec 8, 2022 · 5dac1d5 · 5dac1d5
1 parent fe80f55
commit 5dac1d5
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 57 deletions.
diff --git a/ExtLibs/AltitudeAngelWings.Plugin/AltitudeAngelWings.Plugin.csproj b/ExtLibs/AltitudeAngelWings.Plugin/AltitudeAngelWings.Plugin.csproj
@@ -26,6 +26,10 @@
     <WarningsAsErrors>$(WarningsAsErrors)</WarningsAsErrors>
     <NoWarn>1701;1702;NU1605</NoWarn>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="DotSpatial.Projections" Version="4.0.656" />
+    <PackageReference Include="DotSpatial.Topology" Version="1.9.0" />
+  </ItemGroup>
   <ItemGroup>
 	  <ProjectReference Include="..\..\MissionPlanner.csproj">
 		  <Project>{A2E22272-95FE-47B6-B050-9AE7E2055BF5}</Project>

diff --git a/ExtLibs/Controls/MissionPlanner.Controls.csproj b/ExtLibs/Controls/MissionPlanner.Controls.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>

diff --git a/ExtLibs/GDAL/GDAL.NET.csproj b/ExtLibs/GDAL/GDAL.NET.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <ApplicationIcon />
     <OutputTypeEx>library</OutputTypeEx>
     <StartupObject />

diff --git a/ExtLibs/Maps/MissionPlanner.Maps.csproj b/ExtLibs/Maps/MissionPlanner.Maps.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
     <OutputTypeEx>library</OutputTypeEx>
     <AssemblyName>MissionPlanner.Maps</AssemblyName>
     <RootNamespace>MissionPlanner.Maps</RootNamespace>
 
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net461|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net461|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472|AnyCPU'">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
 
@@ -27,7 +27,7 @@
       <Aliases>Interface</Aliases>
     </ProjectReference>
     <ProjectReference Include="..\MissionPlanner.Drawing\MissionPlanner.Drawing.csproj" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-    <ProjectReference Include="..\MissionPlanner.Drawing\MissionPlanner.Drawing.csproj" Condition="'$(TargetFramework)' == 'net461'">
+    <ProjectReference Include="..\MissionPlanner.Drawing\MissionPlanner.Drawing.csproj" Condition="'$(TargetFramework)' == 'net472'">
       <Aliases>ignore</Aliases>
     </ProjectReference>
 

diff --git a/ExtLibs/Utilities/MissionPlanner.Utilities.csproj b/ExtLibs/Utilities/MissionPlanner.Utilities.csproj
@@ -38,7 +38,7 @@
     <PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.584.1" />
     <PackageReference Include="csmatio" Version="1.0.20" />
     <PackageReference Include="DotNetZip" Version="1.16.0" />
-    <PackageReference Include="DotSpatial.Projections" Version="1.9.0" />
+    <PackageReference Include="DotSpatial.Projections" Version="4.0.656" />
     <PackageReference Include="ExifLibNet" Version="2.1.3" />
     <PackageReference Include="Flurl" Version="3.0.2" />
     <PackageReference Include="Flurl.Http" Version="3.2.0" />

diff --git a/ExtLibs/Xamarin/GDAL/Resources/Resource.designer.cs b/ExtLibs/Xamarin/GDAL/Resources/Resource.designer.cs
diff --git a/ExtLibs/Xamarin/Xamarin.Android/Properties/AndroidManifest.xml b/ExtLibs/Xamarin/Xamarin.Android/Properties/AndroidManifest.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="57854" android:versionName="57854" package="com.michaeloborne.MissionPlanner" android:installLocation="preferExternal">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
-	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.LOCATION_HARDWARE" />
-	<uses-permission android:name="android.permission.WAKE_LOCK" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-	<uses-permission android:name="android.permission.BLUETOOTH" />
-	<uses-permission android:name="android.permission.USB_PERMISSION" />
-	<uses-permission android:name="android.permission.BATTERY_STATS" />
-	<supports-screens android:smallScreens="false" android:normalScreens="true" android:largeScreens="true" />
-	<uses-feature android:name="android.hardware.usb.accessory" android:required="false" />
-	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-	<uses-feature android:name="android.hardware.location" android:required="false" />
-	<uses-feature android:name="android.hardware.telephony" android:required="false" />
-	<uses-feature android:glEsVersion="0x00030000" android:required="true" />
-	<uses-feature android:name="android.hardware.faketouch" android:required="true" />
-	<application android:label="Mission Planner" android:requestLegacyExternalStorage="false" android:hardwareAccelerated="true" android:extractNativeLibs="true" android:killAfterRestore="true" android:hasFragileUserData="true" android:icon="@mipmap/icon" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="107288" android:versionName="107288" package="com.michaeloborne.MissionPlanner" android:installLocation="preferExternal">
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.LOCATION_HARDWARE" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+  <uses-permission android:name="android.permission.BLUETOOTH" />
+  <uses-permission android:name="android.permission.USB_PERMISSION" />
+  <uses-permission android:name="android.permission.BATTERY_STATS" />
+  <supports-screens android:smallScreens="false" android:normalScreens="true" android:largeScreens="true" />
+  <uses-feature android:name="android.hardware.usb.accessory" android:required="false" />
+  <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+  <uses-feature android:name="android.hardware.location" android:required="false" />
+  <uses-feature android:name="android.hardware.telephony" android:required="false" />
+  <uses-feature android:glEsVersion="0x00030000" android:required="true" />
+  <uses-feature android:name="android.hardware.faketouch" android:required="true" />
+  <application android:label="Mission Planner" android:requestLegacyExternalStorage="false" android:hardwareAccelerated="true" android:extractNativeLibs="true" android:killAfterRestore="true" android:hasFragileUserData="true" android:icon="@mipmap/icon" />
   <queries>
     <intent>
       <action android:name="android.intent.action.TTS_SERVICE" />

diff --git a/ExtLibs/tlogThumbnailHandler/tlogThumbnailHandler.csproj b/ExtLibs/tlogThumbnailHandler/tlogThumbnailHandler.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
     <ApplicationIcon />
     <StartupObject />
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

diff --git a/GCSViews/FlightPlanner.cs b/GCSViews/FlightPlanner.cs
@@ -3534,7 +3534,7 @@ public void fromSHPToolStripMenuItem_Click(object sender, EventArgs e)
                         string path = Path.GetDirectoryName(file);
                         foreach (var feature in fs.Features)
                         {
-                            foreach (var point in feature.Coordinates)
+                            foreach (var point in feature.Geometry.Coordinates)
                             {
                                 if (reproject)
                                 {

diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj
@@ -581,18 +581,16 @@
     <PackageReference Include="DotNetZip">
       <Version>1.16.0</Version>
     </PackageReference>
-    <PackageReference Include="DotSpatial.Data" version="1.9" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Data.Forms" version="1.9" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Extensions" version="1.9" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Modeling.Forms" version="1.9" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Mono" version="1.9" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Positioning" Version="1.9.0" />
-    <PackageReference Include="DotSpatial.Projections" version="1.9.0" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Projections.Forms" version="1.9" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Serialization" version="1.9" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Symbology" version="1.9" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Symbology.Forms" version="1.9" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Topology" version="1.9" targetFramework="net462" />
+    <PackageReference Include="DotSpatial.Data" version="3.0.1" targetFramework="net462" />
+    <PackageReference Include="DotSpatial.Data.Forms" version="3.0.1" targetFramework="net462" />
+    <PackageReference Include="DotSpatial.Extensions" version="3.0.1" targetFramework="net462" />
+    <PackageReference Include="DotSpatial.Modeling.Forms" version="3.0.1" targetFramework="net462" />
+    <PackageReference Include="DotSpatial.Positioning" Version="3.0.1" />
+    <PackageReference Include="DotSpatial.Projections" version="4.0.656" targetFramework="net462" />
+    <PackageReference Include="DotSpatial.Projections.Forms" version="3.0.1" targetFramework="net462" />
+    <PackageReference Include="DotSpatial.Serialization" version="3.0.1" targetFramework="net462" />
+    <PackageReference Include="DotSpatial.Symbology" version="3.0.1" targetFramework="net462" />
+    <PackageReference Include="DotSpatial.Symbology.Forms" version="3.0.1" targetFramework="net462" />
     <PackageReference Include="Flurl" version="3.0.2" targetFramework="net462" />
     <PackageReference Include="Flurl.Http" version="3.2.0" targetFramework="net462" />
     <PackageReference Include="GDAL" Version="2.3.2" />

diff --git a/MissionPlannerTests/MissionPlannerTests.csproj b/MissionPlannerTests/MissionPlannerTests.csproj
@@ -82,7 +82,7 @@
       <Version>2.2.10</Version>
     </PackageReference>
     <PackageReference Include="System.IO.Ports">
-      <Version>4.5.0</Version>
+      <Version>4.7.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/ZZZLibShims.cs b/ZZZLibShims.cs
@@ -541,10 +541,12 @@ bool VerticesAreValid
     int NumRows();
 }
 
-public class Feature    
-{
-    public List<Coord> Coordinates { get; set; }
-}
+    public class Feature
+    {
+        public List<Coord> Coordinates { get; set; }
+
+        public Feature Geometry { get; set; }
+    }
 
 public class Coord
 {
@@ -836,7 +838,7 @@ public ObjectQuery(string v)
         }
     }
 
-    public class ManagementObjectSearcher: IDisposable
+    public class ManagementObjectSearcher : IDisposable
     {
         private ObjectQuery query;
 
@@ -861,7 +863,7 @@ public class ManagementObject
 
         public class PropertyDataCollection : ICollection
         {
-         
+
 
             public IEnumerator<extratype> GetEnumerator()
             {
@@ -875,7 +877,7 @@ public extratype this[string pnpdeviceid]
 
             public void CopyTo(Array array, int index)
             {
-                
+
             }
 
             IEnumerator IEnumerable.GetEnumerator()

diff --git a/temp.cs b/temp.cs
@@ -467,7 +467,7 @@ private void BUT_shptopoly_Click(object sender, EventArgs e)
                         var sb = new StringBuilder();
 
                         sb.Append("#Shap to Poly - Mission Planner\r\n");
-                        foreach (var point in feature.Coordinates)
+                        foreach (var point in feature.Geometry.Coordinates)
                         {
                             if (reproject)
                             {