organicmaps/subways
13
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity Actions

Restrict dumping to a single city, and print total number of cities in v2h

Browse source
This commit is contained in:
Ilya Zverev 2017-10-27 14:01:43 +03:00
parent fc67dd1886
commit 7396a3fa9e
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mapsme_subways.py
View file

@ -316,7 +316,10 @@ if __name__ == '__main__':
json.dump(get_unused_entrances_geojson(osm), options.entrances)
if options.dump:
dump_data(cities[0], options.dump)
if len(cities) == 1:
dump_data(cities[0], options.dump)
else:
logging.error('Cannot dump %s cities at once', len(cities))
# Finally, prepare a JSON file for MAPS.ME
if options.output:

1
v2h_templates.py
View file

@ -42,6 +42,7 @@ INDEX_HEADER = '''
</head>
<body>
<h1>Subway Validation Results</h1>
<p>Total good metro networks: {good_cities} of {total_cities}.</p>
<table cellspacing="3" cellpadding="2" style="margin-bottom: 1em;">
'''.replace('(s)', STYLE)

5
validation_to_html.py
View file

@ -40,7 +40,7 @@ class CityData:
def __add__(self, other):
d = CityData()
for k in self.data:
for k in set(self.data.keys()) | set(other.data.keys()):
d.data[k] = self.data.get(k, 0) + other.data.get(k, 0)
return d
@ -109,11 +109,12 @@ for c in data.values():
if c.continent not in c_by_c:
c_by_c[c.continent] = set()
c_by_c[c.continent].add(c.country)
world = sum(continents.values(), CityData())
date = datetime.datetime.now().strftime('%d.%m.%Y %H:%M')
path = '.' if len(sys.argv) < 3 else sys.argv[2]
index = open(os.path.join(path, 'index.html'), 'w', encoding='utf-8')
index.write(tmpl(INDEX_HEADER))
index.write(tmpl(INDEX_HEADER, world))
for continent in sorted(continents.keys()):
content = ''