tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[intersections] no need to store lat/lon in intersections

Browse Source
This commit is contained in:
Al
2016-08-19 01:58:53 -04:00
parent 9a6ec41ce6
commit 294316c721
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/geodata/osm/intersections.py
View File

@@ -27,7 +27,6 @@ class OSMIntersectionReader(object):
self.filename = filename self.filename = filename
self.node_ids = array.array('l') self.node_ids = array.array('l')
self.node_coordinates = array.array('d')
self.logger = logging.getLogger('osm.intersections') self.logger = logging.getLogger('osm.intersections')
@@ -66,10 +65,9 @@ class OSMIntersectionReader(object):
props = {safe_decode(k): safe_decode(v) for k, v in six.iteritems(props)} props = {safe_decode(k): safe_decode(v) for k, v in six.iteritems(props)}
if element_id.startswith('node'): if element_id.startswith('node'):
node_id = long(element_id.split(':')[-1]) node_id = long(element_id.split(':')[-1])
if props.get('junction', '').lower() == 'yes' or props.get('highway', '').lower() in ('traffic_signals', 'crossing'): node_ids.append(node_id)
node_ids.append(node_id) node_counts.append(0)
node_counts.append(0) self.node_props.Put(safe_encode(node_id), json.dumps(props))
self.node_props.Put(safe_encode(node_id), json.dumps(props))
elif element_id.startswith('way'): elif element_id.startswith('way'):
# Don't care about the ordering of the nodes, and want uniques e.g. for circular roads # Don't care about the ordering of the nodes, and want uniques e.g. for circular roads
deps = set(deps) deps = set(deps)
@@ -101,11 +99,6 @@ class OSMIntersectionReader(object):
if element_id.startswith('node'): if element_id.startswith('node'):
node_id = long(element_id.split(':')[-1]) node_id = long(element_id.split(':')[-1])
node_index = self.binary_search(self.node_ids, node_id) node_index = self.binary_search(self.node_ids, node_id)
if node_index is not None:
lat = props.get('lat')
lon = props.get('lon')
lat, lon = latlon_to_decimal(lat, lon)
self.node_coordinates.extend([lat, lon])
elif element_id.startswith('way'): elif element_id.startswith('way'):
props = {safe_decode(k): safe_decode(v) for k, v in six.iteritems(props)} props = {safe_decode(k): safe_decode(v) for k, v in six.iteritems(props)}
way_id = long(element_id.split(':')[-1]) way_id = long(element_id.split(':')[-1])
@@ -154,15 +147,12 @@ class OSMIntersectionReader(object):
if len(ways) > 1: if len(ways) > 1:
node_index = self.binary_search(self.node_ids, node_id) node_index = self.binary_search(self.node_ids, node_id)
lat, lon = self.node_coordinates[node_index * 2], self.node_coordinates[node_index * 2 + 1] yield self.node_ids[node_index], node_props, ways
yield self.node_ids[node_index], node_props, lat, lon, ways
def create_intersections(self, outfile): def create_intersections(self, outfile):
out = open(outfile, 'w') out = open(outfile, 'w')
for node_id, node_props, lat, lon, ways in self.intersections(): for node_id, node_props, ways in self.intersections():
d = {'id': safe_encode(node_id), d = {'id': safe_encode(node_id),
'lat': safe_encode(lat),
'lon': safe_encode(lon),
'node': node_props, 'node': node_props,
'ways': ways} 'ways': ways}
out.write(json.dumps(d) + six.u('\n')) out.write(json.dumps(d) + six.u('\n'))
@@ -172,7 +162,7 @@ class OSMIntersectionReader(object):
f = open(infile) f = open(infile)
for line in f: for line in f:
data = json.loads(line.rstrip()) data = json.loads(line.rstrip())
yield data['id'], data['node'], data['lat'], data['lon'], data['ways'] yield data['id'], data['node'], data['ways']
if __name__ == '__main__': if __name__ == '__main__':