Changeset 66

Timestamp:

01/22/07 22:38:42 (2 years ago)

Author:

migurski

Message:

Merged branch "migurski geocoding" on to branch "darren tile painting"

Files:

• branches/darren tile painting/as2/lib/com/modestmaps/core/Coordinate.as (modified) (1 diff)
• branches/darren tile painting/as2/lib/com/modestmaps/core/mapproviders/AbstractMapProvider.as (modified) (4 diffs)
• branches/darren tile painting/as2/lib/com/modestmaps/core/mapproviders/AbstractMicrosoftMapProvider.as (modified) (2 diffs)
• branches/darren tile painting/as2/lib/com/modestmaps/core/mapproviders/IMapProvider.as (modified) (1 diff)
• branches/darren tile painting/as2/lib/com/modestmaps/core/TileGrid.as (modified) (16 diffs)
• branches/darren tile painting/as2/lib/com/modestmaps/geo (copied) (copied from branches/migurski geocoding/as2/lib/com/modestmaps/geo)
• branches/darren tile painting/as2/lib/SampleClient.as (modified) (3 diffs)
• branches/darren tile painting/as2/lib/SampleFlashLiteClient.as (modified) (5 diffs)
• branches/migurski geocoding (deleted)

branches/darren tile painting/as2/lib/com/modestmaps/core/Coordinate.as

@@ -15 +15 @@
-    {
-        return '(' + row + ',' + column + ' @' + zoom + ')';
+    }
+    
+    public function copy():Coordinate
+    {
+        return new Coordinate(row, column, zoom);
-    }
-    

branches/darren tile painting/as2/lib/com/modestmaps/core/mapproviders/AbstractMapProvider.as

@@ -5 +5 @@
-import com.modestmaps.core.Coordinate;
-import com.modestmaps.events.IDispatchable;
-
+
+
+
+
-
-/**
@@ -17 +20 @@
-        
-        private var __requestThrottler : RequestThrottler;
+        private var __projection:IProjection;
-
-        // tracks if we're set up to broadcast events
@@ -33 +37 @@
-                }
-
-
+
+
+
+
-        }
-
@@ -82 +89 @@
-                super.dispatchEvent( eventObj );
-        }
+    
+   /*
+    * Return projected and transformed coordinate for a location.
+    */
+    public function locationCoordinate(location:Location):Coordinate
+    {
+        return __projection.locationCoordinate(location);
+    }
+    
+   /*
+    * Return untransformed and unprojected location for a coordinate.
+    */
+    public function coordinateLocation(coordinate:Coordinate):Location
+    {
+        return __projection.coordinateLocation(coordinate);
+    }
-}

branches/darren tile painting/as2/lib/com/modestmaps/core/mapproviders/AbstractMicrosoftMapProvider.as

@@ -4 +4 @@
-import com.modestmaps.io.LoadMovieThrottledRequest;
-import mx.utils.Delegate;
+import com.modestmaps.geo.MercatorProjection;
+import com.modestmaps.geo.Transformation;
-
-/**
@@ -17 +19 @@
-        {
-                super();
+
+            // see: http://track.stamen.com/modestmap/wiki/TileCoordinateComparisons#TileGeolocations
+            var t:Transformation = new Transformation(1.068070779e7, 0, 3.355443185e7,
+                                                          0, -1.068070890e7, 3.355443057e7);
+                                                          
+        __projection = new MercatorProjection(26, t);
-        }
-        

branches/darren tile painting/as2/lib/com/modestmaps/core/mapproviders/IMapProvider.as

@@ -3 +3 @@
- */
-import com.modestmaps.core.Coordinate; 
+import com.modestmaps.geo.Location;
- 
-interface com.modestmaps.core.mapproviders.IMapProvider 
-{
-        public function paint( clip : MovieClip, coord : Coordinate ) : Void;
+    
+   /*
+    * Return projected and transformed coordinate for a location.
+    */
+    public function locationCoordinate(location:Location):Coordinate;
+    
+   /*
+    * Return untransformed and unprojected location for a coordinate.
+    */
+    public function coordinateLocation(coordinate:Coordinate):Location;
-}

branches/darren tile painting/as2/lib/com/modestmaps/core/TileGrid.as

@@ -4 +4 @@
-import com.modestmaps.core.Tile;
-import com.modestmaps.core.mapproviders.IMapProvider;
-import com.modestmaps.core.mapproviders.MapProviderFactory;
-import com.modestmaps.core.mapproviders.MapProviders;
-
-import mx.utils.Delegate;
@@ -50 +48 @@
-
-    // Who do we get our Map graphics from?
-
-
+
-
-    public static var symbolName:String = '__Packages.com.modestmaps.core.TileGrid';
@@ -59 +56 @@
-    public function TileGrid()
-    {
-        setMapProvider(mapProviderType);
-
-                this.createEmptyMovieClip( "labelContainer", getNextHighestDepth() );
-        labelContainer.createTextField('label', 1, 10, 10, width-20, height-20);
@@ -110 +105 @@
-        well.onRelease = Delegate.create(this, this.stopWellDrag);
-        well.onReleaseOutside = Delegate.create(this, this.stopWellDrag);
+        
+        /*
+        // So the log is visible...
+        var c:Color = new Color(well);
+        var t:Object = c.getTransform();
+        t.ra = 20;
+        t.rb = 204;
+        t.ga = 20;
+        t.gb = 204;
+        t.ba = 20;
+        t.bb = 204;
+        c.setTransform(t);
+        */
-    }
-    
@@ -154 +162 @@
-    {
-        label.text = '';
-    }
-    
-    private function setMapProvider( mapProviderType : Number ) : Void
-    {
-        this.mapProviderType = mapProviderType;
-        var mapProviderFactory : MapProviderFactory = MapProviderFactory.getInstance();
-        mapProvider = MapProviderFactory.getInstance().getMapProvider( mapProviderType ); 
-    }
-    
@@ -221 +222 @@
-    }
-    
-    /*
-    private function pointCoordinate(point:Point):Coordinate
-    {
@@ -230 +230 @@
-        // an arbitrary reference tile, zoomed to the maximum
-        tile = tiles[0];
-new Coordinate(tile.row, tile.column, tile.zoom
-
+tile.coord.copy(
+ = tileCoord
-        
-        // distance in tile widths from reference tile to point
-        var xTiles:Number = (point.x - tile._x) / tileWidth;
-        var yTiles:Number = (point.y - tile._y) / tileHeight;
-
+
-        // distance in rows & columns at maximum zoom
-
-
+coord.
+coord.
-        
-        // new point coordinate reflecting that distance
@@ -246 +246 @@
-                                    tileCoord.zoom);
-        
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-   /*
@@ -333 +352 @@
-    }
-    
-startZoomIn(
+zoomIn(amount:Number
-    {
-        if(zoomLevel >= bottomRightInLimit.zoom && Math.round(well._xscale) >= 100)
-            return;
-    
-.25
-.25
+amount
+amount
-        
-        normalizeWell();
@@ -348 +367 @@
-    }
-    
-startZoomOut(
+zoomOut(amount:Number
-    {
-        if(zoomLevel <= topLeftOutLimit.zoom && Math.round(well._xscale) <= 100)
-            return;
-    
-.25
-.25
+amount
+amount
-        
-        normalizeWell();
@@ -363 +382 @@
-    }
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        centerWell(false);
@@ -378 +393 @@
-    }
-    
-East( pixels : Number ) : 
-
-   
-   
-
+Right(pixels:Number):
+
+    
+    
+ 
-    }
- 
-West( pixels : Number ) : 
-
-   
-   
+Left(pixels:Number):
+
+    
+    
-        centerWell(true);
-    } 
-    
-    public function panNorth( pixels : Number ) : Void
-    {
-        well._y -= pixels;
-        positionTiles();
-        centerWell(true);
-    }
- 
-South( pixels : Number ) : 
-
-   
-   
+Up(pixels:Number):
+
+    
+    
-        centerWell(true);
-    }      
+    
+    public function panDown(pixels:Number):Void
+    {
+        well._y -= pixels;
+        positionTiles();
+        centerWell(true);
+    }
+
+   /**
+    * Find out whether a tile is at the grid's native zoom level.
+    */
+    private function nativeZoom(tile:Tile):Boolean
+    {
+        return (tile.coord.zoom == zoomLevel);
+    }
-
-   /**
@@ -509 +532 @@
-
-            for(var i:Number = 0; i < zoomAdjust; i += 1) {
+                splitTiles();
-                zoomLevel += 1;
-                splitTiles();
-            }
-                
-            for(var i:Number = 0; i > zoomAdjust; i -= 1) {
+                mergeTiles();
-                zoomLevel -= 1;
-                mergeTiles();
-            }
-                
@@ -540 +563 @@
-    private function splitTiles():Void
-    {
-        var newTiles:/*Tile*/Array = [];
-        var oldTile:Tile;
-        var newTile:Tile;
-        var xOffset:Number, yOffset:Number;
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
-        rows *= 2;
-        columns *= 2;
-        
-        tiles = newTiles;
-    }
-    
-    private function mergeTiles():Void
-    {
-        var newTiles:/*Tile*/Array = [];
-        var oldTile:Tile;
-        var newTile:Tile;
@@ -604 +629 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
-        rows = rowsMerged;
-        columns = columnsMerged;
-        
-        tiles = newTiles;
-    }
-    
@@ -653 +682 @@
-        
-        for(var i:Number = 0; i < tiles.length; i += 1) {
-
-
+
+
+
+
+
+
-            
-            if(tile._y < yMin) {

branches/darren tile painting/as2/lib/SampleClient.as

@@ -1 +1 @@
-import mx.utils.Delegate;
-import com.stamen.twisted.Reactor;
+import com.modestmaps.geo.Map;
-import com.modestmaps.core.TileGrid;
-import com.modestmaps.core.Tile;
-import com.modestmaps.core.mapproviders.MapProviders;
-
@@ -9 +9 @@
-    public static function main(clip:MovieClip):Void
-    {
-grid:TileGrid = TileGrid(clip.attachMovie(TileGrid.symbolName, 'tile
-           {mapProviderType: MapProviders.MICROSOFT_HYBRID, _x: 128, _y: 128, width: Stage.width - 256, height: Stage.height - 256}));
-
+map:Map = Map(clip.attachMovie(Map.symbolName, 'map
+{mapProviderType: MapProviders.MICROSOFT_HYBRID, _x: 128, _y: 128, width: Stage.width - 256, height: Stage.height - 256}))
+
-        Stage.scaleMode = 'noScale';
-        Stage.align = 'TL';
-grid
+map
-        
-grid, grid.startZ
-grid, grid.startZ
-grid, 
+map, map.z
+map, map.z
+map.grid, map.
-
-grid
-grid
+map
+map
-        
-        minus._x = plus._x + minus['label']._width + 4;
@@ -30 +30 @@
-
-        Reactor.run(clip, null, 50);
+        Reactor.callNextFrame(Delegate.create(map, map.nagAboutBoundsForever));
-    }
-    

branches/darren tile painting/as2/lib/SampleFlashLiteClient.as

@@ -1 +1 @@
-import mx.utils.Delegate;
-import com.stamen.twisted.Reactor;
-core.TileGrid
-Tile
+geo.Map
+mapproviders.MapProviders
-
-class SampleFlashLiteClient 
@@ -10 +10 @@
-        clip._focusRect = false;
-        
-grid:TileGrid = TileGrid(clip.attachMovie(TileGrid.symbolName, 'tile
-           {_x: 0, _y: 0, width: Stage.width, height: Stage.height} ));
-
+map:Map = Map(clip.attachMovie(Map.symbolName, 'map
+{mapProviderType: MapProviders.MICROSOFT_AERIAL, _x: 0, _y: 0, width: Stage.width, height: Stage.height}))
+
-
-                // Set up key listeners. 
@@ -18 +18 @@
-        
-        var myListener:Object = new Object();
-grid = grid
+map = map
-                myListener.onKeyDown = function() 
-                {
@@ -24 +24 @@
-                        {
-                                case Key.RIGHT:
-grid
+map
-                                        break;  
-                                
-                                case Key.LEFT:
-grid
+map
-                                        break;
-
-                                case Key.UP:
-grid
+map
-                                        break;  
-                                
-                                case Key.DOWN:
-grid
+map
-                                        break;
-                        }
@@ -45 +45 @@
-        Stage.scaleMode = 'noScale';
-        Stage.align = 'TL';
-grid
+map
-        
-        Reactor.run(clip, null, 50);