green: test TRKPT.

diff --git a/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java b/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
index 951f162..67a2185 100644 (file)
--- a/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
+++ b/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
@@ -112,6 +112,8 @@ public class ElementMapTRKPTTest {
                
                @Before
                public void setUp() throws Exception {
+                       Complementation.param_GpxOverwriteMagvar = true;
+                       
                        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
                        DocumentBuilder builder = factory.newDocumentBuilder();
                        DOMImplementation domImpl=builder.getDOMImplementation();
@@ -152,6 +154,8 @@ public class ElementMapTRKPTTest {
                        TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:18Z"));
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:18Z"));
                        assertThat(tag.eleStr, is(nullValue()));
+                       assertThat(tag.lat, is((new Double(values[0][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -159,6 +163,8 @@ public class ElementMapTRKPTTest {
                        TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:19Z"));
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:18Z"));
                        assertThat(tag.eleStr, is(nullValue()));
+                       assertThat(tag.lat, is((new Double(values[0][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -166,6 +172,8 @@ public class ElementMapTRKPTTest {
                        TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:20Z"));
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:18Z"));
                        assertThat(tag.eleStr, is(nullValue()));
+                       assertThat(tag.lat, is((new Double(values[0][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -174,6 +182,7 @@ public class ElementMapTRKPTTest {
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:21Z"));
                        assertThat(tag.eleStr, is("614.90"));
                        assertThat(tag.lat, is((new Double(values[1][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -182,6 +191,7 @@ public class ElementMapTRKPTTest {
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:21Z"));
                        assertThat(tag.eleStr, is("614.90"));
                        assertThat(tag.lat, is((new Double(values[1][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -190,6 +200,7 @@ public class ElementMapTRKPTTest {
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:21Z"));
                        assertThat(tag.eleStr, is("614.90"));
                        assertThat(tag.lat, is((new Double(values[1][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -198,6 +209,7 @@ public class ElementMapTRKPTTest {
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:24Z"));
                        assertThat(tag.eleStr, is("615.00"));
                        assertThat(tag.lat, is((new Double(values[2][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -206,6 +218,7 @@ public class ElementMapTRKPTTest {
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:24Z"));
                        assertThat(tag.eleStr, is("615.00"));
                        assertThat(tag.lat, is((new Double(values[2][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -214,6 +227,7 @@ public class ElementMapTRKPTTest {
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:24Z"));
                        assertThat(tag.eleStr, is("615.00"));
                        assertThat(tag.lat, is((new Double(values[2][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -222,6 +236,7 @@ public class ElementMapTRKPTTest {
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:27Z"));
                        assertThat(tag.eleStr, is("615.03"));
                        assertThat(tag.lat, is((new Double(values[3][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -230,6 +245,7 @@ public class ElementMapTRKPTTest {
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:27Z"));
                        assertThat(tag.eleStr, is("615.03"));
                        assertThat(tag.lat, is((new Double(values[3][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test
@@ -238,6 +254,7 @@ public class ElementMapTRKPTTest {
                        assertThat(sdf.format(tag.time), is("2017-05-29T10:23:27Z"));
                        assertThat(tag.eleStr, is("615.03"));
                        assertThat(tag.lat, is((new Double(values[3][1])).doubleValue()));
+                       assertThat(tag.magvarStr, is(nullValue()));
                }
 
                @Test

diff --git a/importPicture/test/osm/jp/gpx/ImportPictureTest.java b/importPicture/test/osm/jp/gpx/ImportPictureTest.java
index 95d4b66..dc9ad38 100644 (file)
--- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java
+++ b/importPicture/test/osm/jp/gpx/ImportPictureTest.java
@@ -90,7 +90,7 @@ public class ImportPictureTest {
                                        "testdata/cameradata/20170518.gpx",
                                        "testdata/AdjustTime.20170518.A1.ini",
                                        new Expecter[] {
-                                               new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, true),
+                                               new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, false),
                                                new Expecter("10170518/DSC05183.JPG", false, null, 90.0D, 180.0D, false),
                                                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),
@@ -104,7 +104,7 @@ public class ImportPictureTest {
                                        "testdata/cameradata/20170518.gpx",
                                        "testdata/AdjustTime.20170518.A2.ini",
                                        new Expecter[] {
-                                               new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, true),
+                                               new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, false),
                                                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", 35.4367520000D, 139.4082730000D, true),
                                                new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, true),
@@ -119,7 +119,7 @@ public class ImportPictureTest {
                                        "testdata/cameradata/20170518.gpx",
                                        "testdata/AdjustTime.20170518.B1.ini",
                                        new Expecter[] {
-                                               new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, true),
+                                               new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, false),
                                                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", 35.4366860000D, 139.4082650000D, true),
                                                new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, true),
@@ -133,7 +133,7 @@ public class ImportPictureTest {
                                        "testdata/cameradata/20170518.gpx",
                                        "testdata/AdjustTime.20170518.B2.ini",
                                        new Expecter[] {
-                                               new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, true),
+                                               new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, false),
                                                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),
@@ -148,7 +148,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M1a.separate.ini",
                                        new Expecter[] {
                                        // GPX file
-                                               new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                               new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
                                    
                                    // out of time ( - 2017-05-29T01:23:18)
                                                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
@@ -184,7 +184,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M1b.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.D, 180.0D, false),
                                            
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, true),
@@ -220,7 +220,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M1c.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
                                            
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
@@ -256,7 +256,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M1d.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
                                            
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, true),
@@ -293,7 +293,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M2a.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
                                            
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
@@ -329,7 +329,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M2b.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
                                            
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, true),
@@ -365,7 +365,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M2c.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
                                            
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
@@ -401,7 +401,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M2d.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
                                            
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, true),
@@ -437,7 +437,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M2a.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
                                            
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
@@ -473,7 +473,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M2b.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
 
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, true),
@@ -509,7 +509,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M2c.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
                                            
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
@@ -545,7 +545,7 @@ public class ImportPictureTest {
                                        "testdata/AdjustTime.M2d.separate.ini",
                                        new Expecter[] {
                                                // GPX file
-                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
+                                                       new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
                                            
                                            // out of time ( - 2017-05-29T01:23:18)
                                                        new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, true),