From b5f3cdbba6daf1a4b8cc5286a9a3d0de8d26b191 Mon Sep 17 00:00:00 2001
From: yuuhayashi <hayashi.yuu@gmail.com>
Date: Sun, 30 Oct 2016 10:56:53 +0900
Subject: [PATCH] =?utf8?q?FIX:=20=E5=87=BA=E5=8A=9BGPX=E3=81=ABWPT?=
 =?utf8?q?=E3=81=8C=E5=87=BA=E5=8A=9B=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?=
 =?utf8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E8=A7=A3=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 importPicture/src/osm/jp/gpx/ImportPicture.java | 36 ++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index e0ef313..46dd1c7 100644
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -300,6 +300,7 @@ public class ImportPicture extends Thread {
             }
         }
         catch(ParserConfigurationException | DOMException | SAXException | IOException | ParseException | ImageReadException | ImageWriteException | IllegalArgumentException | TransformerException e) {
+        	e.printStackTrace();
         }
     }
     
@@ -355,12 +356,12 @@ public class ImportPicture extends Thread {
          *   <wpt lat="35.2564461" lon="139.15437809"></wpt>
          * </gpx>
          */
-        TreeMap<Long,Element> map = new TreeMap<>();
+        TreeMap<Long,Element> map = new TreeMap<Long, Element>();
         TreeMap<Long,Element> mapTRKSEG = new TreeMap<>();
         Element trk = null;
         //Element maeTRKPT = null;
         gpx    = builder.parse(gpxFile).getFirstChild();
-        Document doc = gpx.getOwnerDocument();
+        document = gpx.getOwnerDocument();
         NodeList nodes = gpx.getChildNodes();
         for (int i=0; i < nodes.getLength(); i++) {
             Node node2 = nodes.item(i);
@@ -373,7 +374,7 @@ public class ImportPicture extends Thread {
                     Node nodeTRKSEG = nodes1.item(i1);
                     if (nodeTRKSEG.getNodeName().equals("trkseg")) {
                     	trksegCounter++;
-                    	Element newTRKSEG = doc.createElement("trkseg");
+                    	Element newTRKSEG = document.createElement("trkseg");
                         Element trkseg = (Element) nodeTRKSEG;
                         NodeList nodes2 = trkseg.getChildNodes();
                         for (int i2=0; i2 < nodes2.getLength(); i2++) {
@@ -382,10 +383,10 @@ public class ImportPicture extends Thread {
                             	if (param_GpxNoFirstNode && (i2 == 0)) {
                             		continue;
                             	}
-                            	newTRKSEG.appendChild(getCopy(doc, nodeTRKPT));
+                            	newTRKSEG.appendChild(getCopy(document, nodeTRKPT));
                             }
                         }
-                        mapTRKSEG.put(new Long(trksegCounter), getCopy(doc, newTRKSEG));
+                        mapTRKSEG.put(new Long(trksegCounter), getCopy(document, newTRKSEG));
 
                         // <trk>から<trkseg>を削除する。
                         trk.removeChild(nodeTRKSEG);
@@ -421,6 +422,29 @@ public class ImportPicture extends Thread {
 			     gpxEndTime = gpxTime;
 			}
 		}
+		
+		/*
+		 * SPEEDをGPXに設定する
+		 * 条件： SPEEDを書き出すフラグがONの時
+		 * 条件： オリジナルのSPEEDがある場合「上書きする／変更しない」（GPX_OUTPUT_SPEED）
+		 */
+		/*
+        TreeMap<Long,Element> map2 = new TreeMap<Long, Element>();
+		if (Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OUTPUT_SPEED))) {
+			for (Long timeL : keySet) {
+	            Element trkptE = trkpt(map, new Date(timeL));
+	            if (trkptE != null) {
+	            	map2.put(timeL, trkptE);
+	            }
+	            else {
+	            	map2.put(timeL, map.get(timeL));
+	            }
+			}
+		}
+		else {
+			map2 = (TreeMap<Long, Element>) map.clone();
+		}
+		*/
 		 
 		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))+"]");
@@ -652,7 +676,7 @@ public class ImportPicture extends Thread {
             }
 
             if (Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OUTPUT_WPT))) {
-                Element temp = getCopy(gpx.getOwnerDocument(), trkptT.trkpt);
+            	Element temp = createWptTag(image, itime.getTime(), trkptT.trkpt);
                 gpx.appendChild(temp);
             }
         }
-- 
2.11.0