Use the name supplied in the config file for the vector layer

diff --git a/net/systemeD/potlatch2/AutoVectorBackground.as b/net/systemeD/potlatch2/AutoVectorBackground.as
index 762f9509501495530503d5fdd54a6218bf7ca753..6a7a92c3556462dc2533886456248338003a9c64 100644 (file)
--- a/net/systemeD/potlatch2/AutoVectorBackground.as
+++ b/net/systemeD/potlatch2/AutoVectorBackground.as
@@ -24,6 +24,7 @@ package net.systemeD.potlatch2 {
         public function onConfigLoad(e:Event):void {
             var xml:XML = XML(e.target.data);
             for each(var set:XML in xml.set) {
+              var name:String = (set.name == undefined) ? null : String(set.name);
               var loader:String = set.loader;
               switch (loader) {
                 case "TrackLoader":
@@ -33,7 +34,8 @@ package net.systemeD.potlatch2 {
 
                 case "BugLoader":
                   if (set.url && set.apiKey) {
-                    var bugLoader:BugLoader = new BugLoader(map, String(set.url), String(set.apikey));
+                    name ||= 'Bugs';
+                    var bugLoader:BugLoader = new BugLoader(map, String(set.url), String(set.apikey), name);
                     if (set.@loaded == "true") {
                       bugLoader.load();
                     }
@@ -44,7 +46,8 @@ package net.systemeD.potlatch2 {
 
                 case "BikeShopLoader":
                   if (set.url) {
-                    var bikeShopLoader:BikeShopLoader = new BikeShopLoader(map, String(set.url));
+                    name ||= 'Missing Bike Shops'
+                    var bikeShopLoader:BikeShopLoader = new BikeShopLoader(map, String(set.url), name);
                     if (set.@loaded == "true") {
                       bikeShopLoader.load();
                     }

diff --git a/net/systemeD/potlatch2/utils/BikeShopLoader.as b/net/systemeD/potlatch2/utils/BikeShopLoader.as
index f19f155f75f83e507d68874a60b62a8953c7193c..71fc11888b859a47b70fad8b824a3e6a1882dbad 100644 (file)
--- a/net/systemeD/potlatch2/utils/BikeShopLoader.as
+++ b/net/systemeD/potlatch2/utils/BikeShopLoader.as
@@ -24,12 +24,14 @@ package net.systemeD.potlatch2.utils {
 
         private var map:Map;
         private var bikeShopBaseURL:String;
+        private var name:String;
         private var _layer:VectorLayer;
         private static const STYLESHEET:String="bikeshops.css";
 
-        public function BikeShopLoader(map:Map, url:String) {
+        public function BikeShopLoader(map:Map, url:String, name:String) {
             this.map = map;
             this.bikeShopBaseURL = url;
+            this.name = name;
         }
 
         public function load():void {
@@ -65,12 +67,10 @@ package net.systemeD.potlatch2.utils {
 
         private function get layer():VectorLayer {
             if (!_layer) {
-                var n:String='Bike Shops';
-
                 var policyFile:String = bikeShopBaseURL+"crossdomain.xml";
                 Security.loadPolicyFile(policyFile);
 
-                _layer=new VectorLayer(n,map,STYLESHEET);
+                _layer=new VectorLayer(name,map,STYLESHEET);
                 map.addVectorLayer(_layer);
             }
             return _layer;

diff --git a/net/systemeD/potlatch2/utils/BugLoader.as b/net/systemeD/potlatch2/utils/BugLoader.as
index ac4cb1a70bb7c68070ff59c049cec99ba4a8ebfc..17b2b880a5558004b403009115aab1243415ab61 100644 (file)
--- a/net/systemeD/potlatch2/utils/BugLoader.as
+++ b/net/systemeD/potlatch2/utils/BugLoader.as
@@ -14,13 +14,15 @@ package net.systemeD.potlatch2.utils {
         private var bugBaseURL:String;
         private var bugApiKey:String;
         private var _layer:VectorLayer;
+        private var name:String;
         private static const STYLESHEET:String="bugs.css";
 
 
-        public function BugLoader(map:Map, url:String, bugApiKey:String):void {
+        public function BugLoader(map:Map, url:String, bugApiKey:String, name:String):void {
             this.map = map;
             this.bugBaseURL = url;
             this.bugApiKey = bugApiKey;
+            this.name = name;
         }
 
         public function load():void {
@@ -30,12 +32,11 @@ package net.systemeD.potlatch2.utils {
 
         private function get layer():VectorLayer {
             if (!_layer) {
-                var n:String='Bugs';
 
                 var policyFile:String = bugBaseURL+"crossdomain.xml";
                 Security.loadPolicyFile(policyFile);
 
-                _layer=new BugLayer(n,map,STYLESHEET,bugBaseURL,bugApiKey);
+                _layer=new BugLayer(name,map,STYLESHEET,bugBaseURL,bugApiKey);
                 map.addVectorLayer(_layer);
             }
             return _layer;