From ffe3474fc2f3426b5a8f9c909ea5632b93295120 Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Mon, 3 Oct 2011 17:22:22 +0100 Subject: [PATCH] Support importing the element only of files --- net/systemeD/potlatch2/utils/Importer.as | 2 +- net/systemeD/potlatch2/utils/OsmImporter.as | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/systemeD/potlatch2/utils/Importer.as b/net/systemeD/potlatch2/utils/Importer.as index 263dacb7..665e627f 100644 --- a/net/systemeD/potlatch2/utils/Importer.as +++ b/net/systemeD/potlatch2/utils/Importer.as @@ -42,9 +42,9 @@ package net.systemeD.potlatch2.utils { } protected function fileLoaded(e:Event,filenum:uint):void { - trace("loaded file "+filenum); files[filenum]=e.target.data; filesloaded++; + trace("loaded file "+filenum+" ("+filesloaded+"/"+filenames.length+")"); if (filesloaded==filenames.length) { var action:CompositeUndoableAction = new CompositeUndoableAction("Import layer "+connection.name); doImport(action.push); diff --git a/net/systemeD/potlatch2/utils/OsmImporter.as b/net/systemeD/potlatch2/utils/OsmImporter.as index 19b2b512..3e7b0c1a 100644 --- a/net/systemeD/potlatch2/utils/OsmImporter.as +++ b/net/systemeD/potlatch2/utils/OsmImporter.as @@ -12,8 +12,9 @@ package net.systemeD.potlatch2.utils { override protected function doImport(push:Function):void { var map:XML = new XML(files[0]); + if (map.name().localName=='osmChange') { map=map.create[0]; } + var data:XML; - var oldid:Number; var tags:Object; -- 2.36.1