Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorIlya Zverev <zverik@textual.ru>2018-01-12 16:40:53 +0300
committerSlava <slovaricheg@gmail.com>2018-02-13 18:30:19 +0300
commit54ddb8e69f209795d7bba9920391a0550a44d4c4 (patch)
tree2a3f031dabf2cf64e0f35747afb6c2d71a1d0342 /tools
parentcf647f897f184977e6ce3f26089ef09b0ab6dcc3 (diff)
[transit] Update scripts to python 3
Diffstat (limited to 'tools')
-rw-r--r--tools/python/transit/transit_color_palette.py4
-rwxr-xr-xtools/python/transit/transit_graph_generator.py25
2 files changed, 14 insertions, 15 deletions
diff --git a/tools/python/transit/transit_color_palette.py b/tools/python/transit/transit_color_palette.py
index 29c4ba6657..301cce6533 100644
--- a/tools/python/transit/transit_color_palette.py
+++ b/tools/python/transit/transit_color_palette.py
@@ -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
diff --git a/tools/python/transit/transit_graph_generator.py b/tools/python/transit/transit_graph_generator.py
index dc781e7221..2b260303b7 100755
--- a/tools/python/transit/transit_graph_generator.py
+++ b/tools/python/transit/transit_graph_generator.py
@@ -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)