Changeset 152
- Timestamp:
- 03/05/07 18:45:38 (2 years ago)
- Files:
-
- trunk/py (added)
- trunk/py/compose.py (copied) (copied from trunk/play/006/compose-area.py) (4 diffs)
- trunk/py/ModestMaps (added)
- trunk/py/ModestMaps/Providers.py (added)
- trunk/py/ModestMaps/Tiles.py (copied) (copied from trunk/play/006/tile_params.py)
- trunk/py/ModestMaps/__init__.py (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/py/compose.py
r145 r152 1 import sys, math, random, tile_params, PIL.Image, urllib, StringIO, time, optparse 1 import sys, math, PIL.Image, urllib, StringIO, time, optparse 2 from ModestMaps import Providers 2 3 3 4 def deg2rad(deg): … … 29 30 30 31 parser.add_option('-p', '--provider', dest='provider', 31 help='Map Provider', choices= ('microsoft-road', 'microsoft-hybrid', 'microsoft-aerial'))32 help='Map Provider', choices=Providers.ids) 32 33 33 34 (options, args) = parser.parse_args() … … 35 36 if __name__ == '__main__': 36 37 38 provider = Providers.Provider(options.provider) 39 37 40 #print locationCoord(85, -180, 0) 38 41 #print locationCoord(0, 0, 0) … … 59 62 60 63 try: 61 if options.provider == 'microsoft-road': 62 url = 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g=45' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 63 elif options.provider == 'microsoft-hybrid': 64 url = 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g=45' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 65 elif options.provider == 'microsoft-aerial': 66 url = 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g=45' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 64 url = provider.url(col, row, zoom) 67 65 68 66 print row, col, zoom, '->', url, '->', destX, destY
