From 7a39b31761a90859e0b9941e1af204725b77fba9 Mon Sep 17 00:00:00 2001
From: C9Glax <gfreak70@gmail.com>
Date: Thu, 5 May 2022 16:26:15 +0200
Subject: [PATCH] Revert "removed weight from info"

This reverts commit 7e881c1360e83fccf2cf3b4b6aed22e82a207a1e.
---
 Graph/Graph.csproj                                   |  9 ---------
 OpenStreetMap Importer/Importer.cs                   |  4 ++--
 OpenStreetMap Importer/OpenStreetMap Importer.csproj |  1 -
 {Graph => astar}/Edge.cs                             |  0
 {Graph => astar}/Node.cs                             |  0
 astar/astar.csproj                                   |  1 +
 astar/astar.sln                                      | 10 +++++-----
 7 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 Graph/Graph.csproj
 rename {Graph => astar}/Edge.cs (100%)
 rename {Graph => astar}/Node.cs (100%)

diff --git a/Graph/Graph.csproj b/Graph/Graph.csproj
deleted file mode 100644
index 132c02c..0000000
--- a/Graph/Graph.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>
diff --git a/OpenStreetMap Importer/Importer.cs b/OpenStreetMap Importer/Importer.cs
index 803e60a..57393d1 100644
--- a/OpenStreetMap Importer/Importer.cs	
+++ b/OpenStreetMap Importer/Importer.cs	
@@ -32,10 +32,10 @@ namespace OpenStreetMap_Importer
                 }
                 else if (reader.Name == "way")
                 {
-                    if(currentNodeType == nodeType.WAY && currentWay.nodes.Count > 1)
+                    if(currentNodeType == nodeType.WAY)
                     {
                         ImportWay(currentWay);
-                        logger.log(loglevel.INFO, "Way nodes: {0}", currentWay.nodes.Count);
+                        logger.log(loglevel.INFO, "Way nodes: {0} Weight: {1}", currentWay.nodes.Count);
                     }
                     currentNodeType = nodeType.WAY;
                     currentNode = nullNode;
diff --git a/OpenStreetMap Importer/OpenStreetMap Importer.csproj b/OpenStreetMap Importer/OpenStreetMap Importer.csproj
index c123f25..543ca41 100644
--- a/OpenStreetMap Importer/OpenStreetMap Importer.csproj	
+++ b/OpenStreetMap Importer/OpenStreetMap Importer.csproj	
@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Graph\Graph.csproj" />
-    <ProjectReference Include="..\Logging\Logging.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Graph/Edge.cs b/astar/Edge.cs
similarity index 100%
rename from Graph/Edge.cs
rename to astar/Edge.cs
diff --git a/Graph/Node.cs b/astar/Node.cs
similarity index 100%
rename from Graph/Node.cs
rename to astar/Node.cs
diff --git a/astar/astar.csproj b/astar/astar.csproj
index d1cd67a..f3c2557 100644
--- a/astar/astar.csproj
+++ b/astar/astar.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Graph\Graph.csproj" />
     <ProjectReference Include="..\Logging\Logging.csproj" />
     <ProjectReference Include="..\OpenStreetMap Importer\OpenStreetMap Importer.csproj" />
   </ItemGroup>
diff --git a/astar/astar.sln b/astar/astar.sln
index f990f57..493d7f8 100644
--- a/astar/astar.sln
+++ b/astar/astar.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Executable", "..\Executable
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenStreetMap Importer", "..\OpenStreetMap Importer\OpenStreetMap Importer.csproj", "{1E918E64-866F-4386-AA44-AF7120A9294F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Graph", "..\Graph\Graph.csproj", "{FD19250E-516C-4AFF-A08A-E89D036F5FE2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Graph", "..\Graph\Graph.csproj", "{41576467-1FC5-49CE-B5B3-832EEED353DE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,10 +35,10 @@ Global
 		{1E918E64-866F-4386-AA44-AF7120A9294F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E918E64-866F-4386-AA44-AF7120A9294F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E918E64-866F-4386-AA44-AF7120A9294F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD19250E-516C-4AFF-A08A-E89D036F5FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD19250E-516C-4AFF-A08A-E89D036F5FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD19250E-516C-4AFF-A08A-E89D036F5FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD19250E-516C-4AFF-A08A-E89D036F5FE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41576467-1FC5-49CE-B5B3-832EEED353DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41576467-1FC5-49CE-B5B3-832EEED353DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41576467-1FC5-49CE-B5B3-832EEED353DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41576467-1FC5-49CE-B5B3-832EEED353DE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE