Refactored to latest OsmSharp.Core.

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/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/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;

OsmSharp.UI/OsmSharp.UI.csproj

@@ -71,6 +71,7 @@
     <Compile Include="Animations\Invalidation\Triggers\DefaultTrigger.cs" />
     <Compile Include="Animations\Invalidation\Triggers\TriggerBase.cs" />
     <Compile Include="Animations\MapViewAnimator.cs" />
+    <Compile Include="Data\SQLite\SQLiteConnectionBase.cs" />
     <Compile Include="IMapView.cs" />
     <Compile Include="KnownColor.cs" />
     <Compile Include="Map\Layers\Layer.cs" />
@@ -173,12 +174,12 @@
     <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\portable-net40+sl4+win8+wp7\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\portable-net403+sl50+win+wp80+Xamarin.iOS10+MonoAndroid10+MonoTouch10\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\portable-net40+sl4+win8+wp7\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\portable-net403+sl50+win+wp80+Xamarin.iOS10+MonoAndroid10+MonoTouch10\OsmSharp.Osm.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="protobuf-net">

OsmSharp.UI/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr3.Runtime.PCL" version="3.5.0.3" targetFramework="net40" />
-  <package id="OsmSharp.Core" version="0.0.0.48-beta" targetFramework="portable-net403+sl50+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
+  <package id="OsmSharp.Core" version="1.3.0-rc1-0119" targetFramework="portable40-net403+sl5+win8+wp8" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net40" />
   <package id="Zlib.Portable" version="1.9.2" targetFramework="net40" />
 </packages>

OsmSharp.WinForms.UI/OsmSharp.WinForms.UI.csproj

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{1433D177-B342-463C-8128-8399720A35AF}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>OsmSharp.WinForms.UI</RootNamespace>
     <AssemblyName>OsmSharp.WinForms.UI</AssemblyName>
-    <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -65,12 +65,12 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <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="OsmSharp, Version=1.3.0.119, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OsmSharp.Core.1.3.0-rc1-0119\lib\net45\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\net40\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\net45\OsmSharp.Osm.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -90,7 +90,6 @@
       <Link>Properties\SharedAssemblyVersion.cs</Link>
     </Compile>
     <Compile Include="Cache\OsmDataCacheDisk.cs" />
-    <Compile Include="IO\MemoryMappedFiles\TempMemoryMappedFile.cs" />
     <Compile Include="IO\Web\NativeHttpWebRequest.cs" />
     <Compile Include="IO\Web\NativeHttpWebResponse.cs" />
     <Compile Include="Log\ConsoleTraceListener.cs" />

OsmSharp.WinForms.UI/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OsmSharp.Core" version="0.0.0.48-beta" targetFramework="net403" />
+  <package id="OsmSharp.Core" version="1.3.0-rc1-0119" targetFramework="net452" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net403" />
   <package id="Zlib.Portable" version="1.9.2" targetFramework="net403" />
 </packages>