diff --git a/src/main/java/osm/jp/gpx/GpxFile.java b/src/main/java/osm/jp/gpx/GpxFile.java index 3b16595..60315e3 100644 --- a/src/main/java/osm/jp/gpx/GpxFile.java +++ b/src/main/java/osm/jp/gpx/GpxFile.java @@ -26,7 +26,7 @@ * XMLパースを実行する * */ - public ElementMapTRKSEG parse() throws ParserConfigurationException, SAXException, IOException { + public void parse() throws ParserConfigurationException, SAXException, IOException { SAXParserFactory factory = SAXParserFactory.newInstance(); factory.setValidating(false); @@ -47,7 +47,10 @@ gpx.trkseg.put((ElementMapTRKPT)gpx.trkpt.clone()); gpx.trkpt.clear(); } - return gpx.trkseg; + } + + public ElementMapTRKSEG getTrksegMap() { + return this.gpx.trkseg; } /** diff --git a/src/main/java/osm/jp/gpx/GpxParser.java b/src/main/java/osm/jp/gpx/GpxParser.java index 7084280..ea4c71f 100644 --- a/src/main/java/osm/jp/gpx/GpxParser.java +++ b/src/main/java/osm/jp/gpx/GpxParser.java @@ -109,7 +109,6 @@ public void endElement(String uri,String localName,String qName) { if(qName.equals("trkseg")){ if (trkpt.size() > 0) { - trkpt.printinfo(); trkseg.put((ElementMapTRKPT) trkpt.clone()); trkpt.clear(); } diff --git a/src/main/java/osm/jp/gpx/ImgFile.java b/src/main/java/osm/jp/gpx/ImgFile.java index 6c7309f..c96aa53 100644 --- a/src/main/java/osm/jp/gpx/ImgFile.java +++ b/src/main/java/osm/jp/gpx/ImgFile.java @@ -62,7 +62,7 @@ } public boolean procImageFile(AppParameters params, long delta, GpxFile gpxFile, File outDir) throws ParseException, ImageReadException, IOException, ImageWriteException, ParserConfigurationException, SAXException { - ElementMapTRKSEG mapTRKSEG = gpxFile.parse(); + //ElementMapTRKSEG mapTRKSEG = gpxFile.parse(); boolean exifWrite = params.isImgOutputExif(); // itime <-- 画像ファイルの撮影時刻 @@ -75,7 +75,7 @@ // 時刻uktimeにおけるをtrkptに追加する TagTrkpt trkptT = null; - for (Map.Entry map : mapTRKSEG.entrySet()) { + for (Map.Entry map : gpxFile.getTrksegMap().entrySet()) { ElementMapTRKPT mapTRKPT = map.getValue(); trkptT = mapTRKPT.getValue(gpstime); if (trkptT != null) { diff --git a/src/main/java/osm/jp/gpx/ImgFolder.java b/src/main/java/osm/jp/gpx/ImgFolder.java index bd63ee6..66879d9 100644 --- a/src/main/java/osm/jp/gpx/ImgFolder.java +++ b/src/main/java/osm/jp/gpx/ImgFolder.java @@ -33,6 +33,10 @@ public void setOutDir(File outDir) { this.outDir = outDir; } + + public File getOutDir() { + return this.outDir; + } public File getImgDir() { return this.imgDir; @@ -50,11 +54,6 @@ * @throws TransformerException */ void procGPXfile(GpxFile gpxFile, long delta) throws ParserConfigurationException, SAXException, IOException, ParseException, ImageReadException, ImageWriteException, TransformerException { - System.out.println("time difference: "+ (delta / 1000) +"(sec)"); - System.out.println(" Target GPX: ["+ gpxFile.getAbsolutePath() +"]"); - System.out.println(" EXIF: "+ (params.isImgOutputExif() ? ("convert to '" + outDir.getAbsolutePath() +"'") : "off")); - System.out.println(); - // imgDir内の画像ファイルを処理する //System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); //System.out.println("| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |"); @@ -65,7 +64,6 @@ try { if (!image.isDone()) { if(image.procImageFile(params, delta, gpxFile, outDir)) { - //System.out.println(image.toText()); image.setDone(true); } } diff --git a/src/main/java/osm/jp/gpx/ImportPicture.java b/src/main/java/osm/jp/gpx/ImportPicture.java index 8350e40..a507056 100644 --- a/src/main/java/osm/jp/gpx/ImportPicture.java +++ b/src/main/java/osm/jp/gpx/ImportPicture.java @@ -160,6 +160,12 @@ for (GpxFile gpxFile : gpxFolder) { gpxFile.parse(); + + System.out.println("time difference: "+ (delta / 1000) +"(sec)"); + System.out.println(" Target GPX: ["+ gpxFile.getAbsolutePath() +"]"); + System.out.println(" EXIF: "+ (params.isImgOutputExif() ? ("convert to '" + imgFolder.getOutDir().getAbsolutePath() +"'") : "off")); + System.out.println(); + gpxFile.printinfo(); imgFolder.procGPXfile(gpxFile, delta); }