Changeset 408

Show
Ignore:
Timestamp:
11/28/07 14:37:40 (1 year ago)
Author:
migurski
Message:

Added Google terrain map provider

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/py/compose.py

    r392 r408  
    3535    elif value == 'GOOGLE_HYBRID': 
    3636        parser.provider = ModestMaps.Google.HybridProvider() 
     37         
     38    elif value == 'GOOGLE_TERRAIN': 
     39        parser.provider = ModestMaps.Google.TerrainProvider() 
    3740         
    3841    elif value == 'YAHOO_ROAD': 
     
    9699 
    97100parser.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', 
    99102                  action='callback', callback=parseProvider) 
    100103 
  • trunk/py/ModestMaps/Google.py

    r406 r408  
    2828AERIAL_VERSION = '23' 
    2929HYBRID_VERSION = 'w2t.63' 
     30TERRAIN_VERSION = 'w2p.62' 
    3031 
    3132class AbstractProvider(IMapProvider): 
     
    6566        return (under, over) 
    6667 
     68class 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 
    6772if __name__ == '__main__': 
    6873    import doctest