ElementMapTRKSEG.parse(File) を追加

[importpicture/importpicture.git] / importPicture / src / osm / jp / gpx / ImportPicture.java

diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index bb487a5..428006d 100644 (file)
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -343,7 +343,6 @@ public class ImportPicture extends Thread {
     void procGPXfile(File gpxFile) throws ParserConfigurationException, SAXException, IOException, ParseException, ImageReadException, ImageWriteException, TransformerException {\r
         DocumentBuilderFactory factory;\r
         DocumentBuilder        builder;\r
-        Node gpx;\r
 \r
         String fileName = gpxFile.getName();\r
         String iStr = fileName.substring(0, fileName.length() - 4);\r
@@ -361,52 +360,16 @@ public class ImportPicture extends Thread {
         factory.setIgnoringComments(true);\r
         factory.setValidating(true);\r
 \r
-        // GPX file --> Node root\r
-        DOMImplementation domImpl = builder.getDOMImplementation();\r
-        document = domImpl.createDocument("", "gpx", null);\r
-\r
-        /*\r
-         * GPXファイルをパースする\r
-         * \r
-         * <gpx>\r
-         *   <trk>\r
-         *     <trkseg>\r
-         *       <trkpt lat="35.32123832" lon="139.56965631">\r
-         *         <ele>47.20000076293945</ele>\r
-         *         <time>2012-06-15T03:00:29Z</time>\r
-         *         <hdop>0.5</hdop>\r
-         *       </trkpt>\r
-         *     </trkseg>\r
-         *   </trk>\r
-         * </gpx>\r
-         */\r
+        // GPXファイルをパースする\r
         ElementMapTRKSEG mapTRKSEG = new ElementMapTRKSEG();\r
-        Element trk = null;\r
-        gpx    = builder.parse(gpxFile).getFirstChild();\r
-        document = gpx.getOwnerDocument();\r
-        NodeList nodes = gpx.getChildNodes();\r
-        for (int i=0; i < nodes.getLength(); i++) {\r
-            Node node2 = nodes.item(i);\r
-            if (node2.getNodeName().equals("trk")) {\r
-                trk = (Element) node2;\r
-                \r
-                NodeList nodes1 = trk.getChildNodes();\r
-                for (int i1=0; i1 < nodes1.getLength(); i1++) {\r
-                    Node nodeTRKSEG = nodes1.item(i1);\r
-                    if (nodeTRKSEG.getNodeName().equals("trkseg")) {\r
-                        mapTRKSEG.put(nodeTRKSEG);\r
-                    }\r
-                }\r
-            }\r
-        }\r
+        document = mapTRKSEG.parse(gpxFile);\r
         \r
         // パースされた mapTRKSEG の中身を出力する\r
-               System.out.println("                                 |--------------------|--------------------|");\r
-               System.out.println("  GPS logging time               | First Time         | Last Time          |");\r
         mapTRKSEG.printinfo();\r
-               System.out.println("|--------------------------------|--------------------|--------------------|");\r
-               System.out.println();\r
         \r
+        // GPX file --> Node root\r
+        Node gpx = builder.parse(gpxFile).getFirstChild();\r
+\r
         // imgDir内の画像ファイルを処理する\r
                System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");\r
                System.out.println("| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |");\r