Changeset 41

Timestamp:

01/16/07 19:59:33 (2 years ago)

Author:

migurski

Message:

Merged branch "migurski tile zooming" into branch "darren mapprovider prototype"

Files:

• branches/darren mapprovider prototype/as2/lib/com/modestmaps/core/Coordinate.as (copied) (copied from branches/migurski tile zooming/as2/lib/com/modestmaps/core/Coordinate.as)
• branches/darren mapprovider prototype/as2/lib/com/modestmaps/core/mapproviders/AbstractMicrosoftMapProvider.as (modified) (1 diff)
• branches/darren mapprovider prototype/as2/lib/com/modestmaps/core/Tile.as (modified) (12 diffs)
• branches/darren mapprovider prototype/as2/lib/com/modestmaps/core/TileGrid.as (modified) (25 diffs)
• branches/darren mapprovider prototype/as2/lib/SampleClient.as (modified) (3 diffs)
• branches/migurski tile zooming (deleted)

branches/darren mapprovider prototype/as2/lib/com/modestmaps/core/mapproviders/AbstractMicrosoftMapProvider.as

@@ -36 +36 @@
-        {               
-                // convert row + col to zoom string
-
-
+coord.
+coord.
-                
-
-
+ord.co
+coord.
-
-                // generate zoom string by combining strings
-                var zoomString : String = "";
-
+coord.
-                {
-                        zoomString += BinaryUtil.convertToDecimal( rowBinaryString.charAt( i ) + colBinaryString.charAt( i ) ).toString();

branches/darren mapprovider prototype/as2/lib/com/modestmaps/core/Tile.as

@@ -2 +2 @@
-
-import com.modestmaps.core.Point;
+import com.modestmaps.core.Coordinate;
-import com.modestmaps.core.TileGrid;
-
@@ -9 +10 @@
-    public var grid:TileGrid;
-
+    public var coord:Coordinate;
+    
+    /*
-    public var row:Number = 0;
-    public var column:Number = 0;
-    public var zoom:Number = 0;
+    */
-
-    public var width:Number;
@@ -37 +42 @@
-    public function zoomOut():Void
-    {
-
-
-
+
-        redraw();
-    }
@@ -45 +48 @@
-    public function zoomInTopLeft():Void
-    {
-
-
-
+
-        redraw();
-    }
@@ -53 +54 @@
-    public function zoomInTopRight():Void
-    {
-
-
-
-
+
-        redraw();
-    }
@@ -62 +60 @@
-    public function zoomInBottomLeft():Void
-    {
-
-
-
-
+
-        redraw();
-    }
@@ -71 +66 @@
-    public function zoomInBottomRight():Void
-    {
-
-
-
-
-
+
-        redraw();
-    }
@@ -81 +72 @@
-    public function panUp(distance:Number):Void
-    {
-row -= (distance ? distance : 1
+coord = coord.up(distance
-        redraw();
-    }
@@ -87 +78 @@
-    public function panRight(distance:Number):Void
-    {
-lumn += (distance ? distance : 1
+ord = coord.right(distance
-        redraw();
-    }
@@ -93 +84 @@
-    public function panDown(distance:Number):Void
-    {
-row += (distance ? distance : 1
+coord = coord.down(distance
-        redraw();
-    }
@@ -99 +90 @@
-    public function panLeft(distance:Number):Void
-    {
-lumn -= (distance ? distance : 1
+ord = coord.left(distance
-        redraw();
-    }
@@ -105 +96 @@
-    public function toString():String
-    {
-row + ', ' + column + ' @' + zoom
+'Tile' + coord.toString()
-    }
-

branches/darren mapprovider prototype/as2/lib/com/modestmaps/core/TileGrid.as

@@ +1 @@
+import com.modestmaps.core.Coordinate;
-import com.modestmaps.core.Bounds;
-import com.modestmaps.core.Point;
@@ -23 +24 @@
-    private var tileHeight:Number = 256;
-    
+    // the currently-native zoom level
+    private var zoomLevel:Number;
+    
-    // some limits on scrolling distance, initially set to none
-
-
-
-
+
+
-
-    // Tiles attach to the well.
@@ -47 +49 @@
-
-    // Who do we get our Map graphics from?
+    public var mapProviderType:Number;
-    private var __mapProvider : IMapProvider;
-
@@ -55 +58 @@
-    public function TileGrid()
-    {
- MapProviders.MICROSOFT_AERIAL 
+mapProviderType
-        
-        buildWell();
-        buildMask();
+        
+        // impose some limits
+        zoomLevel = 11;
+        topLeftOutLimit = new Coordinate(Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY, 0);
+        bottomRightInLimit = new Coordinate(Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY, Coordinate.MAX_ZOOM);
-        
-        // initial tile centers the map on the SF Bay Area
@@ -67 +75 @@
-            width: tileWidth, 
-            height: tileHeight,
-
-
-
+
-        };
-        
-
-
-
-
-
-
-
+
-                                                                  
-        rows = 1;
@@ -93 +93 @@
-        
-        log('FUCK YEAH '+width+'x'+height);
-        
-        // TODO:
-        // Figure out why positionTiles() doesn't seem to work
-        // when called from here, even on a delay via the Reactor.
-    }
-    
@@ -119 +115 @@
-    }
-    
+   /**
+    * Create a new tile and return it, but don't add it to tiles array.
+    */
+    private function createTile(tileParams:Object):Tile
+    {
+        var tile:Tile;
+
+        tile = Tile(well.attachMovie(Tile.symbolName, 'tile'+well.getNextHighestDepth(), well.getNextHighestDepth(), tileParams));
+        tile.addEventObserver(this, "invalidated", "handleTileInvalidated");
+        tile.redraw();
+        
+        return tile;
+    }
+    
+   /**
+    * Destroy an old tile, but don't remove it from tiles array.
+    */
+    private function destroyTile(tile:Tile):Void
+    {
+        tile.removeEventObserver(this, "invalidated", "handleTileInvalidated");
+        tile.destroy();
+        tile.removeMovieClip();
+    }
+    
-    public function log(msg:String):Void
-    {
@@ -124 +144 @@
-    }
-    
+    public function clearLog():Void
+    {
+        label.text = '';
+    }
+    
-    private function setMapProvider( mapProviderType : Number ) : Void
-    {
+        this.mapProviderType = mapProviderType;
-        var mapProviderFactory : MapProviderFactory = MapProviderFactory.getInstance();
-        __mapProvider = MapProviderFactory.getInstance().getMapProvider( mapProviderType ); 
@@ -140 +166 @@
-    
-   /*
-
-
-
+
+
-    *
-    * Respect infinite rows or columns, to bind movement on one (or no) axis.
-    */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        
-        // store the infinite
-        var force:Point = new Point(0, 0);
-        
-lumn == Infinity || column == -Infinity
-
+ord.column == Number.POSITIVE_INFINITY || coord.column == Number.NEGATIVE_INFINITY
+ord.co
-            
-        } else {
-lumn - tiles[0]
-
-
-
-row == Infinity || row == -Infinity
-
+ord.column - tile.coord
+
+
+
+coord.row == Number.POSITIVE_INFINITY || coord.row == Number.NEGATIVE_INFINITY
+coord.
-            
-        } else {
-row - tiles[0]
+coord.row - tile.coord
-
-        }
@@ -182 +213 @@
-        return point;
-    }
+    
+    /*
+    private function pointCoordinate(point:Point):Coordinate
+    {
+        var tile:Tile;
+        var tileCoord:Coordinate;
+        var pointCoord:Coordinate;
+        
+        // an arbitrary reference tile, zoomed to the maximum
+        tile = tiles[0];
+        tileCoord = new Coordinate(tile.row, tile.column, tile.zoom);
+        tileCoord.zoomTo(Coordinate.MAX_ZOOM);
+        
+        // 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
+        var xDistance:Number = xTiles * Math.pow(2, (Coordinate.MAX_ZOOM - tile.zoom));
+        var yDistance:Number = yTiles * Math.pow(2, (Coordinate.MAX_ZOOM - tile.zoom));
+        
+        // new point coordinate reflecting that distance
+        pointCoord = new Coordinate(Math.round(tileCoord.row + yDistance),
+                                    Math.round(tileCoord.column + xDistance),
+                                    tileCoord.zoom);
+        
+        return pointCoord;
+    }
+    */
-    
-   /*
@@ -193 +253 @@
-        // "min" = furthest well position left & up,
-        // use the location of the bottom-right limit
-tilePosition(rowBottom, columnRigh
- - tileWidth
- - tileHeight
-
+coordinatePoint(bottomRightInLimi
+
+
+
-        // "max" = furthest well position right & down,
-        // use the location of the top-left limit
-tilePosition(rowTop, columnLef
+coordinatePoint(topLeftOutLimi
-        max.x = well._x - max.x;
-        max.y = well._y - max.y;
+        
+        log('min/max for drag: '+min+', '+max+' ('+topLeftOutLimit+', '+bottomRightInLimit+')');
-        
-        // weird negative edge conditions, limit all movement on an axis
@@ -224 +286 @@
-        // so we'll fudge it with some implausibly large numbers.
-        
-Infinity
+Number.POSITIVE_INFINITY
-                            ? 100000
--Infinity
+Number.NEGATIVE_INFINITY
-                                ? -100000
-                                : bounds.min.x);
-        
-Infinity
+Number.POSITIVE_INFINITY
-                            ? 100000
--Infinity
+Number.NEGATIVE_INFINITY
-                                ? -100000
-                                : bounds.min.y);
-        
-Infinity
+Number.POSITIVE_INFINITY
-                            ? 100000
--Infinity
+Number.NEGATIVE_INFINITY
-                                ? -100000
-                                : bounds.max.x);
-        
-Infinity
+Number.POSITIVE_INFINITY
-                            ? 100000
--Infinity
+Number.NEGATIVE_INFINITY
-                                ? -100000
-                                : bounds.max.y);
@@ -263 +325 @@
-        centerWell(true);
-    }
+    
+    public function startZoomIn():Void
+    {
+        if(zoomLevel >= bottomRightInLimit.zoom && Math.round(well._xscale) >= 100)
+            return;
+    
+        well._xscale *= Math.pow(2, .25);
+        well._yscale *= Math.pow(2, .25);
+        
+        normalizeWell();
+        allocateTiles();
+        positionTiles();
+        
+        log('New well scale: '+well._xscale.toString());
+    }
+    
+    public function startZoomOut():Void
+    {
+        if(zoomLevel <= topLeftOutLimit.zoom && Math.round(well._xscale) <= 100)
+            return;
+    
+        well._xscale /= Math.pow(2, .25);
+        well._yscale /= Math.pow(2, .25);
+        
+        normalizeWell();
+        allocateTiles();
+        positionTiles();
+        
+        log('New well scale: '+well._xscale.toString());
+    }
-
-   /*
@@ -313 +405 @@
-    private function allocateTiles():Void
-    {
+        // internal pixel dimensions of well, compensating for scale
+        var wellWidth:Number  = (100 / well._xscale) * width;
+        var wellHeight:Number = (100 / well._yscale) * height;
+
+        var targetCols:Number = Math.ceil(wellWidth  / tileWidth)  + 1 + 2 * tileBuffer;
+        var targetRows:Number = Math.ceil(wellHeight / tileHeight) + 1 + 2 * tileBuffer;
+
-        // grid can't drop below 1 x 1
-var targetCols:Number = Math.max(1, Math.ceil(width / tileWidth) + 1 + 2 * tileBuffer
-var targetRows:Number = Math.max(1, Math.ceil(height / tileHeight) + 1 + 2 * tileBuffer
+targetCols = Math.max(1, targetCols
+targetRows = Math.max(1, targetRows
-
-        // change column count to match target
@@ -342 +441 @@
-   /**
-    * Adjust position of the well, so it stays in the center.
- visual
-discontinuity with respect to upper-left hand corner
+
+visual discontinuity
-    */
-    private function centerWell(adjustTiles:Boolean):Void
@@ -351 +450 @@
-        var xAdjustment:Number = well._x - center.x;
-        var yAdjustment:Number = well._y - center.y;
-
+
-        well._x -= xAdjustment;
-        well._y -= yAdjustment;
@@ -357 +456 @@
-        if(adjustTiles) {
-            for(var i:Number = 0; i < tiles.length; i += 1) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -427 +686 @@
-        var lastTile:Tile;
-        var newTileParams:Object;
-        var newTile:Tile;
-        
-        tiles.sort(compareTileRowColumn);
@@ -435 +693 @@
-            lastTile = tiles[i];
-        
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-        
@@ -455 +708 @@
-    private function popTileRow():Void
-    {
-        var oldTile:Tile;
-        
-        tiles.sort(compareTileRowColumn);
-
-        while(tiles.length > columns * (rows - 1)) {
-
-
-
-
-
+
-        }
-                                         
@@ -477 +724 @@
-        var lastTile:Tile;
-        var newTileParams:Object;
-        var newTile:Tile;
-        
-        tiles.sort(compareTileColumnRow);
@@ -485 +731 @@
-            lastTile = tiles[i];
-        
-
-
+
-                             _x:    lastTile._x + lastTile.width,   _y:     lastTile._y,
-                             width: tileWidth,                      height: tileHeight};
-
-
-
-
-
-
+
+
-        }
-        
@@ -505 +746 @@
-    private function popTileColumn():Void
-    {
-        var oldTile:Tile;
-        
-        tiles.sort(compareTileColumnRow);
-
-        while(tiles.length > rows * (columns - 1)) {
-
-
-
-
-
+
-        }
-
@@ -538 +773 @@
-    private static function compareTileRowColumn(a:Tile, b:Tile):Number
-    {
-row == b
-lumn - b
+coord.row == b.coord
+ord.column - b.coord
-            
-        } else {
-row - b
+coord.row - b.coord
-            
-        }
@@ -552 +787 @@
-    private static function compareTileColumnRow(a:Tile, b:Tile):Number
-    {
-lumn == b
-row - b
+ord.column == b.coord
+coord.row - b.coord
-            
-        } else {
-lumn - b
+ord.column - b.coord
-            
-        }

branches/darren mapprovider prototype/as2/lib/SampleClient.as

@@ -3 +3 @@
-import com.modestmaps.core.TileGrid;
-import com.modestmaps.core.Tile;
+import com.modestmaps.core.mapproviders.MapProviders;
-
-class SampleClient
@@ -9 +10 @@
-    {
-        var grid:TileGrid = TileGrid(clip.attachMovie(TileGrid.symbolName, 'tile', clip.getNextHighestDepth(),
-
+mapProviderType: MapProviders.MICROSOFT_AERIAL, 
-
-        Stage.scaleMode = 'noScale';
@@ -15 +16 @@
-        Stage.addListener(grid);
-        
+        var plus:MovieClip = makeButton(clip, 'plus', 'zoom in', Delegate.create(grid, grid.startZoomIn));
+        var minus:MovieClip = makeButton(clip, 'minus', 'zoom out', Delegate.create(grid, grid.startZoomOut));
+        var clear:MovieClip = makeButton(clip, 'clear', 'clear log', Delegate.create(grid, grid.clearLog));
+
+        plus._x = grid._x;
+        plus._y = grid._y - plus['label']._height - 10;
+        
+        minus._x = plus._x + minus['label']._width + 4;
+        minus._y = plus._y;
+        
+        clear._x = minus._x + clear['label']._width + 14;
+        clear._y = minus._y;
+
-        Reactor.run(clip, null, 50);
+    }
+    
+    public static function makeButton(clip:MovieClip, name:String, label:String, action:Function):MovieClip
+    {
+        var button:MovieClip = clip.createEmptyMovieClip(name, clip.getNextHighestDepth());
+        
+        button.createTextField('label', button.getNextHighestDepth(), 0, 0, 100, 100);
+        button['label'].selectable = false;
+        button['label'].textColor = 0xFFFFFF;
+        button['label'].text = label;
+        button['label']._width = button['label'].textWidth + 4;
+        button['label']._height = button['label'].textHeight + 2;
+        
+        button.moveTo(0, 0);
+        button.beginFill(0x000000, 100);
+        button.lineTo(0, button['label']._height);
+        button.lineTo(button['label']._width, button['label']._height);
+        button.lineTo(button['label']._width, 0);
+        button.lineTo(0, 0);
+        button.endFill(0, 0);
+        
+        button.onRelease = action;
+        
+        return button;
-    }
-