diff --git a/Logica/PolygonManipulatie.cs b/Logica/PolygonManipulatie.cs index 06d056f..475506e 100644 --- a/Logica/PolygonManipulatie.cs +++ b/Logica/PolygonManipulatie.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using System.Text; using Datalaag; using Globals; diff --git a/opdracht2/GeoJsonParser.cs b/opdracht2/GeoJsonParser.cs index e4b1eea..dc07f19 100644 --- a/opdracht2/GeoJsonParser.cs +++ b/opdracht2/GeoJsonParser.cs @@ -1,23 +1,16 @@ -using GeoJSON.Net.Converters; -using GeoJSON.Net.Geometry; +using GeoJSON.Net.Geometry; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Linq; -using System.Net; using System.Numerics; using System.Reflection; -using System.Runtime.CompilerServices; -using System.Security.Cryptography.Pkcs; -using System.Text; using System.Windows; using System.Windows.Media; using System.Windows.Shapes; using Point = System.Windows.Point; -using Polygon = System.Windows.Shapes.Polygon; namespace opdracht2 { diff --git a/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs b/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs index 53f92ef..25eb7f6 100644 --- a/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs +++ b/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs @@ -101,7 +101,7 @@ namespace opdracht2 { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/opdracht2;component/mainwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/opdracht2;V1.0.0.0;component/mainwindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\MainWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache index dcead26..57f6094 100644 Binary files a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache and b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache differ diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.cache b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.cache index 4449608..ae00679 100644 --- a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.cache +++ b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.cache @@ -16,5 +16,5 @@ C:\Users\Beppe\source\repos\opdracht2\opdracht2\App.xaml 1981362301543 MainWindow.xaml; -True +False diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.lref b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.lref deleted file mode 100644 index 2e0809b..0000000 --- a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.lref +++ /dev/null @@ -1,4 +0,0 @@ - - -FC:\Users\Beppe\source\repos\opdracht2\opdracht2\MainWindow.xaml;; - diff --git a/opdracht2/obj/opdracht2.csproj.nuget.dgspec.json b/opdracht2/obj/opdracht2.csproj.nuget.dgspec.json index 178a586..3340e16 100644 --- a/opdracht2/obj/opdracht2.csproj.nuget.dgspec.json +++ b/opdracht2/obj/opdracht2.csproj.nuget.dgspec.json @@ -5,7 +5,6 @@ }, "projects": { "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj": { - "version": "1.0.0", "restore": { "projectUniqueName": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj", "projectName": "Datalaag", @@ -25,7 +24,6 @@ } }, "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Globals\\Globals.csproj": { - "version": "1.0.0", "restore": { "projectUniqueName": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Globals\\Globals.csproj", "projectName": "Globals", @@ -36,7 +34,6 @@ } }, "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj": { - "version": "1.0.0", "restore": { "projectUniqueName": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj", "projectName": "Logica", diff --git a/opdracht2/obj/opdracht2.csproj.nuget.g.props b/opdracht2/obj/opdracht2.csproj.nuget.g.props index 06e0a7a..f4394fb 100644 --- a/opdracht2/obj/opdracht2.csproj.nuget.g.props +++ b/opdracht2/obj/opdracht2.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Beppe\.nuget\packages\ PackageReference - 5.5.0 + 5.6.0 $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/opdracht2/obj/project.nuget.cache b/opdracht2/obj/project.nuget.cache index dc4ba08..c7b4006 100644 --- a/opdracht2/obj/project.nuget.cache +++ b/opdracht2/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "p426YNxR+un7rXUpsV3S3g0htKyuFPUxB5pYHNl1fsHxje10LlIJDBLjupJb2IZCMEZ+Cv3TXWBEUMbbMYO5hA==", + "dgSpecHash": "Zy6jypDVLiSwLfNswZHvoD7ul/+NOG2AgIE/eLzWMMgAaQ+TzAjn3Or2nqa6RpIYT9zQrkp/4+yCHo1D0FoSMQ==", "success": true, "projectFilePath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\opdracht2\\opdracht2.csproj", "expectedPackageFiles": [