From fe98bd2b541e3f622618591358396a4220b16f06 Mon Sep 17 00:00:00 2001 From: bert Date: Wed, 25 Apr 2018 09:07:22 +0200 Subject: [PATCH 1/4] remove unused nuget packages --- Mapsui.Demo.WPF/VectorMbTilesProvider.cs | 10 +++------- VectorTileRenderer/ICanvas.cs | 7 +------ VectorTileRenderer/Renderer.cs | 5 +---- VectorTileRenderer/SkiaCanvas.cs | 2 -- VectorTileRenderer/SkiaGL.cs | 4 ---- VectorTileRenderer/Sources/ITileSource.cs | 8 +------- VectorTileRenderer/Sources/MbTilesSource.cs | 5 +---- VectorTileRenderer/Style.cs | 7 +------ VectorTileRenderer/VectorTileRenderer.csproj | 15 --------------- VectorTileRenderer/app.config | 2 +- VectorTileRenderer/packages.config | 4 ---- 11 files changed, 9 insertions(+), 60 deletions(-) diff --git a/Mapsui.Demo.WPF/VectorMbTilesProvider.cs b/Mapsui.Demo.WPF/VectorMbTilesProvider.cs index 51a9f24c..db1a9a79 100644 --- a/Mapsui.Demo.WPF/VectorMbTilesProvider.cs +++ b/Mapsui.Demo.WPF/VectorMbTilesProvider.cs @@ -1,10 +1,6 @@ using BruTile; using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Media.Imaging; using VectorTileRenderer; @@ -47,19 +43,19 @@ public byte[] GetTile(TileInfo tileInfo) return GetBytesFromBitmapSource(bitmapSource); } - static byte[] GetBytesFromBitmapSource(System.Windows.Media.Imaging.BitmapSource bmp) + static byte[] GetBytesFromBitmapSource(BitmapSource bmp) { if(bmp == null) { return null; } - System.Windows.Media.Imaging.PngBitmapEncoder encoder = new System.Windows.Media.Imaging.PngBitmapEncoder(); + var encoder = new PngBitmapEncoder(); //encoder.Frames.Add(BitmapFrame.Create(bitmapSource)); // byte[] bit = new byte[0]; using (MemoryStream stream = new MemoryStream()) { - encoder.Frames.Add(System.Windows.Media.Imaging.BitmapFrame.Create(bmp)); + encoder.Frames.Add(BitmapFrame.Create(bmp)); encoder.Save(stream); byte[] bit = stream.ToArray(); stream.Close(); diff --git a/VectorTileRenderer/ICanvas.cs b/VectorTileRenderer/ICanvas.cs index 78b946ae..108617ee 100644 --- a/VectorTileRenderer/ICanvas.cs +++ b/VectorTileRenderer/ICanvas.cs @@ -1,10 +1,5 @@ -using GeoJSON.Net.Feature; -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; using System.Windows.Media.Imaging; diff --git a/VectorTileRenderer/Renderer.cs b/VectorTileRenderer/Renderer.cs index 905ce8df..8b5de764 100644 --- a/VectorTileRenderer/Renderer.cs +++ b/VectorTileRenderer/Renderer.cs @@ -1,10 +1,7 @@ -using Mapbox.Vector.Tile; -using System; +using System; using System.Collections.Generic; using System.IO; -using System.IO.Compression; using System.Linq; -using System.Text; using System.Threading.Tasks; using System.Windows; using System.Windows.Media.Imaging; diff --git a/VectorTileRenderer/SkiaCanvas.cs b/VectorTileRenderer/SkiaCanvas.cs index e70bfe3d..d230cc99 100644 --- a/VectorTileRenderer/SkiaCanvas.cs +++ b/VectorTileRenderer/SkiaCanvas.cs @@ -5,8 +5,6 @@ using System.IO; using System.Linq; using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; using System.Windows; using System.Windows.Media; using System.Windows.Media.Imaging; diff --git a/VectorTileRenderer/SkiaGL.cs b/VectorTileRenderer/SkiaGL.cs index f418d808..5e3b5f86 100644 --- a/VectorTileRenderer/SkiaGL.cs +++ b/VectorTileRenderer/SkiaGL.cs @@ -1,10 +1,6 @@ using SkiaSharp; using System; -using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; namespace VectorTileRenderer { diff --git a/VectorTileRenderer/Sources/ITileSource.cs b/VectorTileRenderer/Sources/ITileSource.cs index 0dda7da7..07dd1246 100644 --- a/VectorTileRenderer/Sources/ITileSource.cs +++ b/VectorTileRenderer/Sources/ITileSource.cs @@ -1,11 +1,5 @@ -using Mapbox.Vector.Tile; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; +using System.IO; using System.Threading.Tasks; -using System.Windows; namespace VectorTileRenderer.Sources { diff --git a/VectorTileRenderer/Sources/MbTilesSource.cs b/VectorTileRenderer/Sources/MbTilesSource.cs index f545d912..1858913b 100644 --- a/VectorTileRenderer/Sources/MbTilesSource.cs +++ b/VectorTileRenderer/Sources/MbTilesSource.cs @@ -1,10 +1,7 @@ -using Mapbox.Vector.Tile; -using System; +using System; using System.Collections.Generic; using System.Data.SQLite; using System.IO; -using System.Linq; -using System.Text; using System.Threading.Tasks; using System.Windows; diff --git a/VectorTileRenderer/Style.cs b/VectorTileRenderer/Style.cs index 37a306dd..314c9f77 100644 --- a/VectorTileRenderer/Style.cs +++ b/VectorTileRenderer/Style.cs @@ -1,16 +1,11 @@ -using Mapbox.Vector.Tile; -using Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; using System.Windows; using System.Windows.Media; -using System.Windows.Media.Imaging; namespace VectorTileRenderer { diff --git a/VectorTileRenderer/VectorTileRenderer.csproj b/VectorTileRenderer/VectorTileRenderer.csproj index df32df21..e75e8edb 100644 --- a/VectorTileRenderer/VectorTileRenderer.csproj +++ b/VectorTileRenderer/VectorTileRenderer.csproj @@ -41,18 +41,6 @@ ..\packages\ColorMine.1.2.0\lib\net45\ColorMine.dll - - ..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll - - - ..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll - - - ..\packages\GeoJSON.Net.0.1.56\lib\portable-net40+sl5+wp80+win8+wpa81\GeoJSON.Net.dll - - - ..\packages\mapbox-vector-tile.3.1.4\lib\portable-net4+sl5+wp8+win8\Mapbox.Vector.Tile.dll - ..\packages\Mapbox.VectorTile.1.0.4-alpha2\lib\net35\Mapbox.VectorTile.ExtensionMethods.dll @@ -72,9 +60,6 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\protobuf-net.2.3.2\lib\net40\protobuf-net.dll - ..\packages\SkiaSharp.1.60.0\lib\net45\SkiaSharp.dll diff --git a/VectorTileRenderer/app.config b/VectorTileRenderer/app.config index cbaa3618..f45a76bd 100644 --- a/VectorTileRenderer/app.config +++ b/VectorTileRenderer/app.config @@ -1,7 +1,7 @@  - +
diff --git a/VectorTileRenderer/packages.config b/VectorTileRenderer/packages.config index 5d3cb8a2..28ece562 100644 --- a/VectorTileRenderer/packages.config +++ b/VectorTileRenderer/packages.config @@ -2,15 +2,11 @@ - - - - From 8f08fe0a33d09d630492a87783219b9de750cd10 Mon Sep 17 00:00:00 2001 From: bert Date: Wed, 25 Apr 2018 09:08:46 +0200 Subject: [PATCH 2/4] updating all packages --- Mapsui.Demo.WPF/App.config | 2 +- VectorTileRenderer/VectorTileRenderer.csproj | 26 +++++++++++--------- VectorTileRenderer/packages.config | 18 +++++++------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Mapsui.Demo.WPF/App.config b/Mapsui.Demo.WPF/App.config index d731824b..812d326d 100644 --- a/Mapsui.Demo.WPF/App.config +++ b/Mapsui.Demo.WPF/App.config @@ -15,7 +15,7 @@ - + diff --git a/VectorTileRenderer/VectorTileRenderer.csproj b/VectorTileRenderer/VectorTileRenderer.csproj index e75e8edb..52195ab9 100644 --- a/VectorTileRenderer/VectorTileRenderer.csproj +++ b/VectorTileRenderer/VectorTileRenderer.csproj @@ -56,8 +56,8 @@ ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll @@ -79,15 +79,15 @@ - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + + ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll ..\packages\System.Data.SQLite.Core.1.0.108.0\lib\net46\System.Data.SQLite.dll - - ..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll @@ -106,8 +106,8 @@ ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll + + ..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll @@ -119,7 +119,7 @@ - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll @@ -127,8 +127,8 @@ ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -136,7 +136,7 @@ - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll + ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll @@ -168,10 +168,12 @@ + xcopy "$(TargetDir)x64" "$(SolutionDir)bin\Debug\" /y + \ No newline at end of file diff --git a/VectorTileRenderer/packages.config b/VectorTileRenderer/packages.config index 28ece562..5c1fc38f 100644 --- a/VectorTileRenderer/packages.config +++ b/VectorTileRenderer/packages.config @@ -3,19 +3,19 @@ - + - - + + - + - + @@ -27,7 +27,7 @@ - + @@ -41,16 +41,16 @@ - + - + - + \ No newline at end of file From d0befb30454ef6bf9709f8534a993e303500b843 Mon Sep 17 00:00:00 2001 From: bert Date: Wed, 25 Apr 2018 09:10:55 +0200 Subject: [PATCH 3/4] remove unused usings --- VectorTileRenderer/GlobalMercator.cs | 4 ---- VectorTileRenderer/LineClipper.cs | 2 -- VectorTileRenderer/Sources/IVectorTileSource.cs | 7 +------ VectorTileRenderer/Sources/PbfTileSource.cs | 2 -- VectorTileRenderer/Sources/RasterTileSource.cs | 6 +----- VectorTileRenderer/Utils.cs | 3 --- VectorTileRenderer/VectorTile.cs | 6 +----- 7 files changed, 3 insertions(+), 27 deletions(-) diff --git a/VectorTileRenderer/GlobalMercator.cs b/VectorTileRenderer/GlobalMercator.cs index acc227d5..79eaccdf 100644 --- a/VectorTileRenderer/GlobalMercator.cs +++ b/VectorTileRenderer/GlobalMercator.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace VectorTileRenderer { diff --git a/VectorTileRenderer/LineClipper.cs b/VectorTileRenderer/LineClipper.cs index f3693e7a..ddb3ed97 100644 --- a/VectorTileRenderer/LineClipper.cs +++ b/VectorTileRenderer/LineClipper.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; namespace VectorTileRenderer diff --git a/VectorTileRenderer/Sources/IVectorTileSource.cs b/VectorTileRenderer/Sources/IVectorTileSource.cs index e9f7efb8..3aa3a4e6 100644 --- a/VectorTileRenderer/Sources/IVectorTileSource.cs +++ b/VectorTileRenderer/Sources/IVectorTileSource.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; +using System.Threading.Tasks; namespace VectorTileRenderer.Sources { diff --git a/VectorTileRenderer/Sources/PbfTileSource.cs b/VectorTileRenderer/Sources/PbfTileSource.cs index bda00f13..c1daf116 100644 --- a/VectorTileRenderer/Sources/PbfTileSource.cs +++ b/VectorTileRenderer/Sources/PbfTileSource.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.IO; using System.IO.Compression; -using System.Linq; -using System.Text; using System.Threading.Tasks; using System.Windows; diff --git a/VectorTileRenderer/Sources/RasterTileSource.cs b/VectorTileRenderer/Sources/RasterTileSource.cs index e980e5a8..17e7cfd9 100644 --- a/VectorTileRenderer/Sources/RasterTileSource.cs +++ b/VectorTileRenderer/Sources/RasterTileSource.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; +using System.IO; using System.Threading.Tasks; namespace VectorTileRenderer.Sources diff --git a/VectorTileRenderer/Utils.cs b/VectorTileRenderer/Utils.cs index 46473ea4..a987a975 100644 --- a/VectorTileRenderer/Utils.cs +++ b/VectorTileRenderer/Utils.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace VectorTileRenderer { diff --git a/VectorTileRenderer/VectorTile.cs b/VectorTileRenderer/VectorTile.cs index d636b658..0c09f387 100644 --- a/VectorTileRenderer/VectorTile.cs +++ b/VectorTileRenderer/VectorTile.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using System.Windows; namespace VectorTileRenderer From a516a49b8019d278e1c84f9a7e83bfb6f5780a2c Mon Sep 17 00:00:00 2001 From: bert Date: Wed, 25 Apr 2018 09:17:56 +0200 Subject: [PATCH 4/4] remove warnings --- Mapsui.Demo.WPF/VectorMbTilesProvider.cs | 2 +- Static.Demo.WPF/MainWindow.xaml.cs | 2 +- VectorTileRenderer/VectorTileRenderer.csproj | 4 ++-- VectorTileRenderer/packages.config | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Mapsui.Demo.WPF/VectorMbTilesProvider.cs b/Mapsui.Demo.WPF/VectorMbTilesProvider.cs index db1a9a79..522eb9ad 100644 --- a/Mapsui.Demo.WPF/VectorMbTilesProvider.cs +++ b/Mapsui.Demo.WPF/VectorMbTilesProvider.cs @@ -35,7 +35,7 @@ public byte[] GetTile(TileInfo tileInfo) { bitmapSource = Renderer.RenderCached(cachePath, style, canvas, (int)tileInfo.Index.Col, (int)tileInfo.Index.Row, Convert.ToInt32(tileInfo.Index.Level), 256, 256, 1).Result; } - catch (Exception e) + catch { return null; } diff --git a/Static.Demo.WPF/MainWindow.xaml.cs b/Static.Demo.WPF/MainWindow.xaml.cs index ede9edd7..45795932 100644 --- a/Static.Demo.WPF/MainWindow.xaml.cs +++ b/Static.Demo.WPF/MainWindow.xaml.cs @@ -160,7 +160,7 @@ async void showPbf(string path, string stylePath, double zoom, double size = 512 Console.WriteLine(elapsedMs + "ms time"); } - async void showMbTiles(string path, string stylePath, int minX, int minY, int maxX, int maxY, int zoom, double size = 512, double scale = 1) + void showMbTiles(string path, string stylePath, int minX, int minY, int maxX, int maxY, int zoom, double size = 512, double scale = 1) { var watch = System.Diagnostics.Stopwatch.StartNew(); diff --git a/VectorTileRenderer/VectorTileRenderer.csproj b/VectorTileRenderer/VectorTileRenderer.csproj index 52195ab9..643ea044 100644 --- a/VectorTileRenderer/VectorTileRenderer.csproj +++ b/VectorTileRenderer/VectorTileRenderer.csproj @@ -56,8 +56,8 @@ ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - - ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/VectorTileRenderer/packages.config b/VectorTileRenderer/packages.config index 5c1fc38f..24a8702f 100644 --- a/VectorTileRenderer/packages.config +++ b/VectorTileRenderer/packages.config @@ -6,7 +6,7 @@ - +