GMap.NET.WindowsMobile: sync

radioman · Apr 1, 2015 · a65ba8d · a65ba8d
1 parent 8a56cfc
commit a65ba8d
Show file tree

Hide file tree

Showing 16 changed files with 483 additions and 64 deletions.
diff --git a/Build/Build Demos NET4.bat b/Build/Build Demos NET4.bat
@@ -1,7 +1,7 @@
 
 set msbuildexe=%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
 
-set builddir=Release-NET%TargetFrameworkVersion4%
+set builddir=Release-NETv4.0
 mkdir .\%builddir% 
 del /q /s .\%builddir%\*.*
 

diff --git a/Build/release-cf.bat b/Build/release-cf.bat
@@ -5,7 +5,7 @@ cd .\Release-NETv3.5CF
 "C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsMobile.zip GMap.NET.WindowsMobile.dll
 "C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsMobile.zip System.Data.SQLite.dll
 "C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsMobile.zip System.Data.SQLite.xml
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsMobile.zip SQLite.Interop.081.dll
+"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsMobile.zip SQLite.Interop.*.dll
 
 "C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsMobile.zip OpenNETCF.Configuration.dll
 "C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsMobile.zip OpenNETCF.Configuration.xml

diff --git a/Build/release-mono.bat b/Build/release-mono.bat
@@ -1,10 +1,10 @@
 
-"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar .\Release\Demo.WindowsForms.exe
-"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar .\Release\GMap.NET.Core.dll
-"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar .\Release\GMap.NET.Core.xml
-"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar .\Release\GMap.NET.WindowsForms.dll
-"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar .\Release\GMap.NET.WindowsForms.xml
-"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar ..\Info\License.txt
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar Release-NETv2.0\Demo.WindowsForms.exe
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar Release-NETv2.0\GMap.NET.Core.dll
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar Release-NETv2.0\GMap.NET.Core.xml
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar Release-NETv2.0\GMap.NET.WindowsForms.dll
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar Release-NETv2.0\GMap.NET.WindowsForms.xml
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.Mono.tar Release-NETv2.0\License.txt
 
 "C:\Program Files\7-Zip\7z.exe" t GMap.NET.WindowsForms.Mono.tar
 

diff --git a/Build/release.bat b/Build/release.bat
@@ -1,26 +1,37 @@
 
-cd .\Release-NETv3.5
-
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsPresentation.zip Demo.WindowsPresentation.exe
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsPresentation.zip GMap.NET.Core.dll
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsPresentation.zip GMap.NET.Core.xml
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsPresentation.zip GMap.NET.WindowsPresentation.dll
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsPresentation.zip GMap.NET.WindowsPresentation.xml
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsPresentation.zip ..\..\Info\License.txt
-
-"C:\Program Files\7-Zip\7z.exe" t ..\GMap.NET.WindowsPresentation.zip
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv3.5\Demo.WindowsPresentation.exe
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv3.5\GMap.NET.Core.dll
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv3.5\GMap.NET.Core.xml
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv3.5\GMap.NET.WindowsPresentation.dll
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv3.5\GMap.NET.WindowsPresentation.xml
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv3.5\License.txt
+
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv4.0\Demo.WindowsPresentation.exe
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv4.0\GMap.NET.Core.dll
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv4.0\GMap.NET.Core.xml
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv4.0\GMap.NET.WindowsPresentation.dll
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv4.0\GMap.NET.WindowsPresentation.xml
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsPresentation.zip Release-NETv4.0\License.txt
+
+"C:\Program Files\7-Zip\7z.exe" t GMap.NET.WindowsPresentation.zip
 
 pause
 
-cd ..\Release-NETv2.0
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv4.0\Demo.WindowsForms.exe
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv4.0\GMap.NET.Core.dll
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv4.0\GMap.NET.Core.xml
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv4.0\GMap.NET.WindowsForms.dll
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv4.0\GMap.NET.WindowsForms.xml
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv4.0\License.txt
 
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsForms.zip Demo.WindowsForms.exe
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsForms.zip GMap.NET.Core.dll
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsForms.zip GMap.NET.Core.xml
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsForms.zip GMap.NET.WindowsForms.dll
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsForms.zip GMap.NET.WindowsForms.xml
-"C:\Program Files\7-Zip\7z.exe" a ..\GMap.NET.WindowsForms.zip ..\..\Info\License.txt
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv2.0\Demo.WindowsForms.exe
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv2.0\GMap.NET.Core.dll
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv2.0\GMap.NET.Core.xml
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv2.0\GMap.NET.WindowsForms.dll
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv2.0\GMap.NET.WindowsForms.xml
+"C:\Program Files\7-Zip\7z.exe" a GMap.NET.WindowsForms.zip Release-NETv2.0\License.txt
 
-"C:\Program Files\7-Zip\7z.exe" t ..\GMap.NET.WindowsForms.zip
+"C:\Program Files\7-Zip\7z.exe" t GMap.NET.WindowsForms.zip
 
 pause
+
diff --git a/Demo.WindowsForms/Demo.WindowsForms.csproj b/Demo.WindowsForms/Demo.WindowsForms.csproj
@@ -228,7 +228,6 @@
     </Compile>
     <Compile Include="Source\DemoStuff.cs" />
     <Compile Include="Source\Map.cs">
-      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Source\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/Demo.WindowsForms/Properties/Resources.Designer.cs b/Demo.WindowsForms/Properties/Resources.Designer.cs
diff --git a/Demo.WindowsForms/Properties/Resources.resx b/Demo.WindowsForms/Properties/Resources.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ChevronDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\BSE.Windows.Forms\Resources\ChevronDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

diff --git a/Demo.WindowsForms/Source/DemoStuff.cs b/Demo.WindowsForms/Source/DemoStuff.cs
@@ -396,6 +396,7 @@ public static void GetVilniusTransportData(TransportType type, string line, List
 
       static string sessionId = string.Empty;
 
+#if !PocketPC
       public static void GetFlightRadarData(List<FlightRadarData> ret, RectLatLng bounds)
       {
          ret.Clear();
@@ -517,5 +518,6 @@ static string GetFlightRadarContentUsingHttp(string url)
 
          return ret;
       }
+#endif
    }
 }
diff --git a/GMap.NET.Core/GMap.NET.MapProviders/GMapProvider.cs b/GMap.NET.Core/GMap.NET.MapProviders/GMapProvider.cs
@@ -538,6 +538,7 @@ protected string GetContentUsingHttp(string url)
             return ret;
         }
 
+#if !PocketPC
         /// <summary>
         /// use at your own risk, storing tiles in files is slow and hard on the file system
         /// </summary>
@@ -547,7 +548,7 @@ protected virtual PureImage GetTileImageFromFile(string fileName)
         {
             return GetTileImageFromArray(File.ReadAllBytes(fileName));
         }
-        
+#endif
         protected virtual PureImage GetTileImageFromArray(byte [] data)
         {
             return TileImageProxy.FromArray(data);

diff --git a/GMap.NET.Core/GMap.NET.MapProviders/Google/GoogleMapProvider.cs b/GMap.NET.Core/GMap.NET.MapProviders/Google/GoogleMapProvider.cs
@@ -14,6 +14,9 @@ namespace GMap.NET.MapProviders
     using System.Globalization;
     using System.Xml;
     using System.Text;
+#if PocketPC
+    using OpenNETCF.Security.Cryptography;
+#endif
 
     public abstract class GoogleMapProviderBase : GMapProvider, RoutingProvider, GeocodingProvider, DirectionsProvider
     {

diff --git a/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapControl.cs b/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapControl.cs
@@ -990,7 +990,9 @@ public Image ToImage()
 
                 if (!r)
                 {
+#if !PocketPC
                     ForceDoubleBuffer = true;
+#endif
                 }
 
                 Refresh();                
@@ -1002,7 +1004,11 @@ public Image ToImage()
                     {
                         frame.Save(ms, ImageFormat.Png);
                     }
+#if !PocketPC
                     ret = Image.FromStream(ms);
+#else
+                    ret = new Bitmap(ms);
+#endif
                 }
             }
             catch (Exception)
@@ -1013,7 +1019,9 @@ public Image ToImage()
             {
                 if (!r)
                 {
+#if !PocketPC
                     ForceDoubleBuffer = false;
+#endif
                     ClearBackBuffer();
                 }
             }
@@ -1029,13 +1037,15 @@ public void Offset(int x, int y)
         {
             if (IsHandleCreated)
             {
+#if !PocketPC
                 if (IsRotated)
                 {
                     System.Drawing.Point[] p = new System.Drawing.Point[] { new System.Drawing.Point(x, y) };
                     rotationMatrixInvert.TransformVectors(p);
                     x = (int)p[0].X;
                     y = (int)p[0].Y;
                 }
+#endif
                 Core.DragOffset(new GPoint(x, y));
 
                 ForceUpdateOverlays();
@@ -2790,7 +2800,8 @@ public RectLatLng ViewArea
         {
             get
             {
-                if (!IsRotated)
+#if !PocketPC
+                if (!IsRotated) 
                 {
                     return Core.ViewArea;
                 }
@@ -2802,6 +2813,9 @@ public RectLatLng ViewArea
                     return RectLatLng.FromLTRB(p.Lng, p.Lat, p2.Lng, p2.Lat);
                 }
                 return RectLatLng.Empty;
+#else
+                return Core.ViewArea;
+#endif               
             }
         }
 

diff --git a/GMap.NET.WindowsForms/Properties/Resources.Designer.cs b/GMap.NET.WindowsForms/Properties/Resources.Designer.cs
diff --git a/GMap.NET.WindowsForms/Properties/Resources.resx b/GMap.NET.WindowsForms/Properties/Resources.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>