Make paintContainer private, and add a method to access all MapPaint objects

diff --git a/net/systemeD/halcyon/Map.as b/net/systemeD/halcyon/Map.as
index 1c79093124a369da04430a66001d568aa947b094..9dcb118ac6b408c374700c2b7e0b2f6267f42c77 100644 (file)
--- a/net/systemeD/halcyon/Map.as
+++ b/net/systemeD/halcyon/Map.as
@@ -29,7 +29,7 @@ package net.systemeD.halcyon {
                public const MAXSCALE:uint=23; 
 
                // Container for MapPaint objects
                public const MAXSCALE:uint=23; 
 
                // Container for MapPaint objects

-               public var paintContainer:Sprite;
+               private var paintContainer:Sprite;

 
                /** map scale */
                public var scale:uint=14;                                                
 
                /** map scale */
                public var scale:uint=14;                                                


@@ -269,6 +269,16 @@ package net.systemeD.halcyon {
                private function getLayerAt(i:uint):MapPaint {
                        return MapPaint(paintContainer.getChildAt(i));
                }
                private function getLayerAt(i:uint):MapPaint {
                        return MapPaint(paintContainer.getChildAt(i));
                }

+
+        /** Get all the layers available for this Map object
+        *   @return An array of MapPaint objects */
+        public function getLayers():Array {
+            var a:Array = [];
+            for (var i:uint=0; i<paintContainer.numChildren; i++) {
+                a.push(getLayerAt(i));
+            }
+            return a;
+        }

                
                /* Find which layer is editable */
                public function get editableLayer():MapPaint {
                
                /* Find which layer is editable */
                public function get editableLayer():MapPaint {

diff --git a/net/systemeD/potlatch2/VectorSourceDialog.mxml b/net/systemeD/potlatch2/VectorSourceDialog.mxml
index 5f6b85b5d62db76211f3b86bd7b2a77093692b00..33948ebdee676382e0d05b1bc014e931828abe40 100644 (file)
--- a/net/systemeD/potlatch2/VectorSourceDialog.mxml
+++ b/net/systemeD/potlatch2/VectorSourceDialog.mxml
@@ -103,12 +103,11 @@
        [Bindable(event="layers_changed")]
        private function get vectorLayers():Array {
         var v:Array=[];
        [Bindable(event="layers_changed")]
        private function get vectorLayers():Array {
         var v:Array=[];

-        for (var i:uint = 0; i < map.paintContainer.numChildren; i++) { //nasty
-            var a:MapPaint = MapPaint(map.paintContainer.getChildAt(i));
+        for each (var a:MapPaint in map.getLayers() ) {

             if (a.isBackground) {
                 v.push( { name:a.connection.name, visible:a.visible, url:a.connection.apiBase, style:a.style } );
             }
             if (a.isBackground) {
                 v.push( { name:a.connection.name, visible:a.visible, url:a.connection.apiBase, style:a.style } );
             }

-               }
+        }

                return v;
        }
        
                return v;
        }