Переход на UTF8.

[pyrungps.git] / pyosmname.py

diff --git a/pyosmname.py b/pyosmname.py
index 7140f9f1d101b4ee99131d0478e438254cef62ce..e6dc29e1ca37e6e468728bd4301e3cf882a64ab0 100644 (file)
--- 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, {'User-agent': 'Mozilla/5.0'})
+    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: