move up a level

diff --git a/TODO.txt b/TODO.txt
index 271ef237e86aec1dde88509a1f04ac6908fadf50..5d9ef20ca4372e091a151cd3a7e0d2791ce8878d 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,7 +4,6 @@ Potlatch 2: main outstanding issues
 
 
 ** Slash and burn trace statements
-** Remove SimpleVectorLayer and move CustomVectorLayer into VectorLayer
 
 == Core geometry ==
 

diff --git a/net/systemeD/halcyon/Map.as b/net/systemeD/halcyon/Map.as
index a27e112f1c41359cd30f7a324ab226c3d0311dc6..2a96928c279aad4d0e9daef543fef9fd5b388a49 100755 (executable)
--- a/net/systemeD/halcyon/Map.as
+++ b/net/systemeD/halcyon/Map.as
@@ -16,7 +16,6 @@ package net.systemeD.halcyon {
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.halcyon.connection.EntityEvent;
        import net.systemeD.halcyon.styleparser.*;
-       import net.systemeD.halcyon.vectorlayers.*;
        import net.systemeD.halcyon.Globals;
 
 //     for experimental export function:

diff --git a/net/systemeD/halcyon/MapPaint.as b/net/systemeD/halcyon/MapPaint.as
index cadc45727c5838e8c98a5cce6853547ac5d52a54..89671317160b98f5c803b503adea3209e9a9204b 100644 (file)
--- a/net/systemeD/halcyon/MapPaint.as
+++ b/net/systemeD/halcyon/MapPaint.as
@@ -7,7 +7,6 @@ package net.systemeD.halcyon {
        import net.systemeD.halcyon.connection.Node;
        import net.systemeD.halcyon.connection.Way;
        import net.systemeD.halcyon.styleparser.RuleSet;
-       import net.systemeD.halcyon.vectorlayers.VectorLayer;
        import net.systemeD.halcyon.Globals;
 
     public class MapPaint extends Sprite {

diff --git a/net/systemeD/halcyon/vectorlayers/VectorLayer.as b/net/systemeD/halcyon/VectorLayer.as
similarity index 98%
rename from net/systemeD/halcyon/vectorlayers/VectorLayer.as
rename to net/systemeD/halcyon/VectorLayer.as
index 788dbb7c96ae5f44152e71410383a9821476c9b7..9ef040ea912710f469db399f62473f8c7d9bae6a 100644 (file)
--- a/net/systemeD/halcyon/vectorlayers/VectorLayer.as
+++ b/net/systemeD/halcyon/VectorLayer.as
@@ -1,4 +1,4 @@
-package net.systemeD.halcyon.vectorlayers {
+package net.systemeD.halcyon {
 
        import net.systemeD.halcyon.Map;
        import net.systemeD.halcyon.MapPaint;

diff --git a/net/systemeD/potlatch2/VectorSourceDialog.mxml b/net/systemeD/potlatch2/VectorSourceDialog.mxml
index 8edee5f29a15ce5a977d8c20612bec36c42b676a..5349f09822f0359038e71b0da8cf39244b6922bb 100644 (file)
--- a/net/systemeD/potlatch2/VectorSourceDialog.mxml
+++ b/net/systemeD/potlatch2/VectorSourceDialog.mxml
@@ -54,7 +54,7 @@
 
        import net.systemeD.halcyon.Map;
        import net.systemeD.halcyon.Globals;
-       import net.systemeD.halcyon.vectorlayers.*;
+       import net.systemeD.halcyon.VectorLayer;
        import net.systemeD.potlatch2.utils.Importer;
        import net.systemeD.potlatch2.utils.GpxImporter;
        import net.systemeD.potlatch2.utils.ShpImporter;
@@ -135,7 +135,7 @@
     }
 
        private function loadFiles(url:String,filetype:String,simplify:Boolean):void {
-               var vectorlayer:CustomVectorLayer=new CustomVectorLayer(url,map,"potlatch.css");
+               var vectorlayer:VectorLayer=new VectorLayer(url,map,"potlatch.css");
                vectorlayer.url=url;
                map.vectorlayers[url]=vectorlayer;
                map.vectorbg.addChild(vectorlayer.paint);

diff --git a/net/systemeD/potlatch2/controller/NoSelection.as b/net/systemeD/potlatch2/controller/NoSelection.as
index bc8d082c28dd36def4846b99c9ad62bb236685ad..d5290f446fe610a417dc0a33463bc866e8dc29aa 100644 (file)
--- a/net/systemeD/potlatch2/controller/NoSelection.as
+++ b/net/systemeD/potlatch2/controller/NoSelection.as
@@ -5,7 +5,6 @@ package net.systemeD.potlatch2.controller {
        import net.systemeD.halcyon.connection.*;
        import net.systemeD.halcyon.Map;
        import net.systemeD.halcyon.MapPaint;
-       import net.systemeD.halcyon.vectorlayers.VectorLayer;
        import net.systemeD.halcyon.Globals;
 
        public class NoSelection extends ControllerState {