Changeset 176

Show
Ignore:
Timestamp:
03/18/07 16:36:45 (2 years ago)
Author:
darren
Message:

refactored code to use casa framework EventDispatcher? instead of mx.events.EventDispatcher?
remove mx.events package

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r111 r176  
    99import com.modestmaps.events.IDispatchable; 
    1010import com.modestmaps.mapproviders.AbstractMapProvider; 
     11import org.casaframework.movieclip.DispatchableMovieClip; 
     12import org.casaframework.event.DispatchableInterface; 
    1113 
    1214class com.modestmaps.core.Tile  
    13 extends MovieClip 
     15extends DispatchableMovieClip 
     16implements DispatchableInterface 
    1417{ 
    1518        public static var EVENT_PAINT_COMPLETE : String = "onPaintComplete"; 
    …… 
    2629        // Keeps track of all clips awaiting painting. 
    2730        private var __displayClips : Array; 
    28  
    29         private var __paintCompleteDelegate : Function; 
    3031         
    3132        private var __paintCall : TilePaintCall; 
    3233         
    3334        private var __active:Boolean; 
    34  
    35         // tracks if we're set up to broadcast events 
    36         private static var __dispatcherInited : Boolean = false; 
    37  
    38         // stubs for EventDispatcher 
    39         public var dispatchEvent : Function; 
    40         public var addEventListener : Function; 
    41         public var removeEventListener : Function; 
    4235 
    4336    public static var symbolName:String = '__Packages.com.modestmaps.core.Tile'; 
    …… 
    4740    public function Tile() 
    4841    { 
    49         // only set up broadcasting once, in the prototype 
    50                 if ( !__dispatcherInited ) 
    51                 {                
    52                         EventDispatcher.initialize( this.__proto__ ); 
    53                         __dispatcherInited = true; 
    54                 } 
    55          
    5642        __active = true; 
    57         __displayClips = new Array(); 
    58         __paintCompleteDelegate = Delegate.create( this, this.onPaintComplete );         
     43        __displayClips = new Array();    
    5944    } 
    6045    
    …… 
    150135            return; 
    151136 
    152         IDispatchable(grid.mapProvider).addEventListener(AbstractMapProvider.EVENT_PAINT_COMPLETE, __paintCompleteDelegate); 
     137        DispatchableInterface(grid.mapProvider).addEventObserver( this, AbstractMapProvider.EVENT_PAINT_COMPLETE, "onPaintComplete" ); 
    153138 
    154139        // cancel existing call, if any... 
    …… 
    187172    // Event Handlers 
    188173     
    189     private function onPaintComplete( eventObj : Object ) : Void 
     174    private function onPaintComplete( clip : MovieClip, coord : Coordinate ) : Void 
    190175    { 
    191         var coord : Coordinate = Coordinate( eventObj.coord ); 
    192          
    193176        if ( this.coord.equalTo( coord ) ) 
    194177        { 
    195                 IDispatchable( grid.mapProvider ).removeEventListener( AbstractMapProvider.EVENT_PAINT_COMPLETE, __paintCompleteDelegate ); 
     178                DispatchableInterface(grid.mapProvider).removeEventObserver( this, AbstractMapProvider.EVENT_PAINT_COMPLETE, "onPaintComplete" ); 
    196179                 
    197180                // remove all other displayClips /below/ this clip               
    …… 
    210193                } 
    211194                 
    212                 // notify anyone who's listening 
    213                 var newEventObj : Object = 
    214                 { 
    215                         target : this, 
    216                         type : EVENT_PAINT_COMPLETE      
    217                 }; 
    218                 dispatchEvent( newEventObj ); 
     195                dispatchEvent( EVENT_PAINT_COMPLETE ); 
    219196        }        
    220197    }    

  • trunk/as2/lib/com/modestmaps/io/LoadMovieThrottledRequest.as

    r162 r176  
    3030                if ( clip == undefined || url == undefined || url == "" ) 
    3131                { 
    32                         var eventObj : Object = 
    33                         { 
    34                                 target : this, 
    35                                 type : ThrottledRequest.EVENT_REQUEST_ERROR, 
    36                                 clip : this.clip 
    37                         }; 
    38                         dispatchEvent( eventObj ); 
     32                        dispatchEvent( ThrottledRequest.EVENT_REQUEST_ERROR, clip ); 
    3933                         
    4034                        cleanup(); 
    …… 
    7064        private function onLoadComplete( clip : MovieClip, httpStatus : Number ) : Void 
    7165        { 
    72                 var eventObj : Object = 
    73                 { 
    74                         target : this, 
    75                         type : ThrottledRequest.EVENT_RESPONSE_COMPLETE, 
    76                         clip : clip, 
    77                         url : url 
    78                 }; 
    79                 dispatchEvent( eventObj ); 
     66                dispatchEvent( ThrottledRequest.EVENT_RESPONSE_COMPLETE, clip, url ); 
    8067                 
    8168                cleanup(); 
    …… 
    8471        private function onLoadError( clip : MovieClip, errorCode : String, httpStatus : Number ) : Void 
    8572        { 
    86                 var eventObj : Object = 
    87                 { 
    88                         target : this, 
    89                         type : ThrottledRequest.EVENT_RESPONSE_ERROR, 
    90                         errorCode : errorCode, 
    91                         httpStatus : httpStatus, 
    92                         clip: clip 
    93                 }; 
    94                 dispatchEvent( eventObj ); 
     73                dispatchEvent( ThrottledRequest.EVENT_RESPONSE_ERROR, clip, errorCode, httpStatus ); 
    9574                 
    9675                cleanup(); 

  • trunk/as2/lib/com/modestmaps/io/MapProviderPaintThrottledRequest.as

    r99 r176  
    1818        } 
    1919 
    20         private function onLoadComplete( clip : MovieClip, httpStatus : Number ) : Void 
     20        private function onLoadComplete( clip : MovieClip, url : String ) : Void 
    2121        { 
    22                 var eventObj : Object = 
    23                 { 
    24                         target : this, 
    25                         type : ThrottledRequest.EVENT_RESPONSE_COMPLETE, 
    26                         clip : clip, 
    27                         coord : coord 
    28                 }; 
    29                 dispatchEvent( eventObj ); 
     22                dispatchEvent( ThrottledRequest.EVENT_RESPONSE_COMPLETE, clip, coord ); 
    3023                 
    3124                cleanup(); 

  • trunk/as2/lib/com/modestmaps/io/ThrottledRequest.as

    r78 r176  
    1 import mx.events.EventDispatcher; 
     1import org.casaframework.event.EventDispatcher; 
     2 
     3import com.modestmaps.io.IRequest; 
    24import com.modestmaps.io.RequestThrottler; 
    3 import com.modestmaps.io.IRequest; 
    45 
    56/** 
    …… 
    78 */ 
    89class com.modestmaps.io.ThrottledRequest  
     10extends EventDispatcher 
    911implements IRequest 
    1012{ 
    11         // tracks if we're set up to broadcast events 
    12         private static var __dispatcherInited : Boolean = false; 
    13          
    1413        // Events 
    1514        public static var EVENT_REQUEST_ERROR : String = "onRequestError"; 
    …… 
    1716        public static var EVENT_RESPONSE_ERROR : String = "onResponseError"; 
    1817         
    19         // stubs for EventDispatcher 
    20         public var dispatchEvent : Function; 
    21         public var addEventListener : Function; 
    22         public var removeEventListener : Function; 
    23          
    2418        public function ThrottledRequest() 
    2519        { 
    26                 // only set up broadcasting once, in the prototype 
    27                 if ( !__dispatcherInited ) 
    28                 {                
    29                         EventDispatcher.initialize( this.__proto__ ); 
    30                         __dispatcherInited = true; 
    31                 } 
    3220        } 
    3321         

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

    r160 r176  
    55 
    66import mx.utils.Delegate; 
    7 import mx.events.EventDispatcher; 
     7 
     8import org.casaframework.movieclip.DispatchableMovieClip; 
     9 
     10import com.modestmaps.core.Coordinate; 
     11import com.modestmaps.core.Point; 
     12import com.modestmaps.core.TileGrid; 
     13import com.modestmaps.geo.Location; 
     14import com.modestmaps.mapproviders.IMapProvider; 
     15import com.stamen.twisted.DelayedCall; 
    816import com.stamen.twisted.Reactor; 
    9 import com.stamen.twisted.DelayedCall; 
    10  
    11 import com.modestmaps.geo.Location; 
    12 import com.modestmaps.core.Point; 
    13 import com.modestmaps.core.Marker; 
    14 import com.modestmaps.core.TileGrid; 
    15 import com.modestmaps.core.Coordinate; 
    16 import com.modestmaps.mapproviders.IMapProvider; 
    17  
    18 class com.modestmaps.Map extends MovieClip 
     17 
     18class com.modestmaps.Map  
     19extends DispatchableMovieClip 
    1920{ 
    2021    private var __width:Number = 320; 
    …… 
    4445    // Who do we get our Map graphics from? 
    4546    private var __mapProvider:IMapProvider; 
    46  
    47     // stubs for EventDispatcher 
    48     public var dispatchEvent:Function; 
    49     public var addEventListener:Function; 
    50     public var removeEventListener:Function; 
    51     public static var eventLink = EventDispatcher.initialize(Map.prototype); 
    5247 
    5348    // Events thrown 
    …… 
    452447    { 
    453448        //grid.log('+ '+marker.toString()); 
    454         dispatchEvent({type: EVENT_MARKER_ENTERS, id: id, location: location}); 
     449        dispatchEvent( EVENT_MARKER_ENTERS, id, location ); 
    455450    } 
    456451     
    …… 
    462457    { 
    463458        //grid.log('- '+marker.toString()); 
    464         dispatchEvent({type: EVENT_MARKER_LEAVES, id: id, location: location}); 
     459        dispatchEvent( EVENT_MARKER_LEAVES, id, location ); 
    465460    } 
    466461     
    …… 
    472467    { 
    473468        //grid.log('Leaving zoom level '+grid.zoomLevel+'...'); 
    474         dispatchEvent({type: EVENT_START_ZOOMING, level: grid.zoomLevel}); 
     469        dispatchEvent( EVENT_START_ZOOMING, grid.zoomLevel ); 
    475470    } 
    476471     
    477472   /** 
    478473    * Dispatches EVENT_STOP_ZOOMING when the map stops zooming. 
    479     * Event object includes level:Number. 
     474    * Callback arguments includes level:Number. 
    480475    */ 
    481476    public function onStopZoom():Void 
    482477    { 
    483478        //grid.log('...Entering zoom level '+grid.zoomLevel); 
    484         dispatchEvent({type: EVENT_STOP_ZOOMING, level: grid.zoomLevel}); 
     479        dispatchEvent( EVENT_STOP_ZOOMING, grid.zoomLevel ); 
    485480    } 
    486481     
    487482   /** 
    488483    * Dispatches EVENT_ZOOMED_BY when the map is zooomed. 
    489     * Event object includes delta:Number, difference in levels from zoom start. 
     484    * Callback arguments includes delta:Number, difference in levels from zoom start. 
    490485    */ 
    491486    public function onZoomed(delta:Number):Void 
    492487    { 
    493488        //grid.log('Current well offset from start: '+delta.toString()); 
    494         dispatchEvent({type: EVENT_ZOOMED_BY, delta: delta}); 
     489        dispatchEvent( EVENT_ZOOMED_BY, delta ); 
    495490    } 
    496491     
    …… 
    501496    { 
    502497        //grid.log('Starting pan...'); 
    503         dispatchEvent({type: EVENT_START_PANNING}); 
     498        dispatchEvent( EVENT_START_PANNING ); 
    504499    } 
    505500     
    …… 
    510505    { 
    511506        //grid.log('...Stopping pan'); 
    512         dispatchEvent({type: EVENT_STOP_PANNING}); 
     507        dispatchEvent( EVENT_STOP_PANNING ); 
    513508    } 
    514509     
    515510   /** 
    516511    * Dispatches EVENT_PANNED_BY when the map is panned. 
    517     * Event object includes delta:Point, difference in pixels from pan start. 
     512    * Callback arguments includes delta:Point, difference in pixels from pan start. 
    518513    */ 
    519514    public function onPanned(delta:Point):Void 
    520515    { 
    521516        //grid.log('Current well offset from start: '+delta.toString()); 
    522         dispatchEvent({type: EVENT_PANNED_BY, delta: delta}); 
     517        dispatchEvent( EVENT_PANNED_BY, delta ); 
    523518    } 
    524519     
    525520   /** 
    526521    * Dispatches EVENT_RESIZED_TO when the map is resized. 
    527     * Event object includes width:Number and height:Number. 
     522    * Callback arguments include width:Number and height:Number. 
    528523    */ 
    529524    public function onResized():Void 
    530525    { 
    531         dispatchEvent({type: EVENT_RESIZED_TO, width: __width, height: __height}); 
     526        dispatchEvent( EVENT_RESIZED_TO, __width, __height ); 
    532527    } 
    533528} 

  • trunk/as2/lib/com/modestmaps/mapproviders/AbstractImageBasedMapProvider.as

    r168 r176  
    2121                 
    2222                var request : MapProviderPaintThrottledRequest = new MapProviderPaintThrottledRequest( clip.image, getTileUrl( coord ), coord ); 
    23                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_REQUEST_ERROR, Delegate.create( this, this.onRequestError )); 
    24                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_RESPONSE_COMPLETE, Delegate.create( this, this.onResponseComplete )); 
    25                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_RESPONSE_ERROR, Delegate.create( this, this.onResponseError )); 
     23                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_REQUEST_ERROR, "onRequestError"); 
     24                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_RESPONSE_COMPLETE, "onResponseComplete"); 
     25                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_RESPONSE_ERROR, "onResponseError"); 
    2626                request.send(); 
    2727                 
    …… 
    4040        // Event Handlers 
    4141 
    42         private function onRequestError( eventObj : Object ) : Void 
     42        private function onRequestError( clip : MovieClip ) : Void 
    4343        { 
    44             paintFailure(eventObj.clip); 
     44            paintFailure( clip ); 
    4545        } 
    4646         
    47         private function onResponseComplete( eventObj : Object ) : Void 
     47        private function onResponseComplete( clip : MovieClip, coordinate : Coordinate ) : Void 
    4848        { 
    49                 raisePaintComplete( eventObj.clip, eventObj.coord ); 
     49                raisePaintComplete( clip, coordinate ); 
    5050        } 
    5151         
    52         private function onResponseError( eventObj : Object ) : Void 
     52        private function onResponseError( clip : MovieClip, errorCode : String, httpStatus : Number ) : Void 
    5353        { 
    54             paintFailure(eventObj.clip); 
     54            paintFailure(clip); 
    5555        }                
    5656         

  • trunk/as2/lib/com/modestmaps/mapproviders/AbstractMapProvider.as

    r140 r176  
    1 import mx.events.EventDispatcher; 
     1import org.casaframework.event.DispatchableInterface; 
     2import org.casaframework.event.EventDispatcher; 
    23 
    3 import com.modestmaps.mapproviders.IMapProvider; 
    4 import com.modestmaps.io.RequestThrottler; 
    54import com.modestmaps.core.Coordinate; 
    6 import com.modestmaps.events.IDispatchable; 
    75import com.modestmaps.geo.IProjection; 
    86import com.modestmaps.geo.LinearProjection; 
     7import com.modestmaps.geo.Location; 
    98import com.modestmaps.geo.Transformation; 
    10 import com.modestmaps.geo.Location; 
     9import com.modestmaps.io.RequestThrottler; 
    1110 
    1211/** 
    …… 
    1413 */ 
    1514class com.modestmaps.mapproviders.AbstractMapProvider   
    16 implements IDispatchable 
     15extends EventDispatcher 
     16implements DispatchableInterface 
    1717{ 
    1818        // Event Types 
    …… 
    2525        private var __topLeftOutLimit:Coordinate; 
    2626        private var __bottomRightInLimit:Coordinate; 
    27  
    28         // decorate the AbstractMapProvider prototype with event dispatching methods 
    29         private static var _dispatcherInited = EventDispatcher.initialize(AbstractMapProvider.prototype); 
    3027 
    3128        /* 
    …… 
    9188        private function raisePaintComplete( clip : MovieClip, coord : Coordinate ) : Void 
    9289        { 
    93                 var eventObj : Object = 
    94                 { 
    95                         target : this, 
    96                         type : EVENT_PAINT_COMPLETE, 
    97                         clip : clip, 
    98                         coord : coord 
    99                 }; 
    100                 dispatchEvent( eventObj ); 
    101         } 
    102  
    103         // IDispatchable 
    104         public function addEventListener( type : String, handler ) : Void 
    105         { 
    106                 super.addEventListener( type, handler ); 
    107         } 
    108          
    109         public function removeEventListener( type : String, handler ) : Void 
    110         { 
    111                 super.removeEventListener( type, handler ); 
    112         } 
    113          
    114         public function dispatchEvent( eventObj : Object ) : Void 
    115         { 
    116                 super.dispatchEvent( eventObj ); 
     90                dispatchEvent( EVENT_PAINT_COMPLETE, clip, coord ); 
    11791        } 
    11892     

  • trunk/as2/lib/com/modestmaps/mapproviders/BlueMarbleMapProvider.as

    r167 r176  
    1 import com.modestmaps.mapproviders.IMapProvider; 
    2 import com.modestmaps.mapproviders.AbstractImageBasedMapProvider; 
     1import org.casaframework.event.DispatchableInterface; 
     2 
    33import com.modestmaps.core.Coordinate; 
    4 import com.modestmaps.events.IDispatchable; 
    54import com.modestmaps.geo.MercatorProjection; 
    65import com.modestmaps.geo.Transformation; 
     6import com.modestmaps.mapproviders.AbstractImageBasedMapProvider; 
     7import com.modestmaps.mapproviders.IMapProvider; 
    78 
    89/** 
    …… 
    1213class com.modestmaps.mapproviders.BlueMarbleMapProvider 
    1314extends AbstractImageBasedMapProvider 
    14 implements IMapProvider, IDispatchable 
     15implements IMapProvider, DispatchableInterface 
    1516{ 
    1617    public function BlueMarbleMapProvider() 

  • trunk/as2/lib/com/modestmaps/mapproviders/google/GoogleAerialMapProvider.as

    r121 r176  
     1import org.casaframework.event.DispatchableInterface; 
     2 
    13import com.modestmaps.core.Coordinate; 
    2 import com.modestmaps.geo.Location; 
    34import com.modestmaps.mapproviders.google.AbstractGoogleMapProvider; 
    45import com.modestmaps.mapproviders.IMapProvider; 
    5 import com.modestmaps.events.IDispatchable; 
    66import com.modestmaps.util.BinaryUtil; 
    77 
    …… 
    1111class com.modestmaps.mapproviders.google.GoogleAerialMapProvider  
    1212extends AbstractGoogleMapProvider  
    13 implements IMapProvider, IDispatchable  
     13implements IMapProvider, DispatchableInterface  
    1414{ 
    1515        public function toString() : String 

  • trunk/as2/lib/com/modestmaps/mapproviders/google/GoogleHybridMapProvider.as

    r134 r176  
     1import org.casaframework.event.DispatchableInterface; 
     2 
    13import com.modestmaps.core.Coordinate; 
    2 import com.modestmaps.geo.Location; 
     4import com.modestmaps.io.MapProviderPaintThrottledRequest; 
    35import com.modestmaps.mapproviders.google.AbstractGoogleMapProvider; 
     6import com.modestmaps.mapproviders.google.GoogleAerialMapProvider; 
    47import com.modestmaps.mapproviders.IMapProvider; 
    5 import com.modestmaps.events.IDispatchable; 
    6 import com.modestmaps.io.MapProviderPaintThrottledRequest; 
    7 import mx.utils.Delegate; 
    8 import com.modestmaps.mapproviders.google.GoogleAerialMapProvider; 
    98 
    109/** 
    …… 
    1312class com.modestmaps.mapproviders.google.GoogleHybridMapProvider  
    1413extends AbstractGoogleMapProvider  
    15 implements IMapProvider, IDispatchable  
     14implements IMapProvider, DispatchableInterface  
    1615{ 
    1716        private var __gamp : GoogleAerialMapProvider; 
    …… 
    3433                 
    3534                var request : MapProviderPaintThrottledRequest = new MapProviderPaintThrottledRequest( clip.bg, getBGTileUrl( coord ), coord ); 
    36                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_REQUEST_ERROR, Delegate.create( this, this.onRequestError )); 
    37                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_RESPONSE_COMPLETE, Delegate.create( this, this.onResponseComplete )); 
    38                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_RESPONSE_ERROR, Delegate.create( this, this.onResponseError )); 
     35                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_REQUEST_ERROR, "onRequestError" ); 
     36                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_RESPONSE_COMPLETE, "onResponseComplete"); 
     37                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_RESPONSE_ERROR, "onResponseError" ); 
    3938                request.send(); 
    4039 
    4140                request = new MapProviderPaintThrottledRequest( clip.overlay, getOverlayTileUrl( coord ), coord ); 
    42                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_REQUEST_ERROR, Delegate.create( this, this.onRequestError )); 
    43                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_RESPONSE_COMPLETE, Delegate.create( this, this.onResponseComplete )); 
    44                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_RESPONSE_ERROR, Delegate.create( this, this.onResponseError )); 
     41                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_REQUEST_ERROR, "onRequestError" ); 
     42                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_RESPONSE_COMPLETE, "onResponseComplete"); 
     43                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_RESPONSE_ERROR, "onResponseError" ); 
    4544                request.send(); 
    4645                 
    …… 
    6261        // Event Handlers 
    6362         
    64         private function onResponseComplete( eventObj : Object ) : Void 
     63        private function onResponseComplete( clip : MovieClip, coordinate : Coordinate ) : Void 
    6564        { 
    66                 if ( eventObj.clip.bg._loaded && eventObj.clip.overlay._loaded ) 
    67                         raisePaintComplete( eventObj.clip._parent, eventObj.coord ); 
     65                if ( clip.bg._loaded && clip.overlay._loaded ) 
     66                        raisePaintComplete( clip._parent, coordinate ); 
    6867        } 
    6968} 

  • trunk/as2/lib/com/modestmaps/mapproviders/google/GoogleRoadMapProvider.as

    r134 r176  
     1import org.casaframework.event.DispatchableInterface; 
     2 
    13import com.modestmaps.core.Coordinate; 
    2 import com.modestmaps.geo.Location; 
    34import com.modestmaps.mapproviders.google.AbstractGoogleMapProvider; 
    45import com.modestmaps.mapproviders.IMapProvider; 
    5 import com.modestmaps.events.IDispatchable; 
    66 
    77/** 
    …… 
    1010class com.modestmaps.mapproviders.google.GoogleRoadMapProvider  
    1111extends AbstractGoogleMapProvider  
    12 implements IMapProvider, IDispatchable  
     12implements IMapProvider, DispatchableInterface  
    1313{ 
    1414        public function toString() : String 

  • trunk/as2/lib/com/modestmaps/mapproviders/MapProviderFactory.as

    r168 r176  
    55 */ 
    66  
    7 import com.modestmaps.mapproviders.*;  
    8 import com.modestmaps.mapproviders.microsoft.*; 
    9 import com.modestmaps.mapproviders.google.*; 
    10 import com.modestmaps.mapproviders.yahoo.*; 
     7import com.modestmaps.mapproviders.BlueMarbleMapProvider; 
     8import com.modestmaps.mapproviders.google.GoogleAerialMapProvider; 
     9import com.modestmaps.mapproviders.google.GoogleHybridMapProvider; 
     10import com.modestmaps.mapproviders.google.GoogleRoadMapProvider; 
     11import com.modestmaps.mapproviders.IMapProvider; 
     12import com.modestmaps.mapproviders.MapProviders; 
     13import com.modestmaps.mapproviders.microsoft.MicrosoftAerialMapProvider; 
     14import com.modestmaps.mapproviders.microsoft.MicrosoftHybridMapProvider; 
     15import com.modestmaps.mapproviders.microsoft.MicrosoftRoadMapProvider; 
     16import com.modestmaps.mapproviders.OpenStreetMapProvider; 
     17import com.modestmaps.mapproviders.VanillaMapProvider; 
     18import com.modestmaps.mapproviders.yahoo.YahooAerialMapProvider; 
     19import com.modestmaps.mapproviders.yahoo.YahooHybridMapProvider; 
     20import com.modestmaps.mapproviders.yahoo.YahooRoadMapProvider; 
    1121 
    1222class com.modestmaps.mapproviders.MapProviderFactory  

  • trunk/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftAerialMapProvider.as

    r114 r176  
     1import org.casaframework.event.DispatchableInterface; 
     2 
     3import com.modestmaps.core.Coordinate; 
    14import com.modestmaps.mapproviders.IMapProvider; 
    25import com.modestmaps.mapproviders.microsoft.AbstractMicrosoftMapProvider; 
    3 import com.modestmaps.core.Coordinate; 
    4 import com.modestmaps.util.BinaryUtil; 
    5 import com.modestmaps.events.IDispatchable; 
    66 
    77/** 
    …… 
    1111class com.modestmaps.mapproviders.microsoft.MicrosoftAerialMapProvider  
    1212extends AbstractMicrosoftMapProvider 
    13 implements IMapProvider, IDispatchable 
     13implements IMapProvider, DispatchableInterface 
    1414{ 
    1515        public function toString() : String 

  • trunk/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftHybridMapProvider.as

    r114 r176  
     1import org.casaframework.event.DispatchableInterface; 
     2 
     3import com.modestmaps.core.Coordinate; 
    14import com.modestmaps.mapproviders.IMapProvider; 
    25import com.modestmaps.mapproviders.microsoft.AbstractMicrosoftMapProvider; 
    3 import com.modestmaps.core.Coordinate; 
    4 import com.modestmaps.util.BinaryUtil; 
    5 import com.modestmaps.events.IDispatchable; 
    66 
    77/** 
    …… 
    1111class com.modestmaps.mapproviders.microsoft.MicrosoftHybridMapProvider  
    1212extends AbstractMicrosoftMapProvider 
    13 implements IMapProvider, IDispatchable 
     13implements IMapProvider, DispatchableInterface 
    1414{ 
    1515        public function toString() : String 

  • trunk/as2/lib/com/modestmaps/mapproviders/microsoft/MicrosoftRoadMapProvider.as

    r114 r176  
     1import org.casaframework.event.DispatchableInterface; 
     2 
     3import com.modestmaps.core.Coordinate; 
    14import com.modestmaps.mapproviders.IMapProvider; 
    25import com.modestmaps.mapproviders.microsoft.AbstractMicrosoftMapProvider; 
    3 import com.modestmaps.core.Coordinate; 
    4 import com.modestmaps.events.IDispatchable; 
    56 
    67 
    …… 
    1112class com.modestmaps.mapproviders.microsoft.MicrosoftRoadMapProvider  
    1213extends AbstractMicrosoftMapProvider 
    13 implements IMapProvider, IDispatchable 
     14implements IMapProvider, DispatchableInterface 
    1415{ 
    1516        public function toString() : String 

  • trunk/as2/lib/com/modestmaps/mapproviders/OpenStreetMapProvider.as

    r167 r176  
    1 import com.modestmaps.mapproviders.IMapProvider; 
    2 import com.modestmaps.mapproviders.AbstractImageBasedMapProvider; 
     1import org.casaframework.event.DispatchableInterface; 
     2 
    33import com.modestmaps.core.Coordinate; 
    4 import com.modestmaps.events.IDispatchable; 
    54import com.modestmaps.geo.MercatorProjection; 
    65import com.modestmaps.geo.Transformation; 
     6import com.modestmaps.mapproviders.AbstractImageBasedMapProvider; 
     7import com.modestmaps.mapproviders.IMapProvider; 
    78 
    89/** 
    …… 
    1213class com.modestmaps.mapproviders.OpenStreetMapProvider 
    1314extends AbstractImageBasedMapProvider 
    14 implements IMapProvider, IDispatchable 
     15implements IMapProvider, DispatchableInterface 
    1516{ 
    1617    public function OpenStreetMapProvider() 

  • trunk/as2/lib/com/modestmaps/mapproviders/VanillaMapProvider.as

    r69 r176  
    33 */ 
    44  
     5import org.casaframework.event.DispatchableInterface; 
     6 
     7import com.modestmaps.core.Coordinate; 
     8import com.modestmaps.mapproviders.AbstractMapProvider; 
    59import com.modestmaps.mapproviders.IMapProvider; 
    6 import com.modestmaps.mapproviders.AbstractMapProvider; 
    7 import com.modestmaps.core.Coordinate; 
    8 import com.modestmaps.events.IDispatchable; 
    910 
    1011class com.modestmaps.mapproviders.VanillaMapProvider  
    1112extends AbstractMapProvider 
    12 implements IMapProvider, IDispatchable 
     13implements IMapProvider, DispatchableInterface 
    1314{ 
    1415        public function paintTile( clip : MovieClip, coord : Coordinate ) : Void  

  • trunk/as2/lib/com/modestmaps/mapproviders/yahoo/YahooAerialMapProvider.as

    r121 r176  
    1 import com.modestmaps.events.IDispatchable; 
     1import org.casaframework.event.DispatchableInterface; 
     2 
     3import com.modestmaps.core.Coordinate; 
    24import com.modestmaps.mapproviders.IMapProvider; 
    35import com.modestmaps.mapproviders.yahoo.AbstractYahooMapProvider; 
    4 import com.modestmaps.core.Coordinate; 
    56 
    67/** 
    …… 
    910class com.modestmaps.mapproviders.yahoo.YahooAerialMapProvider  
    1011extends AbstractYahooMapProvider  
    11 implements IMapProvider, IDispatchable  
     12implements IMapProvider, DispatchableInterface  
    1213{ 
    1314        public function toString() : String 

  • trunk/as2/lib/com/modestmaps/mapproviders/yahoo/YahooHybridMapProvider.as

    r121 r176  
    1 import com.modestmaps.events.IDispatchable; 
     1import org.casaframework.event.DispatchableInterface; 
     2 
     3import com.modestmaps.core.Coordinate; 
     4import com.modestmaps.io.MapProviderPaintThrottledRequest; 
    25import com.modestmaps.mapproviders.IMapProvider; 
    36import com.modestmaps.mapproviders.yahoo.AbstractYahooMapProvider; 
    4 import com.modestmaps.core.Coordinate; 
    5 import com.modestmaps.io.MapProviderPaintThrottledRequest; 
    6 import mx.utils.Delegate; 
    77 
    88/** 
    …… 
    1111class com.modestmaps.mapproviders.yahoo.YahooHybridMapProvider  
    1212extends AbstractYahooMapProvider  
    13 implements IMapProvider, IDispatchable  
     13implements IMapProvider, DispatchableInterface  
    1414{ 
    1515        public function toString() : String 
    …… 
    2424                 
    2525                var request : MapProviderPaintThrottledRequest = new MapProviderPaintThrottledRequest( clip.bg, getBGTileUrl( coord ), coord ); 
    26                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_REQUEST_ERROR, Delegate.create( this, this.onRequestError )); 
    27                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_RESPONSE_COMPLETE, Delegate.create( this, this.onResponseComplete )); 
    28                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_RESPONSE_ERROR, Delegate.create( this, this.onResponseError )); 
     26                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_REQUEST_ERROR, "onRequestError" ); 
     27                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_RESPONSE_COMPLETE, "onResponseComplete"); 
     28                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_RESPONSE_ERROR, "onResponseError" ); 
    2929                request.send(); 
    3030 
    3131                request = new MapProviderPaintThrottledRequest( clip.overlay, getOverlayTileUrl( coord ), coord ); 
    32                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_REQUEST_ERROR, Delegate.create( this, this.onRequestError )); 
    33                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_RESPONSE_COMPLETE, Delegate.create( this, this.onResponseComplete )); 
    34                 request.addEventListener( MapProviderPaintThrottledRequest.EVENT_RESPONSE_ERROR, Delegate.create( this, this.onResponseError )); 
     32                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_REQUEST_ERROR, "onRequestError" ); 
     33                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_RESPONSE_COMPLETE, "onResponseComplete"); 
     34                request.addEventObserver( this, MapProviderPaintThrottledRequest.EVENT_RESPONSE_ERROR, "onResponseError" ); 
    3535                request.send(); 
    3636                 
    …… 
    6161        // Event Handlers 
    6262         
    63         private function onResponseComplete( eventObj : Object ) : Void 
     63        private function onResponseComplete( clip : MovieClip, coordinate : Coordinate ) : Void 
    6464        { 
    65                 if ( eventObj.clip.bg._loaded && eventObj.clip.overlay._loaded ) 
    66                         raisePaintComplete( eventObj.clip._parent, eventObj.coord ); 
     65                if ( clip.bg._loaded && clip.overlay._loaded ) 
     66                        raisePaintComplete( clip._parent, coordinate ); 
    6767        } 
    6868} 

  • trunk/as2/lib/com/modestmaps/mapproviders/yahoo/YahooRoadMapProvider.as

    r121 r176  
     1import org.casaframework.event.DispatchableInterface; 
     2 
    13import com.modestmaps.core.Coordinate; 
    2 import com.modestmaps.events.IDispatchable; 
    3 import com.modestmaps.geo.Location; 
    44import com.modestmaps.mapproviders.IMapProvider; 
    55import com.modestmaps.mapproviders.yahoo.AbstractYahooMapProvider; 
    …… 
    1010class com.modestmaps.mapproviders.yahoo.YahooRoadMapProvider  
    1111extends AbstractYahooMapProvider  
    12 implements IMapProvider, IDispatchable  
     12implements IMapProvider, DispatchableInterface  
    1313{        
    1414        public function toString() : String 

  • trunk/as2/lib/SampleClient.as

    r172 r176  
    11import mx.utils.Delegate; 
     2 
     3import com.modestmaps.core.Point; 
     4import com.modestmaps.geo.Location; 
     5import com.modestmaps.Map; 
     6import com.modestmaps.mapproviders.MapProviderFactory; 
     7import com.modestmaps.mapproviders.MapProviders; 
    28import com.stamen.twisted.Reactor; 
    3 import com.modestmaps.Map; 
    4 import com.modestmaps.core.TileGrid; 
    5 import com.modestmaps.mapproviders.MapProviders; 
    6 import com.modestmaps.mapproviders.MapProviderFactory; 
    7 import com.modestmaps.geo.Location; 
    89 
    910class SampleClient 
    1011{ 
    1112        private static var __map:Map; 
     13        private static var __navButtons:MovieClip; 
    1214        private static var __mapButtons:MovieClip; 
    1315        private static var __status:TextField; 
    …… 
    1921        __map = Map(clip.attachMovie(Map.symbolName, 'map', clip.getNextHighestDepth())); 
    2022        __map.init(Stage.width-256, Stage.height-256, true, MapProviderFactory.getInstance().getMapProvider(MapProviders.GOOGLE_ROAD)); 
    21         __map.addEventListener(Map.EVENT_ZOOMED_BY, onZoomed); 
    22         __map.addEventListener(Map.EVENT_STOP_ZOOMING, onStopZoom); 
    23         __map.addEventListener(Map.EVENT_PANNED_BY, onPanned); 
    24         __map.addEventListener(Map.EVENT_STOP_PANNING, onStopPan); 
    25         __map.addEventListener(Map.EVENT_RESIZED_TO, onResized); 
     23        __map.addEventObserver(SampleClient, Map.EVENT_ZOOMED_BY, "onZoomed"); 
     24        __map.addEventObserver(SampleClient, Map.EVENT_STOP_ZOOMING, "onStopZoom"); 
     25        __map.addEventObserver(SampleClient, Map.EVENT_PANNED_BY, "onPanned"); 
     26        __map.addEventObserver(SampleClient, Map.EVENT_STOP_PANNING, "onStopPan"); 
     27        __map.addEventObserver(SampleClient, Map.EVENT_RESIZED_TO, "onResized"); 
    2628         
    2729        __status = clip.createTextField('status', clip.getNextHighestDepth(), 0, 0, 600, 100); 
    …… 
    3840        //Reactor.callLater(2000, Delegate.create(__map, __map.setNewCenter), new Location(37.811411, -122.360916), 14); 
    3941         
    40         __map