Changeset 350
- Timestamp:
- 10/19/07 18:16:06 (1 year ago)
- Files:
-
- branches/1.0b/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as (modified) (1 diff)
- branches/1.0b/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as (modified) (1 diff)
- branches/1.0b/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as (modified) (1 diff)
- branches/1.0b/play/006/compose-area.py (modified) (1 diff)
- branches/1.0b/py/ModestMaps/Providers.py (modified) (1 diff)
- branches/flexible-zoom/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as (modified) (1 diff)
- branches/flexible-zoom/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as (modified) (1 diff)
- branches/flexible-zoom/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as (modified) (1 diff)
- branches/flexible-zoom/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as (modified) (1 diff)
- branches/flexible-zoom/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as (modified) (1 diff)
- branches/flexible-zoom/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as (modified) (1 diff)
- branches/flexible-zoom/play/006/compose-area.py (modified) (1 diff)
- branches/flexible-zoom/py/ModestMaps/Microsoft.py (modified) (2 diffs)
- branches/WPF/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as (modified) (1 diff)
- branches/WPF/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as (modified) (1 diff)
- branches/WPF/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as (modified) (1 diff)
- branches/WPF/play/006/compose-area.py (modified) (1 diff)
- branches/WPF/py/ModestMaps/Microsoft.py (modified) (2 diffs)
- trunk/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as (modified) (1 diff)
- trunk/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as (modified) (1 diff)
- trunk/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as (modified) (1 diff)
- trunk/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as (modified) (1 diff)
- trunk/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as (modified) (1 diff)
- trunk/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as (modified) (1 diff)
- trunk/play/006/compose-area.py (modified) (1 diff)
- trunk/py/ModestMaps/Microsoft.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.0b/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as
r176 r350 20 20 private function getTileUrl( coord : Coordinate ) : String 21 21 { 22 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g= 45";22 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 23 23 } 24 24 } branches/1.0b/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as
r176 r350 20 20 private function getTileUrl( coord : Coordinate ) : String 21 21 { 22 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g= 45";22 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 23 23 } 24 24 } branches/1.0b/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as
r176 r350 21 21 private function getTileUrl( coord : Coordinate ) : String 22 22 { 23 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g= 45";23 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g=90&shading=hill"; 24 24 } 25 25 } branches/1.0b/play/006/compose-area.py
r145 r350 60 60 try: 61 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))62 url = 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 63 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))64 url = 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 65 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))66 url = 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 67 67 68 68 print row, col, zoom, '->', url, '->', destX, destY branches/1.0b/py/ModestMaps/Providers.py
r152 r350 21 21 """ 22 22 if self.id == 'MICROSOFT_ROAD': 23 return 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g= 45' % (random.randint(0,3), Tiles.toMicrosoft(column, row, zoom))23 return 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g=90&shading=hill' % (random.randint(0,3), Tiles.toMicrosoft(column, row, zoom)) 24 24 25 25 if self.id == 'MICROSOFT_HYBRID': 26 return 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g= 45' % (random.randint(0,3), Tiles.toMicrosoft(column, row, zoom))26 return 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g=90&shading=hill' % (random.randint(0,3), Tiles.toMicrosoft(column, row, zoom)) 27 27 28 28 if self.id == 'MICROSOFT_AERIAL': 29 return 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g= 45' % (random.randint(0,3), Tiles.toMicrosoft(column, row, zoom))29 return 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g=90&shading=hill' % (random.randint(0,3), Tiles.toMicrosoft(column, row, zoom)) 30 30 31 31 else: branches/flexible-zoom/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as
r215 r350 20 20 private function getTileUrl( coord : Coordinate ) : String 21 21 { 22 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g= 45";22 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 23 23 } 24 24 } branches/flexible-zoom/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as
r215 r350 20 20 private function getTileUrl( coord : Coordinate ) : String 21 21 { 22 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g= 45";22 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 23 23 } 24 24 } branches/flexible-zoom/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as
r215 r350 21 21 private function getTileUrl( coord : Coordinate ) : String 22 22 { 23 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g= 45";23 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g=90&shading=hill"; 24 24 } 25 25 } branches/flexible-zoom/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as
r286 r350 21 21 override public function getTileUrl(coord:Coordinate):String 22 22 { 23 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g= 45";23 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 24 24 } 25 25 } branches/flexible-zoom/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as
r286 r350 20 20 override public function getTileUrl(coord:Coordinate):String 21 21 { 22 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g= 45";22 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 23 23 } 24 24 } branches/flexible-zoom/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as
r286 r350 21 21 override public function getTileUrl(coord:Coordinate):String 22 22 { 23 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g= 45";23 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g=90&shading=hill"; 24 24 } 25 25 } branches/flexible-zoom/play/006/compose-area.py
r145 r350 60 60 try: 61 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))62 url = 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 63 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))64 url = 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 65 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))66 url = 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 67 67 68 68 print row, col, zoom, '->', url, '->', destX, destY branches/flexible-zoom/py/ModestMaps/Microsoft.py
r206 r350 2 2 >>> p = RoadProvider() 3 3 >>> p.getTileUrl(Coordinate(25322, 10507, 16)) #doctest: +ELLIPSIS 4 'http://r....ortho.tiles.virtualearth.net/tiles/r0230102122203031.png?g= 45'4 'http://r....ortho.tiles.virtualearth.net/tiles/r0230102122203031.png?g=90&shading=hill' 5 5 >>> p.getTileUrl(Coordinate(25333, 10482, 16)) #doctest: +ELLIPSIS 6 'http://r....ortho.tiles.virtualearth.net/tiles/r0230102033330212.png?g= 45'6 'http://r....ortho.tiles.virtualearth.net/tiles/r0230102033330212.png?g=90&shading=hill' 7 7 8 8 >>> p = AerialProvider() 9 9 >>> p.getTileUrl(Coordinate(25322, 10507, 16)) #doctest: +ELLIPSIS 10 'http://a....ortho.tiles.virtualearth.net/tiles/a0230102122203031.jpeg?g= 45'10 'http://a....ortho.tiles.virtualearth.net/tiles/a0230102122203031.jpeg?g=90&shading=hill' 11 11 >>> p.getTileUrl(Coordinate(25333, 10482, 16)) #doctest: +ELLIPSIS 12 'http://a....ortho.tiles.virtualearth.net/tiles/a0230102033330212.jpeg?g= 45'12 'http://a....ortho.tiles.virtualearth.net/tiles/a0230102033330212.jpeg?g=90&shading=hill' 13 13 14 14 >>> p = HybridProvider() 15 15 >>> p.getTileUrl(Coordinate(25322, 10507, 16)) #doctest: +ELLIPSIS 16 'http://h....ortho.tiles.virtualearth.net/tiles/h0230102122203031.jpeg?g= 45'16 'http://h....ortho.tiles.virtualearth.net/tiles/h0230102122203031.jpeg?g=90&shading=hill' 17 17 >>> p.getTileUrl(Coordinate(25333, 10482, 16)) #doctest: +ELLIPSIS 18 'http://h....ortho.tiles.virtualearth.net/tiles/h0230102033330212.jpeg?g= 45'18 'http://h....ortho.tiles.virtualearth.net/tiles/h0230102033330212.jpeg?g=90&shading=hill' 19 19 """ 20 20 … … 45 45 class RoadProvider(AbstractProvider): 46 46 def getTileUrl(self, coordinate): 47 return 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g= 45' % (random.randint(0, 3), self.getZoomString(coordinate))47 return 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g=90&shading=hill' % (random.randint(0, 3), self.getZoomString(coordinate)) 48 48 49 49 class AerialProvider(AbstractProvider): 50 50 def getTileUrl(self, coordinate): 51 return 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g= 45' % (random.randint(0, 3), self.getZoomString(coordinate))51 return 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g=90&shading=hill' % (random.randint(0, 3), self.getZoomString(coordinate)) 52 52 53 53 class HybridProvider(AbstractProvider): 54 54 def getTileUrl(self, coordinate): 55 return 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g= 45' % (random.randint(0, 3), self.getZoomString(coordinate))55 return 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g=90&shading=hill' % (random.randint(0, 3), self.getZoomString(coordinate)) 56 56 57 57 if __name__ == '__main__': branches/WPF/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as
r215 r350 20 20 private function getTileUrl( coord : Coordinate ) : String 21 21 { 22 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g= 45";22 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 23 23 } 24 24 } branches/WPF/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as
r215 r350 20 20 private function getTileUrl( coord : Coordinate ) : String 21 21 { 22 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g= 45";22 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 23 23 } 24 24 } branches/WPF/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as
r215 r350 21 21 private function getTileUrl( coord : Coordinate ) : String 22 22 { 23 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g= 45";23 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g=90&shading=hill"; 24 24 } 25 25 } branches/WPF/play/006/compose-area.py
r145 r350 60 60 try: 61 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))62 url = 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 63 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))64 url = 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 65 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))66 url = 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 67 67 68 68 print row, col, zoom, '->', url, '->', destX, destY branches/WPF/py/ModestMaps/Microsoft.py
r206 r350 2 2 >>> p = RoadProvider() 3 3 >>> p.getTileUrl(Coordinate(25322, 10507, 16)) #doctest: +ELLIPSIS 4 'http://r....ortho.tiles.virtualearth.net/tiles/r0230102122203031.png?g= 45'4 'http://r....ortho.tiles.virtualearth.net/tiles/r0230102122203031.png?g=90&shading=hill' 5 5 >>> p.getTileUrl(Coordinate(25333, 10482, 16)) #doctest: +ELLIPSIS 6 'http://r....ortho.tiles.virtualearth.net/tiles/r0230102033330212.png?g= 45'6 'http://r....ortho.tiles.virtualearth.net/tiles/r0230102033330212.png?g=90&shading=hill' 7 7 8 8 >>> p = AerialProvider() 9 9 >>> p.getTileUrl(Coordinate(25322, 10507, 16)) #doctest: +ELLIPSIS 10 'http://a....ortho.tiles.virtualearth.net/tiles/a0230102122203031.jpeg?g= 45'10 'http://a....ortho.tiles.virtualearth.net/tiles/a0230102122203031.jpeg?g=90&shading=hill' 11 11 >>> p.getTileUrl(Coordinate(25333, 10482, 16)) #doctest: +ELLIPSIS 12 'http://a....ortho.tiles.virtualearth.net/tiles/a0230102033330212.jpeg?g= 45'12 'http://a....ortho.tiles.virtualearth.net/tiles/a0230102033330212.jpeg?g=90&shading=hill' 13 13 14 14 >>> p = HybridProvider() 15 15 >>> p.getTileUrl(Coordinate(25322, 10507, 16)) #doctest: +ELLIPSIS 16 'http://h....ortho.tiles.virtualearth.net/tiles/h0230102122203031.jpeg?g= 45'16 'http://h....ortho.tiles.virtualearth.net/tiles/h0230102122203031.jpeg?g=90&shading=hill' 17 17 >>> p.getTileUrl(Coordinate(25333, 10482, 16)) #doctest: +ELLIPSIS 18 'http://h....ortho.tiles.virtualearth.net/tiles/h0230102033330212.jpeg?g= 45'18 'http://h....ortho.tiles.virtualearth.net/tiles/h0230102033330212.jpeg?g=90&shading=hill' 19 19 """ 20 20 … … 45 45 class RoadProvider(AbstractProvider): 46 46 def getTileUrl(self, coordinate): 47 return 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g= 45' % (random.randint(0, 3), self.getZoomString(coordinate))47 return 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g=90&shading=hill' % (random.randint(0, 3), self.getZoomString(coordinate)) 48 48 49 49 class AerialProvider(AbstractProvider): 50 50 def getTileUrl(self, coordinate): 51 return 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g= 45' % (random.randint(0, 3), self.getZoomString(coordinate))51 return 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g=90&shading=hill' % (random.randint(0, 3), self.getZoomString(coordinate)) 52 52 53 53 class HybridProvider(AbstractProvider): 54 54 def getTileUrl(self, coordinate): 55 return 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g= 45' % (random.randint(0, 3), self.getZoomString(coordinate))55 return 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g=90&shading=hill' % (random.randint(0, 3), self.getZoomString(coordinate)) 56 56 57 57 if __name__ == '__main__': trunk/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as
r292 r350 21 21 private function getTileUrl( coord : Coordinate ) : String 22 22 { 23 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g= 45";23 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 24 24 } 25 25 } trunk/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as
r292 r350 21 21 private function getTileUrl( coord : Coordinate ) : String 22 22 { 23 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g= 45";23 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 24 24 } 25 25 } trunk/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as
r292 r350 22 22 private function getTileUrl( coord : Coordinate ) : String 23 23 { 24 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g= 45";24 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g=90&shading=hill"; 25 25 } 26 26 } trunk/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as
r292 r350 22 22 override public function getTileUrl(coord:Coordinate):String 23 23 { 24 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g= 45";24 return "http://a" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/a" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 25 25 } 26 26 } trunk/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as
r292 r350 21 21 override public function getTileUrl(coord:Coordinate):String 22 22 { 23 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g= 45";23 return "http://h" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/h" + getZoomString( coord ) + ".jpeg?g=90&shading=hill"; 24 24 } 25 25 } trunk/as3/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as
r292 r350 22 22 override public function getTileUrl(coord:Coordinate):String 23 23 { 24 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g= 45";24 return "http://r" + Math.floor(Math.random() * 4) + ".ortho.tiles.virtualearth.net/tiles/r" + getZoomString( coord ) + ".png?g=90&shading=hill"; 25 25 } 26 26 } trunk/play/006/compose-area.py
r145 r350 60 60 try: 61 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))62 url = 'http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 63 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))64 url = 'http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 65 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))66 url = 'http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g=90&shading=hill' % (random.randint(0,3), tile_params.toMicrosoft(col, row, zoom)) 67 67 68 68 print row, col, zoom, '->', url, '->', destX, destY trunk/py/ModestMaps/Microsoft.py
r323 r350 2 2 >>> p = RoadProvider() 3 3 >>> p.getTileUrls(Coordinate(25322, 10507, 16)) #doctest: +ELLIPSIS 4 ('http://r....ortho.tiles.virtualearth.net/tiles/r0230102122203031.png?g= 45',)4 ('http://r....ortho.tiles.virtualearth.net/tiles/r0230102122203031.png?g=90&shading=hill',) 5 5 >>> p.getTileUrls(Coordinate(25333, 10482, 16)) #doctest: +ELLIPSIS 6 ('http://r....ortho.tiles.virtualearth.net/tiles/r0230102033330212.png?g= 45',)6 ('http://r....ortho.tiles.virtualearth.net/tiles/r0230102033330212.png?g=90&shading=hill',) 7 7 8 8 >>> p = AerialProvider() 9 9 >>> p.getTileUrls(Coordinate(25322, 10507, 16)) #doctest: +ELLIPSIS 10 ('http://a....ortho.tiles.virtualearth.net/tiles/a0230102122203031.jpeg?g= 45',)10 ('http://a....ortho.tiles.virtualearth.net/tiles/a0230102122203031.jpeg?g=90&shading=hill',) 11 11 >>> p.getTileUrls(Coordinate(25333, 10482, 16)) #doctest: +ELLIPSIS 12 ('http://a....ortho.tiles.virtualearth.net/tiles/a0230102033330212.jpeg?g= 45',)12 ('http://a....ortho.tiles.virtualearth.net/tiles/a0230102033330212.jpeg?g=90&shading=hill',) 13 13 14 14 >>> p = HybridProvider() 15 15 >>> p.getTileUrls(Coordinate(25322, 10507, 16)) #doctest: +ELLIPSIS 16 ('http://h....ortho.tiles.virtualearth.net/tiles/h0230102122203031.jpeg?g= 45',)16 ('http://h....ortho.tiles.virtualearth.net/tiles/h0230102122203031.jpeg?g=90&shading=hill',) 17 17 >>> p.getTileUrls(Coordinate(25333, 10482, 16)) #doctest: +ELLIPSIS 18 ('http://h....ortho.tiles.virtualearth.net/tiles/h0230102033330212.jpeg?g= 45',)18 ('http://h....ortho.tiles.virtualearth.net/tiles/h0230102033330212.jpeg?g=90&shading=hill',) 19 19 """ 20 20 … … 43 43 class RoadProvider(AbstractProvider): 44 44 def getTileUrls(self, coordinate): 45 return ('http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g= 45' % (random.randint(0, 3), self.getZoomString(self.sourceCoordinate(coordinate))),)45 return ('http://r%d.ortho.tiles.virtualearth.net/tiles/r%s.png?g=90&shading=hill' % (random.randint(0, 3), self.getZoomString(self.sourceCoordinate(coordinate))),) 46 46 47 47 class AerialProvider(AbstractProvider): 48 48 def getTileUrls(self, coordinate): 49 return ('http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g= 45' % (random.randint(0, 3), self.getZoomString(self.sourceCoordinate(coordinate))),)49 return ('http://a%d.ortho.tiles.virtualearth.net/tiles/a%s.jpeg?g=90&shading=hill' % (random.randint(0, 3), self.getZoomString(self.sourceCoordinate(coordinate))),) 50 50 51 51 class HybridProvider(AbstractProvider): 52 52 def getTileUrls(self, coordinate): 53 return ('http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g= 45' % (random.randint(0, 3), self.getZoomString(self.sourceCoordinate(coordinate))),)53 return ('http://h%d.ortho.tiles.virtualearth.net/tiles/h%s.jpeg?g=90&shading=hill' % (random.randint(0, 3), self.getZoomString(self.sourceCoordinate(coordinate))),) 54 54 55 55 if __name__ == '__main__':
