From 6a05ba1a091aa9c44ea97fbc77f416eba101ad97 Mon Sep 17 00:00:00 2001
From: "niehues.mark@gmail.com" <niehues.mark@gmail.com>
Date: Tue, 28 Apr 2020 14:18:44 +0200
Subject: [PATCH] wip
---
evrouting/osm/imports.py | 9 ++++-----
evrouting/osm/routing.py | 4 +---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/evrouting/osm/imports.py b/evrouting/osm/imports.py
index 6eb3e3d..f08247f 100644
--- a/evrouting/osm/imports.py
+++ b/evrouting/osm/imports.py
@@ -11,7 +11,6 @@ Added :
- distance computation to estimate length of each ways (useful to compute the shortest path)
"""
-
import copy
import xml.sax
import logging
@@ -142,11 +141,11 @@ def read_osm(osm_xml_data, profile) -> OSMGraph:
})
# Complete the used nodes' information
- for n_id in G.nodes():
+ for n_id, data in G.nodes(data=True):
n = osm.nodes[n_id]
- G.nodes[n_id]['lat'] = n.lat
- G.nodes[n_id]['lon'] = n.lon
- G.nodes[n_id]['id'] = n.id
+ data['lat'] = n.lat
+ data['lon'] = n.lon
+ data['id'] = n.id
G.insert_into_rtree(n_id)
return G
diff --git a/evrouting/osm/routing.py b/evrouting/osm/routing.py
index fe636d4..0d9b110 100644
--- a/evrouting/osm/routing.py
+++ b/evrouting/osm/routing.py
@@ -32,8 +32,6 @@ def haversine_distance(lon1, lat1, lon2, lat2, unit_m=True):
def shortest_path(G, s: point, t: point, profile):
"""Calc A* shortest path."""
- _s = G.find_nearest(s)
- _t = G.find_nearest(t)
def dist(u, v):
return haversine_distance(
@@ -44,7 +42,7 @@ def shortest_path(G, s: point, t: point, profile):
unit_m=True
) / profile['maxspeed'] * ms_to_kmh
- return nx.astar_path(G, _s, _t, heuristic=dist)
+ return nx.astar_path(G, s, t, heuristic=dist)
def to_coordinates(G, path):
--
GitLab