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

Compare commits

base: glax:bea789f6258221f239d70afac9034e3c1595d71f
Branches Tags
glax:master
..
compare: glax:a0418a6fae0b9c5402647ebe8a4d55d514d15d65
Branches Tags
glax:master

2 Commits
bea789f625 ... a0418a6fae

Author SHA1 Message Date
glax
a0418a6fae Fix neighbors not being added if they are not in the same region 2024-07-22 23:58:24 +02:00
glax
2bf19d1095 Dispose of readers after load 2024-07-22 23:58:06 +02:00
1 changed files with 11 additions and 5 deletions
Show Stats Expand all files Collapse all files

16
OSM_Regions/RegionLoader.cs
View File

@ -61,14 +61,20 @@ public class RegionLoader(float regionSize, string? importFolderPath = null, ILo
{ {
ulong node1Id = w.NodeIds[i - 1]; ulong node1Id = w.NodeIds[i - 1];
ulong node2Id = w.NodeIds[i]; ulong node2Id = w.NodeIds[i];
if (ret.Nodes.TryGetValue(node1Id, out Graph.Node? node1) && ret.Nodes.TryGetValue(node2Id, out Graph.Node? node2)) if (ret.Nodes.TryGetValue(node1Id, out Graph.Node? node1))
{ {
node1.Neighbors.TryAdd(node2Id, w.ID);
node2.Neighbors.TryAdd(node1Id, w.ID);
//TODO add oneway checks //TODO add oneway checks
node1.Neighbors.TryAdd(node2Id, w.ID);
}
if (ret.Nodes.TryGetValue(node2Id, out Graph.Node? node2))
{
//TODO add oneway checks
node2.Neighbors.TryAdd(node1Id, w.ID);
} }
} }
} }
nodesReader.Dispose();
waysReader.Dispose();
return ret; return ret;
} }
@ -76,7 +82,7 @@ public class RegionLoader(float regionSize, string? importFolderPath = null, ILo
public Graph.Graph? LoadRegionFromNodeId(ulong nodeId) public Graph.Graph? LoadRegionFromNodeId(ulong nodeId)
{ {
logger?.LogDebug($"Loading Region for Node {nodeId}"); logger?.LogDebug($"Loading Region for Node {nodeId}");
StreamReader nodesMapFileStream = new(Path.Join(ImportFolderPath, NodesMapRegionFileName), Encoding.ASCII); using StreamReader nodesMapFileStream = new(Path.Join(ImportFolderPath, NodesMapRegionFileName), Encoding.ASCII);
while (!nodesMapFileStream.EndOfStream) while (!nodesMapFileStream.EndOfStream)
{ {
string? line = nodesMapFileStream.ReadLine(); string? line = nodesMapFileStream.ReadLine();
@ -101,7 +107,7 @@ public class RegionLoader(float regionSize, string? importFolderPath = null, ILo
public Graph.Graph?[] LoadRegionsFromWayId(ulong wayId) public Graph.Graph?[] LoadRegionsFromWayId(ulong wayId)
{ {
logger?.LogDebug($"Loading Region for Way {wayId}"); logger?.LogDebug($"Loading Region for Way {wayId}");
StreamReader waysMapFileStream = new(Path.Join(ImportFolderPath, WayMapRegionFileName), Encoding.ASCII); using StreamReader waysMapFileStream = new(Path.Join(ImportFolderPath, WayMapRegionFileName), Encoding.ASCII);
while (!waysMapFileStream.EndOfStream) while (!waysMapFileStream.EndOfStream)
{ {
string? line = waysMapFileStream.ReadLine(); string? line = waysMapFileStream.ReadLine();