remove a huge load of pseudo-traces
authorRichard Fairhurst <richard@systemed.net>
Wed, 16 Feb 2011 13:50:25 +0000 (13:50 +0000)
committerRichard Fairhurst <richard@systemed.net>
Wed, 16 Feb 2011 13:50:25 +0000 (13:50 +0000)
32 files changed:
net/systemeD/halcyon/EntityUI.as
net/systemeD/halcyon/Map.as
net/systemeD/halcyon/MapPaint.as
net/systemeD/halcyon/MarkerUI.as
net/systemeD/halcyon/NodeUI.as
net/systemeD/halcyon/VectorLayer.as
net/systemeD/halcyon/connection/Connection.as
net/systemeD/halcyon/connection/OSMConnection.as
net/systemeD/halcyon/connection/XMLBaseConnection.as
net/systemeD/halcyon/connection/actions/AddNodeToWayAction.as
net/systemeD/halcyon/connection/actions/UnjoinNodeAction.as
net/systemeD/halcyon/styleparser/RuleSet.as
net/systemeD/halcyon/styleparser/StyleChooser.as
net/systemeD/potlatch2/BackgroundSelector.mxml
net/systemeD/potlatch2/collections/Imagery.as
net/systemeD/potlatch2/controller/ControllerState.as
net/systemeD/potlatch2/controller/DragBackground.as
net/systemeD/potlatch2/controller/DragSelection.as
net/systemeD/potlatch2/controller/DragWayNode.as
net/systemeD/potlatch2/controller/DrawWay.as
net/systemeD/potlatch2/controller/NoSelection.as
net/systemeD/potlatch2/controller/SelectedMarker.as
net/systemeD/potlatch2/controller/SelectedMultiple.as
net/systemeD/potlatch2/controller/SelectedPOINode.as
net/systemeD/potlatch2/controller/SelectedParallelWay.as
net/systemeD/potlatch2/controller/SelectedWay.as
net/systemeD/potlatch2/controller/SelectedWayNode.as
net/systemeD/potlatch2/utils/GpxImporter.as
net/systemeD/potlatch2/utils/Importer.as
net/systemeD/potlatch2/utils/KmlImporter.as
net/systemeD/potlatch2/utils/OsmImporter.as
net/systemeD/potlatch2/utils/ShpImporter.as

index 5d3f238..ae7efac 100644 (file)
@@ -4,7 +4,6 @@ package net.systemeD.halcyon {
        import flash.events.MouseEvent;
        import flash.text.AntiAliasType;
        import flash.text.GridFitType;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.styleparser.StyleList;
     import net.systemeD.halcyon.connection.*;
 
index 79f9888..ab8a2b4 100644 (file)
@@ -166,7 +166,6 @@ package net.systemeD.halcyon {
                        scalefactor=MASTERSCALE/Math.pow(2,13-scale);
                        baselon    =startlon          -(mapwidth /2)/scalefactor;
                        basey      =lat2latp(startlat)+(mapheight/2)/scalefactor;
-                       addDebug("Baselon "+baselon+", basey "+basey);
                        updateCoords(0,0);
             this.dispatchEvent(new Event(MapEvent.INITIALISED));
                        download();
@@ -294,7 +293,6 @@ package net.systemeD.halcyon {
                        if (connection.waycount>1000) {
                                connection.purgeOutside(edge_l,edge_r,edge_t,edge_b);
                        }
-                       addDebug("Calling download with "+edge_l+"-"+edge_r+", "+edge_t+"-"+edge_b);
                        connection.loadBbox(edge_l,edge_r,edge_t,edge_b);
 
             // Do the same for vector layers
@@ -425,7 +423,6 @@ package net.systemeD.halcyon {
                }
 
                private function changeScale(newscale:uint):void {
-                       addDebug("new scale "+newscale);
                        scale=newscale;
                        this.dispatchEvent(new MapEvent(MapEvent.SCALE, {scale:scale}));
                        scalefactor=MASTERSCALE/Math.pow(2,13-scale);
@@ -435,10 +432,6 @@ package net.systemeD.halcyon {
                        download();
                }
 
-               private function reportPosition():void {
-                       addDebug("lon "+coord2lon(mouseX)+", lat "+coord2lat(mouseY));
-               }
-
         private function toggleReportPosition():void {
             showingLatLon = !showingLatLon;
             this.dispatchEvent(new MapEvent(MapEvent.TOGGLE_LATLON, {latlon: showingLatLon}));
@@ -488,7 +481,7 @@ package net.systemeD.halcyon {
                // and mask)
 /*             
                public function export():void {
-                       addDebug("size is "+this.width+","+this.height);
+                       trace("size is "+this.width+","+this.height);
                        var jpgSource:BitmapData = new BitmapData(800,800); // (this.width, this.height);
                        jpgSource.draw(this);
                        var jpgEncoder:JPGEncoder = new JPGEncoder(85);
@@ -572,11 +565,6 @@ package net.systemeD.halcyon {
                        }
                }
 
-               /** What to do if an error with the network connection happens. */
-               public function connectionError(err:Object=null): void {
-                       addDebug("got error"); 
-               }
-
                // ------------------------------------------------------------------------------------------
                // Debugging
                
index bf91c3d..7cee4d3 100644 (file)
@@ -6,7 +6,6 @@ package net.systemeD.halcyon {
        import net.systemeD.halcyon.WayUI;
        import net.systemeD.halcyon.connection.*;
        import net.systemeD.halcyon.styleparser.RuleSet;
-       import net.systemeD.halcyon.Globals;
 
        /** Manages the drawing of map entities, allocating their sprites etc. */
        public class MapPaint extends Sprite {
index 834c42d..e2b9f20 100644 (file)
@@ -10,7 +10,6 @@ package net.systemeD.halcyon {
     import flash.geom.Point;
     import net.systemeD.halcyon.styleparser.*;
     import net.systemeD.halcyon.connection.*;
-    import net.systemeD.halcyon.Globals;
 
     public class MarkerUI extends EntityUI {
 
index e4e6ca3..4d84243 100644 (file)
@@ -10,7 +10,6 @@ package net.systemeD.halcyon {
        import flash.geom.Point;
        import net.systemeD.halcyon.styleparser.*;
     import net.systemeD.halcyon.connection.*;
-       import net.systemeD.halcyon.Globals;
        
        /** The graphical representation of a Node (including POIs and nodes that are part of Ways). */
        public class NodeUI extends EntityUI {
index c301cac..9903988 100644 (file)
@@ -4,7 +4,6 @@ package net.systemeD.halcyon {
        import net.systemeD.halcyon.MapPaint;
        import net.systemeD.halcyon.connection.*;
     import net.systemeD.halcyon.connection.actions.*;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.styleparser.RuleSet;
 
     /** The VectorLayer class is used for the concept of Vector Background Layers.
index 9930614..847b6dd 100644 (file)
@@ -4,7 +4,6 @@ package net.systemeD.halcyon.connection {
 
     import flash.events.EventDispatcher;
     import flash.events.Event;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.connection.actions.*;
        import net.systemeD.halcyon.AttentionEvent;
        import net.systemeD.halcyon.MapEvent;
index c38bdc1..18f1294 100644 (file)
@@ -6,7 +6,6 @@ package net.systemeD.halcyon.connection {
        import flash.system.Security;
 
        import net.systemeD.halcyon.ExtendedURLLoader;
-       import net.systemeD.halcyon.Globals;
 
     /**
     * Read-only connection from local OSM-XML format (.osm) files.
@@ -96,7 +95,6 @@ package net.systemeD.halcyon.connection {
                }
                
                private function loadFile(box:Array):void {
-                       Globals.vars.root.addDebug("called loadFile for "+box);
                        bboxes[box]=LOADING;
 
             var mapRequest:URLRequest = new URLRequest(Connection.apiBaseURL+"/"+box[0]+"_"+box[1]+"_"+box[2]+"_"+box[3]+".osm");
index 16749f2..b99e70f 100644 (file)
@@ -6,8 +6,6 @@ package net.systemeD.halcyon.connection {
        import flash.net.*;
     import org.iotashan.oauth.*;
 
-       import net.systemeD.halcyon.Globals;
-
     /**
     * XMLBaseConnection is the common code between connecting to an OSM server
     * (i.e. XMLConnection) and connecting to a standalone .osm file (i.e. OSMConnection)
index bb696be..7e291e9 100644 (file)
@@ -1,7 +1,6 @@
 package net.systemeD.halcyon.connection.actions {
 
     import net.systemeD.halcyon.connection.*;
-       import net.systemeD.halcyon.Globals;
     
     public class AddNodeToWayAction extends UndoableEntityAction {
         private var node:Node;
index 279e1b8..a9e14e8 100644 (file)
@@ -1,7 +1,6 @@
 package net.systemeD.halcyon.connection.actions {
 
     import net.systemeD.halcyon.connection.*;
-       import net.systemeD.halcyon.Globals;
     
     public class UnjoinNodeAction extends CompositeUndoableAction {
 
index 6505062..fed1ea7 100644 (file)
@@ -8,7 +8,6 @@ package net.systemeD.halcyon.styleparser {
     import net.systemeD.halcyon.connection.Entity;
 
     import net.systemeD.halcyon.connection.*;
-       import net.systemeD.halcyon.Globals;
        
        /** A complete stylesheet, as loaded from a MapCSS file. It contains all selectors, declarations, 
                and embedded images.                                                                                                                                                            </p><p>
@@ -337,8 +336,8 @@ package net.systemeD.halcyon.styleparser {
         }
 
                private function httpStatusHandler( event:HTTPStatusEvent ):void { }
-               private function securityErrorHandler( event:SecurityErrorEvent ):void { Globals.vars.root.addDebug("securityerrorevent"); }
-               private function ioErrorHandler( event:IOErrorEvent ):void { Globals.vars.root.addDebug("ioerrorevent"); }
+               private function securityErrorHandler( event:SecurityErrorEvent ):void { trace("securityerrorevent"); }
+               private function ioErrorHandler( event:IOErrorEvent ):void { trace("ioerrorevent"); }
 
                // ------------------------------------------------------------------------------------------------
                // Parse CSS
@@ -418,11 +417,11 @@ package net.systemeD.halcyon.styleparser {
                                // Unknown pattern
                                } else if ((o=UNKNOWN.exec(css))) {
                                        css=css.replace(UNKNOWN,'');
-                                       Globals.vars.root.addDebug("unknown: "+o[1]);
+                                       trace("unknown: "+o[1]);
                                        // ** do some debugging with o[1]
 
                                } else {
-                                       Globals.vars.root.addDebug("choked on "+css);
+                                       trace("choked on "+css);
                                        return;
                                }
                        }
index 988d8db..05b71b8 100644 (file)
@@ -1,7 +1,6 @@
 package net.systemeD.halcyon.styleparser {
 
        import net.systemeD.halcyon.connection.Entity;
-       import net.systemeD.halcyon.Globals;
 
        public class StyleChooser {
 
index 6abcc57..551e87f 100644 (file)
@@ -29,7 +29,6 @@
                import mx.core.*;
                import mx.collections.ArrayCollection;
                import mx.managers.PopUpManager;
-               import net.systemeD.halcyon.Globals;
 
                public function setDimming(v:Boolean):void {
                        Application.application.theMap.setDimming(dim.selected);
index 1258f97..e837e10 100644 (file)
@@ -109,7 +109,6 @@ package net.systemeD.potlatch2.collections {
                                }
                                if (bg.attribution_url) {
                                        // load the attribution
-                                       trace("requesting "+bg.attribution_url);
                                var urlloader:URLLoader = new URLLoader();
                                        var thisbg2:Object = bg;                        // scope it for the closure
                                        urlloader.addEventListener(Event.COMPLETE, function(e:Event):void { onAttributionLoad(e,thisbg2); });
@@ -137,7 +136,6 @@ package net.systemeD.potlatch2.collections {
                }
                
                public function onAttributionLoad(e:Event,bg: Object):void {
-                       trace ("onAttributionLoad");
                        // if we ever need to cope with non-Microsoft attribution, then this should look at bg.scheme
             default xml namespace = Namespace("http://schemas.microsoft.com/search/local/ws/rest/v1");
             var xml:XML = new XML(e.target.data);
index 3f9cb31..56c0722 100644 (file)
@@ -6,7 +6,6 @@ package net.systemeD.potlatch2.controller {
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.potlatch2.collections.Imagery;
     import net.systemeD.potlatch2.EditController;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.potlatch2.save.SaveManager;
        import flash.ui.Keyboard;
        import mx.controls.Alert;
index ba1624d..7f46b98 100644 (file)
@@ -3,7 +3,6 @@ package net.systemeD.potlatch2.controller {
     import net.systemeD.potlatch2.EditController;
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.halcyon.MapEvent;
-       import net.systemeD.halcyon.Globals;
 
     /** The state of realigning the background imagery by holding down a key and moving the mouse. This moves the background, but 
     * doesn't move the map, thereby adjusting the offset between the background and the map. */
@@ -40,13 +39,11 @@ package net.systemeD.potlatch2.controller {
         /** Prevent map panning while background is being dragged. */
         override public function enterState():void {
                        controller.map.draggable=false;
-                       Globals.vars.root.addDebug("**** -> "+this);
         }
         
         /** Re-allow map panning. */
         override public function exitState(newState:ControllerState):void {
                        controller.map.draggable=true;
-                       Globals.vars.root.addDebug("**** <- "+this);
         }
         
         /** "DragBackground" */
index 3322b11..e17299a 100644 (file)
@@ -5,7 +5,6 @@ package net.systemeD.potlatch2.controller {
     import net.systemeD.potlatch2.EditController;
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.halcyon.connection.actions.*;
-       import net.systemeD.halcyon.Globals;
 
     /** The state of moving a selection around with the mouse. */
     public class DragSelection extends ControllerState {
@@ -98,7 +97,6 @@ package net.systemeD.potlatch2.controller {
                        for each (var entity:Entity in selection) {
                                controller.map.setHighlight(entity, { selected: true });
                        }
-                       Globals.vars.root.addDebug("**** -> "+this);
         }
         
         /** Un-highlight the dragged selection. */
@@ -106,7 +104,6 @@ package net.systemeD.potlatch2.controller {
                        for each (var entity:Entity in selection) {
                                controller.map.setHighlight(entity, { selected: false });
                        }
-                       Globals.vars.root.addDebug("**** <- "+this);
         }
         /** "DragSelection" */
         override public function toString():String {
index 3d10871..8342154 100644 (file)
@@ -2,7 +2,6 @@ package net.systemeD.potlatch2.controller {
        import flash.events.*;
     import net.systemeD.potlatch2.EditController;
     import net.systemeD.halcyon.connection.*;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.WayUI;
 
     public class DragWayNode extends ControllerState {
@@ -121,14 +120,12 @@ package net.systemeD.potlatch2.controller {
                        controller.map.setHighlight(draggingNode, { selected: true } );
                        controller.map.protectWay(parentWay);
                        controller.map.limitWayDrawing(parentWay, NaN, draggingIndex);
-                       Globals.vars.root.addDebug("**** -> "+this);
         }
         override public function exitState(newState:ControllerState):void {
                        controller.map.unprotectWay(parentWay);
                        controller.map.limitWayDrawing(parentWay);
                        controller.map.setHighlightOnNodes(parentWay, { selectedway: false } );
                        controller.map.setHighlight(draggingNode, { selected: false } );
-                       Globals.vars.root.addDebug("**** <- "+this);
         }
         override public function toString():String {
             return "DragWayNode";
index 528c6a9..80a637d 100644 (file)
@@ -7,7 +7,6 @@ package net.systemeD.potlatch2.controller {
        import net.systemeD.halcyon.connection.*;
     import net.systemeD.halcyon.connection.actions.*;
        import net.systemeD.halcyon.Elastic;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.MapPaint;
 
        public class DrawWay extends SelectedWay {
@@ -323,7 +322,6 @@ package net.systemeD.potlatch2.controller {
                        var start:Point = new Point(node.lon, node.latp);
                        elastic = new Elastic(controller.map, start, start);
                        controller.setCursor(controller.pen);
-                       Globals.vars.root.addDebug("**** -> "+this);
                }
                override public function exitState(newState:ControllerState):void {
             Way(firstSelected).removeEventListener(Connection.WAY_NODE_REMOVED, fixElastic);
@@ -333,7 +331,6 @@ package net.systemeD.potlatch2.controller {
                        controller.setCursor(null);
                        elastic.removeSprites();
                        elastic = null;
-                       Globals.vars.root.addDebug("**** <- "+this);
                }
                override public function toString():String {
                        return "DrawWay";
index 8737de1..c65c6f2 100644 (file)
@@ -6,7 +6,6 @@ package net.systemeD.potlatch2.controller {
     import net.systemeD.halcyon.connection.actions.*;
        import net.systemeD.halcyon.Map;
        import net.systemeD.halcyon.MapPaint;
-       import net.systemeD.halcyon.Globals;
 
        public class NoSelection extends ControllerState {
 
@@ -45,10 +44,8 @@ package net.systemeD.potlatch2.controller {
                
         override public function enterState():void {
                        controller.map.mouseUpHandler();
-                       Globals.vars.root.addDebug("**** -> "+this);
         }
         override public function exitState(newState:ControllerState):void {
-                       Globals.vars.root.addDebug("**** <- "+this);
         }
                override public function toString():String {
                        return "NoSelection";
index c63164d..a6164ee 100644 (file)
@@ -4,7 +4,6 @@ package net.systemeD.potlatch2.controller {
     import net.systemeD.potlatch2.EditController;
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.halcyon.VectorLayer;
-       import net.systemeD.halcyon.Globals;
 
     public class SelectedMarker extends ControllerState {
         protected var initMarker:Marker;
@@ -55,13 +54,11 @@ package net.systemeD.potlatch2.controller {
         override public function enterState():void {
             selectMarker(initMarker);
                        controller.map.setPurgable(selection,false);
-                       Globals.vars.root.addDebug("**** -> "+this);
         }
 
         override public function exitState(newState:ControllerState):void {
                        controller.map.setPurgable(selection,true);
             clearSelection(newState);
-                       Globals.vars.root.addDebug("**** <- "+this);
         }
 
         override public function toString():String {
index 1eb56b0..b7c4f0b 100644 (file)
@@ -2,7 +2,6 @@ package net.systemeD.potlatch2.controller {
        import flash.events.*;
        
        import net.systemeD.halcyon.AttentionEvent;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.connection.*;
        import net.systemeD.halcyon.connection.actions.MergeWaysAction;
     
@@ -115,7 +114,6 @@ package net.systemeD.potlatch2.controller {
                        }
                        controller.updateSelectionUI();
                        controller.map.setPurgable(selection,false);
-                       Globals.vars.root.addDebug("**** -> "+this+" "+selection);
                }
 
                override public function exitState(newState:ControllerState):void {
@@ -125,7 +123,6 @@ package net.systemeD.potlatch2.controller {
                        }
                        selection = [];
                        if (!newState.isSelectionState()) { controller.updateSelectionUI(); }
-                       Globals.vars.root.addDebug("**** <- "+this);
                }
 
                override public function toString():String {
index f68f422..415004d 100644 (file)
@@ -3,7 +3,6 @@ package net.systemeD.potlatch2.controller {
        import flash.ui.Keyboard;
     import net.systemeD.potlatch2.EditController;
     import net.systemeD.halcyon.connection.*;
-       import net.systemeD.halcyon.Globals;
 
     public class SelectedPOINode extends ControllerState {
         protected var initNode:Node;
@@ -59,7 +58,6 @@ package net.systemeD.potlatch2.controller {
         override public function enterState():void {
             selectNode(initNode);
                        controller.map.setPurgable(selection,false);
-                       Globals.vars.root.addDebug("**** -> "+this);
         }
         override public function exitState(newState:ControllerState):void {
             if(firstSelected.hasTags()) {
@@ -67,7 +65,6 @@ package net.systemeD.potlatch2.controller {
             }
                        controller.map.setPurgable(selection,true);
             clearSelection(newState);
-                       Globals.vars.root.addDebug("**** <- "+this);
         }
 
         override public function toString():String {
index cd30446..94ff889 100644 (file)
@@ -4,7 +4,6 @@ package net.systemeD.potlatch2.controller {
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.halcyon.Map;
        import net.systemeD.potlatch2.tools.Parallelise;
-       import net.systemeD.halcyon.Globals;
 
     /** The state midway during the use of the "parallelise tool", where a parallel way has been created but is stuck to the 
     * mouse cursor, allowing the user to choose how far from the original way it should go. This transforms it in the process. */
@@ -80,12 +79,10 @@ package net.systemeD.potlatch2.controller {
                        controller.map.paint.createWayUI(firstSelected as Way);
                        startlon =controller.map.coord2lon(controller.map.mouseX);
                        startlatp=controller.map.coord2latp(controller.map.mouseY);
-                       Globals.vars.root.addDebug("**** -> "+this);
         }
                /** Unselects. */
                override public function exitState(newState:ControllerState):void {
             clearSelection(newState);
-                       Globals.vars.root.addDebug("**** <- "+this);
         }
 
         override public function toString():String {
index bab211e..b3aadd8 100644 (file)
@@ -3,7 +3,6 @@ package net.systemeD.potlatch2.controller {
        import flash.geom.Point;
        import flash.ui.Keyboard;
        
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.WayUI;
        import net.systemeD.halcyon.connection.*;
        import net.systemeD.potlatch2.tools.Quadrilateralise;
@@ -117,7 +116,6 @@ package net.systemeD.potlatch2.controller {
                    initWay.addEventListener(Connection.WAY_REORDERED, updateSelectionUI, false, 0, true);
                        }
                        controller.map.setPurgable(selection,false);
-                       Globals.vars.root.addDebug("**** -> "+this+" "+firstSelected.id);
         }
         /** Officially leave the state, remembering the current way's tags for future repeats. */
         // TODO: tweak this so that repeat tags aren't remembered if you only select a way in order to branch off it. (a la PL1) 
@@ -128,7 +126,6 @@ package net.systemeD.potlatch2.controller {
                        controller.map.setPurgable(selection,true);
             firstSelected.removeEventListener(Connection.WAY_REORDERED, updateSelectionUI);
             clearSelection(newState);
-                       Globals.vars.root.addDebug("**** <- "+this);
         }
 
         /** @return "SelectedWay" */
index 04a91ce..24e7d22 100644 (file)
@@ -4,7 +4,6 @@ package net.systemeD.potlatch2.controller {
        import flash.ui.Keyboard;
        
        import net.systemeD.halcyon.AttentionEvent;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.WayUI;
        import net.systemeD.halcyon.connection.*;
        import net.systemeD.halcyon.connection.actions.*;
@@ -108,7 +107,6 @@ package net.systemeD.potlatch2.controller {
                override public function enterState():void {
             selectNode(parentWay,initIndex);
                        controller.map.setPurgable(selection,false);
-                       Globals.vars.root.addDebug("**** -> "+this);
         }
                override public function exitState(newState:ControllerState):void {
             if (firstSelected.hasTags()) {
@@ -116,7 +114,6 @@ package net.systemeD.potlatch2.controller {
             }
                        controller.map.setPurgable(selection,true);
             clearSelection(newState);
-                       Globals.vars.root.addDebug("**** <- "+this);
         }
 
         override public function toString():String {
index 43070d4..6c6eac4 100644 (file)
@@ -1,7 +1,6 @@
 package net.systemeD.potlatch2.utils {
 
        import net.systemeD.halcyon.MapPaint;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.connection.Node;
        import net.systemeD.halcyon.connection.Way;
        import net.systemeD.potlatch2.tools.Simplify;
index 195239f..e4b6195 100644 (file)
@@ -9,8 +9,6 @@ package net.systemeD.potlatch2.utils {
        import flash.events.*;
        import flash.net.*;
 
-       import net.systemeD.halcyon.Globals;
-
        public class Importer {
 
                protected var container:Object;                         // destination object for way/node/relations data
@@ -23,9 +21,6 @@ package net.systemeD.potlatch2.utils {
                protected var simplify:Boolean;
 
                public function Importer(container:*, paint:MapPaint, filenames:Array, callback:Function, simplify:Boolean) {
-                       Globals.vars.root.addDebug("starting importer"); 
-                       Globals.vars.root.addDebug("container is "+container);
-                       Globals.vars.root.addDebug("paint is "+paint);
                        this.container = container;
                        this.paint = paint;
                        this.filenames=filenames;
@@ -35,7 +30,7 @@ package net.systemeD.potlatch2.utils {
                        var sp:uint=0;
                        for each (var fn:String in filenames) {
                                var thissp:uint=sp;             // scope within this block for the URLLoader 'complete' closure
-                               Globals.vars.root.addDebug("requesting file "+fn);
+                               trace("requesting file "+fn);
                                var request:DebugURLRequest = new DebugURLRequest(fn);
                                var loader:URLLoader = new URLLoader();
                                loader.dataFormat=URLLoaderDataFormat.BINARY;
@@ -50,7 +45,7 @@ package net.systemeD.potlatch2.utils {
                }
                
                protected function fileLoaded(e:Event,filenum:uint):void {
-                       Globals.vars.root.addDebug("loaded file "+filenum); 
+                       trace("loaded file "+filenum); 
                        files[filenum]=e.target.data;
                        filesloaded++;
                        if (filesloaded==filenames.length) { 
index b8ee48d..947240a 100644 (file)
@@ -1,7 +1,6 @@
 package net.systemeD.potlatch2.utils {
 
     import net.systemeD.halcyon.MapPaint;
-    import net.systemeD.halcyon.Globals;
     import net.systemeD.halcyon.connection.Node;
     import net.systemeD.halcyon.connection.Way;
     import net.systemeD.halcyon.connection.Relation;
index 4bb305f..f456899 100644 (file)
@@ -1,7 +1,6 @@
 package net.systemeD.potlatch2.utils {
 
        import net.systemeD.halcyon.MapPaint;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.connection.*;
        import net.systemeD.potlatch2.tools.Simplify;
 
index bc3e742..6c46fab 100644 (file)
@@ -3,7 +3,6 @@ package net.systemeD.potlatch2.utils {
        import org.vanrijkom.shp.*;
        import org.vanrijkom.dbf.*;
        import net.systemeD.halcyon.MapPaint;
-       import net.systemeD.halcyon.Globals;
        import net.systemeD.halcyon.connection.Node;
        import net.systemeD.halcyon.connection.Way;
        import net.systemeD.potlatch2.tools.Simplify;