Changeset 196

Show
Ignore:
Timestamp:
03/22/07 00:18:13 (2 years ago)
Author:
migurski
Message:

Started IDE-based client (ticket:19), which seemed unhappy with getters/setters and clip init objects

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/as2/lib/com/modestmaps/core/MarkerSet.as

    r186 r196  
    115115         
    116116        for(var i:Number = 0; i < tiles.length; i += 1) { 
    117             sourceCoord = grid.mapProvider.sourceCoordinate(tiles[i].coord); 
     117            sourceCoord = grid.getMapProvider().sourceCoordinate(tiles[i].coord); 
    118118         
    119119            if(tileMarkers[sourceCoord.toString()] != undefined) 

  • trunk/as2/lib/com/modestmaps/core/Tile.as

    r186 r196  
    127127    { 
    128128        // any need to repeat ourselves? 
    129         if(__paintCall && __paintCall.match(grid.mapProvider, coord.copy()) && __paintCall.pending()) 
     129        if(__paintCall && __paintCall.match(grid.getMapProvider(), coord.copy()) && __paintCall.pending()) 
    130130            return; 
    131131         
    …… 
    144144                         
    145145        // fire up a new call for the next frame... 
    146         __paintCall = new TilePaintCall(Reactor.callNextFrame(Delegate.create(this, this.paint), grid.mapProvider, coord.copy()), 
    147                                         grid.mapProvider, coord.copy()); 
     146        __paintCall = new TilePaintCall(Reactor.callNextFrame(Delegate.create(this, this.paint), grid.getMapProvider(), coord.copy()), 
     147                                        grid.getMapProvider(), coord.copy()); 
    148148    } 
    149149     
    …… 
    153153         
    154154        // set up the proper clip to paint here 
    155                 DispatchableInterface(grid.mapProvider).addEventObserver( this, AbstractMapProvider.EVENT_PAINT_COMPLETE, "onPaintComplete" ); 
     155                DispatchableInterface(grid.getMapProvider()).addEventObserver( this, AbstractMapProvider.EVENT_PAINT_COMPLETE, "onPaintComplete" ); 
    156156         
    157157        var clipId : Number = this.getNextHighestDepth(); 
    …… 
    174174        if ( this.coord.equalTo( coord ) ) 
    175175        { 
    176                 DispatchableInterface(grid.mapProvider).removeEventObserver( this, AbstractMapProvider.EVENT_PAINT_COMPLETE, "onPaintComplete" ); 
     176                DispatchableInterface(grid.getMapProvider()).removeEventObserver( this, AbstractMapProvider.EVENT_PAINT_COMPLETE, "onPaintComplete" ); 
    177177                 
    178178                // remove all other displayClips /below/ this clip               

  • trunk/as2/lib/com/modestmaps/core/TileGrid.as

    r194 r196  
    7777    public static var symbolLink:Boolean = Object.registerClass(symbolName, symbolOwner); 
    7878 
    79     public function TileGrid() 
    80     { 
     79    public function init(width:Number, height:Number, draggable:Boolean, provider:IMapProvider, map:Map):Void 
     80    { 
     81        if(!Reactor.running()) 
     82            throw new Error('com.modestmaps.core.TileGrid.init(): com.stamen.Twisted.Reactor really ought to be running at this point. Seriously.'); 
     83 
     84        this.width = width; 
     85        this.height = height; 
     86        this.draggable = draggable; 
     87        this.map = map; 
     88        __mapProvider = provider; 
     89     
    8190        buildWell(); 
    8291        buildMask(); 
    …… 
    147156        // impose some limits 
    148157        zoomLevel = initTileCoord.zoom; 
    149         topLeftOutLimit = mapProvider.outerLimits()[0]; 
    150         bottomRightInLimit = mapProvider.outerLimits()[1]; 
     158        topLeftOutLimit = __mapProvider.outerLimits()[0]; 
     159        bottomRightInLimit = __mapProvider.outerLimits()[1]; 
    151160         
    152161        // initial tile 
    …… 
    223232     
    224233     
    225     public function get mapProvider():IMapProvider 
     234    public function getMapProvider():IMapProvider 
    226235    { 
    227236        return __mapProvider;  
    228237    } 
    229238 
    230     public function set mapProvider(mapProvider:IMapProvider):Void 
     239    public function setMapProvider(mapProvider:IMapProvider):Void 
    231240    { 
    232241        var previousGeometry:String = __mapProvider.geometry(); 
    …… 
    11061115         
    11071116        for(var i:Number = 0; i < active.length; i += 1) 
    1108             active[i].paint(mapProvider, active[i].coord); 
     1117            active[i].paint(__mapProvider, active[i].coord); 
    11091118    } 
    11101119     

  • trunk/as2/lib/com/modestmaps/Map.as

    r191 r196  
    8484   /* 
    8585    * Initialize the map: set properties, add a tile grid, draw it. 
     86    * This method must be called before the map can be used! 
    8687    * Default extent covers the entire globe, (+/-85, +/-180). 
    8788    * 
    …… 
    9596    public function init(width:Number, height:Number, draggable:Boolean, provider:IMapProvider):Void 
    9697    { 
     98        if(!Reactor.running()) 
     99            throw new Error('com.modestmaps.Map.init(): com.stamen.Twisted.Reactor ought to be running at this point.'); 
     100 
    97101        __animSteps = []; 
    98102 
    …… 
    101105        __draggable = draggable; 
    102106     
    103         var initObj:Object = { 
    104             map: this, 
    105                 mapProvider: __mapProvider, 
    106                 _x: 0,  
    107                 _y: 0,  
    108                 width: __width,  
    109                 height: __height,  
    110                 draggable: __draggable 
    111         }; 
    112                  
    113         grid = TileGrid(attachMovie(TileGrid.symbolName, 'grid', getNextHighestDepth(), initObj)); 
     107        grid = TileGrid(attachMovie(TileGrid.symbolName, 'grid', getNextHighestDepth())); 
     108        grid.init(width, height, draggable, provider, this); 
    114109 
    115110        var extent:/*Location*/Array = [new Location(85, -180), 
    …… 
    324319        var extent:/*Location*/Array = getExtent(); 
    325320         
    326         __mapProvider = grid.mapProvider = newProvider; 
     321        __mapProvider = newProvider; 
     322        grid.setMapProvider(__mapProvider); 
    327323         
    328324        if(__mapProvider.geometry() == previousGeometry) {