From 8939a54cad5e296aa6dadec044c0d1ff22166195 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Mon, 18 Jun 2018 19:17:11 +0300 Subject: [PATCH] 0.10.0: many changes --- CHANGELOG.md | 11 + mwm/__init__.py | 5 +- mwm/mwm.py | 49 +- mwm/mwmfile.py | 74 ++- mwm/mwmtool.py | 94 +++- mwm/osm2ft.py | 38 ++ mwm/types.txt | 1225 +++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 2 +- 8 files changed, 1427 insertions(+), 71 deletions(-) mode change 100755 => 100644 mwm/mwmtool.py create mode 100644 mwm/osm2ft.py create mode 100644 mwm/types.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index d396a94..d0068e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ ## master branch +## 0.10.0 + +_Released 2018-06-18_ + +* Extracted osm id encoding methods to `OsmIdCode` class. +* Added id decoding to mwmtool. +* Fixed printing utf-8 characters under Python 2 in mwmtool. +* Python 2.6 is not supported officially. +* Package `types.txt` to eliminate the need to check out omim repository. +* `dump -s` will skip reading all the features. + ## 0.9.0 _Released 2017-06-08_ diff --git a/mwm/__init__.py b/mwm/__init__.py index fc587ff..b181b69 100644 --- a/mwm/__init__.py +++ b/mwm/__init__.py @@ -1,2 +1,3 @@ -from .mwm import MWM, Osm2Ft, __version__ -from .mwmfile import MWMFile +from .mwmfile import MWMFile, OsmIdCode +from .mwm import MWM, __version__ +from .osm2ft import Osm2Ft diff --git a/mwm/mwm.py b/mwm/mwm.py index cd918bf..40ce963 100644 --- a/mwm/mwm.py +++ b/mwm/mwm.py @@ -1,8 +1,9 @@ # MWM Reader Module from .mwmfile import MWMFile from datetime import datetime +import os -__version__ = '0.9.0' +__version__ = '0.10.0' # Unprocessed sections: geomN, trgN, idx, sdx (search index), # addr (search address), offs (feature offsets - succinct) @@ -20,17 +21,23 @@ class MWM(MWMFile): "turn_lanes", "turn_lanes_forward", "turn_lanes_backward", "email", "postcode", "wikipedia", "maxspeed", "flats", "height", "min_height", "denomination", "building_levels", "test_id", "ref:sponsored", "price_rate", - "rating", "fuel", "routes"] + "rating", "banner_url", "level"] - regiondata = ["languages", "driving", "timezone", "addr_fmt", "phone_fmt", "postcode_fmt", "holidays", "housenames"] + regiondata = ["languages", "driving", "timezone", "addr_fmt", "phone_fmt", + "postcode_fmt", "holidays", "housenames"] def __init__(self, f): MWMFile.__init__(self, f) self.read_tags() self.read_header() self.type_mapping = [] + self.read_types(os.path.join( + os.getcwd(), os.path.dirname(__file__), 'types.txt')) def read_types(self, filename): + if not os.path.exists(filename): + return + self.type_mapping = [] with open(filename, 'r') as ft: for line in ft: if len(line.strip()) > 0: @@ -268,39 +275,3 @@ class MWM(MWMFile): raise Exception('Feature parsing error, read too much') yield feature self.f.seek(next_feature) - - -class Osm2Ft(MWMFile): - def __init__(self, f, ft2osm=False, tuples=True): - MWMFile.__init__(self, f) - self.read(ft2osm, tuples) - - def read(self, ft2osm=False, tuples=True): - """Reads mwm.osm2ft file, returning a dict of feature id <-> osm way id.""" - count = self.read_varuint() - self.data = {} - self.ft2osm = ft2osm - for i in range(count): - osmid = self.read_osmid(tuples) - fid = self.read_uint(4) - self.read_uint(4) # filler - if osmid is not None: - if ft2osm: - self.data[fid] = osmid - else: - self.data[osmid] = fid - - def __getitem__(self, k): - return self.data.get(k) - - def __repr__(self): - return '{} with {} items'.format('ft2osm' if self.ft2osm else 'osm2ft', len(self.data)) - - def __len__(self): - return len(self.data) - - def __contains__(self, k): - return k in self.data - - def __iter__(self): - return iter(self.data) diff --git a/mwm/mwmfile.py b/mwm/mwmfile.py index b8f0701..46ce88e 100644 --- a/mwm/mwmfile.py +++ b/mwm/mwmfile.py @@ -3,6 +3,63 @@ import struct import math +class OsmIdCode: + NODE = 0x4000000000000000 + WAY = 0x8000000000000000 + RELATION = 0xC000000000000000 + RESET = ~(NODE | WAY | RELATION) + + @staticmethod + def is_node(code): + return code & OsmIdCode.NODE == OsmIdCode.NODE + + @staticmethod + def is_way(code): + return code & OsmIdCode.WAY == OsmIdCode.WAY + + @staticmethod + def is_relation(code): + return code & OsmIdCode.RELATION == OsmIdCode.RELATION + + @staticmethod + def get_type(code): + if OsmIdCode.is_relation(code): + return 'r' + elif OsmIdCode.is_node(code): + return 'n' + elif OsmIdCode.is_way(code): + return 'w' + return None + + @staticmethod + def get_id(code): + return code & OsmIdCode.RESET + + @staticmethod + def unpack(num): + typ = OsmIdCode.get_type(num) + if typ is None: + return None + return typ, OsmIdCode.get_id(num) + + @staticmethod + def pack(osm_type, osm_id, int64=False): + if osm_type is None or len(osm_type) == 0: + return None + typ = osm_type[0].lower() + if typ == 'r': + result = osm_id | OsmIdCode.RELATION + elif typ == 'w': + result = osm_id | OsmIdCode.WAY + elif typ == 'n': + result = osm_id | OsmIdCode.NODE + else: + return None + if int64 and result >= 2**63: + result = -1 - (result ^ (2**64 - 1)) + return result + + class MWMFile(object): # coding/multilang_utf8_string.cpp languages = ["default", @@ -86,23 +143,12 @@ class MWMFile(object): AREA = 1 << 6 POINT_EX = 3 << 5 - class OsmIdCode: - NODE = 0x4000000000000000 - WAY = 0x8000000000000000 - RELATION = 0xC000000000000000 - RESET = ~(NODE | WAY | RELATION) - @staticmethod def unpack_osmid(num): - if num & MWMFile.OsmIdCode.RELATION == MWMFile.OsmIdCode.RELATION: - typ = 'r' - elif num & MWMFile.OsmIdCode.WAY == MWMFile.OsmIdCode.WAY: - typ = 'w' - elif num & MWMFile.OsmIdCode.NODE == MWMFile.OsmIdCode.NODE: - typ = 'n' - else: + typ = OsmIdCode.get_type(num) + if typ is None: return None - return typ, num & MWMFile.OsmIdCode.RESET + return typ, OsmIdCode.get_id(num) def read_osmid(self, as_tuple=True): osmid = self.read_uint(8) diff --git a/mwm/mwmtool.py b/mwm/mwmtool.py old mode 100755 new mode 100644 index bb1fbab..787e859 --- a/mwm/mwmtool.py +++ b/mwm/mwmtool.py @@ -1,15 +1,23 @@ #!/usr/bin/env python import sys -import os.path import random import json import argparse -from . import MWM, Osm2Ft +import re +from . import MWM, Osm2Ft, OsmIdCode + + +def print_json(data): + s = json.dumps(data, ensure_ascii=False, sort_keys=True) + if sys.version_info[0] >= 3: + print(s) + else: + print(s.encode('utf-8')) def dump_mwm(args): mwm = MWM(args.mwm) - if os.path.exists(args.types): + if args.types: mwm.read_types(args.types) print('Tags:') @@ -20,6 +28,10 @@ def dump_mwm(args): print('Format: {0}, version: {1}'.format(v['fmt'], v['date'].strftime('%Y-%m-%d %H:%M'))) print('Header: {0}'.format(mwm.read_header())) print('Region Info: {0}'.format(mwm.read_region_info())) + + if args.short: + return + print('Metadata count: {0}'.format(len(mwm.read_metadata()))) cross = mwm.read_crossmwm() @@ -39,13 +51,13 @@ def dump_mwm(args): print('Feature count: {0}'.format(i)) print('Sample features:') for feature in sample: - print(json.dumps(feature, ensure_ascii=False)) + print_json(feature) def find_feature(args): mwm = MWM(args.mwm) mwm.read_header() - if os.path.exists(args.types): + if args.types: mwm.read_types(args.types) if args.iname: args.iname = args.iname.lower() @@ -75,7 +87,7 @@ def find_feature(args): continue if args.meta and ('metadata' not in feature or args.meta not in feature['metadata']): continue - print(json.dumps(feature, ensure_ascii=False, sort_keys=True)) + print_json(feature) def ft2osm(args): @@ -84,35 +96,87 @@ def ft2osm(args): type_abbr = {'n': 'node', 'w': 'way', 'r': 'relation'} for ftid in args.ftid: if ftid in ft2osm: - print('https://www.openstreetmap.org/{}/{}'.format(type_abbr[ft2osm[ftid][0]], ft2osm[ftid][1])) + print('https://www.openstreetmap.org/{}/{}'.format( + type_abbr[ft2osm[ftid][0]], + ft2osm[ftid][1])) else: print('Could not find osm id for feature {}'.format(ftid)) code = 2 return code +def decode_id(args): + if args.id.isdigit(): + osm_id = OsmIdCode.unpack(int(args.id)) + if osm_id is None: + print('That is not a valid identifier') + return 2 + else: + type_abbr = {'n': 'node', 'w': 'way', 'r': 'relation'} + print('https://www.openstreetmap.org/{}/{}'.format( + type_abbr[osm_id[0]], osm_id[1])) + else: + m = re.search(r'/(node|way|relation)/(\d+)', args.id) + if m: + print(OsmIdCode.pack(m.group(1), int(m.group(2)))) + else: + print('Please specify an URL to OSM object on its website') + return 2 + + +def dat_to_gpx(args): + POINT_SOURCE = ['apple', 'windows', 'android', 'google', 'tizen', 'predictor'] + out = sys.stdout if not args.gpx else open(args.gpx, 'w') + # TODO + print('Not implemented yet, sorry.') + return 2 + + def main(): parser = argparse.ArgumentParser(description='Toolbox for MWM files.') - parser.add_argument('--types', default=os.path.join(os.path.dirname(sys.argv[0]), '..', '..', '..', '..', 'data', 'types.txt'), help='path to types.txt') + parser.add_argument('-t', '--types', help='path to types.txt') subparsers = parser.add_subparsers(dest='cmd') subparsers.required = True + parser_dump = subparsers.add_parser('dump', help='Dumps some structures.') parser_dump.add_argument('mwm', type=argparse.FileType('rb'), help='file to browse') + parser_dump.add_argument('-s', '--short', action='store_true', + help='Read header only, no features') parser_dump.set_defaults(func=dump_mwm) + parser_find = subparsers.add_parser('find', help='Finds features in a file.') parser_find.add_argument('mwm', type=argparse.FileType('rb'), help='file to search') - parser_find.add_argument('-t', dest='type', help='look inside types ("-t hwtag" will find all hwtags-*)') - parser_find.add_argument('-et', dest='exact_type', help='look for a type ("-et shop won\'t find shop-chemist)') - parser_find.add_argument('-n', dest='name', help='look inside names, case-sensitive ("-n Starbucks" for all starbucks)') - parser_find.add_argument('-in', '-ni', dest='iname', help='look inside names, case-insensitive ("-in star" will find Starbucks)') - parser_find.add_argument('-m', dest='meta', help='look for a metadata key ("m flats" for features with flats)') - parser_find.add_argument('-id', dest='fid', type=int, help='look for a feature id ("-id 1234 for feature #1234)') + parser_find.add_argument('-t', dest='type', + help='look inside types ("-t hwtag" will find all hwtags-*)') + parser_find.add_argument('-et', dest='exact_type', + help='look for a type ("-et shop won\'t find shop-chemist)') + parser_find.add_argument('-n', dest='name', + help='look inside names, case-sensitive ("-n Starbucks" ' + 'for all starbucks)') + parser_find.add_argument('-in', '-ni', dest='iname', + help='look inside names, case-insensitive ("-in star" will ' + 'find Starbucks)') + parser_find.add_argument('-m', dest='meta', + help='look for a metadata key ("m flats" for features with flats)') + parser_find.add_argument('-id', dest='fid', type=int, + help='look for a feature id ("-id 1234 for feature #1234)') parser_find.set_defaults(func=find_feature) - parser_osm = subparsers.add_parser('osm', help='Displays an OpenStreetMap link for a feature id.') + + parser_osm = subparsers.add_parser('osm', + help='Displays an OpenStreetMap link for a feature id.') parser_osm.add_argument('osm2ft', type=argparse.FileType('rb'), help='.mwm.osm2ft file') parser_osm.add_argument('ftid', type=int, nargs='+', help='feature id') parser_osm.set_defaults(func=ft2osm) + parser_id = subparsers.add_parser('id', help='Decode or encode OSM ID') + parser_id.add_argument('id', help='MWM internal OSM ID, or a link to OSM website') + parser_id.set_defaults(func=decode_id) + + parser_dump = subparsers.add_parser('gpx', help='Convert gps_track.dat to GPX') + parser_dump.add_argument('dat', type=argparse.FileType('rb'), help='file to convert') + parser_dump.add_argument('--gpx', '-o', type=argparse.FileType('w'), help='output gpx file') + parser_dump.set_defaults(func=dat_to_gpx) + args = parser.parse_args() code = args.func(args) if code is not None: diff --git a/mwm/osm2ft.py b/mwm/osm2ft.py new file mode 100644 index 0000000..2f43eb0 --- /dev/null +++ b/mwm/osm2ft.py @@ -0,0 +1,38 @@ +# OSM2FT Reader +from .mwmfile import MWMFile + + +class Osm2Ft(MWMFile): + def __init__(self, f, ft2osm=False, tuples=True): + MWMFile.__init__(self, f) + self.read(ft2osm, tuples) + + def read(self, ft2osm=False, tuples=True): + """Reads mwm.osm2ft file, returning a dict of feature id <-> osm way id.""" + count = self.read_varuint() + self.data = {} + self.ft2osm = ft2osm + for i in range(count): + osmid = self.read_osmid(tuples) + fid = self.read_uint(4) + self.read_uint(4) # filler + if osmid is not None: + if ft2osm: + self.data[fid] = osmid + else: + self.data[osmid] = fid + + def __getitem__(self, k): + return self.data.get(k) + + def __repr__(self): + return '{} with {} items'.format('ft2osm' if self.ft2osm else 'osm2ft', len(self.data)) + + def __len__(self): + return len(self.data) + + def __contains__(self, k): + return k in self.data + + def __iter__(self): + return iter(self.data) diff --git a/mwm/types.txt b/mwm/types.txt new file mode 100644 index 0000000..3dab12e --- /dev/null +++ b/mwm/types.txt @@ -0,0 +1,1225 @@ +building +highway|residential +highway|service +waterway|stream +highway|unclassified +natural|water +highway|footway +highway|track +highway|tertiary +power|tower +landuse|forest +landuse|grass +highway|secondary +natural|wood +landuse|residential +highway|path +highway|bus_stop +natural|tree +place|locality +natural|coastline +place|village +highway|residential +waterway|river +hwtag|oneway +hwtag|private +amenity|parking +highway|primary +railway|rail +highway|service|parking_aisle +place|hamlet +highway|road +highway|track|grade2 +natural|wetland +highway|track|grade3 +boundary|administrative|8 +amenity|school +highway|cycleway +landuse|farm +amenity|place_of_worship +highway|track|grade1 +highway|secondary +highway|service|driveway +mapswithme +highway|motorway_link +waterway|stream|intermittent +highway|track|grade4 +highway|tertiary +landuse|farmland +barrier|fence +highway|primary +power|pole +waterway|riverbank +highway|path|bicycle +landuse|meadow +highway|living_street +highway|unclassified +natural|peak +highway|motorway +highway|steps +waterway|ditch +amenity|restaurant +landuse|reservoir +highway|track|grade5 +amenity|bench +highway|service +highway|trunk +amenity|fuel +leisure|park +leisure|pitch +highway|pedestrian +natural|scrub +highway|motorway|bridge +highway|trunk +railway|level_crossing +landuse|industrial +barrier|wall +amenity|post_box +place|town +power|line +landuse|farmyard +highway|residential|bridge +railway|rail|bridge +boundary|administrative|10 +boundary|administrative|6 +highway|secondary|bridge +highway|tertiary|bridge +barrier|bollard +leisure|playground +waterway|drain +waterway|canal +highway|trunk_link +highway|unclassified|bridge +landuse|forest|deciduous +place|island +highway|primary|bridge +highway|primary_link +amenity|fast_food +highway|footway|bridge +amenity|bank +barrier|hedge +amenity|pub +leisure|swimming_pool +natural|land +tourism|hotel +landuse|cemetery +sport|soccer +boundary|administrative|4 +amenity|cafe +amenity|recycling +leisure|garden +landuse|commercial +railway|station +highway|path|hiking +amenity|hospital +waterway|stream|ephemeral +highway|trunk|bridge +amenity|post_office +landuse|quarry +amenity|pharmacy +man_made|pier +highway|motorway_junction +amenity|telephone +waterway|stream|tunnel +tourism|information|guidepost +amenity|parking|fee +amenity|kindergarten +power|generator|wind +place|suburb +landuse|allotments +landuse|forest|coniferous +landuse|forest|mixed +natural|wood|mixed +sport|tennis +landuse|vineyard +aeroway|taxiway +aeroway|aerodrome +highway|secondary +amenity|fire_station +landuse|retail +leisure|nature_reserve +leisure|pitch|tennis +tourism|information +highway|motorway_link|bridge +railway|abandoned +amenity|parking|private +boundary|administrative|7 +tourism|attraction +highway|tertiary +highway|track +railway|tram +amenity|toilets +highway|residential +highway|footway|permissive +highway|primary +landuse|construction +tourism|viewpoint +amenity|atm +highway|pedestrian|area +tourism|picnic_site +shop|supermarket +shop|convenience +shop|bakery +highway|construction +highway|cycleway|bridge +leisure|sports_centre +highway|path|mountain_hiking +tourism|camp_site +highway|bridleway +natural|heath +landuse|basin +amenity|library +natural|wood|coniferous +landuse|recreation_ground +landuse|village_green +amenity|drinking_water +amenity|university +highway|secondary_link +power|substation +railway|tram_stop +place|city +amenity|shelter +natural|beach +highway|footway|tunnel +shop|hairdresser +amenity|hunting_stand +boundary|administrative|9 +amenity|fountain +highway|primary_link +amenity|bar +landuse|garages +boundary|administrative|2 +leisure|common +highway|track|bridge +highway|path|bridge +piste:type|nordic +highway|motorway +railway|crossing +boundary|national_park +natural|wood|deciduous +waterway|dam +highway|motorway_link +leisure|golf_course +highway|service|bridge +power|minor_line +natural|wetland|marsh +leisure|stadium +amenity|doctors +railway|disused +aeroway|runway +railway|halt +mapswithme +railway|rail|tunnel +man_made|wastewater_plant +highway|trunk +place|county +highway|footway +mapswithme +highway|unclassified +power|station +sport|swimming +leisure|track +highway|trunk_link +barrier|retaining_wall +amenity|college +sport|baseball +highway|service|area +highway|residential|area +amenity|bus_station +highway|track|permissive +waterway|drain|tunnel +landuse|cemetery|christian +highway|cycleway|tunnel +amenity|parking|permissive +boundary|administrative|5 +highway|unclassified|tunnel +highway|track +highway|trunk +highway|residential|tunnel +aeroway|helipad +highway|path|permissive +place|islet +sport|basketball +amenity|cinema +amenity|theatre +highway|secondary_link +railway|spur +aerialway|station +landuse|brownfield +aeroway|apron +natural|glacier +amenity|grave_yard +waterway|canal|tunnel +piste:type|downhill|easy +waterway|ditch|tunnel +landuse|forest +piste:type|downhill|intermediate +railway|subway_entrance +highway|trunk_link +man_made|pipeline +route|ferry +highway|trunk_link|bridge +landuse|military +highway|service|tunnel +railway|light_rail +place|region +railway|narrow_gauge +railway|subway +natural|cave_entrance +highway|tertiary|tunnel +landuse|landfill +amenity|bicycle_rental +highway|track +highway|tertiary_link +landuse|greenfield +tourism|alpine_hut +highway|footway|area +tourism|hostel +waterway|river|tunnel +boundary|administrative|county +highway|road|bridge +boundary|administrative|3 +man_made|pipeline +boundary|administrative +highway|road +highway|path +sport|athletics +landuse|railway +leisure|slipway +tourism|caravan_site +place|state +highway|path +railway|subway|tunnel +barrier|city_wall +place|farm +boundary|administrative|11 +waterway|weir +highway|secondary|tunnel +railway|abandoned|bridge +man_made|lighthouse +highway|path|demanding_mountain_hiking +highway|primary +tourism|hotel +power|generator +highway|pedestrian|bridge +man_made|pipeline|overground +amenity|parking +highway|unclassified +highway|raceway +highway|primary|tunnel +highway|primary_link|bridge +mapswithme +sport|equestrian +tourism|information|office +highway|footway|hiking +aeroway|gate +railway|preserved +highway|path|horse +landuse|field +highway|tertiary_link +leisure|water_park +natural|wetland|bog +man_made|windmill +military|bunker +aerialway|chair_lift +amenity|grave_yard|christian +highway|trunk|tunnel +highway|steps|tunnel +amenity|car_sharing +sport|football +highway|steps|bridge +highway|track|tunnel +highway|pedestrian|tunnel +power|generator|hydro +sport|cricket +sport|bowls +highway|path|tunnel +man_made|breakwater +amenity|parking|permissive|fee +mapswithme +tourism|zoo +sport|gymnastics +highway|trunk_link +railway|subway|bridge +railway|light_rail|bridge +aeroway|terminal +railway|tram|bridge +piste:type|downhill|advanced +sport|shooting +place|country +highway|path|alpine_hiking +highway|footway +sport|scuba_diving +highway|cycleway|permissive +highway|unclassified|area +natural|volcano +amenity|parking|underground|fee +amenity|parking|underground +man_made|pipeline +amenity|parking|multi-storey +leisure|recreation_ground +highway|footway|mountain_hiking +highway|service|driveway|bridge +amenity|parking|multi-storey|fee +mapswithme +highway|track +piste:type|downhill|novice +railway|narrow_gauge|bridge +mapswithme +highway|service|parking_aisle +highway|bridleway|permissive +railway|construction +highway|primary_link +landuse|greenhouse_horticulture +highway|primary_link +amenity|bureau_de_change +power|generator|photovoltaic +highway|motorway_link +highway|bridleway|bridge +highway|service|driveway|tunnel +highway|track +natural|water +railway|narrow_gauge|tunnel +mapswithme +waterway|dock +natural|wood +highway|service|driveway|area +man_made|pipeline +place|city|capital +aerialway|cable_car +piste:type|downhill +sport|american_football +highway|cycleway +man_made|cairn +railway|preserved|bridge +highway|path|demanding_alpine_hiking +natural|water +highway|secondary_link|bridge +railway|tram|tunnel +highway|footway +railway|abandoned|tunnel +area:highway|living_street +piste:type|sled +aerialway|chair_lift +leisure|dog_park +aerialway|gondola +historic|museum +highway|living_street|bridge +highway|service +railway|monorail +highway|road +man_made|pipeline +leisure|park|private +highway|secondary +noexit|motor_vehicle +highway|service|parking_aisle +highway|motorway|tunnel +railway|light_rail|tunnel +area:highway|service +highway|construction +highway|construction +highway|path +natural|scrub +highway|road|tunnel +sport|archery +mapswithme +mapswithme +highway|ford +area:highway|path +railway|siding +highway|track|area +highway|unclassified +railway|funicular +amenity|parking|fee +historic|battlefield +highway|construction +sport|australian_football +mapswithme +highway|secondary_link +highway|cycleway +highway|steps +piste:lift|t-bar +highway|construction +amenity|parking +highway|path|difficult_alpine_hiking +earthquake:damage|spontaneous_camp +highway|cycleway +railway|yard +highway|trunk +natural|meadow +highway|motorway +railway|razed +highway|footway|demanding_mountain_hiking +aerialway|chair_lift +natural|water +landuse|orchard +highway|track +highway|living_street|tunnel +highway|construction +highway|living_street +mapswithme +sport|handball +boundary|administrative|city +piste:type|downhill|freeride +amenity|restaurant +communication|line +piste:type|downhill|expert +landuse|salt_pond +natural|water +railway|monorail|bridge +area:highway|steps +mapswithme +mapswithme +highway|construction +natural|grassland +mapswithme +mapswithme +piste:lift|platter +man_made|pipeline +mapswithme +railway|preserved|tunnel +mapswithme +mapswithme +highway|construction +mapswithme +highway|construction +mapswithme +leisure|park|permissive +highway|bridleway|tunnel +highway|motorway_link|tunnel +mapswithme +mapswithme +highway|bridleway +highway|tertiary_link|bridge +highway|construction +amenity|parking|park_and_ride +highway|track +mapswithme +landuse|forest +waterway|lock +highway|path +highway|motorway +highway|construction +highway|trunk_link|tunnel +highway|footway +mapswithme +highway|tertiary +mapswithme +natural|water +railway|spur|bridge +mapswithme +highway|tertiary_link +highway|track +sport|curling +natural|water +landuse|forest +mapswithme +mapswithme +leisure|playground|tennis +mapswithme +sport|diving +highway|track|grade3 +boundary|administrative|suburb +mapswithme +railway|monorail|tunnel +railway|funicular|bridge +highway|construction +highway|footway +highway|primary_link|tunnel +highway|footway|alpine_hiking +mapswithme +highway|track +man_made|pipeline +leisure|landscape_reserve +mapswithme +highway|secondary_link +boundary|administrative|state +highway|cycleway +mapswithme +railway|funicular|tunnel +barrier|cycle_barrier +highway|unclassified +amenity|speed_trap +area:highway|track +area:highway|primary +power|line|underground +amenity|restaurant +highway|construction +highway|unclassified +highway|bridleway +waterway|lock_gate +mapswithme +mapswithme +highway|unclassified +highway|construction +highway|footway|demanding_alpine_hiking +mapswithme +highway|track +mapswithme +landuse|farmland +highway|unclassified +mapswithme +mapswithme +highway|track +natural|lake +man_made|pipeline +highway|construction +natural|water +mapswithme +highway|track +natural|water +mapswithme +natural|water +highway|construction +mapswithme +piste:lift|rope_tow +natural|pond +mapswithme +highway|secondary_link|tunnel +highway|pedestrian +highway|track|grade5 +mapswithme +landuse|forest +highway|construction +mapswithme +mapswithme +mapswithme +aerialway|mixed_lift +mapswithme +highway|footway +power|line +highway|track|grade3|permissive +highway|track|grade4 +highway|track +mapswithme +highway|service +mapswithme +boundary|administrative|region +highway|construction +highway|path +mapswithme +place|continent +landuse|farmland +highway|footway +boundary|administrative|nation +mapswithme +mapswithme +highway|track +piste:lift|magic_carpet +mapswithme +highway|unclassified +highway|bridleway +mapswithme +mapswithme +highway|unclassified +mapswithme +mapswithme +highway|track +highway|footway +piste:lift|j-bar +mapswithme +mapswithme +mapswithme +highway|track +landuse|forest +mapswithme +railway|siding|bridge +highway|footway|difficult_alpine_hiking +mapswithme +mapswithme +highway|primary_link +highway|track|grade5|permissive +natural|water +aeroway|aerodrome +highway|tertiary_link|tunnel +mapswithme +highway|footway +mapswithme +mapswithme +highway|construction +mapswithme +leisure|park +highway|footway +mapswithme +mapswithme +mapswithme +highway|unclassified +highway|secondary +highway|track +landuse|forest +highway|footway +railway|spur|tunnel +highway|path +highway|path +mapswithme +mapswithme +railway|incline|tunnel +boundary|administrative|municipality +highway|path +highway|bridleway +mapswithme +communication|line +highway|tertiary_link +mapswithme +leisure|recreation_ground +railway|yard|bridge +mapswithme +mapswithme +mapswithme +mapswithme +highway|service +mapswithme +mapswithme +highway|unclassified +mapswithme +highway|track|grade4|permissive +mapswithme +mapswithme +mapswithme +mapswithme +highway|service +mapswithme +highway|unclassified +highway|residential +mapswithme +highway|path +natural|vineyard +highway|cycleway +man_made|pipeline +highway|footway +mapswithme +boundary|administrative|country +highway|service +natural|orchard +mapswithme +communication|line|underground +mapswithme +highway|track +highway|path +mapswithme +mapswithme +mapswithme +mapswithme +railway|station|subway +amenity|police +amenity|car_rental +amenity|taxi +amenity|marketplace +amenity|nightclub +amenity|embassy +amenity|townhall +barrier|gate +barrier|lift_gate +barrier|stile +barrier|block +barrier|toll_booth +historic|memorial +historic|ruins +historic|monument +historic|castle +historic|archaeological_site +highway|residential +man_made|cutline +natural|bay +natural|spring +railway|platform +shop|clothes +shop|car_repair +shop|car +shop|kiosk +sport|multi +sport|golf +sport|skiing +tourism|museum +tourism|guest_house +tourism|motel +boundary|administrative|4|state +place|state|USA +building|address +amenity|parking|no-access +highway|track +highway|track +highway|track +highway|track +highway|track +highway|track +highway|track +highway|track +highway|track +highway|cycleway +highway|cycleway +highway|cycleway +highway|cycleway +highway|cycleway +highway|cycleway +highway|cycleway +highway|cycleway +highway|cycleway +highway|cycleway +highway|footway +highway|footway +highway|footway +highway|footway +highway|footway +highway|footway +highway|footway +highway|footway +highway|footway +highway|footway +highway|footway +highway|footway +highway|footway +highway|footway +mapswithme +mapswithme +highway|unclassified +highway|unclassified +highway|unclassified +highway|unclassified +highway|unclassified +highway|motorway +highway|motorway +highway|motorway +highway|motorway +highway|motorway +highway|motorway +highway|path +highway|path +highway|path|bicycle +highway|path|bicycle +highway|path|bicycle +highway|path|bicycle +highway|path +highway|path +highway|path +highway|path +highway|path +highway|path +highway|path +highway|path +highway|pedestrian +highway|primary +highway|primary +highway|primary_link +highway|primary_link +mapswithme +mapswithme +highway|secondary +highway|secondary_link +highway|secondary_link +highway|secondary_link +highway|service +highway|steps +highway|steps +highway|steps +highway|steps +highway|tertiary +highway|tertiary_link +highway|tertiary_link +highway|tertiary_link +highway|tertiary_link +highway|track|grade3|no-access +highway|track|grade4|no-access +highway|track|grade5|no-access +highway|track|no-access +mapswithme +highway|trunk +highway|trunk +highway|trunk +highway|trunk +highway|trunk +highway|trunk +highway|trunk_link +highway|trunk_link +highway|trunk_link +highway|unclassified +highway|unclassified +highway|unclassified +highway|unclassified +highway|unclassified +highway|unclassified +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +leisure|dog_park|tennis +leisure|park|no-access +leisure|playing_fields|tennis +leisure|recreation_ground +leisure|recreation_ground +man_made|pipeline +man_made|pipeline +man_made|pipeline +man_made|pipeline +man_made|pipeline +mapswithme|grid +mapswithme +mapswithme +mapswithme +landuse|greenhouse_horticulture +natural|salt_pond +mapswithme +railway|incline|bridge +railway|siding|tunnel +railway|yard|tunnel +area:highway|footway +area:highway|service +area:highway|residential +area:highway|secondary +area:highway|tertiary +area:highway|primary +area:highway|path +area:highway|pedestrian +area:highway|unclassified +area:highway|steps +area:highway|living_street +area:highway|cycleway +area:highway|track +area:highway|motorway +area:highway|trunk +mapswithme +entrance +hwtag|oneway +highway|proposed +tourism|artwork +railway|subway|red +railway|subway|blue +railway|subway|orange +railway|subway|green +railway|subway|brown +railway|subway|yellow +railway|subway|purple +railway|station|subway|red +railway|station|subway|blue +railway|station|subway|orange +railway|station|subway|green +railway|station|subway|brown +railway|station|subway|yellow +railway|station|subway|purple +railway|subway|darkgreen +railway|station|subway|darkgreen +railway|subway|gray +railway|station|subway|gray +railway|subway|lightblue +railway|station|subway|lightblue +railway|subway|lightgreen +railway|station|subway|lightgreen +railway|subway|violet +railway|station|subway|violet +railway|subway|grey +railway|station|subway|grey +historic|ship +marking|sport +marking|sport|white +marking|sport|red +marking|sport|black +marking|sport|blue +shop|mall +shop|doityourself +place|sea +place|ocean +natural|cliff +shop|butcher +shop|florist +shop|bicycle +shop|alcohol +shop|books +shop|electronics +shop|shoes +shop|department_store +shop|hardware +shop|jewelry +shop|chemist +shop|optician +shop|garden_centre +shop|gift +shop|computer +shop|mobile_phone +shop|greengrocer +shop|beverages +shop|toys +shop|confectionery +shop +hwtag|lit +office|company +office|telecommunication +office|government +office|estate_agent +office|lawyer +office +landuse|residential|rural +landuse|residential|urban +amenity|ferry_terminal +amenity +shop|furniture +natural|grassland +waterway|waterfall +waterway|waterfall +railway|proposed +amenity|casino +amenity|brothel +place|neighbourhood +place|isolated_dwelling +historic|wayside_cross +historic|wayside_shrine +historic|boundary_stone +historic|citywalls +historic|tomb +natural|rock +natural|bare_rock +natural|tree_row +natural|cape +craft|carpenter +craft|shoemaker +craft|photographer +craft|electrician +craft|tailor +craft|plumber +craft|brewery +craft|metal_construction +craft|hvac +craft|painter +craft|gardener +internet_access +internet_access|wlan +amenity|waste_disposal +amenity|bbq +hwtag|private +route|ferry|motorcar +junction|roundabout +highway|speed_camera +shop|beauty +shop|sports +route|ferry|motor_vehicle +railway|rail|motor_vehicle +hwtag|nofoot +place|city|capital|2 +place|city|capital|3 +place|city|capital|4 +place|city|capital|5 +place|city|capital|6 +place|city|capital|7 +place|city|capital|8 +place|city|capital|9 +place|city|capital|10 +place|city|capital|11 +hwtag|yesfoot +public_transport|platform +highway|platform +aeroway|aerodrome|international +railway|station|light_rail +railway|station|monorail +railway|station|subway|london +railway|station|subway|newyork +railway|station|subway|moscow +railway|station|subway|berlin +railway|station|subway|minsk +railway|station|subway|kiev +railway|station|subway|barcelona +railway|station|subway|paris +railway|station|subway|madrid +railway|station|subway|roma +railway|station|subway|spb +railway|subway_entrance|london +railway|subway_entrance|newyork +railway|subway_entrance|moscow +railway|subway_entrance|berlin +railway|subway_entrance|minsk +railway|subway_entrance|kiev +railway|subway_entrance|barcelona +railway|subway_entrance|paris +railway|subway_entrance|madrid +railway|subway_entrance|roma +railway|subway_entrance|spb +aerialway|drag_lift +amenity|dentist +amenity|clinic +barrier|entrance +barrier|border_control +shop|laundry +amenity|vending_machine|parking_tickets +amenity|vending_machine|public_transport_tickets +building:part +amenity|place_of_worship|christian +amenity|place_of_worship|muslim +amenity|place_of_worship|buddhist +amenity|place_of_worship|hindu +amenity|place_of_worship|shinto +amenity|place_of_worship|jewish +amenity|place_of_worship|taoist +man_made|water_tower +highway|world_level +highway|world_towns_level +building|train_station +route|shuttle_train +shop|copyshop +shop|photo +shop|travel_agency +shop|travel_agency +shop|outdoor +craft|tailor +office|estate_agent +shop|dry_cleaning +shop|tyres +leisure|swimming_pool +amenity|car_wash +amenity|veterinary +amenity|charging_station +amenity|childcare +natural|wetland|marsh +amenity|bicycle_parking +amenity|community_centre +amenity|courthouse +amenity|vending_machine|cigarettes +amenity|vending_machine|drinks +amenity|waste_basket +building|garage +building|garage +emergency|phone +highway|rest_area +highway|traffic_signals +leisure|fitness_centre +leisure|fitness_centre +leisure|fitness_centre +leisure|sauna +leisure|sauna +man_made|chimney +man_made|tower +man_made|water_well +power|substation +shop|bookmaker +shop|car_repair|tyres +shop|cosmetics +shop|pet +shop|seafood +shop|ticket +shop|wine +tourism|chalet +tourism|information|board +tourism|information|map +tourism|information|office +traffic_calming|bump +traffic_calming|hump +shop|car_parts +leisure|sports_centre|climbing +leisure|sports_centre|shooting +leisure|sports_centre|swimming +leisure|sports_centre|yoga +amenity|public_bookcase +tourism|apartment +tourism|resort +sponsored +sponsored|booking +hwtag|nobicycle +hwtag|yesbicycle +hwtag|bidir_bicycle +psurface|paved_good +psurface|paved_bad +psurface|unpaved_good +psurface|unpaved_bad +wheelchair|yes +wheelchair|no +wheelchair|limited +building|has_parts +olympics|transport_airport +olympics|transport_railway +olympics|transport_boat +olympics|transport_bus +olympics|transport_tram +olympics|transport_cable +olympics|transport_subway +olympics|official_building +olympics|attraction +olympics|live_site +olympics|stadium_main +olympics|stadium +olympics|water_sport +olympics|bike_sport +sponsored|opentable +sponsored|banner|lamoda_ru +sponsored|banner|lamoda_ua +sponsored|banner|deliveryclub +sponsored|banner|tutu +sponsored|banner|geerbest_uk +sponsored|banner|rentalcars +sponsored|banner|viator +sponsored|banner|geerbest_de +sponsored|banner|geerbest_fr +sponsored|banner|raileurope +hwtag|yescar +hwtag|nocar +tourism|gallery +historic|fort +shop|coffee +shop|tea +mapswithme +sponsored|viator +hwtag|toll +amenity|arts_centre +amenity|biergarten +amenity|driving_school +amenity|food_court +amenity|ice_cream +amenity|internet_cafe +amenity|motorcycle_parking +amenity|nursing_home +amenity|payment_terminal +amenity|prison +amenity|shower +amenity|water_point +emergency|defibrillator +emergency|fire_hydrant +highway|services +leisure|fitness_station +leisure|ice_rink +leisure|marina +tourism|picnic_site +man_made|surveillance +man_made|water_tap +man_made|works +office|insurance +office|ngo +shop|chocolate +shop|erotic +office|estate_agent +shop|fabric +shop|funeral_directors +shop|massage +shop|motorcycle +shop|music +shop|musical_instrument +shop|newsagent +shop|pawnbroker +shop|stationery +shop|tattoo +shop|variety_store +shop|video +tourism|theme_park +tourism|wilderness_hut +mapswithme +sponsored|holiday +tourism|resort +sponsored|partner1 +sponsored|partner2 +sponsored|partner3 +sponsored|partner4 +sponsored|partner5 +event|fc2018 +event|fc2018_city +shop|money_lender +sponsored|partner6 +sponsored|partner7 +sponsored|partner8 +sponsored|partner9 +sponsored|partner10 +sponsored|partner11 +sponsored|partner12 +sponsored|partner13 +sponsored|partner14 +sponsored|partner15 +sponsored|partner16 +sponsored|partner17 +sponsored|partner18 +sponsored|partner19 +sponsored|partner20 diff --git a/setup.py b/setup.py index 07f6cd8..32af8e5 100644 --- a/setup.py +++ b/setup.py @@ -10,6 +10,7 @@ setup( author='Ilya Zverev', author_email='ilya@zverev.info', packages=['mwm'], + package_data={'mwm': ['types.txt']}, url='https://github.com/mapsme/mwm.py', license='Apache License 2.0', description='Library to read binary MAPS.ME files.', @@ -22,7 +23,6 @@ setup( 'Environment :: Console', 'License :: OSI Approved :: Apache Software License', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', ],