mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[transit] Update scripts to python 3

Browse source
This commit is contained in:
Ilya Zverev 2018-01-12 16:40:53 +03:00 • committed by Slava
parent cf647f897f
commit 54ddb8e69f
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/python/transit/transit_color_palette.py
View file

@ -96,7 +96,7 @@ def cie94(ref_color, src_color):
class Palette:
def __init__(self, colors):
self.colors = {}
for name, color_info in colors['colors'].iteritems():
for name, color_info in colors['colors'].items():
self.colors[name] = to_rgb(color_info['clear'])
def get_default_color(self):
@ -111,7 +111,7 @@ class Palette:
min_diff = None
bluish = is_bluish(color)
for name, palette_color in self.colors.iteritems():
for name, palette_color in self.colors.items():
# Uncomment if you want to exclude duplicates.
#if name in excluded_names:
# continue

25
tools/python/transit/transit_graph_generator.py
View file

@ -1,16 +1,12 @@
#!/usr/bin/env python2.7
# -*- coding: utf-8 -*-
#!/usr/bin/env python3
# Generates transit graph for MWM transit section generator.
# Also shows preview of transit scheme lines.
import argparse
import copy
import json
import math
import matplotlib.pyplot as plt
import matplotlib.patches as patches
import numpy as np
import os.path
import sys, io
import bezier_curves
import transit_color_palette
@ -227,7 +223,7 @@ class TransitGraphBuilder:
if c != self.palette.get_default_color():
self.matched_colors[matched_colors_key] = c
return c
def __generate_transfer_nodes(self):
"""Merges stops into transfer nodes."""
for edge in self.edges:
@ -331,14 +327,15 @@ class TransitGraphBuilder:
self.transit_graph = {'networks': self.networks,
'lines': self.lines,
'gates': self.gates.values(),
'stops': self.stops.values(),
'transfers': self.transfers.values(),
'gates': list(self.gates.values()),
'stops': list(self.stops.values()),
'transfers': list(self.transfers.values()),
'shapes': self.shapes,
'edges': self.edges}
return self.transit_graph
def show_preview(self):
import matplotlib.pyplot as plt
for (s1, s2), info in self.segments.items():
plt.plot(info['curve'][:, 0], info['curve'][:, 1], 'g')
for stop in self.stops.values():
@ -358,6 +355,8 @@ class TransitGraphBuilder:
plt.show()
def show_color_maching_table(self, title, colors_ref_table):
import matplotlib.pyplot as plt
import matplotlib.patches as patches
fig = plt.figure()
ax = fig.add_subplot(111, aspect='equal')
plt.title(title)
@ -413,16 +412,16 @@ if __name__ == '__main__':
name, extension = os.path.splitext(tail)
if output_file is None:
output_file = os.path.join(head, name + '.transit' + extension)
with io.open(output_file, 'w', encoding='utf8') as json_file:
with open(output_file, 'w') as json_file:
result_data = json.dumps(result, ensure_ascii=False, indent=4, sort_keys=True)
json_file.write(unicode(result_data))
print 'Transit graph generated:', output_file
json_file.write(result_data)
print('Transit graph generated:', output_file)
if args.preview:
transit.show_preview()
if args.matched_colors:
colors_ref_table = {}
for color_name, color_info in colors['colors'].iteritems():
for color_name, color_info in colors['colors'].items():
colors_ref_table[color_name] = color_info['clear']
transit.show_color_maching_table(name, colors_ref_table)