X-Git-Url: https://git.rvb.name/pyrungps.git/blobdiff_plain/50682c1f7ad6f88896b241d11ab47b57c49364d2..d2651ad4f9981d3e21c5f10fdef0a520d0f2d42d:/pyosmname.py diff --git a/pyosmname.py b/pyosmname.py index 7140f9f..a0ee16f 100644 --- a/pyosmname.py +++ b/pyosmname.py @@ -8,7 +8,7 @@ from lxml import etree def GetXMLDescr(lat,lon): - req = urllib2.Request("http://nominatim.openstreetmap.org/reverse?lat=%s&lon=%s&accept-language=ru,en" %(lat,lon), None, {'User-agent': 'Mozilla/5.0'}) + req = urllib2.Request("http://nominatim.openstreetmap.org/reverse?lat=%s&lon=%s&accept-language=ru,en" %(lat,lon), None) page = urllib2.urlopen(req).read() return etree.fromstring(page) @@ -51,12 +51,12 @@ def printable_name(addr): else: if 'city' in addr: if 'road' in addr: - str = addr['road'] + ', ' + addr['city'] + addr['country'] + str = addr['road'] + ', ' + addr['city'] + ', ' + addr['country'] else: str = addr['city'] + ', ' + addr['country'] elif 'village' in addr: if 'road' in addr: - str = addr['road'] + ', ' + addr['village'] + addr['country'] + str = addr['road'] + ', ' + addr['village'] +', ' + addr['country'] else: str = addr['village'] + ', ' + addr['country'] else: