Make sure Importers notice POI nodes

openstreetmap · May 24, 2012 · 28161b1 · 28161b1
1 parent d6503c3
commit 28161b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
@@ -188,6 +188,14 @@ package net.systemeD.halcyon.connection {
             }
         }
 
+        public function registerPOINodes():void {
+            for each (var nodeID:Number in getAllNodeIDs()) {
+                var node:Node = getNode(nodeID);
+                if (!node.hasParentWays)
+                    registerPOI(node);
+            }
+        }
+
         public function getNode(id:Number):Node {
             return nodes[id];
         }

diff --git a/net/systemeD/halcyon/connection/XMLBaseConnection.as b/net/systemeD/halcyon/connection/XMLBaseConnection.as
@@ -171,14 +171,6 @@ package net.systemeD.halcyon.connection {
 			if (statusFetcher) statusFetcher.fetch(createdEntities); 
 		}
 
-		protected function registerPOINodes():void {
-			for each (var nodeID:Number in getAllNodeIDs()) {
-				var node:Node = getNode(nodeID);
-				if (!node.hasParentWays)
-					registerPOI(node);
-			}
-		}
-
 		protected function parseTags(tagElements:XMLList):Object {
 			var tags:Object = {};
 			for each (var tagEl:XML in tagElements)

diff --git a/net/systemeD/potlatch2/utils/GpxImporter.as b/net/systemeD/potlatch2/utils/GpxImporter.as
@@ -42,7 +42,6 @@ package net.systemeD.potlatch2.utils {
 					tags[tag.name().localName]=tag.toString().substr(0,255);
 				}
 				var node:Node = connection.createNode(tags, wpt.@lat, wpt.@lon, push);
-				connection.registerPOI(node);
 			}
 
 			default xml namespace = new Namespace("");

diff --git a/net/systemeD/potlatch2/utils/Importer.as b/net/systemeD/potlatch2/utils/Importer.as
@@ -82,6 +82,7 @@ package net.systemeD.potlatch2.utils {
 			var action:CompositeUndoableAction = new CompositeUndoableAction("Import layer "+connection.name);
 			doImport(action.push);
 			action.doAction(); // just do it, don't add to undo stack
+			connection.registerPOINodes();
 			if (callback!=null) { callback(connection,options,true); }
 		}