fam, dit is zo onplezant

This commit is contained in:
BuildTools
2020-07-26 12:01:43 +02:00
parent aaec57bb56
commit 2cea96e863
82 changed files with 79296 additions and 917 deletions

Binary file not shown.

View File

@@ -1,12 +1,67 @@
<Project Sdk="Microsoft.NET.Sdk"> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{FCBF208D-81B1-4E15-BE2F-29D25B20AAFC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Datalaag</RootNamespace>
<AssemblyName>Datalaag</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="GeoJSON.Net" Version="1.2.19" /> <Reference Include="GeoJSON.Net, Version=1.2.16.0, Culture=neutral, PublicKeyToken=42c00ea87f5f14d4">
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <HintPath>..\packages\GeoJSON.Net.1.2.20-rc\lib\net45\GeoJSON.Net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Windows" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup>
</Project> <Compile Include="JsonReader.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Globals\Globals.csproj">
<Project>{993c82fa-6f2d-4f9c-9712-0301e70ceab6}</Project>
<Name>Globals</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -1,11 +1,10 @@
using Newtonsoft.Json.Linq; using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO; using System.IO;
using System.Text;
using GeoJSON.Net.Geometry; using GeoJSON.Net.Geometry;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Globals;
namespace Datalaag namespace Datalaag
@@ -24,17 +23,14 @@ namespace Datalaag
{ {
case "MultiPolygon": case "MultiPolygon":
_polygons.Add(new PolygonPunten(JsonConvert.DeserializeObject<Polygon>(feature["geometry"] _polygons.Add(new PolygonPunten(JsonConvert.DeserializeObject<Polygon>(feature["geometry"]
.ToString()), feature["properties"]["name"].ToString())); .ToString()), feature["properties"]["name"].ToString()));
break; break;
case "Polygon": case "Polygon":
_multiPolygons.Add(new MultiPolygonPunten(JsonConvert.DeserializeObject<MultiPolygon> _multiPolygons.Add(new MultiPolygonPunten(JsonConvert.DeserializeObject<MultiPolygon>
(feature["geometry"].ToString()), feature["properties"]["name"].ToString())); (feature["geometry"].ToString()), feature["properties"]["name"].ToString()));
break; break;
} }
} }
} }
} }
} }

View File

@@ -1,31 +0,0 @@
using System;
using System.Collections.Generic;
using GeoJSON.Net.Geometry;
namespace Datalaag
{
public class MultiPolygonPunten
{
public List<PolygonPunten> PolygonPunten;
public string Naam;
public MultiPolygonPunten(MultiPolygon multiPolygon, string naam = "")
{
PolygonPunten = new List<PolygonPunten>();
Naam = naam;
foreach (Polygon polygon in multiPolygon.Coordinates)
{
PolygonPunten.Add(new PolygonPunten(polygon, naam));
}
}
public override string ToString()
{
if (string.Equals(Naam, "", StringComparison.Ordinal)) return "UNKNOWN";
else return Naam;
}
}
}

View File

@@ -1,66 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using GeoJSON.Net.Geometry;
namespace Datalaag
{
public class PolygonPunten
{
public double MinimumXWaarde, MinimumYWaarde, MaximumXWaarde, MaximumYWaarde;
public List<Punt> Punten;
public string Naam;
public PolygonPunten(Polygon polygon, string naam = "")
{
Naam = naam;
MinimumXWaarde = double.MaxValue;
MinimumYWaarde = double.MaxValue;
MaximumXWaarde = double.MinValue;
MaximumYWaarde = double.MinValue;
LeesPuntenVanPolygon(polygon);
}
public PolygonPunten(List<Punt> polygon, string naam = "")
{
Naam = naam;
Punten = polygon;
MaximumXWaarde = Punten.Max(p => p.X);
MinimumXWaarde = Punten.Min(p => p.X);
MaximumYWaarde = Punten.Max(p => p.Y);
MinimumYWaarde = Punten.Min(p => p.Y);
}
private void LeesPuntenVanPolygon(Polygon polygon)
{
foreach (LineString lijn in polygon.Coordinates)
{
foreach (Position positie in lijn.Coordinates)
{
CheckMinMaxWaarden(positie);
Punten.Add(new Punt(positie.Longitude, positie.Latitude, Naam));
}
}
}
private void CheckMinMaxWaarden(Position positie)
{
if (positie.Longitude > MaximumXWaarde) MaximumXWaarde = positie.Longitude;
if (positie.Longitude < MinimumXWaarde) MinimumXWaarde = positie.Longitude;
if (positie.Latitude > MaximumYWaarde) MaximumYWaarde = positie.Latitude;
if (positie.Latitude < MinimumYWaarde) MinimumYWaarde = positie.Latitude;
}
public override string ToString()
{
if (string.Equals(Naam, "", StringComparison.Ordinal)) return "UNKNOWN";
else return Naam;
}
}
}

View File

@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Datalaag")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Datalaag")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("fcbf208d-81b1-4e15-be2f-29d25b20aafc")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

View File

@@ -1,23 +0,0 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v3.1",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v3.1": {
"Datalaag/1.0.0": {
"runtime": {
"Datalaag.dll": {}
}
}
}
},
"libraries": {
"Datalaag/1.0.0": {
"type": "project",
"serviceable": false,
"sha512": ""
}
}
}

View File

@@ -1,70 +0,0 @@
{
"format": 1,
"restore": {
"C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj": {}
},
"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",
"projectPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj",
"packagesPath": "C:\\Users\\Beppe\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Beppe\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netcoreapp3.1"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.1": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.1": {
"dependencies": {
"GeoJSON.Net": {
"target": "Package",
"version": "[1.2.19, )"
},
"Newtonsoft.Json": {
"target": "Package",
"version": "[12.0.3, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.302\\RuntimeIdentifierGraph.json"
}
}
}
}
}

View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Beppe\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.5.0</NuGetToolVersion>
</PropertyGroup>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
</Project>

View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
</Project>

View File

@@ -1,4 +1,4 @@
// <autogenerated /> // <autogenerated />
using System; using System;
using System.Reflection; using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v3.1", FrameworkDisplayName = "")] [assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]

View File

@@ -1,23 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Datalaag")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("Datalaag")]
[assembly: System.Reflection.AssemblyTitleAttribute("Datalaag")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class.

View File

@@ -1 +0,0 @@
4eb3636ff46def5b52e701646fabc9893067cd02

View File

@@ -1,5 +0,0 @@
C:\Users\Beppe\source\repos\opdracht2\Datalaag\bin\Debug\netcoreapp3.1\Datalaag.deps.json
C:\Users\Beppe\source\repos\opdracht2\Datalaag\bin\Debug\netcoreapp3.1\Datalaag.dll
C:\Users\Beppe\source\repos\opdracht2\Datalaag\obj\Debug\netcoreapp3.1\Datalaag.csprojAssemblyReference.cache
C:\Users\Beppe\source\repos\opdracht2\Datalaag\obj\Debug\netcoreapp3.1\Datalaag.AssemblyInfoInputs.cache
C:\Users\Beppe\source\repos\opdracht2\Datalaag\obj\Debug\netcoreapp3.1\Datalaag.AssemblyInfo.cs

View File

@@ -1,150 +0,0 @@
{
"version": 3,
"targets": {
".NETCoreApp,Version=v3.1": {
"GeoJSON.Net/1.2.19": {
"type": "package",
"dependencies": {
"Newtonsoft.Json": "10.0.2"
},
"compile": {
"lib/netstandard2.1/GeoJSON.Net.dll": {}
},
"runtime": {
"lib/netstandard2.1/GeoJSON.Net.dll": {}
}
},
"Newtonsoft.Json/12.0.3": {
"type": "package",
"compile": {
"lib/netstandard2.0/Newtonsoft.Json.dll": {}
},
"runtime": {
"lib/netstandard2.0/Newtonsoft.Json.dll": {}
}
}
}
},
"libraries": {
"GeoJSON.Net/1.2.19": {
"sha512": "b1sIWezvF7a4dBz6d0nQfbwJEWFeRjJ6Mri+Hm/FJ1OIEksekiY1X+CgPG/7E3NcHKz3+3RnbX3VAhx03GG21w==",
"type": "package",
"path": "geojson.net/1.2.19",
"files": [
".nupkg.metadata",
".signature.p7s",
"geojson.net.1.2.19.nupkg.sha512",
"geojson.net.nuspec",
"lib/net35/GeoJSON.Net.dll",
"lib/net40/GeoJSON.Net.dll",
"lib/net45/GeoJSON.Net.dll",
"lib/netstandard1.0/GeoJSON.Net.dll",
"lib/netstandard1.1/GeoJSON.Net.dll",
"lib/netstandard2.0/GeoJSON.Net.dll",
"lib/netstandard2.1/GeoJSON.Net.dll"
]
},
"Newtonsoft.Json/12.0.3": {
"sha512": "6mgjfnRB4jKMlzHSl+VD+oUc1IebOZabkbyWj2RiTgWwYPPuaK1H97G1sHqGwPlS5npiF5Q0OrxN1wni2n5QWg==",
"type": "package",
"path": "newtonsoft.json/12.0.3",
"files": [
".nupkg.metadata",
".signature.p7s",
"LICENSE.md",
"lib/net20/Newtonsoft.Json.dll",
"lib/net20/Newtonsoft.Json.xml",
"lib/net35/Newtonsoft.Json.dll",
"lib/net35/Newtonsoft.Json.xml",
"lib/net40/Newtonsoft.Json.dll",
"lib/net40/Newtonsoft.Json.xml",
"lib/net45/Newtonsoft.Json.dll",
"lib/net45/Newtonsoft.Json.xml",
"lib/netstandard1.0/Newtonsoft.Json.dll",
"lib/netstandard1.0/Newtonsoft.Json.xml",
"lib/netstandard1.3/Newtonsoft.Json.dll",
"lib/netstandard1.3/Newtonsoft.Json.xml",
"lib/netstandard2.0/Newtonsoft.Json.dll",
"lib/netstandard2.0/Newtonsoft.Json.xml",
"lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.dll",
"lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.xml",
"lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.dll",
"lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.xml",
"newtonsoft.json.12.0.3.nupkg.sha512",
"newtonsoft.json.nuspec",
"packageIcon.png"
]
}
},
"projectFileDependencyGroups": {
".NETCoreApp,Version=v3.1": [
"GeoJSON.Net >= 1.2.19",
"Newtonsoft.Json >= 12.0.3"
]
},
"packageFolders": {
"C:\\Users\\Beppe\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj",
"projectName": "Datalaag",
"projectPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj",
"packagesPath": "C:\\Users\\Beppe\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Beppe\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netcoreapp3.1"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.1": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.1": {
"dependencies": {
"GeoJSON.Net": {
"target": "Package",
"version": "[1.2.19, )"
},
"Newtonsoft.Json": {
"target": "Package",
"version": "[12.0.3, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.302\\RuntimeIdentifierGraph.json"
}
}
}
}

View File

@@ -1,11 +0,0 @@
{
"version": 2,
"dgSpecHash": "vmw2sWM3we/HBXnNGRXWz0s694rjQwC3pE16toYVSE6mWRTpo3/Dmldhr2pN+hLG/clnqOj9soWfad987by8wg==",
"success": true,
"projectFilePath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj",
"expectedPackageFiles": [
"C:\\Users\\Beppe\\.nuget\\packages\\geojson.net\\1.2.19\\geojson.net.1.2.19.nupkg.sha512",
"C:\\Users\\Beppe\\.nuget\\packages\\newtonsoft.json\\12.0.3\\newtonsoft.json.12.0.3.nupkg.sha512"
],
"logs": []
}

View File

@@ -1,57 +0,0 @@
{
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj",
"projectName": "Datalaag",
"projectPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj",
"outputPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\obj\\",
"projectStyle": "PackageReference",
"originalTargetFrameworks": [
"netcoreapp3.1"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.1": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.1": {
"dependencies": {
"GeoJSON.Net": {
"target": "Package",
"version": "[1.2.19, )"
},
"Newtonsoft.Json": {
"target": "Package",
"version": "[12.0.3, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.302\\RuntimeIdentifierGraph.json"
}
}
}

5
Datalaag/packages.config Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GeoJSON.Net" version="1.2.20-rc" targetFramework="net472" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net472" />
</packages>

64
Globals/Globals.csproj Normal file
View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{993C82FA-6F2D-4F9C-9712-0301E70CEAB6}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Globals</RootNamespace>
<AssemblyName>Globals</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="GeoJSON.Net, Version=1.2.16.0, Culture=neutral, PublicKeyToken=42c00ea87f5f14d4">
<HintPath>..\packages\GeoJSON.Net.1.2.20-rc\lib\net45\GeoJSON.Net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Windows" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="MultiPolygonPunten.cs" />
<Compile Include="PolygonPunten.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Punt.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -0,0 +1,39 @@
using System.Collections.Generic;
using System.Linq;
using GeoJSON.Net.Geometry;
namespace Globals
{
public class MultiPolygonPunten
{
public double MaximumX, MinimumX, MaximumY, MinimumY;
public List<PolygonPunten> PolygonPunten;
public string Naam;
public MultiPolygonPunten(List<PolygonPunten> polygonPunten, string naam = "")
{
PolygonPunten = polygonPunten;
Naam = naam;
VindMaximumEnMinimum(polygonPunten);
}
public MultiPolygonPunten(MultiPolygon multiPolygon, string naam = "")
{
Naam = naam;
PolygonPunten = new List<PolygonPunten>();
foreach (Polygon polygon in multiPolygon.Coordinates)
{
PolygonPunten.Add(new PolygonPunten(polygon, naam));
}
VindMaximumEnMinimum(PolygonPunten);
}
private void VindMaximumEnMinimum(List<PolygonPunten> polygonPunten)
{
MaximumX = polygonPunten.Max(p => p.MaximumX);
MaximumY = polygonPunten.Max(p => p.MaximumY);
MinimumX = polygonPunten.Max(p => p.MinimumX);
MinimumY = polygonPunten.Max(p => p.MinimumY);
}
}
}

50
Globals/PolygonPunten.cs Normal file
View File

@@ -0,0 +1,50 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Shapes;
using GeoJSON.Net.Geometry;
using Polygon = GeoJSON.Net.Geometry.Polygon;
namespace Globals
{
public class PolygonPunten
{
public double MaximumX, MinimumX, MaximumY, MinimumY;
public List<Punt> Punten;
public string Naam;
public PolygonPunten(List<Punt> punten, string naam = "")
{
Punten = punten;
Naam = naam;
MaximumX = punten.Max(punt => punt.X);
MaximumY = punten.Max(punt => punt.Y);
MinimumX = punten.Min(punt => punt.X);
MinimumY = punten.Min(punt => punt.Y);
}
public PolygonPunten(Polygon p, string naam = "")
{
Naam = naam;
Punten = new List<Punt>();
MaximumX = double.MinValue;
MaximumY = double.MinValue;
MinimumX = double.MaxValue;
MinimumY = double.MaxValue;
foreach (LineString l in p.Coordinates)
{
foreach (Position pos in l.Coordinates)
{
if (pos.Longitude > MaximumX) MaximumX = pos.Longitude;
if (pos.Longitude < MinimumX) MinimumX = pos.Longitude;
if (pos.Latitude > MaximumY) MaximumY = pos.Latitude;
if (pos.Latitude < MinimumY) MinimumY = pos.Latitude;
Punten.Add(new Punt(pos.Longitude, pos.Latitude, naam));
}
}
}
}
}

View File

@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Globals")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Globals")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("993c82fa-6f2d-4f9c-9712-0301e70ceab6")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

View File

@@ -1,8 +1,13 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
namespace Datalaag namespace Globals
{ {
public class Punt public class Punt
{ {
public double X, Y; public double X, Y;
public string Naam; public string Naam;
@@ -12,11 +17,17 @@ namespace Datalaag
X = x; X = x;
Y = y; Y = y;
} }
public override string ToString() public override string ToString()
{ {
if (string.Equals(Naam, "", StringComparison.Ordinal)) return "UNKNOWN"; if (string.Equals(Naam, "", StringComparison.Ordinal)) return "UNKNOWN";
else return Naam; else return Naam;
} }
public Point GetPoint()
{
return new Point(X, Y);
}
} }
} }

View File

@@ -1,4 +1,4 @@
// <autogenerated /> // <autogenerated />
using System; using System;
using System.Reflection; using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v3.1", FrameworkDisplayName = "")] [assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]

5
Globals/packages.config Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GeoJSON.Net" version="1.2.20-rc" targetFramework="net472" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net472" />
</packages>

View File

@@ -1,8 +1,10 @@
using System; 
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Text; using System.Text;
using Datalaag; using Datalaag;
using Globals;
namespace Logica namespace Logica
{ {
@@ -51,7 +53,7 @@ namespace Logica
{ {
BACKUP++; BACKUP++;
} }
BACKBACKUP = punten.Count; BACKBACKUP = punten.Count;
} }
@@ -75,12 +77,12 @@ namespace Logica
i = punt1Index; i = punt1Index;
BACKUP = 0; BACKUP = 0;
continue; continue;
} }
Debug.WriteLine(hoek); Debug.WriteLine(hoek);
i++; i++;
@@ -96,7 +98,7 @@ namespace Logica
private PolygonPunten MaakNieuweDriehoek(Punt punt, Punt punt1, Punt punt2, string naam = "") private PolygonPunten MaakNieuweDriehoek(Punt punt, Punt punt1, Punt punt2, string naam = "")
{ {
return new PolygonPunten(new List<Punt>(){punt, punt1, punt2}, naam); return new PolygonPunten(new List<Punt>() { punt, punt1, punt2 }, naam);
} }
private double VindHoek(Punt p1, Punt p2, Punt p3) private double VindHoek(Punt p1, Punt p2, Punt p3)
@@ -115,9 +117,9 @@ namespace Logica
int index = 0; int index = 0;
int end = punten.Count; int end = punten.Count;
for (int i = 1; i < end-1; i++) for (int i = 1; i < end - 1; i++)
{ {
double distance = PerpendicularDistance2(punten[i], punten[0], punten[end-1]); double distance = PerpendicularDistance2(punten[i], punten[0], punten[end - 1]);
if (distance > dmax) if (distance > dmax)
{ {
index = i; index = i;
@@ -131,15 +133,15 @@ namespace Logica
if (dmax > epsilon) if (dmax > epsilon)
{ {
List<Punt> recResults1 = peuker(punten.GetRange(0, index), epsilon); List<Punt> recResults1 = peuker(punten.GetRange(0, index), epsilon);
List<Punt> recResults2 = peuker(punten.GetRange(index, end-1-index), epsilon); List<Punt> recResults2 = peuker(punten.GetRange(index, end - 1 - index), epsilon);
returnWaarde.AddRange(recResults1); returnWaarde.AddRange(recResults1);
returnWaarde.AddRange(recResults2); returnWaarde.AddRange(recResults2);
} }
else else
{ {
returnWaarde = new List<Punt>() { punten[0], punten[punten.Count-1] }; returnWaarde = new List<Punt>() { punten[0], punten[punten.Count - 1] };
} }
return returnWaarde; return returnWaarde;

View File

@@ -1,20 +1,58 @@
<Project Sdk="Microsoft.NET.Sdk"> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3FAF45FF-5331-43A1-A832-3B19555B66C9}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Logica</RootNamespace>
<AssemblyName>Logica</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<COMReference Include="{d37e2a3e-8545-3a39-9f4f-31827c9124ab}"> <Reference Include="System" />
<Guid>d37e2a3e-8545-3a39-9f4f-31827c9124ab</Guid> <Reference Include="System.Core" />
<VersionMajor>2</VersionMajor> <Reference Include="System.Xml.Linq" />
<VersionMinor>4</VersionMinor> <Reference Include="System.Data.DataSetExtensions" />
<WrapperTool>tlbimp</WrapperTool> <Reference Include="Microsoft.CSharp" />
</COMReference> <Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Datalaag\Datalaag.csproj" /> <Compile Include="Class1.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
</Project> <ProjectReference Include="..\Datalaag\Datalaag.csproj">
<Project>{fcbf208d-81b1-4e15-be2f-29d25b20aafc}</Project>
<Name>Datalaag</Name>
</ProjectReference>
<ProjectReference Include="..\Globals\Globals.csproj">
<Project>{993c82fa-6f2d-4f9c-9712-0301e70ceab6}</Project>
<Name>Globals</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Logica")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Logica")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("3faf45ff-5331-43a1-a832-3b19555b66c9")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

View File

@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]

View File

@@ -1,23 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Logica")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("Logica")]
[assembly: System.Reflection.AssemblyTitleAttribute("Logica")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class.

View File

@@ -1 +0,0 @@
559139bcad75bc699883210d21815f3a7b66c208

View File

@@ -1,126 +0,0 @@
{
"format": 1,
"restore": {
"C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj": {}
},
"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",
"projectPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj",
"packagesPath": "C:\\Users\\Beppe\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Beppe\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netcoreapp3.1"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.1": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.1": {
"dependencies": {
"GeoJSON.Net": {
"target": "Package",
"version": "[1.2.19, )"
},
"Newtonsoft.Json": {
"target": "Package",
"version": "[12.0.3, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.302\\RuntimeIdentifierGraph.json"
}
}
},
"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",
"projectPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj",
"packagesPath": "C:\\Users\\Beppe\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Beppe\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netcoreapp3.1"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.1": {
"projectReferences": {
"C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj": {
"projectPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj"
}
}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.1": {
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.302\\RuntimeIdentifierGraph.json"
}
}
}
}
}

View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Beppe\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.5.0</NuGetToolVersion>
</PropertyGroup>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
</Project>

View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
</Project>

View File

@@ -1,162 +0,0 @@
{
"version": 3,
"targets": {
".NETCoreApp,Version=v3.1": {
"GeoJSON.Net/1.2.19": {
"type": "package",
"dependencies": {
"Newtonsoft.Json": "10.0.2"
},
"compile": {
"lib/netstandard2.1/GeoJSON.Net.dll": {}
},
"runtime": {
"lib/netstandard2.1/GeoJSON.Net.dll": {}
}
},
"Newtonsoft.Json/12.0.3": {
"type": "package",
"compile": {
"lib/netstandard2.0/Newtonsoft.Json.dll": {}
},
"runtime": {
"lib/netstandard2.0/Newtonsoft.Json.dll": {}
}
},
"Datalaag/1.0.0": {
"type": "project",
"framework": ".NETCoreApp,Version=v3.1",
"dependencies": {
"GeoJSON.Net": "1.2.19",
"Newtonsoft.Json": "12.0.3"
},
"compile": {
"bin/placeholder/Datalaag.dll": {}
},
"runtime": {
"bin/placeholder/Datalaag.dll": {}
}
}
}
},
"libraries": {
"GeoJSON.Net/1.2.19": {
"sha512": "b1sIWezvF7a4dBz6d0nQfbwJEWFeRjJ6Mri+Hm/FJ1OIEksekiY1X+CgPG/7E3NcHKz3+3RnbX3VAhx03GG21w==",
"type": "package",
"path": "geojson.net/1.2.19",
"files": [
".nupkg.metadata",
".signature.p7s",
"geojson.net.1.2.19.nupkg.sha512",
"geojson.net.nuspec",
"lib/net35/GeoJSON.Net.dll",
"lib/net40/GeoJSON.Net.dll",
"lib/net45/GeoJSON.Net.dll",
"lib/netstandard1.0/GeoJSON.Net.dll",
"lib/netstandard1.1/GeoJSON.Net.dll",
"lib/netstandard2.0/GeoJSON.Net.dll",
"lib/netstandard2.1/GeoJSON.Net.dll"
]
},
"Newtonsoft.Json/12.0.3": {
"sha512": "6mgjfnRB4jKMlzHSl+VD+oUc1IebOZabkbyWj2RiTgWwYPPuaK1H97G1sHqGwPlS5npiF5Q0OrxN1wni2n5QWg==",
"type": "package",
"path": "newtonsoft.json/12.0.3",
"files": [
".nupkg.metadata",
".signature.p7s",
"LICENSE.md",
"lib/net20/Newtonsoft.Json.dll",
"lib/net20/Newtonsoft.Json.xml",
"lib/net35/Newtonsoft.Json.dll",
"lib/net35/Newtonsoft.Json.xml",
"lib/net40/Newtonsoft.Json.dll",
"lib/net40/Newtonsoft.Json.xml",
"lib/net45/Newtonsoft.Json.dll",
"lib/net45/Newtonsoft.Json.xml",
"lib/netstandard1.0/Newtonsoft.Json.dll",
"lib/netstandard1.0/Newtonsoft.Json.xml",
"lib/netstandard1.3/Newtonsoft.Json.dll",
"lib/netstandard1.3/Newtonsoft.Json.xml",
"lib/netstandard2.0/Newtonsoft.Json.dll",
"lib/netstandard2.0/Newtonsoft.Json.xml",
"lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.dll",
"lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.xml",
"lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.dll",
"lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.xml",
"newtonsoft.json.12.0.3.nupkg.sha512",
"newtonsoft.json.nuspec",
"packageIcon.png"
]
},
"Datalaag/1.0.0": {
"type": "project",
"path": "../Datalaag/Datalaag.csproj",
"msbuildProject": "../Datalaag/Datalaag.csproj"
}
},
"projectFileDependencyGroups": {
".NETCoreApp,Version=v3.1": [
"Datalaag >= 1.0.0"
]
},
"packageFolders": {
"C:\\Users\\Beppe\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj",
"projectName": "Logica",
"projectPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj",
"packagesPath": "C:\\Users\\Beppe\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Beppe\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netcoreapp3.1"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.1": {
"projectReferences": {
"C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj": {
"projectPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj"
}
}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.1": {
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.302\\RuntimeIdentifierGraph.json"
}
}
}
}

View File

@@ -1,11 +0,0 @@
{
"version": 2,
"dgSpecHash": "DkYRZH0wz5GvI2ijvz+sgOT16efYptv7grKHSqTr/pe3P5xaJovOtDwwUbm+RZKSgm6Hz7X/vIr5shpuBp7gjA==",
"success": true,
"projectFilePath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj",
"expectedPackageFiles": [
"C:\\Users\\Beppe\\.nuget\\packages\\geojson.net\\1.2.19\\geojson.net.1.2.19.nupkg.sha512",
"C:\\Users\\Beppe\\.nuget\\packages\\newtonsoft.json\\12.0.3\\newtonsoft.json.12.0.3.nupkg.sha512"
],
"logs": []
}

View File

@@ -1,51 +0,0 @@
{
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj",
"projectName": "Logica",
"projectPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj",
"outputPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\obj\\",
"projectStyle": "PackageReference",
"originalTargetFrameworks": [
"netcoreapp3.1"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.1": {
"projectReferences": {
"C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj": {
"projectPath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj"
}
}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.1": {
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.302\\RuntimeIdentifierGraph.json"
}
}
}

View File

@@ -5,9 +5,11 @@ VisualStudioVersion = 16.0.30309.148
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "opdracht2", "opdracht2\opdracht2.csproj", "{81E4F6D2-D6A1-410F-9255-B76BFCD03B87}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "opdracht2", "opdracht2\opdracht2.csproj", "{81E4F6D2-D6A1-410F-9255-B76BFCD03B87}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logica", "Logica\Logica.csproj", "{531468D0-2AFF-4550-9DD2-25F174AF1EEE}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Globals", "Globals\Globals.csproj", "{993C82FA-6F2D-4F9C-9712-0301E70CEAB6}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datalaag", "Datalaag\Datalaag.csproj", "{7C4F8BFE-8154-4F81-8C4B-10E345F60EF4}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logica", "Logica\Logica.csproj", "{3FAF45FF-5331-43A1-A832-3B19555B66C9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datalaag", "Datalaag\Datalaag.csproj", "{FCBF208D-81B1-4E15-BE2F-29D25B20AAFC}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,14 +21,18 @@ Global
{81E4F6D2-D6A1-410F-9255-B76BFCD03B87}.Debug|Any CPU.Build.0 = Debug|Any CPU {81E4F6D2-D6A1-410F-9255-B76BFCD03B87}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81E4F6D2-D6A1-410F-9255-B76BFCD03B87}.Release|Any CPU.ActiveCfg = Release|Any CPU {81E4F6D2-D6A1-410F-9255-B76BFCD03B87}.Release|Any CPU.ActiveCfg = Release|Any CPU
{81E4F6D2-D6A1-410F-9255-B76BFCD03B87}.Release|Any CPU.Build.0 = Release|Any CPU {81E4F6D2-D6A1-410F-9255-B76BFCD03B87}.Release|Any CPU.Build.0 = Release|Any CPU
{531468D0-2AFF-4550-9DD2-25F174AF1EEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {993C82FA-6F2D-4F9C-9712-0301E70CEAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{531468D0-2AFF-4550-9DD2-25F174AF1EEE}.Debug|Any CPU.Build.0 = Debug|Any CPU {993C82FA-6F2D-4F9C-9712-0301E70CEAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{531468D0-2AFF-4550-9DD2-25F174AF1EEE}.Release|Any CPU.ActiveCfg = Release|Any CPU {993C82FA-6F2D-4F9C-9712-0301E70CEAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{531468D0-2AFF-4550-9DD2-25F174AF1EEE}.Release|Any CPU.Build.0 = Release|Any CPU {993C82FA-6F2D-4F9C-9712-0301E70CEAB6}.Release|Any CPU.Build.0 = Release|Any CPU
{7C4F8BFE-8154-4F81-8C4B-10E345F60EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3FAF45FF-5331-43A1-A832-3B19555B66C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C4F8BFE-8154-4F81-8C4B-10E345F60EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU {3FAF45FF-5331-43A1-A832-3B19555B66C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C4F8BFE-8154-4F81-8C4B-10E345F60EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU {3FAF45FF-5331-43A1-A832-3B19555B66C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C4F8BFE-8154-4F81-8C4B-10E345F60EF4}.Release|Any CPU.Build.0 = Release|Any CPU {3FAF45FF-5331-43A1-A832-3B19555B66C9}.Release|Any CPU.Build.0 = Release|Any CPU
{FCBF208D-81B1-4E15-BE2F-29D25B20AAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FCBF208D-81B1-4E15-BE2F-29D25B20AAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCBF208D-81B1-4E15-BE2F-29D25B20AAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FCBF208D-81B1-4E15-BE2F-29D25B20AAFC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@@ -2,6 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.

View File

@@ -2,6 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.

View File

@@ -61,7 +61,7 @@ namespace opdracht2 {
return; return;
} }
_contentLoaded = true; _contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/opdracht2;V1.0.0.0;component/mainwindow.xaml", System.UriKind.Relative); System.Uri resourceLocater = new System.Uri("/opdracht2;component/mainwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\MainWindow.xaml" #line 1 "..\..\..\MainWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater); System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@@ -10,11 +10,11 @@ none
false false
TRACE;DEBUG;NETCOREAPP;NETCOREAPP3_1 TRACE;DEBUG;NETCOREAPP;NETCOREAPP3_1
C:\Users\Beppe\source\repos\opdracht2\opdracht2\App.xaml C:\Users\Beppe\source\repos\opdracht2\opdracht2\App.xaml
1-281698643 11151548125
4-1544482097 4-1295637703
195-561000208 195549397899
MainWindow.xaml; MainWindow.xaml;
False True

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,20 @@
The MIT License (MIT)
Copyright (c) 2007 James Newton-King
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,116 @@
param($installPath, $toolsPath, $package, $project)
# open json.net splash page on package install
# don't open if json.net is installed as a dependency
try
{
$url = "http://www.newtonsoft.com/json/install?version=" + $package.Version
$dte2 = Get-Interface $dte ([EnvDTE80.DTE2])
if ($dte2.ActiveWindow.Caption -eq "Package Manager Console")
{
# user is installing from VS NuGet console
# get reference to the window, the console host and the input history
# show webpage if "install-package newtonsoft.json" was last input
$consoleWindow = $(Get-VSComponentModel).GetService([NuGetConsole.IPowerConsoleWindow])
$props = $consoleWindow.GetType().GetProperties([System.Reflection.BindingFlags]::Instance -bor `
[System.Reflection.BindingFlags]::NonPublic)
$prop = $props | ? { $_.Name -eq "ActiveHostInfo" } | select -first 1
if ($prop -eq $null) { return }
$hostInfo = $prop.GetValue($consoleWindow)
if ($hostInfo -eq $null) { return }
$history = $hostInfo.WpfConsole.InputHistory.History
$lastCommand = $history | select -last 1
if ($lastCommand)
{
$lastCommand = $lastCommand.Trim().ToLower()
if ($lastCommand.StartsWith("install-package") -and $lastCommand.Contains("newtonsoft.json"))
{
$dte2.ItemOperations.Navigate($url) | Out-Null
}
}
}
else
{
# user is installing from VS NuGet dialog
# get reference to the window, then smart output console provider
# show webpage if messages in buffered console contains "installing...newtonsoft.json" in last operation
$instanceField = [NuGet.Dialog.PackageManagerWindow].GetField("CurrentInstance", [System.Reflection.BindingFlags]::Static -bor `
[System.Reflection.BindingFlags]::NonPublic)
$consoleField = [NuGet.Dialog.PackageManagerWindow].GetField("_smartOutputConsoleProvider", [System.Reflection.BindingFlags]::Instance -bor `
[System.Reflection.BindingFlags]::NonPublic)
if ($instanceField -eq $null -or $consoleField -eq $null) { return }
$instance = $instanceField.GetValue($null)
if ($instance -eq $null) { return }
$consoleProvider = $consoleField.GetValue($instance)
if ($consoleProvider -eq $null) { return }
$console = $consoleProvider.CreateOutputConsole($false)
$messagesField = $console.GetType().GetField("_messages", [System.Reflection.BindingFlags]::Instance -bor `
[System.Reflection.BindingFlags]::NonPublic)
if ($messagesField -eq $null) { return }
$messages = $messagesField.GetValue($console)
if ($messages -eq $null) { return }
$operations = $messages -split "=============================="
$lastOperation = $operations | select -last 1
if ($lastOperation)
{
$lastOperation = $lastOperation.ToLower()
$lines = $lastOperation -split "`r`n"
$installMatch = $lines | ? { $_.StartsWith("------- installing...newtonsoft.json ") } | select -first 1
if ($installMatch)
{
$dte2.ItemOperations.Navigate($url) | Out-Null
}
}
}
}
catch
{
try
{
$pmPane = $dte2.ToolWindows.OutputWindow.OutputWindowPanes.Item("Package Manager")
$selection = $pmPane.TextDocument.Selection
$selection.StartOfDocument($false)
$selection.EndOfDocument($true)
if ($selection.Text.StartsWith("Attempting to gather dependencies information for package 'Newtonsoft.Json." + $package.Version + "'"))
{
# don't show on upgrade
if (!$selection.Text.Contains("Removed package"))
{
$dte2.ItemOperations.Navigate($url) | Out-Null
}
}
}
catch
{
# stop potential errors from bubbling up
# worst case the splash page won't open
}
}
# still yolo