Added Wpf MapControl

OsmSharp.Android.UI/Data/SQLite/SQLiteConnection.cs

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with OsmSharp. If not, see <http://www.gnu.org/licenses/>.
 
-using OsmSharp.Data.SQLite;
+using OsmSharp.UI.Data.SQLite;
 using System.IO;
 using System.Reflection;
 
@@ -25,7 +25,7 @@ namespace OsmSharp.Android.UI.Data.SQLite
     /// <summary>
     /// An Android-specific implementation of an SQLiteConnection.
     /// </summary>
-    public class SQLiteConnection : OsmSharp.Data.SQLite.SQLiteConnectionBase
+    public class SQLiteConnection : OsmSharp.UI.Data.SQLite.SQLiteConnectionBase
     {
         /// <summary>
         /// Holds the 'native' or platform-specific connection.

OsmSharp.Android.UI/OsmSharp.Android.UI.csproj

@@ -38,12 +38,12 @@
     <DocumentationFile>..\OutputAndroid\OsmSharp.Android.UI.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OsmSharp, Version=0.0.0.48, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OsmSharp.Core.0.0.0.48-beta\lib\MonoAndroid\OsmSharp.dll</HintPath>
+    <Reference Include="OsmSharp, Version=1.3.0.119, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OsmSharp.Core.1.3.0-rc1-0119\lib\MonoAndroid\OsmSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OsmSharp.Osm, Version=0.0.0.48, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OsmSharp.Core.0.0.0.48-beta\lib\MonoAndroid\OsmSharp.Osm.dll</HintPath>
+    <Reference Include="OsmSharp.Osm, Version=1.3.0.119, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OsmSharp.Core.1.3.0-rc1-0119\lib\MonoAndroid\OsmSharp.Osm.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

OsmSharp.Android.UI/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="modernhttpclient" version="1.2.2" targetFramework="MonoAndroid31" />
-  <package id="OsmSharp.Core" version="0.0.0.48-beta" targetFramework="MonoAndroid44" />
+  <package id="OsmSharp.Core" version="1.3.0-rc1-0119" targetFramework="monoandroid44" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="MonoAndroid42" />
   <package id="Zlib.Portable" version="1.9.2" targetFramework="MonoAndroid42" />
 </packages>

OsmSharp.UI.Test/OsmSharp.UI.Test.csproj

@@ -64,12 +64,16 @@
     <Reference Include="Antlr3.Runtime">
       <HintPath>..\packages\Antlr3.Runtime.PCL.3.5.0.3\lib\portable-win+net40+sl40+wp\Antlr3.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="OsmSharp, Version=0.0.0.48, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OsmSharp.Core.0.0.0.48-beta\lib\net40\OsmSharp.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.0.5813.39032, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.0.1\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OsmSharp.Osm, Version=0.0.0.48, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OsmSharp.Core.0.0.0.48-beta\lib\net40\OsmSharp.Osm.dll</HintPath>
+    <Reference Include="OsmSharp, Version=1.3.0.119, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OsmSharp.Core.1.3.0-rc1-0119\lib\net40\OsmSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="OsmSharp.Osm, Version=1.3.0.119, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OsmSharp.Core.1.3.0-rc1-0119\lib\net40\OsmSharp.Osm.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
@@ -82,9 +86,6 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="Zlib.Portable, Version=1.9.1.9000, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Zlib.Portable.1.9.2\lib\portable-net4+sl4+wp71+win8\Zlib.Portable.dll</HintPath>
       <Private>True</Private>
@@ -139,5 +140,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup />
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
 </Project>

OsmSharp.UI.Test/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr3.Runtime.PCL" version="3.5.0.3" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
-  <package id="OsmSharp.Core" version="0.0.0.48-beta" targetFramework="net40" />
+  <package id="NUnit" version="3.0.1" targetFramework="net40" />
+  <package id="OsmSharp.Core" version="1.3.0-rc1-0119" targetFramework="net40" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net40" />
   <package id="Zlib.Portable" version="1.9.2" targetFramework="net40" />
 </packages>

OsmSharp.UI.sln

@@ -1,14 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OsmSharp.WinForms.UI", "OsmSharp.WinForms.UI\OsmSharp.WinForms.UI.csproj", "{1433D177-B342-463C-8128-8399720A35AF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OsmSharp.UI", "OsmSharp.UI\OsmSharp.UI.csproj", "{1524C255-2EE5-4C0C-A64C-56CE39A062E3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OsmSharp.UI.Test", "OsmSharp.UI.Test\OsmSharp.UI.Test.csproj", "{0739A23C-1D40-477F-AE7C-38518B499567}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OsmSharp.Wpf.UI", "OsmSharp.Wpf.UI\OsmSharp.Wpf.UI.csproj", "{141C2CD0-6A13-43C2-9924-D2217E88AA88}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OsmSharp.Wpf.UI.Sample", "OsmSharp.Wpf.UI.Sample\OsmSharp.Wpf.UI.Sample.csproj", "{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -53,6 +57,30 @@ Global
 		{0739A23C-1D40-477F-AE7C-38518B499567}.Release|x64.Build.0 = Release|x64
 		{0739A23C-1D40-477F-AE7C-38518B499567}.Release|x86.ActiveCfg = Release|x86
 		{0739A23C-1D40-477F-AE7C-38518B499567}.Release|x86.Build.0 = Release|x86
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Debug|x64.Build.0 = Debug|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Debug|x86.Build.0 = Debug|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Release|Any CPU.Build.0 = Release|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Release|x64.ActiveCfg = Release|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Release|x64.Build.0 = Release|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Release|x86.ActiveCfg = Release|Any CPU
+		{141C2CD0-6A13-43C2-9924-D2217E88AA88}.Release|x86.Build.0 = Release|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Debug|x64.Build.0 = Debug|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Release|x64.ActiveCfg = Release|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Release|x64.Build.0 = Release|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E2BD0D5-1EE6-4023-8880-78B451B6AEE1}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

OsmSharp.UI/Data/SQLite/SQLiteConnectionBase.cs

@@ -0,0 +1,44 @@
+// OsmSharp - OpenStreetMap (OSM) SDK
+// Copyright (C) 2016 Abelshausen Ben
+// 
+// This file is part of OsmSharp.
+// 
+// OsmSharp is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+// 
+// OsmSharp is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with OsmSharp. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+
+namespace OsmSharp.UI.Data.SQLite
+{
+    /// <summary>
+    /// A wrapper-class for all platform-specific SQLite connections.
+    /// </summary>
+    public abstract class SQLiteConnectionBase : IDisposable
+    {
+        /// <summary>
+        /// Creates an SQLLite command.
+        /// </summary>
+        public abstract List<T> Query<T>(string query, params object[] args) where T : new();
+
+        /// <summary>
+        /// Disposes of all resources associated with this connection.
+        /// </summary>
+        public abstract void Dispose();
+
+        /// <summary>
+        /// Closes this SQLite command.
+        /// </summary>
+        public abstract void Close();
+    }
+}

OsmSharp.UI/IMapView.cs

@@ -21,7 +21,6 @@
 using OsmSharp.UI.Animations;
 using OsmSharp.Math.Geo.Projections;
 using OsmSharp.UI.Renderer;
-using System;
 
 namespace OsmSharp.UI
 {

OsmSharp.UI/Map/Layers/Layer.cs

@@ -83,7 +83,7 @@ public bool IsLayerVisibleFor(float zoomLevel)
         /// <param name="zoomFactor"></param>
         /// <param name="view"></param>
         /// <returns></returns>
-        protected internal abstract IEnumerable<Primitive2D> Get(float zoomFactor, View2D view);
+        public abstract IEnumerable<Primitive2D> Get(float zoomFactor, View2D view);
 
         /// <summary>
         /// Called when the view on the map has changed.
@@ -93,15 +93,14 @@ public bool IsLayerVisibleFor(float zoomLevel)
         /// <param name="center"></param>
         /// <param name="view"></param>
         /// <param name="extraView"></param>
-        protected internal virtual void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
+        public virtual void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
         {
             // override in layer implementation if needed.
         }
-
         /// <summary>
         /// Called when the last map view change has to be cancelled.
         /// </summary>
-        protected internal virtual void ViewChangedCancel()
+        public virtual void ViewChangedCancel()
         {
             // override in layer implementation to cancel large map requests.
         }
@@ -124,7 +123,7 @@ protected void RaiseLayerChanged()
         /// <summary>
         /// An event raised when the content of this layer has changed.
         /// </summary>
-        protected internal event OsmSharp.UI.Map.Map.LayerChanged LayerChanged;
+        public event Map.LayerChanged LayerChanged;
 
         /// <summary>
         /// Holds the visible flag.
@@ -156,6 +155,7 @@ public bool IsVisible
         /// </summary>
         public object Tag { get; set; }
 
+
         /// <summary>
         /// Pauses all activities in this layer.
         /// </summary>

OsmSharp.UI/Map/Layers/LayerGpx.cs

@@ -57,7 +57,7 @@ public LayerGpx(IProjection projection)
         /// <param name="center"></param>
         /// <param name="view"></param>
         /// <param name="extraView"></param>
-        protected internal override void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
+        public override void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
         {
             // all data is pre-loaded for now.
 
@@ -70,7 +70,7 @@ protected internal override void ViewChanged(Map map, float zoomFactor, GeoCoord
         /// <param name="zoomFactor"></param>
         /// <param name="view"></param>
         /// <returns></returns>
-        protected internal override IEnumerable<Primitive2D> Get(float zoomFactor, View2D view)
+        public override IEnumerable<Primitive2D> Get(float zoomFactor, View2D view)
         {
             return _scene.Get(view, zoomFactor);
         }

OsmSharp.UI/Map/Layers/LayerMBTile.cs

@@ -23,7 +23,7 @@
 using OsmSharp.UI.Renderer;
 using OsmSharp.Math.Geo;
 using OsmSharp.Osm.Tiles;
-using OsmSharp.Data.SQLite;
+using OsmSharp.UI.Data.SQLite;
 using OsmSharp.Collections.Cache;
 using OsmSharp.UI.Renderer.Primitives;
 using OsmSharp.Math.Geo.Projections;
@@ -114,7 +114,7 @@ private void OnRemove(Image2D image)
         /// <param name="zoomFactor"></param>
         /// <param name="view"></param>
         /// <returns></returns>
-        protected internal override IEnumerable<Primitive2D> Get(float zoomFactor, View2D view)
+        public override IEnumerable<Primitive2D> Get(float zoomFactor, View2D view)
         {
             var primitives = new List<Primitive2D>();
             lock (_cache)
@@ -147,7 +147,7 @@ protected internal override IEnumerable<Primitive2D> Get(float zoomFactor, View2
         /// <param name="center"></param>
         /// <param name="view"></param>
         /// <param name="extraView"></param>
-        protected internal override void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
+        public override void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
         {
             // calculate the current zoom level.
             var zoomLevel = (int)System.Math.Round(map.Projection.ToZoomLevel(zoomFactor), 0);

OsmSharp.UI/Map/Layers/LayerOsm.cs

@@ -68,7 +68,7 @@ public LayerOsm(IDataSourceReadOnly dataSource, StyleInterpreter styleInterprete
         /// <param name="center"></param>
         /// <param name="view"></param>
         /// <param name="extraView"></param>
-        protected internal override void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
+        public override void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
         {
             this.BuildScene(map, zoomFactor, center, extraView);
         }
@@ -79,7 +79,7 @@ protected internal override void ViewChanged(Map map, float zoomFactor, GeoCoord
         /// <param name="zoomFactor"></param>
         /// <param name="view"></param>
         /// <returns></returns>
-        protected internal override IEnumerable<Primitive2D> Get(float zoomFactor, View2D view)
+        public override IEnumerable<Primitive2D> Get(float zoomFactor, View2D view)
         {
             return _styleSceneManager.Scene.Get(view, zoomFactor);
         }

OsmSharp.UI/Map/Layers/LayerPrimitives.cs

@@ -278,7 +278,7 @@ public void Clear()
         /// <param name="center"></param>
         /// <param name="view"></param>
         /// <param name="extraView"></param>
-        protected internal override void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
+        public override void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
         {
             // all data is preloaded for now.
 
@@ -291,7 +291,7 @@ protected internal override void ViewChanged(Map map, float zoomFactor, GeoCoord
         /// <param name="zoomFactor"></param>
         /// <param name="view"></param>
         /// <returns></returns>
-        protected internal override IEnumerable<Primitive2D> Get(float zoomFactor, View2D view)
+        public override IEnumerable<Primitive2D> Get(float zoomFactor, View2D view)
         {
             return _scene.Get(view, zoomFactor);
         }

OsmSharp.UI/Map/Layers/LayerScene.cs

@@ -58,15 +58,15 @@ public LayerScene(IPrimitives2DSource index)
         /// <param name="center"></param>
         /// <param name="view"></param>
         /// <param name="extraView"></param>
-        protected internal override void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
+        public override void ViewChanged(Map map, float zoomFactor, GeoCoordinate center, View2D view, View2D extraView)
         {
             this.BuildScene(map, zoomFactor, center, extraView);
         }
 
         /// <summary>
         /// Called when the last map view change has to be cancelled.
         /// </summary>
-        protected internal override void ViewChangedCancel()
+        public override void ViewChangedCancel()
         { // cancel the current get if there is one going on.
             _index.GetCancel();
         }
@@ -136,7 +136,7 @@ private void BuildScene(Map map, float zoomFactor, GeoCoordinate center, View2D
         /// <param name="zoomFactor"></param>
         /// <param name="view"></param>
         /// <returns></returns>
-        protected internal override IEnumerable<Primitive2D> Get(float zoomFactor, View2D view)
+        public override IEnumerable<Primitive2D> Get(float zoomFactor, View2D view)
         {
             return _primitives.Where((primitive) =>
             {