Changeset 408
- Timestamp:
- 11/28/07 14:37:40 (1 year ago)
- Files:
-
- trunk/py/compose.py (modified) (2 diffs)
- trunk/py/ModestMaps/Google.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/py/compose.py
r392 r408 35 35 elif value == 'GOOGLE_HYBRID': 36 36 parser.provider = ModestMaps.Google.HybridProvider() 37 38 elif value == 'GOOGLE_TERRAIN': 39 parser.provider = ModestMaps.Google.TerrainProvider() 37 40 38 41 elif value == 'YAHOO_ROAD': … … 96 99 97 100 parser.add_option('-p', '--provider', dest='provider', 98 type='string', help='Map Provider, one of: MICROSOFT_ROAD, MICROSOFT_AERIAL, MICROSOFT_HYBRID, GOOGLE_ROAD, GOOGLE_AERIAL, GOOGLE_HYBRID, YAHOO_ROAD, YAHOO_AERIAL, YAHOO_HYBRID',101 type='string', help='Map Provider, one of: MICROSOFT_ROAD, MICROSOFT_AERIAL, MICROSOFT_HYBRID, GOOGLE_ROAD, GOOGLE_AERIAL, GOOGLE_HYBRID, GOOGLE_TERRAIN, YAHOO_ROAD, YAHOO_AERIAL, YAHOO_HYBRID', 99 102 action='callback', callback=parseProvider) 100 103 trunk/py/ModestMaps/Google.py
r406 r408 28 28 AERIAL_VERSION = '23' 29 29 HYBRID_VERSION = 'w2t.63' 30 TERRAIN_VERSION = 'w2p.62' 30 31 31 32 class AbstractProvider(IMapProvider): … … 65 66 return (under, over) 66 67 68 class TerrainProvider(RoadProvider): 69 def getTileUrls(self, coordinate): 70 return ('http://mt%d.google.com/mt?n=404&v=%s&%s' % (random.randint(0, 3), TERRAIN_VERSION, self.getZoomString(self.sourceCoordinate(coordinate))),) 71 67 72 if __name__ == '__main__': 68 73 import doctest
