Fork: 0
haya4 / adjustgpx-core
Browse code
green: magvar, speed.
master v5.3.9 ...MAVEN
1 parent 5b7105c commit db27cfb0909e4a2adaad679de6d25fd53cba2b3f
@hayashi hayashi authored on 9 Jul 2017
Patch
Unified Split
Showing 2 changed files
View
7
■■■■■
 importPicture/src/osm/jp/gpx/ElementMapTRKPT.java
// 緯度・経度と時間差から速度(km/h)を求める
if (Complementation.param_GpxOutputSpeed) {
comp.complementationSpeed();
}
return (TagTrkpt)(comp.imaTag.trkpt.cloneNode(true));
//return (TagTrkpt)(comp.imaTag.trkpt.cloneNode(true));
return (TagTrkpt)(comp.imaTag);
}
return imaE;
}
return null;
private TagTrkpt getMaeTrkpt(Date time) throws ParseException {
Date maeTime = null;
for (Date key : this.keySet()) {
int flag = time.compareTo(key);
if (flag < 0) {
if (flag > 0) {
maeTime = new Date(key.getTime());
}
else if (flag == 0) {
if (maeTime == null) {
}
return this.get(maeTime);
}
else {
// time は key より古い
if (maeTime == null) {
return null;
}
if (Math.abs(maeTime.getTime() - time.getTime()) > OVER_TIME_LIMIT) {
View
4
■■■■■
 importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
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(notNullValue()));
assertThat(tag.magvarStr, is(nullValue()));
}
 
@Test
public void get_20() throws ParseException {
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(notNullValue()));
assertThat(tag.magvarStr, is(nullValue()));
}
 
@Test
public void get_21() throws ParseException {