support GPX 1.1 too

diff --git a/net/systemeD/halcyon/connection/Trace.as b/net/systemeD/halcyon/connection/Trace.as
index 8d222a74846e183b406ce01258d43cdc321acfc5..4662bf4589d6c48e1e97a9076582e540e2541b6c 100644 (file)
--- a/net/systemeD/halcyon/connection/Trace.as
+++ b/net/systemeD/halcyon/connection/Trace.as
@@ -99,8 +99,12 @@ package net.systemeD.halcyon.connection {
         }
 
         private function process():void {
-            default xml namespace = new Namespace("http://www.topografix.com/GPX/1/0");
             var file:XML = new XML(_traceData);
+                       for each (var ns:Namespace in file.namespaceDeclarations()) {
+                               if (ns.uri.match(/^http:\/\/www\.topografix\.com\/GPX\/1\/[01]$/)) {
+                                       default xml namespace = ns;
+                               }
+                       }
 
             for each (var trkseg:XML in file..trkseg) {
                 var way:Way;
@@ -117,7 +121,7 @@ package net.systemeD.halcyon.connection {
             for each (var wpt:XML in file.wpt) {
                 var tags:Object = {};
                 for each (var tag:XML in wpt.children()) {
-                    tags[tag.name()]=tag.toString();
+                    tags[tag.name().localName]=tag.toString();
                 }
                 var node:Node = layer.createNode(tags, wpt.@lat, wpt.@lon);
                                layer.registerPOI(node);

diff --git a/net/systemeD/potlatch2/utils/GpxImporter.as b/net/systemeD/potlatch2/utils/GpxImporter.as
index 2092e24da9f12f2fa41e83f078a78742514c2148..40f41df1b5dd4c646ec302df5b382412ce7f3696 100644 (file)
--- a/net/systemeD/potlatch2/utils/GpxImporter.as
+++ b/net/systemeD/potlatch2/utils/GpxImporter.as
@@ -17,8 +17,12 @@ package net.systemeD.potlatch2.utils {
                }
 
                override protected function doImport(): void {
-            default xml namespace = new Namespace("http://www.topografix.com/GPX/1/0");
                        var file:XML = new XML(files[0]);
+                       for each (var ns:Namespace in file.namespaceDeclarations()) {
+                               if (ns.uri.match(/^http:\/\/www\.topografix\.com\/GPX\/1\/[01]$/)) {
+                                       default xml namespace = ns;
+                               }
+                       }
 
                        for each (var trkseg:XML in file..trkseg) {
                                var way:Way;
@@ -35,7 +39,7 @@ package net.systemeD.potlatch2.utils {
             for each (var wpt:XML in file.wpt) {
                                var tags:Object = {};
                                for each (var tag:XML in wpt.children()) {
-                                       tags[tag.name()]=tag.toString();
+                                       tags[tag.name().localName]=tag.toString();
                                }
                                var node:Node = container.createNode(tags, wpt.@lat, wpt.@lon);
                                container.registerPOI(node);

diff --git a/net/systemeD/potlatch2/utils/TrackLoader.as b/net/systemeD/potlatch2/utils/TrackLoader.as
index 03cb67d0aab829f82072f03d56916339b2e9f84c..4a0e170107a2eb1ad015342a5a21bcb6103c879d 100644 (file)
--- a/net/systemeD/potlatch2/utils/TrackLoader.as
+++ b/net/systemeD/potlatch2/utils/TrackLoader.as
@@ -47,8 +47,12 @@ package net.systemeD.potlatch2.utils {
                }
 
                public function parseGPX(event:Event):void {
-            default xml namespace = new Namespace("http://www.topografix.com/GPX/1/0");
                        var file:XML = new XML(event.target.data);
+                       for each (var ns:Namespace in file.namespaceDeclarations()) {
+                               if (ns.uri.match(/^http:\/\/www\.topografix\.com\/GPX\/1\/[01]$/)) {
+                                       default xml namespace = ns;
+                               }
+                       }
 
                        for each (var trkseg:XML in file..trkseg) {
                                var nodestring:Array = [];