glax/OSM_Graph
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save direction of edge to neighbor

Browse Source
This commit is contained in:
glax 2024-07-23 15:33:16 +02:00
parent 87d210abe5
commit 2ba8bca590
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Graph/Node.cs
View File

@ -1,8 +1,8 @@
namespace Graph; namespace Graph;
public class Node(float lat, float lon, Dictionary<ulong, ulong>? neighbors = null) public class Node(float lat, float lon, Dictionary<ulong, KeyValuePair<ulong, bool>>? neighbors = null)
{ {
public readonly Dictionary<ulong, ulong> Neighbors = neighbors??new(); //nodeId, wayId public readonly Dictionary<ulong, KeyValuePair<ulong, bool>> Neighbors = neighbors??new(); //nodeId, wayId, forward
public readonly float Lat = lat, Lon = lon; public readonly float Lat = lat, Lon = lon;
public double DistanceTo(Node n2) => Utils.NodeUtils.DistanceBetween(this, n2); public double DistanceTo(Node n2) => Utils.NodeUtils.DistanceBetween(this, n2);

12
OSM_Graph/Node.cs
View File

@ -3,13 +3,13 @@ using System.Runtime.Serialization;
namespace OSM_Graph; namespace OSM_Graph;
public class Node(ulong id, float lat, float lon, Dictionary<ulong, ulong>? neighbors = null) : Graph.Node(lat, lon, neighbors), IOSMSerializable<Node> public class Node(ulong id, float lat, float lon, Dictionary<ulong, KeyValuePair<ulong, bool>>? neighbors = null) : Graph.Node(lat, lon, neighbors), IOSMSerializable<Node>
{ {
public readonly ulong ID = id; public readonly ulong ID = id;
public string Serialize() public string Serialize()
{ {
return $"{this.ID}#{this.Lat.ToString(CultureInfo.InvariantCulture)}#{this.Lon.ToString(CultureInfo.InvariantCulture)}#{string.Join(',', this.Neighbors.Select(n => $"{n.Key}-{n.Value}"))}"; return $"{this.ID}#{this.Lat.ToString(CultureInfo.InvariantCulture)}#{this.Lon.ToString(CultureInfo.InvariantCulture)}#{string.Join(',', this.Neighbors.Select(n => $"{n.Key}-{n.Value.Key}-{n.Value.Value}"))}";
} }
public static Node Deserialize(string serialized) public static Node Deserialize(string serialized)
@ -22,9 +22,11 @@ public class Node(ulong id, float lat, float lon, Dictionary<ulong, ulong>? neig
ulong id = ulong.Parse(parts[0]); ulong id = ulong.Parse(parts[0]);
float lat = float.Parse(parts[1], NumberStyles.Float, CultureInfo.InvariantCulture); float lat = float.Parse(parts[1], NumberStyles.Float, CultureInfo.InvariantCulture);
float lon = float.Parse(parts[2], NumberStyles.Float, CultureInfo.InvariantCulture); float lon = float.Parse(parts[2], NumberStyles.Float, CultureInfo.InvariantCulture);
Dictionary<ulong, ulong> neighbors = parts[3].Length > 3 Dictionary<ulong, KeyValuePair<ulong, bool>> neighbors = parts[3].Length > 3
? parts[3].Split(',').ToDictionary(str => ulong.Parse(str.Split('-')[0]), str => ulong.Parse(str.Split('-')[1])) ? parts[3].Split(',').ToDictionary(str => ulong.Parse(str.Split('-')[0]),
: new(); str => new KeyValuePair<ulong, bool>(ulong.Parse(str.Split('-')[1]),
bool.Parse(str.Split('-')[2])))
: new();
return new Node(id, lat, lon, neighbors); return new Node(id, lat, lon, neighbors);
} }