diff --git a/media/Server/eindverslag persoonlijke bijdrage/src/main.tex b/media/Server/eindverslag persoonlijke bijdrage/src/main.tex
index 1bb0993..2fb2313 100755
--- a/media/Server/eindverslag persoonlijke bijdrage/src/main.tex
+++ b/media/Server/eindverslag persoonlijke bijdrage/src/main.tex
@@ -1,4 +1,4 @@
-\documentclass[conference]{IEEEtran}
+\documentclass[10pt]{article}
%/ Use case: language and spell checking
\usepackage[utf8]{inputenc}
@@ -28,13 +28,12 @@
\allsectionsfont{\mdseries\scshape}
-\title{\titlecap{\scshape Vergelijking van API architecturen voor de API Server van het Project Robotica}}\normalfont
-\author{\IEEEauthorblockN{Wessel Tip $<$contact@wessel.gg$>$ (Student nummer 696770, \url{https://wessel.gg/})}
-\IEEEauthorblockA{
-Technische Informatica --- Project Robotica \\
+\title{\titlecap{\scshape Project Robotica}\normalfont}
+\author{Wessel Tip $<$contact@wessel.gg$>$ (\url{https://wessel.gg/}) \\
+Technische Informatica \\
Hoogeschool Inholland Alkmaar \\
Jaar 2, Semester 2 (Jan. 2024 - Jun. 2024)
-}}
+}
\begin{document}
diff --git a/src/CoveragePathPlanner/bin/Debug/net8.0/CoveragePathPlanner.dll b/src/CoveragePathPlanner/bin/Debug/net8.0/CoveragePathPlanner.dll
index a487bf2..ebef114 100644
Binary files a/src/CoveragePathPlanner/bin/Debug/net8.0/CoveragePathPlanner.dll and b/src/CoveragePathPlanner/bin/Debug/net8.0/CoveragePathPlanner.dll differ
diff --git a/src/CoveragePathPlanner/bin/Debug/net8.0/CoveragePathPlanner.pdb b/src/CoveragePathPlanner/bin/Debug/net8.0/CoveragePathPlanner.pdb
index 0ef3126..b5b3225 100644
Binary files a/src/CoveragePathPlanner/bin/Debug/net8.0/CoveragePathPlanner.pdb and b/src/CoveragePathPlanner/bin/Debug/net8.0/CoveragePathPlanner.pdb differ
diff --git a/src/Server/.idea/.idea.REST API/.idea/workspace.xml b/src/Server/.idea/.idea.REST API/.idea/workspace.xml
index bb348da..fbfbdd8 100755
--- a/src/Server/.idea/.idea.REST API/.idea/workspace.xml
+++ b/src/Server/.idea/.idea.REST API/.idea/workspace.xml
@@ -36,34 +36,34 @@
- {
+ "keyToString": {
+ ".NET Project.Console.executor": "Run",
+ "ASKED_ADD_EXTERNAL_FILES": "true",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "d452b4e4-aa15-4fa9-847f-33d4d7fab23d.executor": "Run",
+ "git-widget-placeholder": "master",
+ "ignore.virus.scanning.warn.message": "true",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "settings.editor.selected.configurable": "HotReloadSettingsPage",
+ "vue.rearranger.settings.migration": "true"
},
- "keyToStringList": {
- "DatabaseDriversLRU": [
- "cassandra"
+ "keyToStringList": {
+ "DatabaseDriversLRU": [
+ "cassandra"
],
- "rider.external.source.directories": [
- "C:\\Users\\Wessel\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache",
- "C:\\Users\\Wessel\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache",
- "C:\\Users\\Wessel\\AppData\\Local\\Symbols\\src"
+ "rider.external.source.directories": [
+ "C:\\Users\\Wessel\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache",
+ "C:\\Users\\Wessel\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache",
+ "C:\\Users\\Wessel\\AppData\\Local\\Symbols\\src"
]
}
-}]]>
+}
@@ -117,7 +117,8 @@
-
+
+
diff --git a/src/Server/LibParse/bin/Debug/net8.0/LibParse.dll b/src/Server/LibParse/bin/Debug/net8.0/LibParse.dll
index 9eacaa5..1ca1abf 100644
Binary files a/src/Server/LibParse/bin/Debug/net8.0/LibParse.dll and b/src/Server/LibParse/bin/Debug/net8.0/LibParse.dll differ
diff --git a/src/Server/LibParse/bin/Debug/net8.0/LibParse.pdb b/src/Server/LibParse/bin/Debug/net8.0/LibParse.pdb
index 172844f..392ec4a 100644
Binary files a/src/Server/LibParse/bin/Debug/net8.0/LibParse.pdb and b/src/Server/LibParse/bin/Debug/net8.0/LibParse.pdb differ
diff --git a/src/Server/LibServer/bin/Debug/net8.0/LibServer.dll b/src/Server/LibServer/bin/Debug/net8.0/LibServer.dll
index 2eff5dc..5ae2af3 100644
Binary files a/src/Server/LibServer/bin/Debug/net8.0/LibServer.dll and b/src/Server/LibServer/bin/Debug/net8.0/LibServer.dll differ
diff --git a/src/Server/LibServer/bin/Debug/net8.0/LibServer.pdb b/src/Server/LibServer/bin/Debug/net8.0/LibServer.pdb
index 4d283a7..a8b413d 100644
Binary files a/src/Server/LibServer/bin/Debug/net8.0/LibServer.pdb and b/src/Server/LibServer/bin/Debug/net8.0/LibServer.pdb differ
diff --git a/src/Server/RobotControlServer/Routes/RoutePlan.cs b/src/Server/RobotControlServer/Routes/RoutePlan.cs
index a26e255..fae0638 100644
--- a/src/Server/RobotControlServer/Routes/RoutePlan.cs
+++ b/src/Server/RobotControlServer/Routes/RoutePlan.cs
@@ -36,11 +36,14 @@ public class RoutePlan: IRoute {
}
List PlanPath = planner.PlanPath(obstacles);
- // Don't know if this is needed here or just do List path = planner.PlanPath(obstacles);?
- string path = JsonConvert.SerializeObject(PlanPath);
+ List> points = new List>();
+ foreach(var point in PlanPath) {
+ // push [x,y] to points
+ points.Add(new List {point.X, point.Y});
+ }
// Return success message with the path
- return new HttpResponse($"{{\"message\":\"success\",\"path\":\"{path}\"}}");
+ return new HttpResponse($"{{\"message\":\"success\",\"path\":{points.ToJson()}}}");
} catch (Exception ex) {
// Return error message if failed for any reason
return new HttpResponse($"{{\"message\": \"{ex.Message.Replace("\"", "\\\"")}\"}}", 400);
diff --git a/src/Server/Tests/bin/Debug/net8.0/CoverletSourceRootsMapping_Tests b/src/Server/Tests/bin/Debug/net8.0/CoverletSourceRootsMapping_Tests
index e438a75..5f1a55e 100755
Binary files a/src/Server/Tests/bin/Debug/net8.0/CoverletSourceRootsMapping_Tests and b/src/Server/Tests/bin/Debug/net8.0/CoverletSourceRootsMapping_Tests differ