Only add a new vector layer to the map once we know we have loaded

it successfully or it will keep reappearing in the dialog.

diff --git a/net/systemeD/potlatch2/VectorSourceDialog.mxml b/net/systemeD/potlatch2/VectorSourceDialog.mxml
index 1e8b244ad5d503b31b18ab9a8d34a3bb1a7169ea..cba76587e511220909f31bff2c7c6f63ff230c55 100644 (file)
--- a/net/systemeD/potlatch2/VectorSourceDialog.mxml
+++ b/net/systemeD/potlatch2/VectorSourceDialog.mxml
@@ -145,7 +145,15 @@
                if (type=='gpx') { stylesheet="gpx.css"; }
                var vectorlayer:VectorLayer=new VectorLayer(name,map,stylesheet);
                vectorlayer.url=url;
-               map.addVectorLayer(vectorlayer);
+
+                var filesLoaded:Function = function(success:Boolean,message:String=null):void {
+                        if (success) {
+                                map.addVectorLayer(vectorlayer);
+                                dispatchEvent(new Event("layers_changed"));
+                        } else {
+                                Alert.show(message, 'Error', mx.controls.Alert.OK);
+                        }
+                }
 
                if (type=='gpx') {
                        var gpx:GpxImporter=new GpxImporter(vectorlayer, vectorlayer.paint, [url], filesLoaded, simplify);
@@ -160,14 +168,6 @@
                                                            [url+".shp",url+".shx",url+".dbf"], filesLoaded, simplify);
                }
        }
-       
-       public function filesLoaded(success:Boolean,message:String=null):void {
-               if (success) {
-                       dispatchEvent(new Event("layers_changed"));
-               } else {
-                       Alert.show(message, 'Error', mx.controls.Alert.OK);
-               }
-       }
 
               ]]>
   </mx:Script>