X-Git-Url: https://git.rvb.name/pyrungps.git/blobdiff_plain/68b3fe33b18c37bbe42cfa588c4c469bff4c0d8e..efbf2acd157a4b92e2de85da4879ec7b34af18d8:/pyosmname.py?ds=inline

diff --git a/pyosmname.py b/pyosmname.py
index b64d4ea..e6dc29e 100644
--- a/pyosmname.py
+++ b/pyosmname.py
@@ -8,7 +8,10 @@ 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)
+    reqstr = "http://nominatim.openstreetmap.org/reverse?lat=%s&lon=%s&accept-language=ru,en" %(lat,lon)
+    print reqstr
+    headers = { 'User-Agent' : 'PyRunGPS/1.0', 'Referer' : 'https://maps.rvb.name' }    
+    req = urllib2.Request(reqstr, None, headers)
     page = urllib2.urlopen(req).read()
 
     return etree.fromstring(page)
@@ -51,12 +54,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: