glax/OSMServer
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Renamed PathNode distance and weight to include "delta".

Browse Source 
Added directDistanceDelta
This commit is contained in:
glax 2023-04-09 17:52:37 +02:00
parent 6eab23ff16
commit d8f8a41dcc
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Pathfinding/PathNode.cs
View File

@ -7,10 +7,11 @@ namespace Pathfinding;
public class PathNode : OsmNode public class PathNode : OsmNode
{ {
[JsonInclude]public new double directDistanceToGoal = double.MaxValue; [JsonInclude]public new double directDistanceToGoal = double.MaxValue;
[JsonInclude]public double directDistanceDelta = double.MaxValue;
[JsonInclude]public new double currentPathLength = double.MaxValue; [JsonInclude]public new double currentPathLength = double.MaxValue;
[JsonInclude]public double distanceBetweenNodes = double.MaxValue; [JsonInclude]public double pathDistanceDelta = double.MaxValue;
[JsonInclude]public new double currentPathWeight = double.MaxValue; [JsonInclude]public new double currentPathWeight = double.MaxValue;
[JsonInclude]public double weightBetweenNodes = double.MaxValue; [JsonInclude]public double pathWeightDelta = double.MaxValue;
[JsonInclude]public Dictionary<string, string> tags = new(); [JsonInclude]public Dictionary<string, string> tags = new();
public PathNode(ulong nodeId, float lat, float lon) : base(nodeId, lat, lon) public PathNode(ulong nodeId, float lat, float lon) : base(nodeId, lat, lon)
@ -21,7 +22,7 @@ public class PathNode : OsmNode
{ {
} }
public static PathNode? FromOsmNode(OsmNode? node, HashSet<Tag>? tags, double distance, double weight) public static PathNode? FromOsmNode(OsmNode? node, HashSet<Tag>? tags, double pathDistanceDelta, double pathWeightDelta, double directDistanceDelta)
{ {
if (node is null) if (node is null)
return null; return null;
@ -30,8 +31,9 @@ public class PathNode : OsmNode
currentPathLength = node.currentPathLength, currentPathLength = node.currentPathLength,
currentPathWeight = double.IsPositiveInfinity(node.currentPathWeight) ? double.MaxValue : node.currentPathWeight, currentPathWeight = double.IsPositiveInfinity(node.currentPathWeight) ? double.MaxValue : node.currentPathWeight,
directDistanceToGoal = node.directDistanceToGoal, directDistanceToGoal = node.directDistanceToGoal,
distanceBetweenNodes = distance, directDistanceDelta = directDistanceDelta,
weightBetweenNodes = weight pathDistanceDelta = pathDistanceDelta,
pathWeightDelta = pathWeightDelta
}; };
if (tags != null) if (tags != null)
foreach (Tag tag in tags) foreach (Tag tag in tags)

13
Pathfinding/Pathfinder.cs
View File

@ -38,17 +38,20 @@ public static partial class Pathfinder
while (currentNode is not null) while (currentNode is not null)
{ {
HashSet<Tag>? tags = null; HashSet<Tag>? tags = null;
double distance = 0; double pathDistanceDelta = 0;
double weight = 0; double pathWeightDelta = 0;
double directDistanceDelta = 0;
if (currentNode.previousPathNode is not null) if (currentNode.previousPathNode is not null)
{ {
OsmEdge edge = currentNode.previousPathNode!.edges.First(e => e.neighborId.Equals(currentNode.nodeId)); OsmEdge edge = currentNode.previousPathNode!.edges.First(e => e.neighborId.Equals(currentNode.nodeId));
tags = regionManager.GetRegion(currentNode.coordinates)!.tagManager.GetTagsForWayId(edge.wayId); tags = regionManager.GetRegion(currentNode.coordinates)!.tagManager.GetTagsForWayId(edge.wayId);
distance = currentNode.currentPathLength - currentNode.previousPathNode.currentPathLength; pathDistanceDelta = currentNode.currentPathLength - currentNode.previousPathNode.currentPathLength;
weight = currentNode.currentPathWeight - currentNode.previousPathNode.currentPathWeight; pathWeightDelta = currentNode.currentPathWeight - currentNode.previousPathNode.currentPathWeight;
directDistanceDelta =
currentNode.directDistanceToGoal - currentNode.previousPathNode.directDistanceToGoal;
} }
PathNode? pn = PathNode.FromOsmNode(currentNode, tags, distance, weight); PathNode? pn = PathNode.FromOsmNode(currentNode, tags, pathDistanceDelta, pathWeightDelta, directDistanceDelta);
if(pn is not null) if(pn is not null)
path.Add(pn!); path.Add(pn!);
currentNode = currentNode.previousPathNode; currentNode = currentNode.previousPathNode;