From fcc32176b9bff6e7540d91697bffbd70b041e0dc Mon Sep 17 00:00:00 2001
From: yuuhayashi <hayashi.yuu@gmail.com>
Date: Mon, 24 Nov 2014 11:04:07 +0900
Subject: [PATCH] =?utf8?q?FIX:=20=E8=A4=87=E6=95=B0<trk>=E3=82=A8=E3=83=AC?=
 =?utf8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=81=AB=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 importPicture/src/osm/jp/gpx/ImportPicture.java    | 45 ++++++++++++----------
 .../src/osm/jp/gpx/matchtime/gui/Command.java      |  6 +++
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index 0696de1..d219503 100644
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -8,8 +8,8 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Locale;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
@@ -175,6 +175,7 @@ public class ImportPicture {
 					</wpt>
 				</gpx>
 				*/
+				HashMap<Long,Element> map = new HashMap<Long,Element>();
 				Element trk = null;
 				gpx    = builder.parse(gpxFile).getFirstChild();
 				NodeList nodes = gpx.getChildNodes();
@@ -182,12 +183,12 @@ public class ImportPicture {
 					Node node2 = nodes.item(i);
 					if (node2.getNodeName().equals("trk")) {
 						trk = (Element) node2;
+						trkptMap(trk, map);
 					}
 				}
 
 				if (trk != null) {
-					HashMap<Long,Element> map = trkptMap(trk);
-
+					dfjp.setTimeZone(TimeZone.getTimeZone("JST"));
 					String timeStr = argv[2];
 					try {
 						Date t = dfjp.parse(timeStr);
@@ -196,7 +197,7 @@ public class ImportPicture {
 						/*
 						 * GPXへ割りつける開始時刻と終了時刻を求める
 						 */
-						long gpxStartTime = (new Date()).getTime();	// 対象とする開始時刻
+						long gpxStartTime = (new Date()).getTime();		// 対象とする開始時刻(現在時刻)
 						long gpxEndTime = 0L;							// 対象とする終了時刻
 						Set<Long> keySet = map.keySet();  //すべてのキー値を取得
 						for (Iterator<Long> keyIte = keySet.iterator(); keyIte.hasNext();) {
@@ -212,14 +213,14 @@ public class ImportPicture {
 						
 						System.out.println("           時差： "+ (delta / 1000) +"(sec)");
 						System.out.println("    Target GPX： ["+ gpxFile.getName() +"]");
-						System.out.println("GPX start time： "+ dfjp.format(new Date(gpxStartTime).getTime()));
-						System.out.println("  GPX end time： "+ dfjp.format(new Date(gpxEndTime).getTime()));
+						System.out.println("GPX start time： "+ dfjp.format(new Date(gpxStartTime)) + "\t[GMT " + dfuk.format(new Date(gpxStartTime))+"]");
+						System.out.println("  GPX end time： "+ dfjp.format(new Date(gpxEndTime)) + "\t[GMT " + dfuk.format(new Date(gpxEndTime))+"]");
 						System.out.println();
-						System.out.println("------------|--------------------|--------------------|--------|-------|--------");
-						System.out.println(" name       | UpdateTime         | GPStime            | LAT    | LON   | ele");
-						System.out.println("------------|--------------------|--------------------|--------|-------|--------");
+						System.out.println("------------|--------------------|--------------------|------------|----------|--------");
+						System.out.println(" name       | UpdateTime         | GPStime            | LAT        | LON      | ele");
+						System.out.println("------------|--------------------|--------------------|------------|----------|--------");
 						proc(gpxDir, delta, gpxStartTime, gpxEndTime, map, gpx);
-						System.out.println("------------|--------------------|--------------------|--------|-------|--------");
+						System.out.println("------------|--------------------|--------------------|------------|----------|--------");
 					}
 					catch (ParseException e) {
 						System.out.println("'"+ timeStr +"' の書式が違います("+ TIME_FORMAT_STRING +")");
@@ -275,12 +276,14 @@ public class ImportPicture {
 						Element trkpt = trkpt(map, uktime);
 						if (trkpt != null) {
 							System.out.print(String.format("%12s ", image.getName()));
-							System.out.print(String.format("%19s ", dfjp.format(itime)));
-							System.out.print(String.format("%19s ", dfjp.format(uktime)));
+							System.out.print(String.format("%20s ", dfjp.format(itime)));
+							System.out.print(String.format("%20s ", dfjp.format(uktime)));
 
 							Element wpt = createWptTag(image, uktime.getTime(), trkpt);
 							System.out.print(String.format("%12s ", wpt.getAttribute("lat")));
-							System.out.print(String.format("%12s "+ wpt.getAttribute("lon")));
+							String lonStr = wpt.getAttribute("lon");
+							//System.out.print(String.format("%12s "+ lonStr));
+							System.out.print(lonStr + " ");
 							
 							NodeList nodes = wpt.getChildNodes();      // 子ノードを取得
 							for (int i4=0; i4< nodes.getLength(); i4++) {
@@ -291,6 +294,9 @@ public class ImportPicture {
 										System.out.println(eleStr);
 									}
 							    }
+								else {
+									System.out.println("-");
+								}
 							}
 
 							Element temp = getCopy(gpx.getOwnerDocument(), wpt);
@@ -310,7 +316,7 @@ public class ImportPicture {
 	 */
 	public static final String TIME_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ss";
 	public static SimpleDateFormat dfjp = new SimpleDateFormat(TIME_FORMAT_STRING);
-	public static SimpleDateFormat dfuk = new SimpleDateFormat(TIME_FORMAT_STRING +"'Z'", Locale.UK);
+	public static SimpleDateFormat dfuk = new SimpleDateFormat(TIME_FORMAT_STRING +"'Z'");
 
 	/**
 	 * XMLエレメント<trkpt>をTIMEでキー付したHashMapを生成する<br>
@@ -321,9 +327,9 @@ public class ImportPicture {
 	 * @return
 	 * @throws ParseException
 	 */
-	public static HashMap<Long,Element> trkptMap(Element trk) throws ParseException {
-		HashMap<Long,Element> map = new HashMap<Long,Element>();
-
+	public static void trkptMap(Element trk, HashMap<Long,Element> map) throws ParseException {
+		dfuk.setTimeZone(TimeZone.getTimeZone("GMT"));
+		
 		NodeList nodes1 = trk.getChildNodes();
 		for (int i1=0; i1 < nodes1.getLength(); i1++) {
 			Node node2 = nodes1.item(i1);
@@ -346,7 +352,7 @@ public class ImportPicture {
 									if (node5 != null) {
 										if (node5.getNodeType() == Node.TEXT_NODE) {
 											String timeStr = node5.getNodeValue();
-											long t = dfuk.parse(timeStr).getTime() + (9L * 3600000L);
+											long t = dfuk.parse(timeStr).getTime();
 											map.put(new Long(t), getCopy(trk.getOwnerDocument(), trkpt));
 										}
 								    }
@@ -357,7 +363,6 @@ public class ImportPicture {
 				}
 			}
 		}
-		return map;
 	}
 
 	public static Element trkpt(HashMap<Long,Element> map, Date jptime) throws ParseException {
@@ -377,7 +382,7 @@ public class ImportPicture {
 		}
 
 		if (sa < (60000L * 10L)) {
-    		System.out.println(dfuk.format(jpt) +" ("+ sa +")");
+    		// System.out.println(dfuk.format(jpt) +" ("+ sa +")");
     		return ret;
         }
 		return null;
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/Command.java b/importPicture/src/osm/jp/gpx/matchtime/gui/Command.java
index 04d67b1..130af21 100644
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/Command.java
+++ b/importPicture/src/osm/jp/gpx/matchtime/gui/Command.java
@@ -1,4 +1,5 @@
 package osm.jp.gpx.matchtime.gui;
+import java.lang.reflect.InvocationTargetException;
 import java.text.SimpleDateFormat;
 
 class Command extends Thread {
@@ -50,6 +51,11 @@ class Command extends Thread {
 	    		System.out.println();
 	    		System.out.println("[END:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName);
 	        }
+	        catch (InvocationTargetException e) {
+	    		System.out.println("[ERR!:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName);
+	            e.getCause().printStackTrace();
+	        	throw e;
+	        }
 	        catch (Exception e) {
 	    		System.out.println("[ERR!:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName);
 	        	throw e;
-- 
2.11.0