diff --git a/README.md b/README.md index 89ae9cb..907c7f9 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,10 @@ if you allow the `process_subway.py` to fetch data from Overpass API. Here are t Summary information about all metro networks that are monitored is gathered in the [Google Spreadsheet](https://docs.google.com/spreadsheets/d/1SEW1-NiNOnA2qDwievcxYV1FOaQl1mb1fdeyqAxHu3k). -Not so regular updates of validation results are available at -[this website](https://alexey-zakharenkov.github.io/subways/rapid/). +Regular updates of validation results are available at +[this website](https://maps.mail.ru/osm/tools/subways/latest/). +You can find more info about this validator instance in +[OSM Wiki](https://wiki.openstreetmap.org/wiki/Quality_assurance#subway-preprocessor). ## Adding Stop Areas To OSM diff --git a/v2h_templates.py b/v2h_templates.py index bcec823..8198d9b 100644 --- a/v2h_templates.py +++ b/v2h_templates.py @@ -121,7 +121,12 @@ INDEX_HEADER = ''' <body> <main> <h1>Subway Validation Results</h1> -<p>Total good metro networks: {good_cities} of {total_cities}.</p> +<p><b>{good_cities}</b> of <b>{total_cities}</b> networks validated without errors. +To make a network validate successfully please follow the +<a href="https://wiki.openstreetmap.org/wiki/Metro_Mapping">metro mapping instructions</a>. +Commit your changes to the OSM and then check back to the updated validation results after the next validation cycle, please. +See <a href="https://wiki.openstreetmap.org/wiki/Quality_assurance#subway-preprocessor">the validator instance(s) description</a> +for the schedule and capabilities.</p> <p><a href="render.html">View networks on a map</a></p> <table cellspacing="3" cellpadding="2" style="margin-bottom: 1em;"> '''.replace('(s)', STYLE) @@ -172,7 +177,7 @@ INDEX_COUNTRY = ''' INDEX_FOOTER = ''' </table> </main> -<footer>Produced by <a href="https://github.com/mapsme/subways">Subway Preprocessor</a> on {date}. +<footer>Produced by <a href="https://github.com/alexey-zakharenkov/subways">Subway Preprocessor</a> on {date}. See <a href="{google}">this spreadsheet</a> for the reference metro statistics and <a href="https://en.wikipedia.org/wiki/List_of_metro_systems#List">this wiki page</a> for a list of all metro systems.</footer> @@ -253,7 +258,7 @@ COUNTRY_CITY = ''' COUNTRY_FOOTER = ''' </table> </main> -<footer>Produced by <a href="https://github.com/mapsme/subways">Subway Preprocessor</a> on {date}.</footer> +<footer>Produced by <a href="https://github.com/alexey-zakharenkov/subways">Subway Preprocessor</a> on {date}.</footer> </body> </html> ''' diff --git a/validation_to_html.py b/validation_to_html.py index f4468de..fe21734 100755 --- a/validation_to_html.py +++ b/validation_to_html.py @@ -7,8 +7,6 @@ import json from subway_structure import SPREADSHEET_ID from v2h_templates import * -date = datetime.datetime.now().strftime('%d.%m.%Y %H:%M') - class CityData: def __init__(self, city=None): @@ -157,7 +155,7 @@ for c in data.values(): world = sum(continents.values(), CityData()) overground = 'traml_expected' in next(iter(data.values())).data -date = datetime.datetime.now().strftime('%d.%m.%Y %H:%M') +date = datetime.datetime.utcnow().strftime('%d.%m.%Y %H:%M UTC') 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, world))