Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

clean up

Browse source
This commit is contained in:
Victor Shcherb 2020-05-16 17:17:04 +02:00
parent 7319a235c0
commit a52767bdb3
1 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java
View file

@ -1,10 +1,5 @@
package net.osmand.data; package net.osmand.data;
import net.osmand.osm.edit.Node;
import net.osmand.osm.edit.Way;
import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@ -12,9 +7,10 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import gnu.trove.list.array.TIntArrayList; import net.osmand.osm.edit.Node;
import gnu.trove.map.hash.TIntObjectHashMap; import net.osmand.osm.edit.Way;
import gnu.trove.map.hash.TLongObjectHashMap; import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils;
public class TransportRoute extends MapObject { public class TransportRoute extends MapObject {
private List<TransportStop> forwardStops = new ArrayList<TransportStop>(); private List<TransportStop> forwardStops = new ArrayList<TransportStop>();
@ -26,12 +22,11 @@ public class TransportRoute extends MapObject {
private List<Way> forwardWays; private List<Way> forwardWays;
private TransportSchedule schedule; private TransportSchedule schedule;
public static final double SAME_STOP = 40; public static final double SAME_STOP = 40;
private boolean combined = false;
public TransportRoute() { public TransportRoute() {
} }
public TransportRoute(TransportRoute r, List<TransportStop> mergedSegment, List<Way> ways) { public TransportRoute(TransportRoute r, List<TransportStop> forwardStops, List<Way> forwardWay) {
this.name = r.name; this.name = r.name;
this.enName = r.enName; this.enName = r.enName;
this.names = r.names; this.names = r.names;
@ -41,10 +36,8 @@ public class TransportRoute extends MapObject {
this.type = r.type; this.type = r.type;
this.color = r.color; this.color = r.color;
this.schedule = r.schedule; this.schedule = r.schedule;
this.combined = true; this.forwardStops = forwardStops;
this.forwardStops = mergedSegment; this.forwardWays = forwardWay;
this.dist = calculateDistance();
this.forwardWays = ways;
} }
public TransportSchedule getSchedule() { public TransportSchedule getSchedule() {
@ -58,19 +51,6 @@ public class TransportRoute extends MapObject {
return schedule; return schedule;
} }
public boolean isCombined() {
return combined;
}
public Integer calculateDistance() {
int distance = 0;
for (int i = 0; i < forwardStops.size()-1; i++) {
if (!forwardStops.get(i).isMissingStop() || !forwardStops.get(i+1).isMissingStop())
distance += MapUtils.getDistance(forwardStops.get(i).getLocation(), forwardStops.get(i+1).getLocation());
}
return distance;
}
public boolean isIncomplete() { public boolean isIncomplete() {
for (TransportStop s : forwardStops) { for (TransportStop s : forwardStops) {
if (s.isMissingStop()) { if (s.isMissingStop()) {