OSDN Git Service

red: BUG: EXIFのLATがひと後の値が設定されている。
authorhayashi <hayashi.yuu@gmail.com>
Sun, 2 Jul 2017 03:15:13 +0000 (12:15 +0900)
committerhayashi <hayashi.yuu@gmail.com>
Sun, 2 Jul 2017 03:15:13 +0000 (12:15 +0900)
14 files changed:
importPicture/doc/EXiF.class.violet.html
importPicture/test/osm/jp/gpx/ImportPictureTest.java
importPicture/testdata/AdjustTime.20170518.A1.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.20170518.A2.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.20170518.B1.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.20170518.B2.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.M1a.separate.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.M1b.separate.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.M1c.separate.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.M1d.separate.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.M2a.separate.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.M2b.separate.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.M2c.separate.log [new file with mode: 0644]
importPicture/testdata/AdjustTime.M2d.separate.log [new file with mode: 0644]

index 8def701..d6280ed 100644 (file)
         <text></text>
       </methods>
     </ClassNode>
+    <InterfaceNode id="53">
+      <children id="54"/>
+      <location class="Point2D.Double" id="55" x="330.0" y="10.0"/>
+      <id id="56" value="1cd2131a-7b04-4a56-93c9-949e2bd54fa3"/>
+      <revision>1</revision>
+      <backgroundColor id="57">
+        <red>255</red>
+        <green>255</green>
+        <blue>255</blue>
+        <alpha>255</alpha>
+      </backgroundColor>
+      <borderColor id="58">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+        <alpha>255</alpha>
+      </borderColor>
+      <textColor reference="58"/>
+      <name id="59" justification="1" size="3" underlined="false">
+        <text>«Imaging»</text>
+      </name>
+      <methods id="60" justification="0" size="4" underlined="false">
+        <text>+ getMetadata(file:File)</text>
+      </methods>
+    </InterfaceNode>
+    <ClassNode id="61">
+      <children id="62"/>
+      <location class="Point2D.Double" id="63" x="250.0" y="330.0"/>
+      <id id="64" value="2d20fc7d-49f4-46fb-9da5-14c14ee32ceb"/>
+      <revision>1</revision>
+      <backgroundColor reference="57"/>
+      <borderColor reference="58"/>
+      <textColor reference="58"/>
+      <name id="65" justification="1" size="3" underlined="false">
+        <text>GPSInfo</text>
+      </name>
+      <attributes id="66" justification="0" size="4" underlined="false">
+        <text></text>
+      </attributes>
+      <methods id="67" justification="0" size="4" underlined="false">
+        <text>+ getLatitudeAsDegreesNorth() : double
++ getLongitudeAsDegreesEast() : double</text>
+      </methods>
+    </ClassNode>
   </nodes>
-  <edges id="53">
-    <CompositionEdge id="54">
+  <edges id="68">
+    <CompositionEdge id="69">
       <start class="ClassNode" reference="18"/>
       <end class="ClassNode" reference="11"/>
-      <startLocation class="Point2D.Double" id="55" x="70.0" y="20.0"/>
-      <endLocation class="Point2D.Double" id="56" x="140.0" y="50.0"/>
-      <transitionPoints id="57"/>
-      <id id="58" value="516b1ac1-150a-42fe-941a-2866baf497dd"/>
+      <startLocation class="Point2D.Double" id="70" x="70.0" y="20.0"/>
+      <endLocation class="Point2D.Double" id="71" x="140.0" y="50.0"/>
+      <transitionPoints id="72"/>
+      <id id="73" value="516b1ac1-150a-42fe-941a-2866baf497dd"/>
       <revision>1</revision>
       <bentStyle name="AUTO"/>
       <startLabel>0..1</startLabel>
       <middleLabel>getExif()</middleLabel>
       <endLabel></endLabel>
     </CompositionEdge>
-    <InterfaceInheritanceEdge id="59">
+    <InterfaceInheritanceEdge id="74">
       <start class="ClassNode" reference="11"/>
       <end class="InterfaceNode" reference="3"/>
-      <startLocation class="Point2D.Double" id="60" x="90.0" y="50.0"/>
-      <endLocation class="Point2D.Double" id="61" x="80.0" y="30.0"/>
-      <transitionPoints id="62"/>
-      <id id="63" value="80e6e38d-53ef-4849-9d90-b9a2c2dc5fd0"/>
+      <startLocation class="Point2D.Double" id="75" x="90.0" y="50.0"/>
+      <endLocation class="Point2D.Double" id="76" x="80.0" y="30.0"/>
+      <transitionPoints id="77"/>
+      <id id="78" value="80e6e38d-53ef-4849-9d90-b9a2c2dc5fd0"/>
       <revision>1</revision>
       <bentStyle name="AUTO"/>
       <startLabel></startLabel>
       <middleLabel></middleLabel>
       <endLabel></endLabel>
     </InterfaceInheritanceEdge>
-    <CompositionEdge id="64">
+    <CompositionEdge id="79">
       <start class="ClassNode" reference="32"/>
       <end class="ClassNode" reference="18"/>
-      <startLocation class="Point2D.Double" id="65" x="60.0" y="30.0"/>
-      <endLocation class="Point2D.Double" id="66" x="140.0" y="100.0"/>
-      <transitionPoints id="67"/>
-      <id id="68" value="b52729a0-5367-45b9-bd3d-d1987c830f25"/>
+      <startLocation class="Point2D.Double" id="80" x="60.0" y="30.0"/>
+      <endLocation class="Point2D.Double" id="81" x="140.0" y="100.0"/>
+      <transitionPoints id="82"/>
+      <id id="83" value="b52729a0-5367-45b9-bd3d-d1987c830f25"/>
       <revision>1</revision>
       <bentStyle name="AUTO"/>
       <startLabel>1</startLabel>
       <middleLabel>getOutputSet()</middleLabel>
       <endLabel></endLabel>
     </CompositionEdge>
-    <CompositionEdge id="69">
+    <CompositionEdge id="84">
       <start class="ClassNode" reference="25"/>
       <end class="ClassNode" reference="32"/>
-      <startLocation class="Point2D.Double" id="70" x="90.0" y="40.0"/>
-      <endLocation class="Point2D.Double" id="71" x="200.0" y="80.0"/>
-      <transitionPoints id="72"/>
-      <id id="73" value="0649afe3-3491-4c1b-a4c8-2f989dc6ad32"/>
+      <startLocation class="Point2D.Double" id="85" x="90.0" y="40.0"/>
+      <endLocation class="Point2D.Double" id="86" x="200.0" y="80.0"/>
+      <transitionPoints id="87"/>
+      <id id="88" value="0649afe3-3491-4c1b-a4c8-2f989dc6ad32"/>
       <revision>1</revision>
       <bentStyle name="AUTO"/>
       <startLabel>1</startLabel>
       <middleLabel>getGPSDirectory()</middleLabel>
       <endLabel></endLabel>
     </CompositionEdge>
-    <CompositionEdge id="74">
+    <CompositionEdge id="89">
       <start class="ClassNode" reference="39"/>
       <end class="ClassNode" reference="25"/>
-      <startLocation class="Point2D.Double" id="75" x="70.0" y="20.0"/>
-      <endLocation class="Point2D.Double" id="76" x="120.0" y="100.0"/>
-      <transitionPoints id="77"/>
-      <id id="78" value="ccf5391a-467f-41bb-a2ef-32242e0b54a5"/>
+      <startLocation class="Point2D.Double" id="90" x="70.0" y="20.0"/>
+      <endLocation class="Point2D.Double" id="91" x="120.0" y="100.0"/>
+      <transitionPoints id="92"/>
+      <id id="93" value="ccf5391a-467f-41bb-a2ef-32242e0b54a5"/>
       <revision>1</revision>
       <bentStyle name="VHV"/>
       <startLabel>1</startLabel>
       <middleLabel>getFields()</middleLabel>
       <endLabel></endLabel>
     </CompositionEdge>
-    <AggregationEdge id="79">
+    <AggregationEdge id="94">
       <start class="ClassNode" reference="46"/>
       <end class="ClassNode" reference="39"/>
-      <startLocation class="Point2D.Double" id="80" x="80.0" y="30.0"/>
-      <endLocation class="Point2D.Double" id="81" x="70.0" y="40.0"/>
-      <transitionPoints id="82"/>
-      <id id="83" value="880de603-5ed4-41bc-9e00-d427598f30c6"/>
+      <startLocation class="Point2D.Double" id="95" x="80.0" y="30.0"/>
+      <endLocation class="Point2D.Double" id="96" x="70.0" y="40.0"/>
+      <transitionPoints id="97"/>
+      <id id="98" value="880de603-5ed4-41bc-9e00-d427598f30c6"/>
       <revision>1</revision>
       <bentStyle name="AUTO"/>
       <startLabel>0..*</startLabel>
       <middleLabel></middleLabel>
       <endLabel></endLabel>
     </AggregationEdge>
+    <AggregationEdge id="99">
+      <start class="InterfaceNode" reference="3"/>
+      <end class="InterfaceNode" reference="53"/>
+      <startLocation class="Point2D.Double" id="100" x="100.0" y="30.0"/>
+      <endLocation class="Point2D.Double" id="101" x="40.0" y="30.0"/>
+      <transitionPoints id="102"/>
+      <id id="103" value="415ddb9e-5584-47cf-902e-229f2414df2d"/>
+      <revision>1</revision>
+      <bentStyle name="AUTO"/>
+      <startLabel>1</startLabel>
+      <middleLabel>getMetadata(file)</middleLabel>
+      <endLabel>1</endLabel>
+    </AggregationEdge>
+    <CompositionEdge id="104">
+      <start class="ClassNode" reference="18"/>
+      <end class="ClassNode" reference="61"/>
+      <startLocation class="Point2D.Double" id="105" x="90.0" y="60.0"/>
+      <endLocation class="Point2D.Double" id="106" x="90.0" y="70.0"/>
+      <transitionPoints id="107"/>
+      <id id="108" value="64c1f884-7944-42bd-a2c0-eb509548ec67"/>
+      <revision>1</revision>
+      <bentStyle name="AUTO"/>
+      <startLabel></startLabel>
+      <middleLabel>+ getExif()</middleLabel>
+      <endLabel></endLabel>
+    </CompositionEdge>
   </edges>
 </ClassDiagramGraph>]]></SCRIPT>
        <BR />
        <BR />
-       <IMG alt="embedded diagram image" src="data:image/png;base64,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\r
-UqtyBAAlP4x2Sw5lDkityhEAlPwgtaLMAalVOQKAkh+kVmUOILUqRwC0IEFqRZkDUisAaEGC1KrM\r
-AaRWANCCRGql7sucSUUaGhriq9WrV2fD3759e+XKlenbjo6Oko8xwN27dzdv3jxz5sys571790Z5\r
-7WbMmJHmPnXq1Pnz52/fvv3hw4fZt/nVgZFMrVCFA6b24wocR1IrSK1UL3Oq1wvt7e3x7YULFx4/\r
-ftzX11fy8f79+2n03t7eGLinp2fVqlVpgOrLc+TIkWnTpg17dUpGjzlGWI2OWKpLly6lZbh48eKI\r
-b8ZnXGwmYGq1UdDOs62wb/gvgNTK2KbWkm9LPm7bti0+Xr16tfYJ1j5M7aNnqXVI04+I+4zzrcUw\r
-5oLUinaebQX2Df8FkFqVOdWSWHZJ7aCX7ZTHxfD1119nE4yOuXPnpu6TJ08WTjb1Wbdu3bJly1Kf\r
-LVu29PX1DWn0ksXIL0P+CuHo2L179+bNm6MjIncK3k1NTWlS+dOz0T+77Lmzs7NwvmH//v3z5s1L\r
-fXbs2FE+l4ULF8bf27dvj0hcR2pFO8+2wr6B/wJIrVJracyrcq41uhcsWFAywTNnzlRPrZUmm87Z\r
-9vT05ONojaOXpNb8wPnVeeutt6I7+qRToJ9++ulXX32Vrnbevn17fHX+/Pnov3Pnzujeu3dvfHX4\r
-8OEYpnC++/bti4/vvfdedMfCZ9/m55JWJzJ5tmobN260Q0qtqBfRJsZx5AgFpQpjlloHPddaOJ05\r
-c+ZkHy9cuPCMqbXKudb8iIsXLy45g3rq1Kk02Lx58wbdVtHd0tJSuNiFG62joyM68k+KQmpFvWhb\r
-OY5wHDlCQanCc0yt6b7W7u7uShPMx87jx4/XmFrPnTtXnlqrj17lvtbqq3PgwIHCbVJjas0Wr0pq\r
-vXnzZnxMQdqJVqkV9SLaxDiOHKGgVGH0Umv2DOHr16/Hx97e3jVr1uSfIZwNH8k2gmX1yX733Xf9\r
-ZVcI1zh69gzhmPWKFSuiz+XLlwddnU8++SQ+RkjOMme6SvnTTz+N7vg2uk+cOFFp9L1792ZvAIol\r
-LF/szIcffuiOVqkV9SLaxDiOHKGgVGG0U2v/wPtaI7bNmjUre19r9Mm+jejY2tqavtq1a1c27tGj\r
-R7NRImqmu0CXLl1a8jSmGkfP3tc6ZcqUhQsX7tix49GjR7WsTti+fXtzc3P+8uAkJpLNIj2NqXy+\r
-KbjOnTs39UmPdyqcS/7uVqRW1ItoE+M4coSCUoVxVuaUXGo78WzdujXWMZ/nkVpRL6JNjONo/B2h\r
-hS+WaGho6H/6RMHt27dXrlyZndMo+dg/cN5j8+bN2Qsboue9e/dGee3u3LnzzjvvTJ06NS3D6dOn\r
-/ceVKmgVVF+81tbWCbnlb968md7oc/ToUfuh1Ip6EakVx9EEOUKr3/vU3t6e7hlLr2oo+ZjdY9bb\r
-29s/cE3aqlWr8veYVXLkyJFp06YNe3VKRo85Tp48+fGA+Cq7Xe05zR2lCloF9eybb75JlxMjtaJe\r
-RP2E4+iFSK21PM8zPU2kxgnWPkzto0d3U1PTsEdHqUKdtwq6urp6enpe2I3Z3d197do1O5WyTtWF\r
-elFqxXEktT6RXSE8qar+otc/9Nfw7sTC6axbty5d1ZZ/MkqNo3/++efp8ubbt2+XLEzk6gi0aciL\r
-Fy8Wjo5ShXpuFVy/fj2mFof5SE0we5bS1KlTowTbvn17/o2m+Vsk6kSUbLFIW7dutV9JrSot1ItS\r
-K44jqbWg0Vb9XGt0L1iwoGSCZ86cqZ5aK002nbMteQtFLaOHU6dOvfbaa+mRninx9g+8TOKrr75K\r
-FzNHwzS+PX/+fL9zrUoVxlWrYMSfnJR/b82lS5fSfQ3pV62RNYI3Ixw8eDD/bGGkVlAvSq04jqTW\r
-Z0qtg55rLZzOnDlzso/pNYZDSq1JV1dX/qvFixeXnFlN75mQWpUqjJdWwTfffBOTOnz4cPlXPT09\r
-x48ff5bUWqUYLDeMO0WHUdRUmkt6W8+SJUvsWlLrs+5ktRiTSw6mTZsWMz1z5ky+Z/b8jBGfXb5V\r
-oV5UPw37ACl/TmmNdcMzPhDVQeo4klqHlFrTfa3d3d2VJpiPndG+rDG1njt3rjy1Vhk93847evRo\r
-/pzqgQMHRqQpidqZMUmtUTXHpG7evJk+9vb2trW1pUN45syZX375ZTa7wrsMosqLsqXk5ajlqTX/\r
-W1tJAbh79+7NmzdnL0ctv+kgKwyzR6mnM6KFNyPs379/3rx5qc+OHTvK57Jw4cL4m93sUFKcKrik\r
-1omcWtO67N27N99z165db7/99qALM4wLG2ppEI+jhzeqF0e/fkpKnlM6jH2+ximXfHSQOo6k1iGl\r
-1uznlevXr6cG5Zo1a/LPEM6Gj2QbzcTqk00P/i25QnjQ0aM5G92NjY2PHj2Kj9EQzN5S+Mknn0R3\r
-ZOD+H8/fpouQNf6kVsZLq6CwrOgbsGHDhpIyofAug6lTp6aeqYgoTK35mjFfAL711lvRHX3ST2OV\r
-bjrYuXNnqsfjq8OHD8cwhQu/b9+++Pjee+9Fdyxq9m1+LmnhI4FnK7Jx48Y0en59kVpHPrXmr14Y\r
-8QZxLZdGxBzTcRUHZL5nevvws7T+h90gHkfNBfXiWKXWZ9lJnuWBqA5Sx5HUOqTU2j/wvtaOjo5Z\r
-s2Zl1yzk32t/+fLl1tbW9NWuXbuycY8ePZqNkq58i5kuXbq05DxJjaOfPn06O/2yfv36/Atj4+Bq\r
-bm4uOdNSMrrdQ2plAqTWwrsM4qiPjuXLl+eLhSGda83PvcpNB/Pmzatl4VtaWsoXslIxm84zZ0+K\r
-+vDDD6VWqXXSoDtZ4VUH/RWuE6h09ULJYbBy5crsooVvvvkm9uPoaG9vTwPE0RVHY7p0MHR1dVWf\r
-eKWFie6vvvoq/kZrIPVJF1mlN9pVGbf8wobCRXr06FEcVNOnT089N27cmE22cPgaJ6tenDD1U/mu\r
-leqGaIBG97Vr16J71apV/ZUfWzrUnPYsD0R1kDqOtCDHavFG9mkrSK1MyNSabgFIZ1BXrFhx48aN\r
-wtSa3WWQz4dRNVdKrfm5VP/ZrtJNBzWm1nxBVym1putHUmMpO9Ha7yIRZV2NqbXwqoPqDycs/x2o\r
-/DC4c+dONChfffXV1F7cv39/NkC6cuDy5csx/U2bNkV3elFVpYlXWZi9e/fu2bMnf519Y2NjfFvL\r
-uPntULhI7733XnaXfKxCeoRjLatQfbLqxYlRP1XatVJ3OpoWLlw4aD3xLDVc/1BOHDlIn8fR5ziS\r
-WmtZvNbWVv8mlCrKnBLp2bklNx3kX1ST719yl0EMFtnvwYMH/T/eL1CSWqPuiylH+k1V4aBthko3\r
-HUQdHd3xbXSfOHGi0uhR12dP6+ju7i6/FSKTTquW9Ew/hdu1pNZBUmvhVQfVH044aGrNnruYTn1E\r
-yzj/toD+gasatmzZsnbt2tRizp9dKZ94lYVZtGhRHLHpfE60iaPj0qVL+QZx7U9ZLF+k+Lts2bJs\r
-gPyxWn0Vqk9WvTgx6qdKu1Z2OOR/7KzD1PrCHqSOIy1IkFqphzIn3Ty/Zs2a9PHw4cNTpkxJdd+s\r
-WbPyd5CW32Vw69at9vb27HqilDb7c+9rjUktXLhwx44d2S2vg7ZGCm866B+4oz677yB7P035zQgR\r
-XOfOnZv6pMc7Fc4lf3drkn5lLnkEBlLrEJ5tWHidQKWrF0oOg2inVmkQp5779+9/+PDhsWPHojv+\r
-9le9NKLSRQtpRh0dHZs2bWpqakof8w3iGp+yWLhIJY/hzjeIK61CLZNVL06M+qnSrhXefPPNVOXU\r
-c2p9YQ9Sx5EWZFdXV/1c9jI83d3d165d86+XWhnvv5Slm2jSs8qzWi9CYP5e9wl2l0F6sEX+GQHx\r
-8eWXX7ZfSa1/3ePv3LnT19dX/sKJSs82rP5wwvKrF4bUIM7m0tvb+/rrr6fb6qpMvMrCpBnFdNK4\r
-6enh+QZxjU9ZLFykdPHhoUOH+gcem1H4jMfCVag+WfXixKifKu1aabe5fft2/G1ubh6nqXUCH6SO\r
-oxe8BXn9+vUY/vPPPx/zxY56+Z133pk6dWraV0+fPl37uKmEicaf/77UyrhOrWlqmzdv7h/4XTi9\r
-GyY9Yyk7qzlh7jKIBkB6kk6sadYzvbQ2ykP7ldQ6KfstJ3tgScmjxgqfbdhf4TqBSlcvDKlBHA3T\r
-7MGJ6UemdKal0sQrLUx+RvkGbr5B3F/bUxYLFyk2RWyQ7CEx6cr+6qtQy2TVixOmfirftaIpHN0n\r
-Tpzo//FpTG+++WbtqfVZnsY0sql1Ah+kjqMXvAX5LGctnvHdZiWjx5JMnjz58YD0fLL0C3KNo6c7\r
-4rJ2LVIr4zS1vlAio3q2OYOk1pGqvytdvTBSS//8Jo56Uf3kIHUcveBHaPpRPz2+61n2/xEZPbqb\r
-mpqGPXp6p07+CnmUKmgVwEROrUO66qDS1Qsj4rlOHPWi+slB6jh6wY/Q9IbAdJl6sn///nnz5qVd\r
-eseOHdkEs99zs5cAl7+NqdKr42ocPV2a0dDQcPv27ZLlrOVdUP3eFaFUQasAXpzUin1Fvah+wnH0\r
-ghyhJTFv37598fG9997r//EhllnCLI+d/TW/Oq7G0fsHHnOdXtc0ZcqU7PacGt8FFfLP8UapglYB\r
-SK2oF9VP4DiaaKk1ultaWrKP2bvfak+tha+Oqz21Jl1dXfmvan8XVHrtoR1AqYJWAUitqBdRP+E4\r
-mrCpNf9kh8LYefz48RpTa/7VcbWMnn8kSXqnVHZOtZZ3QfW7QlipglYBSK2oF1E/4TiaYEdoeu5u\r
-pNP0ce/evfGxo6Ojf+ANqPlLfFNH9Cx8nVL+Y/mr42oZ/ebNm9Hd2Nj46NGj+Lhjx47sBYY1vgsq\r
-9Zk5c6YdQKmCVgFIragXUT/hOJogR2h6afmaNWuyPhFc586dmwLhtm3bUs/Lly9nr03KPyu75G1M\r
-lV4dV+Pop0+fbmtrSx/Xr1+ffyldLe+CSjfixvLbAZQqaBWA1Ip6EfUTjqOJc4Sml/d2d3ePyHyH\r
-/erXEZn7yy+/7L+vVEGrAKRW1Iuon3AcTbQjNIbfvHnziMx3SK+OG0HpxbN37tzx31eqoFUAUivq\r
-RdRPOI4coaBUQZkDUivqRfUTjiMcoaBUUeaA1ArqRfUTjiNHKChVUOaA1Ip6cUjOfjCpxAdniwf7\r
-sX82xhtf9KZPH5xNf8tH6/3ijdyw1aVhC6biOEL7UgsSJnSpktWWJdXw03V0VpXmBv+xX4UhS2rw\r
-MWxqVG4qaBWA1Ip6sVL9kVUDQ63MohbJVYbx6UmYLUumMe2/9vtL3VNtNn+pymLQ4oVxHCG1Sq0w\r
-wUqVpyvifMzMf3yqWvwx9eUr4iwJPl2BlkxyxBZ1uJG8SlNBqwCkVtSLlWuDYafW0hq0woeypPok\r
-wdY6cfUTUqvUChO0VHlS3xVUj71nv/jibG9BtfiXj/9aXFdWr4NHqs3wzOMPbWJaBSC1MiHrxaeu\r
-D8oK+icXEv34c+yTYYoqv4Hh/9ov685qyvy4Zeddq12SVEtNpX5CapVaYTyXKkOuiP9nxxtVftMt\r
-rkkHxi+pLssq0CexNftqoOPJyCVLNXib4WzJKj7p8dfJvlJyFfMbX3w/SFNBqwDqJrVCJSPd2s79\r
-XJurFZ5cjVNQgfWX3dear4KenkzxuFVy6UimVhit4wipFS25YZcqw6iIq1eOhVcI58NllSunymcR\r
-C/JGwcW6udOyuRUoXsL8MvzYnZvsk7XOuobRGNAqgNFuQTnXynP7NXfQyvJJZVP+fIZarhAeGPHJ\r
-D6JjnFrtMIzWcYTUilJlhFJrTRVxyQXC2cBF45bVkOl8Zm9hBTpIQh60eVBYNQ96xfKPYfVJfH0u\r
-qdWOCiNb1kmtjGpru+CZgsXPUHhuqfWpy37c14rUKrXCi1WqDKMiLqoeazwTW23Ip0+gFtXggzQP\r
-hpdan1wvnDsjW6WpoFUAUisvXGu7uHDP9c2e4jdoav1rZTdYnfd05VN4dVKNzxBWPyG1Sq0w7kuV\r
-YVfEkyr86ls0wZILhYtOaQ6E5/xzhouv9S1bquFeIfzUQpa+sWaQpoJWAUitjMd6sa+vb9jTrPC6\r
-tye93/jibO+PlVvqsf/78ve1/s+OCk9jKqhBc3VR7sn2BYtUVGVVuQlH/YTUKrXC+Kudh1ERD1SP\r
-T41XdKFTpblUuOK3+OGIhfHyqaV6+mlMvYMsaunv2v2lUbq2poLUClIr46xe3LRpU/Rfvnz5Dz/8\r
-MPRJPsv7bIYt/4yHkXoznPoJqVVqhfFYO49JRVxvyh8TPMJNBWUOSK2M2b5y8uTJX/ziF9mPpD/7\r
-2c+ijhzqedf8T7WjV1UO/HD6HDOr+ol6T60Fb4Z47gdd4QmVWhY0vZ9iOItZetWfIxS1c71UxPUj\r
-FYeFV16NXFNBmQNSK2Owr5w/f/7VV1/9yU9+Uv5A6mnTph08eNC2chxRV6n1qWeY5F9v3F9we9og\r
-ow9npvnzGIMk0NJFLX/jxRBaojGKq/VQO6udtQpAauUF21c6OzvXrVs3efLk6i9TamlpOXfunPoJ\r
-6iO1lj6YpCT/DfbkseFdNDi8yw4rPXll2JcuSq2ondXOWgUgtfKC7StNTU01vgX4pz/96dKlS2/c\r
-uKF+gueVWp96lEn+xGa+11MXA/9r4Rsrih/+mb0fomT0D77IPQ6lt4axzv51Iao8+6xwUZ++06z8\r
-vjOpFdTOWgUgtULe999/P4mhsM/wnFNrLn/mEt2TK2krZ9HK7zYsHLLi6y6K3iFR9U2Mkyq8W6Km\r
-RX32U75P/RcAtApAamVi7ivLli375S9/2djYWL1o/u1vfztv3rw1a9Zcu3bNr6owGqn1Seorf5VE\r
-SRQcwrnWWpLkv9aWWp/M6skZ2kEX9TmmVrsiame0CkBqZcLuK5999llUjYsWLfrZz35WXiO+9NJL\r
-ixcvfv311zs7O9VP8DxTa+FzeQsfnFT7fa3PPbU+NcAgi1o2L1cIg9pZqwC0oKRWatxXLl68+P77\r
-7//t3/5ta2trViP+/Oc//93vfrdw4cITJ04M9f036iek1qErzmO5vtkTeJ8estozhJ9E2txQtVwh\r
-XHWs/GODn7qYeZBFfSqnehoTqJ21CkBZJ7Uy1H3l22+/feWVV/7u7/5u9uzZS5YsmTt37r59+9SI\r
-6ieGl1qHcezk37KYi2a9uYclne196mLcp/Jm8Qsanwz6xQe5M7Cp3/7vC5/GNMhYMVBuUfOzG2xR\r
-c7E19xIcqRXUzloFILU6rqi5tR214O7du6P/H/7whx9++MEmGr/1U6VHR2QrcurUqWgANTQ0xH88\r
-3x1fdXd3L1++PD42NjauXbv29u3bdoChptZNmzZF/9iMQzmOhvdqmWc0ajMqmd3wLg/WgkTtrHbW\r
-KgCpFa3tH2tHG2c066eOjo7nN1alJW9pabl06VL6d+e7r1+/3tzc/OWXXz5+/PjevXsbN25cuHBh\r
-Xa1RnR9HJ0+e/MUvfpH9UvCzn/0sEmyNx1T+XOtoRclRTq1/Pcc6wplVCxK1M1IrSK28aPUio1w/\r
-DW/iNY5VabB8/3z3+vXr0xnXTAq09bNGdXscnT9//tVXX/3JT35SfpZ72rRpBw8edBxpQYLaWZkD\r
-SK2oF8emfrp79+6KFSumTp3a0tLy9ddfp54PHz7cuHFj44BNmzbFxzSdffv2zZw5M4sxJVfwpkk1\r
-NDTMnj37yJEj2dyrj1Vl8Uq+yoavdAlxU1PTnTt3Cic1mmsUyTm2Z3xbEqHrc9/o7Oxct27d5MmT\r
-q7+jInaPc+fOOZq0IEHtrMwBpFbUi6NdP61Zs2bDhg19fX3d3d0fffRR6hm5LvrfGxAd8TFNZ/Pm\r
-zTHkpUuXIrOVT3zr1q3fffdddFy8eDECZLoebNCxal/y7GOlc60RvSpNajTXaMqUKbdu3Xr06FH8\r
-rf99I9arxrfS//SnP126dOmNGzccU1qQoHZW5oCy7qnUCpWoF4daP+XPB2YaGhrSicdKPR88eNDY\r
-2FgpK+Z7xlj5f9DZs2drGWsEU+v06dPv3r1bOKnRXKPdu3dv3Lgxxd169v333ytG6oRiCqmV0fwf\r
-ASObRNTlqBef+6+qg6bW+/fvx8da0trbb79dfe7PO7W+++67n376aX6UQ4cOPX78ePTX6N69ex9/\r
-/HFk1/rfN5YtW/bLX/4yYnz1ovm3v/3tvHnz1qxZc+3aNcfUaB6hoHZGmQN1XtZJragXn3v9tG7d\r
-uvb29kePHvX29q5evTrruXbt2nQ9bUTBGKBSWps8eXKEwNQdkebgwYOREm/duhWBLbt3tPpYI5ha\r
-e3p6Zs2adeDAgfQM4U2bNi1ZsmSU1+jOnTunT5+OUWJ7TpkyZVwcR5999lkE10WLFv3sZz8rz6sv\r
-vfTS4sWLX3/99c7OTkeTFiSonZU5gNSKenG066e7d++uWrUq8lX+aUwRwNavX98wYMOGDQ8ePKiU\r
-1iINxrhtbW2R0yKwRe6NUSI6Zg8iGnSsoT6NqUpq7c+9r3Xq1KkRTbMLhkdtjf7f//t/sQARYmfM\r
-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" />
+       <IMG alt="embedded diagram image" src="data:image/png;base64,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" />
 </BODY>
 </HTML>
\ No newline at end of file
index cfb6ccc..a462fe5 100644 (file)
@@ -18,6 +18,7 @@ import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.ImageMetadata;
 import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
 import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
+import org.apache.commons.imaging.formats.tiff.TiffImageMetadata.GPSInfo;
 import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
 import org.junit.runner.*;
 import org.junit.experimental.theories.DataPoints;
@@ -89,9 +90,9 @@ public class ImportPictureTest {
                                        new Expecter[] {
                                                new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, true),
                                                new Expecter("10170518/DSC05183.JPG", false, null, 90.0D, 180.0D, false),
-                                               new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 90.0D, 180.0D, true),
-                                               new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 90.0D, 180.0D, true),
-                                               new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 90.0D, 180.0D, true),
+                                               new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, true),
+                                               new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, true),
+                                               new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, true),
                                                new Expecter("10170518/DSC05205.JPG", false, null, 90.0D, 180.0D, false),
                                        }),
                        new Fixture(
@@ -103,9 +104,9 @@ public class ImportPictureTest {
                                        new Expecter[] {
                                                new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, true),
                                                new Expecter("10170518/DSC05183.JPG", true, "2017:05:18 09:16:48", 90.0D, 180.0D, true),
-                                               new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 90.0D, 180.0D, true),
-                                               new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 90.0D, 180.0D, true),
-                                               new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 90.0D, 180.0D, true),
+                                               new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, true),
+                                               new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, true),
+                                               new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, true),
                                                new Expecter("10170518/DSC05205.JPG", true, "2017:05:18 09:48:04", 90.0D, 180.0D, true),
                                        }),
                        
@@ -118,8 +119,8 @@ public class ImportPictureTest {
                                        new Expecter[] {
                                                new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, true),
                                                new Expecter("cameradata/20170518_092031A.jpg", false, null, 90.0D, 180.0D, false),
-                                               new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 90.0D, 180.0D, true),
-                                               new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 90.0D, 180.0D, true),
+                                               new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, true),
+                                               new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, true),
                                                new Expecter("cameradata/20170518_094827A.jpg", false, null, 90.0D, 180.0D, false),
                                        }),
 
@@ -131,9 +132,9 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.20170518.B2.ini",
                                        new Expecter[] {
                                                new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, true),
-                                               new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 09:20:30", 0.0D, 0.0D, true),
-                                               new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 90.0D, 180.0D, true),
-                                               new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 90.0D, 180.0D, true),
+                                               new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 09:20:30", 90.0D, 180.0D, true),
+                                               new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, true),
+                                               new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, true),
                                                new Expecter("cameradata/20170518_094827A.jpg", true, "2017:05:18 09:48:26", 90.0D, 180.0D, true),
                                        }),
                        
@@ -152,25 +153,25 @@ public class ImportPictureTest {
                                                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
                                    
                                    // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                               new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                               new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                               new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, true),
+                                               new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                               new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                               new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
 
                                    // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
                                                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
                                    // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                               new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                               new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                               new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                               new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                    // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
                                                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
                                    // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                               new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                               new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
+                                               new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                               new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
                                        }),
 
                        new Fixture(
@@ -188,25 +189,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
                                        }),
 
                        new Fixture(
@@ -224,25 +225,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808881603D, 137.9979396332D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
                                                        new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
                                                        new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, true),
                                        }),
 
                        new Fixture(
@@ -260,25 +261,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808881603D, 137.9979396332D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, true),
                                        }),
 
                        
@@ -297,25 +298,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
                                                        new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
                                                        new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
                                        }),
 
                        new Fixture(
@@ -333,25 +334,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
                                        }),
 
                        new Fixture(
@@ -369,25 +370,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
                                                        new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
                                                        new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
                                        }),
 
                        new Fixture(
@@ -405,25 +406,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
                                        }),
                        
                        new Fixture(
@@ -441,25 +442,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
                                                        new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
                                                        new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
                                        }),
 
                        new Fixture(
@@ -477,25 +478,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
                                        }),
 
                        new Fixture(
@@ -513,25 +514,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
                                                        new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
                                                        new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
                                        }),
 
                        new Fixture(
@@ -549,25 +550,25 @@ public class ImportPictureTest {
                                                        new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
                                            
                                            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
+                                                       new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
+                                                       new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
 
                                            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
                                                        new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
+                                                       new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
 
                                            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
                                                        new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true),
                                                        new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true),
 
                                            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
-                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
+                                                       new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
+                                                       new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
                                        }),
        };
 
@@ -603,10 +604,28 @@ public class ImportPictureTest {
                String exifTime = ImportPicture.toEXIFString(ImportPicture.toEXIFDate(exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0]));
                System.out.println("[debug] exifTime = '"+ exifTime +"' <--> '"+ es[i].timeStr +"'");
                assertThat(exifTime, is(es[i].timeStr));
+               
+               // LAT,LON
+               GPSInfo gpsInfo = exif.getGPS();
+               if (es[i].latD != 90.0D) {
+                       assertThat(round7(gpsInfo.getLatitudeAsDegreesNorth()), is(round7(es[i].latD)));
+               }
+               if (es[i].lonD != 180.0D) {
+                       assertThat(round7(gpsInfo.getLongitudeAsDegreesEast()), is(round7(es[i].lonD)));
+               }
                }
                }
        }
        
+       /**
+        * 小数点第8位で四捨五入した文字列
+        * @param d
+        * @return
+        */
+       static String round7(double d) {
+               return String.format("%.7f", d);
+       }
+       
        static void setup(Fixture dataset) throws IOException {
                System.out.println(dataset.toString());
                
@@ -649,7 +668,7 @@ public class ImportPictureTest {
                        fail("Exceptionが発生した。");
                }
        }
-
+       
        /**
      * *.tar.gz解凍
      * ファイル更新日時をオリジナルと同じにします。
diff --git a/importPicture/testdata/AdjustTime.20170518.A1.log b/importPicture/testdata/AdjustTime.20170518.A1.log
new file mode 100644 (file)
index 0000000..a8a04a4
--- /dev/null
@@ -0,0 +1,69 @@
+テストパターン : [A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時
+       tarFilePath = testdata/Sony20170518.tar.gz
+       gpxSourcePath = testdata/20170518.gpx
+       gpxDestinationPath = testdata/cameradata/20170518.gpx
+       iniFilePath = testdata/AdjustTime.20170518.A1.ini
+Param File = 'testdata/AdjustTime.20170518.A1.ini'
+ - param: IMG.TIME=2017-05-18T00:16:48Z
+ - param: IMG.BASE_FILE=DSC05183.JPG
+ - param: GPX.BASETIME=FILE_UPDATE
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/10170518
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=false
+ - param: GPX.OUTPUT_SPEED=false
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=false
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx
+           時差: -32420(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|DSC05183.JPG                    |2017-05-18T09:17:08Z|2017-05-18T00:16:48Z|              |              |        |      |      |
+|DSC05184.JPG                    |2017-05-18T09:35:04Z|2017-05-18T00:34:44Z| 35.4367520000|139.4082730000|  63.087|     -|     -|
+|DSC05185.JPG                    |2017-05-18T09:35:08Z|2017-05-18T00:34:48Z| 35.4367360000|139.4082530000|  62.760|     -|     -|
+|DSC05186.JPG                    |2017-05-18T09:35:10Z|2017-05-18T00:34:50Z| 35.4367340000|139.4082440000|  62.313|     -|     -|
+|DSC05187.JPG                    |2017-05-18T09:35:20Z|2017-05-18T00:35:00Z| 35.4367720000|139.4082390000|  63.060|     -|     -|
+|DSC05188.JPG                    |2017-05-18T09:35:28Z|2017-05-18T00:35:08Z| 35.4367940000|139.4082300000|  63.612|     -|     -|
+|DSC05189.JPG                    |2017-05-18T09:35:40Z|2017-05-18T00:35:20Z| 35.4368380000|139.4081910000|  59.427|     -|     -|
+|DSC05190.JPG                    |2017-05-18T09:36:10Z|2017-05-18T00:35:50Z| 35.4371180000|139.4083070000|  59.608|     -|     -|
+|DSC05191.JPG                    |2017-05-18T09:36:20Z|2017-05-18T00:36:00Z| 35.4371710000|139.4083370000|  61.142|     -|     -|
+|DSC05192.JPG                    |2017-05-18T09:36:26Z|2017-05-18T00:36:06Z| 35.4372020000|139.4083510000|  61.727|     -|     -|
+|DSC05193.JPG                    |2017-05-18T09:36:52Z|2017-05-18T00:36:32Z| 35.4374490000|139.4084050000|  67.747|     -|     -|
+|DSC05194.JPG                    |2017-05-18T09:37:10Z|2017-05-18T00:36:50Z| 35.4375190000|139.4084670000|  68.156|     -|     -|
+|DSC05195.JPG                    |2017-05-18T09:37:24Z|2017-05-18T00:37:04Z| 35.4376190000|139.4084540000|  67.816|     -|     -|
+|DSC05196.JPG                    |2017-05-18T09:37:52Z|2017-05-18T00:37:32Z| 35.4376820000|139.4085150000|  68.610|     -|     -|
+|DSC05197.JPG                    |2017-05-18T09:38:18Z|2017-05-18T00:37:58Z| 35.4377770000|139.4086780000|  66.243|     -|     -|
+|DSC05198.JPG                    |2017-05-18T09:38:22Z|2017-05-18T00:38:02Z| 35.4377680000|139.4086840000|  67.086|     -|     -|
+|DSC05199.JPG                    |2017-05-18T09:38:28Z|2017-05-18T00:38:08Z| 35.4377680000|139.4086970000|  67.788|     -|     -|
+|DSC05200.JPG                    |2017-05-18T09:38:48Z|2017-05-18T00:38:28Z| 35.4376200000|139.4087570000|  69.652|     -|     -|
+|DSC05201.JPG                    |2017-05-18T09:38:52Z|2017-05-18T00:38:32Z| 35.4375980000|139.4087640000|  69.565|     -|     -|
+|DSC05202.JPG                    |2017-05-18T09:39:00Z|2017-05-18T00:38:40Z| 35.4375630000|139.4087800000|  68.890|     -|     -|
+|DSC05203.JPG                    |2017-05-18T09:39:24Z|2017-05-18T00:39:04Z| 35.4372650000|139.4087430000|  69.999|     -|     -|
+|DSC05204.JPG                    |2017-05-18T09:47:08Z|2017-05-18T00:46:48Z| 35.4368560000|139.4082190000|  68.637|     -|     -|
+|DSC05205.JPG                    |2017-05-18T09:48:24Z|2017-05-18T00:48:04Z|              |              |        |      |      |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05183.JPG'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05184.JPG'
+[debug] exifTime = '2017:05:18 09:34:44' <--> '2017:05:18 09:34:44'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05196.JPG'
+[debug] exifTime = '2017:05:18 09:37:32' <--> '2017:05:18 09:37:32'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05204.JPG'
+[debug] exifTime = '2017:05:18 09:46:48' <--> '2017:05:18 09:46:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05205.JPG'
+
diff --git a/importPicture/testdata/AdjustTime.20170518.A2.log b/importPicture/testdata/AdjustTime.20170518.A2.log
new file mode 100644 (file)
index 0000000..b8b0439
--- /dev/null
@@ -0,0 +1,71 @@
+テストパターン : [A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時
+       tarFilePath = testdata/Sony20170518.tar.gz
+       gpxSourcePath = testdata/20170518.gpx
+       gpxDestinationPath = testdata/cameradata/20170518.gpx
+       iniFilePath = testdata/AdjustTime.20170518.A2.ini
+Param File = 'testdata/AdjustTime.20170518.A2.ini'
+ - param: IMG.TIME=2017-05-18T00:16:48Z
+ - param: IMG.BASE_FILE=DSC05183.JPG
+ - param: GPX.BASETIME=FILE_UPDATE
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/10170518
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=false
+ - param: GPX.OUTPUT_SPEED=false
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx
+           時差: -32420(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|DSC05183.JPG                    |2017-05-18T09:17:08Z|2017-05-18T00:16:48Z|              |              |        |      |      |
+|DSC05184.JPG                    |2017-05-18T09:35:04Z|2017-05-18T00:34:44Z| 35.4367520000|139.4082730000|  63.087|     -|     -|
+|DSC05185.JPG                    |2017-05-18T09:35:08Z|2017-05-18T00:34:48Z| 35.4367360000|139.4082530000|  62.760|     -|     -|
+|DSC05186.JPG                    |2017-05-18T09:35:10Z|2017-05-18T00:34:50Z| 35.4367340000|139.4082440000|  62.313|     -|     -|
+|DSC05187.JPG                    |2017-05-18T09:35:20Z|2017-05-18T00:35:00Z| 35.4367720000|139.4082390000|  63.060|     -|     -|
+|DSC05188.JPG                    |2017-05-18T09:35:28Z|2017-05-18T00:35:08Z| 35.4367940000|139.4082300000|  63.612|     -|     -|
+|DSC05189.JPG                    |2017-05-18T09:35:40Z|2017-05-18T00:35:20Z| 35.4368380000|139.4081910000|  59.427|     -|     -|
+|DSC05190.JPG                    |2017-05-18T09:36:10Z|2017-05-18T00:35:50Z| 35.4371180000|139.4083070000|  59.608|     -|     -|
+|DSC05191.JPG                    |2017-05-18T09:36:20Z|2017-05-18T00:36:00Z| 35.4371710000|139.4083370000|  61.142|     -|     -|
+|DSC05192.JPG                    |2017-05-18T09:36:26Z|2017-05-18T00:36:06Z| 35.4372020000|139.4083510000|  61.727|     -|     -|
+|DSC05193.JPG                    |2017-05-18T09:36:52Z|2017-05-18T00:36:32Z| 35.4374490000|139.4084050000|  67.747|     -|     -|
+|DSC05194.JPG                    |2017-05-18T09:37:10Z|2017-05-18T00:36:50Z| 35.4375190000|139.4084670000|  68.156|     -|     -|
+|DSC05195.JPG                    |2017-05-18T09:37:24Z|2017-05-18T00:37:04Z| 35.4376190000|139.4084540000|  67.816|     -|     -|
+|DSC05196.JPG                    |2017-05-18T09:37:52Z|2017-05-18T00:37:32Z| 35.4376820000|139.4085150000|  68.610|     -|     -|
+|DSC05197.JPG                    |2017-05-18T09:38:18Z|2017-05-18T00:37:58Z| 35.4377770000|139.4086780000|  66.243|     -|     -|
+|DSC05198.JPG                    |2017-05-18T09:38:22Z|2017-05-18T00:38:02Z| 35.4377680000|139.4086840000|  67.086|     -|     -|
+|DSC05199.JPG                    |2017-05-18T09:38:28Z|2017-05-18T00:38:08Z| 35.4377680000|139.4086970000|  67.788|     -|     -|
+|DSC05200.JPG                    |2017-05-18T09:38:48Z|2017-05-18T00:38:28Z| 35.4376200000|139.4087570000|  69.652|     -|     -|
+|DSC05201.JPG                    |2017-05-18T09:38:52Z|2017-05-18T00:38:32Z| 35.4375980000|139.4087640000|  69.565|     -|     -|
+|DSC05202.JPG                    |2017-05-18T09:39:00Z|2017-05-18T00:38:40Z| 35.4375630000|139.4087800000|  68.890|     -|     -|
+|DSC05203.JPG                    |2017-05-18T09:39:24Z|2017-05-18T00:39:04Z| 35.4372650000|139.4087430000|  69.999|     -|     -|
+|DSC05204.JPG                    |2017-05-18T09:47:08Z|2017-05-18T00:46:48Z| 35.4368560000|139.4082190000|  68.637|     -|     -|
+|DSC05205.JPG                    |2017-05-18T09:48:24Z|2017-05-18T00:48:04Z|              |              |        |      |      |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05183.JPG'
+[debug] exifTime = '2017:05:18 09:16:48' <--> '2017:05:18 09:16:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05184.JPG'
+[debug] exifTime = '2017:05:18 09:34:44' <--> '2017:05:18 09:34:44'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05196.JPG'
+[debug] exifTime = '2017:05:18 09:37:32' <--> '2017:05:18 09:37:32'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05204.JPG'
+[debug] exifTime = '2017:05:18 09:46:48' <--> '2017:05:18 09:46:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05205.JPG'
+[debug] exifTime = '2017:05:18 09:48:04' <--> '2017:05:18 09:48:04'
+
diff --git a/importPicture/testdata/AdjustTime.20170518.B1.log b/importPicture/testdata/AdjustTime.20170518.B1.log
new file mode 100644 (file)
index 0000000..acb2d9b
--- /dev/null
@@ -0,0 +1,93 @@
+テストパターン : [B1].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時
+       tarFilePath = testdata/WiMiUS20170518.tar.gz
+       gpxSourcePath = testdata/20170518.gpx
+       gpxDestinationPath = testdata/cameradata/20170518.gpx
+       iniFilePath = testdata/AdjustTime.20170518.B1.ini
+Param File = 'testdata/AdjustTime.20170518.B1.ini'
+ - param: IMG.TIME=2017-05-18T00:20:30Z
+ - param: IMG.BASE_FILE=20170518_092031A.jpg
+ - param: GPX.BASETIME=FILE_UPDATE
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=false
+ - param: GPX.OUTPUT_SPEED=false
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx
+           時差: -32400(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170517_153708A.jpg            |2017-05-17T15:37:08Z|2017-05-17T06:37:08Z|              |              |        |      |      |
+|20170518_092031A.jpg            |2017-05-18T09:20:30Z|2017-05-18T00:20:30Z|              |              |        |      |      |
+|20170518_094226A_snap.jpg       |2017-05-18T09:42:26Z|2017-05-18T00:42:26Z| 35.4366860000|139.4082650000|  61.958|     -|     -|
+|20170518_094230A.jpg            |2017-05-18T09:42:30Z|2017-05-18T00:42:30Z| 35.4366840000|139.4082500000|  61.700|     -|     -|
+|20170518_094235A.jpg            |2017-05-18T09:42:34Z|2017-05-18T00:42:34Z| 35.4366880000|139.4082510000|  60.970|     -|     -|
+|20170518_094239A.jpg            |2017-05-18T09:42:38Z|2017-05-18T00:42:38Z| 35.4366920000|139.4082490000|  60.564|     -|     -|
+|20170518_094243A.jpg            |2017-05-18T09:42:42Z|2017-05-18T00:42:42Z| 35.4367100000|139.4082430000|  60.497|     -|     -|
+|20170518_094248A.jpg            |2017-05-18T09:42:48Z|2017-05-18T00:42:48Z| 35.4367510000|139.4082460000|  60.755|     -|     -|
+|20170518_094252A.jpg            |2017-05-18T09:42:52Z|2017-05-18T00:42:52Z| 35.4367750000|139.4082250000|  60.034|     -|     -|
+|20170518_094256A.jpg            |2017-05-18T09:42:56Z|2017-05-18T00:42:56Z| 35.4368010000|139.4082140000|  59.186|     -|     -|
+|20170518_094300A.jpg            |2017-05-18T09:43:00Z|2017-05-18T00:43:00Z| 35.4368290000|139.4082170000|  59.608|     -|     -|
+|20170518_094305A.jpg            |2017-05-18T09:43:04Z|2017-05-18T00:43:04Z| 35.4368690000|139.4082180000|  59.641|     -|     -|
+|20170518_094309A.jpg            |2017-05-18T09:43:08Z|2017-05-18T00:43:08Z| 35.4369020000|139.4082280000|  60.149|     -|     -|
+|20170518_094313A.jpg            |2017-05-18T09:43:12Z|2017-05-18T00:43:12Z| 35.4369510000|139.4082380000|  61.838|     -|     -|
+|20170518_094318A.jpg            |2017-05-18T09:43:18Z|2017-05-18T00:43:18Z| 35.4370030000|139.4082700000|  64.454|     -|     -|
+|20170518_094322A.jpg            |2017-05-18T09:43:22Z|2017-05-18T00:43:22Z| 35.4370310000|139.4082910000|  66.074|     -|     -|
+|20170518_094326A.jpg            |2017-05-18T09:43:26Z|2017-05-18T00:43:26Z| 35.4370530000|139.4083160000|  66.428|     -|     -|
+|20170518_094332A.jpg            |2017-05-18T09:43:32Z|2017-05-18T00:43:32Z| 35.4370790000|139.4083410000|  66.419|     -|     -|
+|20170518_094336A.jpg            |2017-05-18T09:43:36Z|2017-05-18T00:43:36Z| 35.4371070000|139.4083470000|  66.384|     -|     -|
+|20170518_094340A.jpg            |2017-05-18T09:43:40Z|2017-05-18T00:43:40Z| 35.4371310000|139.4083400000|  66.488|     -|     -|
+|20170518_094352A.jpg            |2017-05-18T09:43:52Z|2017-05-18T00:43:52Z| 35.4371940000|139.4083500000|  68.267|     -|     -|
+|20170518_094357A.jpg            |2017-05-18T09:43:56Z|2017-05-18T00:43:56Z| 35.4372240000|139.4083580000|  69.006|     -|     -|
+|20170518_094401A.jpg            |2017-05-18T09:44:00Z|2017-05-18T00:44:00Z| 35.4372560000|139.4083600000|  68.477|     -|     -|
+|20170518_094405A.jpg            |2017-05-18T09:44:04Z|2017-05-18T00:44:04Z| 35.4372910000|139.4083820000|  68.966|     -|     -|
+|20170518_094410A.jpg            |2017-05-18T09:44:10Z|2017-05-18T00:44:10Z| 35.4373480000|139.4084020000|  71.281|     -|     -|
+|20170518_094418A.jpg            |2017-05-18T09:44:18Z|2017-05-18T00:44:18Z| 35.4373910000|139.4084280000|  72.327|     -|     -|
+|20170518_094422A.jpg            |2017-05-18T09:44:22Z|2017-05-18T00:44:22Z| 35.4374130000|139.4084290000|  72.864|     -|     -|
+|20170518_094427A.jpg            |2017-05-18T09:44:26Z|2017-05-18T00:44:26Z| 35.4374290000|139.4084330000|  73.037|     -|     -|
+|20170518_094431A.jpg            |2017-05-18T09:44:30Z|2017-05-18T00:44:30Z| 35.4374440000|139.4084380000|  74.372|     -|     -|
+|20170518_094435A.jpg            |2017-05-18T09:44:34Z|2017-05-18T00:44:34Z| 35.4374640000|139.4084300000|  74.478|     -|     -|
+|20170518_094440A.jpg            |2017-05-18T09:44:40Z|2017-05-18T00:44:40Z| 35.4374820000|139.4084610000|  74.989|     -|     -|
+|20170518_094444A.jpg            |2017-05-18T09:44:44Z|2017-05-18T00:44:44Z| 35.4374660000|139.4084760000|  75.505|     -|     -|
+|20170518_094448A.jpg            |2017-05-18T09:44:48Z|2017-05-18T00:44:48Z| 35.4374590000|139.4084720000|  77.319|     -|     -|
+|20170518_094452A.jpg            |2017-05-18T09:44:52Z|2017-05-18T00:44:52Z| 35.4374410000|139.4084730000|  78.333|     -|     -|
+|20170518_094457A.jpg            |2017-05-18T09:44:56Z|2017-05-18T00:44:56Z| 35.4374170000|139.4084750000|  78.086|     -|     -|
+|20170518_094501A.jpg            |2017-05-18T09:45:00Z|2017-05-18T00:45:00Z| 35.4373940000|139.4084600000|  77.169|     -|     -|
+|20170518_094505A.jpg            |2017-05-18T09:45:04Z|2017-05-18T00:45:04Z| 35.4373720000|139.4084510000|  77.476|     -|     -|
+|20170518_094509A.jpg            |2017-05-18T09:45:10Z|2017-05-18T00:45:10Z| 35.4373380000|139.4084390000|  76.312|     -|     -|
+|20170518_094514A.jpg            |2017-05-18T09:45:14Z|2017-05-18T00:45:14Z| 35.4372990000|139.4084320000|  76.043|     -|     -|
+|20170518_094518A.jpg            |2017-05-18T09:45:18Z|2017-05-18T00:45:18Z| 35.4372460000|139.4084230000|  75.330|     -|     -|
+|20170518_094522A.jpg            |2017-05-18T09:45:22Z|2017-05-18T00:45:22Z| 35.4371980000|139.4084180000|  75.431|     -|     -|
+|20170518_094527A.jpg            |2017-05-18T09:45:26Z|2017-05-18T00:45:26Z| 35.4371630000|139.4084100000|  76.060|     -|     -|
+|20170518_094531A.jpg            |2017-05-18T09:45:30Z|2017-05-18T00:45:30Z| 35.4371360000|139.4083960000|  76.469|     -|     -|
+|20170518_094535A.jpg            |2017-05-18T09:45:34Z|2017-05-18T00:45:34Z| 35.4371100000|139.4083820000|  76.606|     -|     -|
+|20170518_094539A.jpg            |2017-05-18T09:45:40Z|2017-05-18T00:45:40Z| 35.4370480000|139.4083650000|  75.932|     -|     -|
+|20170518_094544A.jpg            |2017-05-18T09:45:44Z|2017-05-18T00:45:44Z| 35.4370160000|139.4083570000|  76.083|     -|     -|
+|20170518_094733A_snap.jpg       |2017-05-18T09:47:32Z|2017-05-18T00:47:32Z| 35.4368190000|139.4082730000|  65.510|     -|     -|
+|20170518_094737A.jpg            |2017-05-18T09:47:36Z|2017-05-18T00:47:36Z| 35.4368200000|139.4082810000|  65.185|     -|     -|
+|20170518_094827A.jpg            |2017-05-18T09:48:26Z|2017-05-18T00:48:26Z|              |              |        |      |      |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_092031A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094226A_snap.jpg'
+[debug] exifTime = '2017:05:18 09:42:26' <--> '2017:05:18 09:42:26'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094737A.jpg'
+[debug] exifTime = '2017:05:18 09:47:36' <--> '2017:05:18 09:47:36'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094827A.jpg'
+
diff --git a/importPicture/testdata/AdjustTime.20170518.B2.log b/importPicture/testdata/AdjustTime.20170518.B2.log
new file mode 100644 (file)
index 0000000..32dfd3b
--- /dev/null
@@ -0,0 +1,95 @@
+テストパターン : [B2].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時
+       tarFilePath = testdata/WiMiUS20170518.tar.gz
+       gpxSourcePath = testdata/20170518.gpx
+       gpxDestinationPath = testdata/cameradata/20170518.gpx
+       iniFilePath = testdata/AdjustTime.20170518.B2.ini
+Param File = 'testdata/AdjustTime.20170518.B2.ini'
+ - param: IMG.TIME=2017-05-18T00:20:30Z
+ - param: IMG.BASE_FILE=20170518_092031A.jpg
+ - param: GPX.BASETIME=FILE_UPDATE
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=false
+ - param: GPX.OUTPUT_SPEED=false
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx
+           時差: -32400(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170517_153708A.jpg            |2017-05-17T15:37:08Z|2017-05-17T06:37:08Z|              |              |        |      |      |
+|20170518_092031A.jpg            |2017-05-18T09:20:30Z|2017-05-18T00:20:30Z|              |              |        |      |      |
+|20170518_094226A_snap.jpg       |2017-05-18T09:42:26Z|2017-05-18T00:42:26Z| 35.4366860000|139.4082650000|  61.958|     -|     -|
+|20170518_094230A.jpg            |2017-05-18T09:42:30Z|2017-05-18T00:42:30Z| 35.4366840000|139.4082500000|  61.700|     -|     -|
+|20170518_094235A.jpg            |2017-05-18T09:42:34Z|2017-05-18T00:42:34Z| 35.4366880000|139.4082510000|  60.970|     -|     -|
+|20170518_094239A.jpg            |2017-05-18T09:42:38Z|2017-05-18T00:42:38Z| 35.4366920000|139.4082490000|  60.564|     -|     -|
+|20170518_094243A.jpg            |2017-05-18T09:42:42Z|2017-05-18T00:42:42Z| 35.4367100000|139.4082430000|  60.497|     -|     -|
+|20170518_094248A.jpg            |2017-05-18T09:42:48Z|2017-05-18T00:42:48Z| 35.4367510000|139.4082460000|  60.755|     -|     -|
+|20170518_094252A.jpg            |2017-05-18T09:42:52Z|2017-05-18T00:42:52Z| 35.4367750000|139.4082250000|  60.034|     -|     -|
+|20170518_094256A.jpg            |2017-05-18T09:42:56Z|2017-05-18T00:42:56Z| 35.4368010000|139.4082140000|  59.186|     -|     -|
+|20170518_094300A.jpg            |2017-05-18T09:43:00Z|2017-05-18T00:43:00Z| 35.4368290000|139.4082170000|  59.608|     -|     -|
+|20170518_094305A.jpg            |2017-05-18T09:43:04Z|2017-05-18T00:43:04Z| 35.4368690000|139.4082180000|  59.641|     -|     -|
+|20170518_094309A.jpg            |2017-05-18T09:43:08Z|2017-05-18T00:43:08Z| 35.4369020000|139.4082280000|  60.149|     -|     -|
+|20170518_094313A.jpg            |2017-05-18T09:43:12Z|2017-05-18T00:43:12Z| 35.4369510000|139.4082380000|  61.838|     -|     -|
+|20170518_094318A.jpg            |2017-05-18T09:43:18Z|2017-05-18T00:43:18Z| 35.4370030000|139.4082700000|  64.454|     -|     -|
+|20170518_094322A.jpg            |2017-05-18T09:43:22Z|2017-05-18T00:43:22Z| 35.4370310000|139.4082910000|  66.074|     -|     -|
+|20170518_094326A.jpg            |2017-05-18T09:43:26Z|2017-05-18T00:43:26Z| 35.4370530000|139.4083160000|  66.428|     -|     -|
+|20170518_094332A.jpg            |2017-05-18T09:43:32Z|2017-05-18T00:43:32Z| 35.4370790000|139.4083410000|  66.419|     -|     -|
+|20170518_094336A.jpg            |2017-05-18T09:43:36Z|2017-05-18T00:43:36Z| 35.4371070000|139.4083470000|  66.384|     -|     -|
+|20170518_094340A.jpg            |2017-05-18T09:43:40Z|2017-05-18T00:43:40Z| 35.4371310000|139.4083400000|  66.488|     -|     -|
+|20170518_094352A.jpg            |2017-05-18T09:43:52Z|2017-05-18T00:43:52Z| 35.4371940000|139.4083500000|  68.267|     -|     -|
+|20170518_094357A.jpg            |2017-05-18T09:43:56Z|2017-05-18T00:43:56Z| 35.4372240000|139.4083580000|  69.006|     -|     -|
+|20170518_094401A.jpg            |2017-05-18T09:44:00Z|2017-05-18T00:44:00Z| 35.4372560000|139.4083600000|  68.477|     -|     -|
+|20170518_094405A.jpg            |2017-05-18T09:44:04Z|2017-05-18T00:44:04Z| 35.4372910000|139.4083820000|  68.966|     -|     -|
+|20170518_094410A.jpg            |2017-05-18T09:44:10Z|2017-05-18T00:44:10Z| 35.4373480000|139.4084020000|  71.281|     -|     -|
+|20170518_094418A.jpg            |2017-05-18T09:44:18Z|2017-05-18T00:44:18Z| 35.4373910000|139.4084280000|  72.327|     -|     -|
+|20170518_094422A.jpg            |2017-05-18T09:44:22Z|2017-05-18T00:44:22Z| 35.4374130000|139.4084290000|  72.864|     -|     -|
+|20170518_094427A.jpg            |2017-05-18T09:44:26Z|2017-05-18T00:44:26Z| 35.4374290000|139.4084330000|  73.037|     -|     -|
+|20170518_094431A.jpg            |2017-05-18T09:44:30Z|2017-05-18T00:44:30Z| 35.4374440000|139.4084380000|  74.372|     -|     -|
+|20170518_094435A.jpg            |2017-05-18T09:44:34Z|2017-05-18T00:44:34Z| 35.4374640000|139.4084300000|  74.478|     -|     -|
+|20170518_094440A.jpg            |2017-05-18T09:44:40Z|2017-05-18T00:44:40Z| 35.4374820000|139.4084610000|  74.989|     -|     -|
+|20170518_094444A.jpg            |2017-05-18T09:44:44Z|2017-05-18T00:44:44Z| 35.4374660000|139.4084760000|  75.505|     -|     -|
+|20170518_094448A.jpg            |2017-05-18T09:44:48Z|2017-05-18T00:44:48Z| 35.4374590000|139.4084720000|  77.319|     -|     -|
+|20170518_094452A.jpg            |2017-05-18T09:44:52Z|2017-05-18T00:44:52Z| 35.4374410000|139.4084730000|  78.333|     -|     -|
+|20170518_094457A.jpg            |2017-05-18T09:44:56Z|2017-05-18T00:44:56Z| 35.4374170000|139.4084750000|  78.086|     -|     -|
+|20170518_094501A.jpg            |2017-05-18T09:45:00Z|2017-05-18T00:45:00Z| 35.4373940000|139.4084600000|  77.169|     -|     -|
+|20170518_094505A.jpg            |2017-05-18T09:45:04Z|2017-05-18T00:45:04Z| 35.4373720000|139.4084510000|  77.476|     -|     -|
+|20170518_094509A.jpg            |2017-05-18T09:45:10Z|2017-05-18T00:45:10Z| 35.4373380000|139.4084390000|  76.312|     -|     -|
+|20170518_094514A.jpg            |2017-05-18T09:45:14Z|2017-05-18T00:45:14Z| 35.4372990000|139.4084320000|  76.043|     -|     -|
+|20170518_094518A.jpg            |2017-05-18T09:45:18Z|2017-05-18T00:45:18Z| 35.4372460000|139.4084230000|  75.330|     -|     -|
+|20170518_094522A.jpg            |2017-05-18T09:45:22Z|2017-05-18T00:45:22Z| 35.4371980000|139.4084180000|  75.431|     -|     -|
+|20170518_094527A.jpg            |2017-05-18T09:45:26Z|2017-05-18T00:45:26Z| 35.4371630000|139.4084100000|  76.060|     -|     -|
+|20170518_094531A.jpg            |2017-05-18T09:45:30Z|2017-05-18T00:45:30Z| 35.4371360000|139.4083960000|  76.469|     -|     -|
+|20170518_094535A.jpg            |2017-05-18T09:45:34Z|2017-05-18T00:45:34Z| 35.4371100000|139.4083820000|  76.606|     -|     -|
+|20170518_094539A.jpg            |2017-05-18T09:45:40Z|2017-05-18T00:45:40Z| 35.4370480000|139.4083650000|  75.932|     -|     -|
+|20170518_094544A.jpg            |2017-05-18T09:45:44Z|2017-05-18T00:45:44Z| 35.4370160000|139.4083570000|  76.083|     -|     -|
+|20170518_094733A_snap.jpg       |2017-05-18T09:47:32Z|2017-05-18T00:47:32Z| 35.4368190000|139.4082730000|  65.510|     -|     -|
+|20170518_094737A.jpg            |2017-05-18T09:47:36Z|2017-05-18T00:47:36Z| 35.4368200000|139.4082810000|  65.185|     -|     -|
+|20170518_094827A.jpg            |2017-05-18T09:48:26Z|2017-05-18T00:48:26Z|              |              |        |      |      |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_092031A.jpg'
+[debug] exifTime = '2017:05:18 09:20:30' <--> '2017:05:18 09:20:30'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094226A_snap.jpg'
+[debug] exifTime = '2017:05:18 09:42:26' <--> '2017:05:18 09:42:26'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094737A.jpg'
+[debug] exifTime = '2017:05:18 09:47:36' <--> '2017:05:18 09:47:36'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094827A.jpg'
+[debug] exifTime = '2017:05:18 09:48:26' <--> '2017:05:18 09:48:26'
+
diff --git a/importPicture/testdata/AdjustTime.M1a.separate.log b/importPicture/testdata/AdjustTime.M1a.separate.log
new file mode 100644 (file)
index 0000000..3f2c98e
--- /dev/null
@@ -0,0 +1,104 @@
+テストパターン : [M1a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M1a.separate.ini
+Param File = 'testdata/AdjustTime.M1a.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=FILE_UPDATE
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=false
+ - param: GPX.OUTPUT_SPEED=false
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: -32400(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
+
diff --git a/importPicture/testdata/AdjustTime.M1b.separate.log b/importPicture/testdata/AdjustTime.M1b.separate.log
new file mode 100644 (file)
index 0000000..f6b7c95
--- /dev/null
@@ -0,0 +1,110 @@
+テストパターン : [M1b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M1b.separate.ini
+Param File = 'testdata/AdjustTime.M1b.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=FILE_UPDATE
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: -32400(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
+
diff --git a/importPicture/testdata/AdjustTime.M1c.separate.log b/importPicture/testdata/AdjustTime.M1c.separate.log
new file mode 100644 (file)
index 0000000..92f0f3b
--- /dev/null
@@ -0,0 +1,104 @@
+テストパターン : [M1c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M1c.separate.ini
+Param File = 'testdata/AdjustTime.M1c.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=EXIF_TIME
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: 0(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
+
diff --git a/importPicture/testdata/AdjustTime.M1d.separate.log b/importPicture/testdata/AdjustTime.M1d.separate.log
new file mode 100644 (file)
index 0000000..0a41943
--- /dev/null
@@ -0,0 +1,110 @@
+テストパターン : [M1d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M1d.separate.ini
+Param File = 'testdata/AdjustTime.M1d.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=EXIF_TIME
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: 0(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
+
diff --git a/importPicture/testdata/AdjustTime.M2a.separate.log b/importPicture/testdata/AdjustTime.M2a.separate.log
new file mode 100644 (file)
index 0000000..5e7d117
--- /dev/null
@@ -0,0 +1,210 @@
+テストパターン : [M2a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M2a.separate.ini
+Param File = 'testdata/AdjustTime.M2a.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=FILE_UPDATE
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: -32400(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
+
+
+
+テストパターン : [M3a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M2a.separate.ini
+Param File = 'testdata/AdjustTime.M2a.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=FILE_UPDATE
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: -32400(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
+
diff --git a/importPicture/testdata/AdjustTime.M2b.separate.log b/importPicture/testdata/AdjustTime.M2b.separate.log
new file mode 100644 (file)
index 0000000..188ac42
--- /dev/null
@@ -0,0 +1,222 @@
+テストパターン : [M2b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M2b.separate.ini
+Param File = 'testdata/AdjustTime.M2b.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=FILE_UPDATE
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: -32400(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
+
+
+
+テストパターン : [M3b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M2b.separate.ini
+Param File = 'testdata/AdjustTime.M2b.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=FILE_UPDATE
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: -32400(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
+
diff --git a/importPicture/testdata/AdjustTime.M2c.separate.log b/importPicture/testdata/AdjustTime.M2c.separate.log
new file mode 100644 (file)
index 0000000..2a3c808
--- /dev/null
@@ -0,0 +1,210 @@
+テストパターン : [M2c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M2c.separate.ini
+Param File = 'testdata/AdjustTime.M2c.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=EXIF_TIME
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: 0(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
+
+
+
+テストパターン : [M3c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M2c.separate.ini
+Param File = 'testdata/AdjustTime.M2c.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=EXIF_TIME
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: 0(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
+
diff --git a/importPicture/testdata/AdjustTime.M2d.separate.log b/importPicture/testdata/AdjustTime.M2d.separate.log
new file mode 100644 (file)
index 0000000..e816976
--- /dev/null
@@ -0,0 +1,222 @@
+テストパターン : [M2d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M2d.separate.ini
+Param File = 'testdata/AdjustTime.M2d.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=EXIF_TIME
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: 0(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
+
+
+
+
+テストパターン : [M3d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse
+       tarFilePath = testdata/separate.tar.gz
+       gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
+       gpxDestinationPath = testdata/cameradata/separate.gpx
+       iniFilePath = testdata/AdjustTime.M2d.separate.ini
+Param File = 'testdata/AdjustTime.M2d.separate.ini'
+ - param: IMG.TIME=2017-05-29T01:31:46Z
+ - param: IMG.BASE_FILE=20170529_103146A.jpg
+ - param: GPX.BASETIME=EXIF_TIME
+ - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
+ - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
+ - param: IMG.OUTPUT=true
+ - param: IMG.OUTPUT_ALL=false
+ - param: IMG.OUTPUT_EXIF= false
+ - param: GPX.SOURCE_FOLDER=.
+ - param: GPX.OUTPUT_WPT=true
+ - param: GPX.OVERWRITE_MAGVAR=true
+ - param: GPX.OUTPUT_SPEED=true
+ - param: GPX.gpxSplit=false
+ - param: GPX.noFirstNode=true
+ - param: GPX.REUSE=false
+/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
+           時差: 0(sec)
+    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
+          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
+
+                                 +--------------------+--------------------|
+  GPS logging time               | First Time         | Last Time          |
+|--------------------------------+--------------------+--------------------|
+|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
+|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
+|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
+|--------------------------------+--------------------+--------------------|
+
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
+|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
+|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
+|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
+|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
+|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
+|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
+|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
+|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
+|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
+|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
+|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
+|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
+|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
+|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
+|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
+|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
+|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
+|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
+|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
+|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
+|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
+|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
+|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
+|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
+|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
+|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
+|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
+|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
+|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
+|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
+|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
+[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
+[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
+[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
+[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
+[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
+[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
+[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
+[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
+[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
+[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
+[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
+[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
+[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
+[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'