Changeset 368

Timestamp:

02/23/09 13:44:01 (13 months ago)

Author:

wangchun

Message:

geoutils:

• propset svn:executable
• updated googlewms.py for the latest google maps
• fixed googlewms.py compatiblity for python 2.5

Location:

geoutils

Files:

• columbus.pl (modified) (1 prop)
• googlewms.py (modified) (7 diffs, 1 prop)
• plt.pl (modified) (1 prop)

geoutils/googlewms.py

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+
+from __future__ import with_statement
 
 import sys
@@ -13 +15 @@
 
 layers = {
-    'kh33': {'url': 'http://kh.google.com/kh?v=33', 'type': 'jpg'},
-    'w2p.87': {'url': 'http://mt.google.com/mt?v=w2p.87', 'type': 'jpg'},
-    'w2.86': {'url': 'http://mt.google.com/mt?v=w2.86', 'type': 'png'},
-    'w2t.86': {'url': 'http://mt.google.com/mt?v=w2t.86', 'type': 'png'},
-    'cn1.5': {'url': 'http://mt.google.cn/mt?v=cn1.5', 'type': 'png'},
+    'khm36': {'url': 'http://khm.google.com/kh/v=36', 'type': 'jpg'},
+    'w2p.87': {'url': 'http://mt.google.com/mt/v=w2p.87', 'type': 'jpg'},
+    'w2.92': {'url': 'http://mt.google.com/mt/v=w2.86', 'type': 'png'},
+    'w2t.92': {'url': 'http://mt.google.com/mt/v=w2t.86', 'type': 'png'},
+    'cn1.6': {'url': 'http://mt.google.cn/mt?v=cn1.6', 'type': 'png'},
 }
 
@@ -44 +46 @@
             x1, y1 = lon1 / 2.0 / pi + 0.5, log((1.0 + sin(lat1)) / (1.0 - sin(lat1))) / 4.0 / pi + 0.5
             x2, y2 = lon2 / 2.0 / pi + 0.5, log((1.0 + sin(lat2)) / (1.0 - sin(lat2))) / 4.0 / pi + 0.5
-            z = min(max(int(ceil(log(min(width / ((x2 - x1) * 256), height / ((y2 - y1) * 256)), 2))), 0), 17)
+            z = min(max(int(ceil(log(min(width / ((x2 - x1) * 256), height / ((y2 - y1) * 256)), 2))), 0), 18)
             iw, ih = int(round(ldexp((x2 - x1) * 256, z))), int(round(ldexp((y2 - y1) * 256, z)))
             ix_list = range(int(floor((floor(ldexp(x1, z)) - ldexp(x1, z)) / ldexp(x2 - x1, z) * iw)), iw, 256)
@@ -56 +58 @@
                 filename = '%02d-%06d-%06d.%s' % (z, 2 ** z - y - 1, x, layers[layer]['type'])
                 try:
-                    with file(os.path.join(dirname, filename), 'r') as f:
+                    with open(os.path.join(dirname, filename), 'r') as f:
                         if layers[layer]['type'] == 'png':
                             gd.image(f, layers[layer]['type']).copyTo(image, (ix, ih - iy - 256))
@@ -65 +67 @@
                     try:
                         data = urllib.urlopen(url).read()
-                    except Exception as exc:
+                    except Exception, exc:
                         print >> sys.stderr, 'ERROR: %s' % exc
                         continue
@@ -74 +76 @@
                         else:
                             image.paste(Image.open(StringIO(data)), (ix, ih - iy - 256))
-                    except Exception as exc:
+                    except Exception, exc:
                         print >> sys.stderr, exc
                         continue
@@ -82 +84 @@
                         pass
                     try:
-                        with file(os.path.join(dirname, filename), 'w') as f:
+                        with open(os.path.join(dirname, filename), 'w') as f:
                             f.write(data)
                     except IOError:
                         pass
-        except Exception as exc:
+        except Exception, exc:
             print >> sys.stderr, exc
             self.send_error(500)