Changeset 160

Timestamp:

03/09/07 15:35:52 (2 years ago)

Author:

migurski

Message:

Merged API branch

Files:

• branches/api (deleted)
• tags/branchpoint api (deleted)
• trunk/as2/lib/com/modestmaps/core/TileGrid.as (modified) (10 diffs)
• trunk/as2/lib/com/modestmaps/geo/Location.as (modified) (1 diff)
• trunk/as2/lib/com/modestmaps/geo/Map.as (deleted)
• trunk/as2/lib/com/modestmaps/Map.as (copied) (copied from branches/api/as2/lib/com/modestmaps/Map.as)
• trunk/as2/lib/SampleClient.as (modified) (7 diffs)
• trunk/as2/lib/SampleFlashLiteClient.as (modified) (3 diffs)

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

@@ -4 +4 @@
- */
-
-geo.
+
-import com.modestmaps.geo.Location;
-import com.modestmaps.core.Coordinate;
@@ -114 +114 @@
-    public function resetTiles(coord:Coordinate, point:Point):Void
-    {
+        if(!tiles) {
+            setInitialTile(coord, point);
+            return;
+        }
+    
-        var initTile:Tile;
-        var condemnedTiles:/*Tile*/Array = activeTiles();
@@ -187 +192 @@
-    }
-    
-name
-
-name
-name
+id
+
+id
+id
-        markers.put(marker);
-
@@ -197 +202 @@
-    }
-
-
-
-
-
-
+
+
+
+
-            markers.remove(marker);
-        }
-    }
-        
@@ -321 +324 @@
-
-        if(previousPosition.x != well._x || previousPosition.y != well._y)
-Well
+
-        
-        wellDragTask = Reactor.callNextFrame(Delegate.create(this, this.onWellDrag), new Point(well._x, well._y));
@@ -409 +412 @@
-    {
-        var point:Point = new Point(0, 0);
+        return pointCoordinate(point);
+    }
+    
+    public function centerCoordinate():Coordinate
+    {
+        var point:Point = new Point(width/2, height/2);
-        return pointCoordinate(point);
-    }
@@ -490 +499 @@
-        //log('Starting well position: '+__startingWellPosition.toString());
-        
-Drag
+Pan
-        well.startDrag(false, xMin, yMin, xMax, yMax);
-        onWellDrag(__startingWellPosition.copy());
@@ -501 +510 @@
-    private function stopWellDrag():Void
-    {
-Drag
+Pan
-        wellDragTask.cancel();
-        well.stopDrag();
@@ -965 +974 @@
-        for(var id:String in newOverlappingMarkers) {
-            if(newOverlappingMarkers[id] && !__overlappingMarkers[id]) {
-markers.getMarker(id)
+id, markers.getMarker(id).location
-                __overlappingMarkers[id] = true;
-            }
@@ -972 +981 @@
-        for(var id:String in __overlappingMarkers) {
-            if(!newOverlappingMarkers[id] && __overlappingMarkers[id]) {
-markers.getMarker(id)
+id, markers.getMarker(id).location
-                delete __overlappingMarkers[id];
-            }

trunk/as2/lib/com/modestmaps/geo/Location.as

@@ -12 +12 @@
-    public function toString():String
-    {
-
+
+
+
+
-    }
-}

trunk/as2/lib/SampleClient.as

@@ -1 +1 @@
-import mx.utils.Delegate;
-import com.stamen.twisted.Reactor;
-geo.
+
-import com.modestmaps.core.TileGrid;
-import com.modestmaps.mapproviders.MapProviders;
@@ -9 +9 @@
-class SampleClient
-{
- : 
-
-mpButtons : MovieClip
+:
+private static var __mapButtons:MovieClip;
+status:TextField
-        
-    public static function main(clip:MovieClip):Void
@@ -17 +17 @@
-        Reactor.run(clip, null, 50);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        var extent:/*Location*/Array = [new Location(37.829853, -122.514725),
-                                        new Location(37.700121, -122.212601)];
-        
-Initial
+
-
-        //Reactor.callLater(2000, Delegate.create(__map, __map.setNewCenter), new Location(37.811411, -122.360916), 14);
@@ -50 +52 @@
-        Stage.align = 'TL';
-        Stage.addListener(SampleClient);
+        onResize();
-        
- : 
+:
-        
-
-
-
+
+
+
+
+
+
+
-
- : 
- : 
+:
+:
-                
-
-
+
-                        buttons[i]._x = nextX;
-                        buttons[i]._y = nextY;
@@ -67 +73 @@
-                }
-
-
-                // mapProvider buttons
-
-pButtons = clip.createEmptyMovieClip( "mpButtons", clip.getNextHighestDepth() 
+apButtons = clip.createEmptyMovieClip("mpButtons", clip.getNextHighestDepth()
-
-        buttons = new Array();
-                
- makeButton(__m
- makeButton(__m
- makeButton(__m
+makeButton(__ma
+makeButton(__ma
+makeButton(__ma
-
- makeButton(__m
- makeButton(__m
- makeButton(__m
+makeButton(__ma
+makeButton(__ma
+makeButton(__ma
-
- makeButton(__m
- makeButton(__m
- makeButton(__m
+makeButton(__ma
+makeButton(__ma
+makeButton(__ma
-
- makeButton(__m
- makeButton(__m
+makeButton(__ma
+makeButton(__ma
-
-                __mpButtons._x = 128 + __map._x + __map._width;
-                __mpButtons._y = __map._y + 10;
-                
-                nextY = 0;
-                
-
-
+
-                        buttons[i]._y = nextY;
-                        nextY += buttons[i]['label']._height + 5;
-                        buttons[i]._alpha = 60;
-                }
-                
-
-        Reactor.callNextFrame(Delegate.create(__map, __map.nagAboutBoundsForever));
-        
-        _root.createEmptyMovieClip('marks', _root.getNextHighestDepth());
-    }
-    
-    
- button : MovieClip ) : 
+button:MovieClip):
-    {
-        __map.setMapProvider(MapProviderFactory.getInstance().getMapProvider(MapProviders[button._name]));
-    }
-    
-    
-    public static function makeButton(clip:MovieClip, name:String, label:String, action:Function):MovieClip
@@ -135 +132 @@
-        button.onRelease = function()
-        {
- SampleClient, [button] 
+SampleClient, [button]
-        };
-        
@@ -141 +138 @@
-    }
-    
- str : String ) : 
+str:String):
-    {
- str 
+str
-    }
-    
-    // Event Handlers
-    
- : 
+:
-    {
+        __map._x = __map._y = 50;
-        __map.setSize(Stage.width - 2*__map._x, Stage.height - 2*__map._y);
-
+
+
+
+
+
+
+
-        }
+    
+    private static function onPanned(event:Object):Void
+    {
+        __status.text = 'Panned by '+event.delta.toString()+', top left: '+__map.getExtent()[0].toString()+', bottom right: '+__map.getExtent()[3].toString();
+    }
+    
+    private static function onStopPan(event:Object):Void
+    {
+        __status.text = 'Stopped panning, top left: '+__map.getExtent()[0].toString()+', center: '+__map.getCenterZoom()[0].toString()+', bottom right: '+__map.getExtent()[3].toString()+', zoom: '+__map.getCenterZoom()[1];
+    }
+    
+    private static function onZoomed(event:Object):Void
+    {
+        __status.text = 'Zoomed by '+event.delta.toString()+', top left: '+__map.getExtent()[0].toString()+', bottom right: '+__map.getExtent()[3].toString();
+    }
+    
+    private static function onStopZoom(event:Object):Void
+    {
+        __status.text = 'Stopped zooming, top left: '+__map.getExtent()[0].toString()+', center: '+__map.getCenterZoom()[0].toString()+', bottom right: '+__map.getExtent()[3].toString()+', zoom: '+__map.getCenterZoom()[1];
+    }
+    
+    private static function onResized(event:Object):Void
+    {
+        __status.text = 'Resized to: '+event.width+' x '+event.height;
+    }
-    
-    private static function onMarkerEnters(event:Object):Void
-    {
-markerID.toString()
+id
-    }
-    
-    private static function onMarkerLeaves(event:Object):Void
-    {
-markerID.toString()
+id
-    }
-}

trunk/as2/lib/SampleFlashLiteClient.as

@@ -1 +1 @@
-import mx.utils.Delegate;
-import com.stamen.twisted.Reactor;
-geo.
+
-import com.modestmaps.geo.Location;
-import com.modestmaps.mapproviders.MapProviders;
@@ -17 +17 @@
-        
-        __map = Map(clip.attachMovie(Map.symbolName, 'map', clip.getNextHighestDepth(),
-
-
-
+
-        
+        __map.init(Stage.width, Stage.height, true, MapProviderFactory.getInstance().getMapProvider(MapProviders.MICROSOFT_AERIAL)); 
-
-        var extent:/*Location*/Array = [new Location(37.829853, -122.514725),
-                                        new Location(37.700121, -122.212601)];
-        
-Initial
+
-        
-                // Set up key listeners. 
@@ -38 +37 @@
-                        {
-                                case Key.RIGHT:
-East( Stage.width 
+Right(
-                                        break;  
-                                
-                                case Key.LEFT:
-West( Stage.width 
+Left(
-                                        break;
-
-                                case Key.UP:
-North( Stage.height 
+Up(
-                                        break;  
-                                
-                                case Key.DOWN:
-South( Stage.height 
+Down(
-                                        break;
-                        }