Remove abstract CoordinateReader
This commit is contained in:
Manuel Fuhr
parent
01ad4dc09a
commit
9d93d25a84
2 changed files with 173 additions and 224 deletions
|
|
@ -1,5 +1,17 @@
|
||||||
package btools.routingapp;
|
package btools.routingapp;
|
||||||
|
|
||||||
|
import android.graphics.Point;
|
||||||
|
|
||||||
|
import org.xmlpull.v1.XmlPullParser;
|
||||||
|
import org.xmlpull.v1.XmlPullParserFactory;
|
||||||
|
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.io.FileReader;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
@ -9,43 +21,181 @@ import java.util.Set;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
|
|
||||||
import btools.router.OsmNodeNamed;
|
import btools.router.OsmNodeNamed;
|
||||||
|
import btools.router.OsmNogoPolygon;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read coordinates from a gpx-file
|
* Read coordinates from a gpx-file
|
||||||
*/
|
*/
|
||||||
public abstract class CoordinateReader {
|
public class CoordinateReader {
|
||||||
|
protected static String[] posnames
|
||||||
|
= new String[]{"from", "via1", "via2", "via3", "via4", "via5", "via6", "via7", "via8", "via9", "to"};
|
||||||
|
private final String internalDir;
|
||||||
public List<OsmNodeNamed> waypoints;
|
public List<OsmNodeNamed> waypoints;
|
||||||
public List<OsmNodeNamed> nogopoints;
|
public List<OsmNodeNamed> nogopoints;
|
||||||
public String basedir;
|
public String basedir;
|
||||||
public String rootdir;
|
public String rootdir;
|
||||||
public String tracksdir;
|
public String tracksdir;
|
||||||
|
|
||||||
private boolean nogosOnly;
|
|
||||||
|
|
||||||
private Map<String, Map<String, OsmNodeNamed>> allpointsMap;
|
|
||||||
public List<OsmNodeNamed> allpoints;
|
public List<OsmNodeNamed> allpoints;
|
||||||
|
private boolean nogosOnly;
|
||||||
|
private Map<String, Map<String, OsmNodeNamed>> allpointsMap;
|
||||||
private HashMap<String, OsmNodeNamed> pointmap;
|
private HashMap<String, OsmNodeNamed> pointmap;
|
||||||
|
|
||||||
protected static String[] posnames
|
|
||||||
= new String[]{"from", "via1", "via2", "via3", "via4", "via5", "via6", "via7", "via8", "via9", "to"};
|
|
||||||
|
|
||||||
public CoordinateReader(String basedir) {
|
public CoordinateReader(String basedir) {
|
||||||
this.basedir = basedir;
|
this.basedir = basedir;
|
||||||
|
internalDir = basedir + "/brouter/import";
|
||||||
|
tracksdir = "/brouter/import/tracks";
|
||||||
|
rootdir = "/brouter/import";
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract long getTimeStamp() throws Exception;
|
public static CoordinateReader obtainValidReader(String basedir) throws IOException {
|
||||||
|
return obtainValidReader(basedir, false);
|
||||||
|
}
|
||||||
|
|
||||||
public abstract int getTurnInstructionMode();
|
public static CoordinateReader obtainValidReader(String basedir, boolean nogosOnly) throws IOException {
|
||||||
|
CoordinateReader cor = new CoordinateReader(basedir);
|
||||||
|
cor.nogosOnly = nogosOnly;
|
||||||
|
cor.readFromTo();
|
||||||
|
return cor;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getTurnInstructionMode() {
|
||||||
|
return 4; // comment style
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* read the from and to position from a gpx-file
|
||||||
|
* (with hardcoded name for now)
|
||||||
|
*/
|
||||||
|
public void readPointmap() throws IOException {
|
||||||
|
if (!_readPointmap(internalDir + "/favourites_bak.gpx")) {
|
||||||
|
_readPointmap(internalDir + "/favourites.gpx");
|
||||||
|
}
|
||||||
|
|
||||||
|
_readNogoLines(basedir + tracksdir);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean _readPointmap(String filename) throws IOException {
|
||||||
|
BufferedReader br;
|
||||||
|
try {
|
||||||
|
br = new BufferedReader(
|
||||||
|
new InputStreamReader(
|
||||||
|
new FileInputStream(filename)));
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
// ignore until it's reading error
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
OsmNodeNamed n = null;
|
||||||
|
|
||||||
|
for (; ; ) {
|
||||||
|
String line = br.readLine();
|
||||||
|
if (line == null) break;
|
||||||
|
|
||||||
|
int idx0 = line.indexOf(" lat=\"");
|
||||||
|
int idx10 = line.indexOf("<name>");
|
||||||
|
if (idx0 >= 0) {
|
||||||
|
n = new OsmNodeNamed();
|
||||||
|
idx0 += 6;
|
||||||
|
int idx1 = line.indexOf('"', idx0);
|
||||||
|
n.ilat = (int) ((Double.parseDouble(line.substring(idx0, idx1)) + 90.) * 1000000. + 0.5);
|
||||||
|
int idx2 = line.indexOf(" lon=\"");
|
||||||
|
if (idx2 < 0) continue;
|
||||||
|
idx2 += 6;
|
||||||
|
int idx3 = line.indexOf('"', idx2);
|
||||||
|
n.ilon = (int) ((Double.parseDouble(line.substring(idx2, idx3)) + 180.) * 1000000. + 0.5);
|
||||||
|
if (idx3 < 0) continue;
|
||||||
|
}
|
||||||
|
if (n != null && idx10 >= 0) {
|
||||||
|
idx10 += 6;
|
||||||
|
int idx11 = line.indexOf("</name>", idx10);
|
||||||
|
if (idx11 >= 0) {
|
||||||
|
n.name = line.substring(idx10, idx11).trim();
|
||||||
|
checkAddPoint("(one-for-all)", n);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
br.close();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _readNogoLines(String dirname) {
|
||||||
|
File dir = new File(dirname);
|
||||||
|
|
||||||
|
if (dir.exists() && dir.isDirectory()) {
|
||||||
|
for (final File file : dir.listFiles()) {
|
||||||
|
final String name = file.getName();
|
||||||
|
if (name.startsWith("nogo") && name.endsWith(".gpx")) {
|
||||||
|
try {
|
||||||
|
_readNogoLine(file);
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _readNogoLine(File file) throws Exception {
|
||||||
|
XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
|
||||||
|
factory.setNamespaceAware(false);
|
||||||
|
XmlPullParser xpp = factory.newPullParser();
|
||||||
|
|
||||||
|
xpp.setInput(new FileReader(file));
|
||||||
|
|
||||||
|
List<Point> tmpPts = new ArrayList<>();
|
||||||
|
int eventType = xpp.getEventType();
|
||||||
|
int numSeg = 0;
|
||||||
|
while (eventType != XmlPullParser.END_DOCUMENT) {
|
||||||
|
switch (eventType) {
|
||||||
|
case XmlPullParser.START_TAG: {
|
||||||
|
if (xpp.getName().equals("trkpt") || xpp.getName().equals("rtept")) {
|
||||||
|
final String lon = xpp.getAttributeValue(null, "lon");
|
||||||
|
final String lat = xpp.getAttributeValue(null, "lat");
|
||||||
|
if (lon != null && lat != null) {
|
||||||
|
tmpPts.add(new Point(
|
||||||
|
(int) ((Double.parseDouble(lon) + 180.) * 1000000. + 0.5),
|
||||||
|
(int) ((Double.parseDouble(lat) + 90.) * 1000000. + 0.5)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case XmlPullParser.END_TAG: {
|
||||||
|
if (xpp.getName().equals("trkseg") || xpp.getName().equals("rte")) { // rte has no segment
|
||||||
|
OsmNogoPolygon nogo;
|
||||||
|
if (tmpPts.size() > 0) {
|
||||||
|
if (tmpPts.get(0).x == tmpPts.get(tmpPts.size() - 1).x &&
|
||||||
|
tmpPts.get(0).y == tmpPts.get(tmpPts.size() - 1).y) {
|
||||||
|
nogo = new OsmNogoPolygon(true);
|
||||||
|
} else {
|
||||||
|
nogo = new OsmNogoPolygon(false);
|
||||||
|
}
|
||||||
|
for (Point p : tmpPts) {
|
||||||
|
nogo.addVertex(p.x, p.y);
|
||||||
|
}
|
||||||
|
nogo.calcBoundingCircle();
|
||||||
|
final String name = file.getName();
|
||||||
|
nogo.name = name.substring(0, name.length() - 4);
|
||||||
|
if (numSeg > 0) {
|
||||||
|
nogo.name += Integer.toString(numSeg + 1);
|
||||||
|
}
|
||||||
|
numSeg++;
|
||||||
|
checkAddPoint("(one-for-all)", nogo);
|
||||||
|
}
|
||||||
|
tmpPts.clear();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
eventType = xpp.next();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void readAllPoints() throws Exception {
|
public void readAllPoints() throws Exception {
|
||||||
allpointsMap = new TreeMap<String, Map<String, OsmNodeNamed>>();
|
allpointsMap = new TreeMap<>();
|
||||||
readFromTo();
|
readFromTo();
|
||||||
allpoints = new ArrayList<OsmNodeNamed>();
|
allpoints = new ArrayList<>();
|
||||||
Set<String> names = new HashSet<String>();
|
Set<String> names = new HashSet<>();
|
||||||
for (String category : allpointsMap.keySet()) {
|
for (String category : allpointsMap.keySet()) {
|
||||||
Map<String, OsmNodeNamed> cat = allpointsMap.get(category);
|
Map<String, OsmNodeNamed> cat = allpointsMap.get(category);
|
||||||
if (cat.size() < 101) {
|
if (cat != null && cat.size() < 101) {
|
||||||
for (OsmNodeNamed wp : cat.values()) {
|
for (OsmNodeNamed wp : cat.values()) {
|
||||||
if (names.add(wp.name)) {
|
if (names.add(wp.name)) {
|
||||||
allpoints.add(wp);
|
allpoints.add(wp);
|
||||||
|
|
@ -62,14 +212,13 @@ public abstract class CoordinateReader {
|
||||||
/*
|
/*
|
||||||
* read the from, to and via-positions from a gpx-file
|
* read the from, to and via-positions from a gpx-file
|
||||||
*/
|
*/
|
||||||
public void readFromTo() throws Exception {
|
public void readFromTo() throws IOException {
|
||||||
pointmap = new HashMap<String, OsmNodeNamed>();
|
pointmap = new HashMap<>();
|
||||||
waypoints = new ArrayList<OsmNodeNamed>();
|
waypoints = new ArrayList<>();
|
||||||
nogopoints = new ArrayList<OsmNodeNamed>();
|
nogopoints = new ArrayList<>();
|
||||||
readPointmap();
|
readPointmap();
|
||||||
boolean fromToMissing = false;
|
boolean fromToMissing = false;
|
||||||
for (int i = 0; i < posnames.length; i++) {
|
for (String name : posnames) {
|
||||||
String name = posnames[i];
|
|
||||||
OsmNodeNamed n = pointmap.get(name);
|
OsmNodeNamed n = pointmap.get(name);
|
||||||
if (n != null) {
|
if (n != null) {
|
||||||
waypoints.add(n);
|
waypoints.add(n);
|
||||||
|
|
@ -86,7 +235,7 @@ public abstract class CoordinateReader {
|
||||||
if (category == null) category = "";
|
if (category == null) category = "";
|
||||||
Map<String, OsmNodeNamed> cat = allpointsMap.get(category);
|
Map<String, OsmNodeNamed> cat = allpointsMap.get(category);
|
||||||
if (cat == null) {
|
if (cat == null) {
|
||||||
cat = new TreeMap<String, OsmNodeNamed>();
|
cat = new TreeMap<>();
|
||||||
allpointsMap.put(category, cat);
|
allpointsMap.put(category, cat);
|
||||||
}
|
}
|
||||||
if (cat.size() < 101) {
|
if (cat.size() < 101) {
|
||||||
|
|
@ -96,8 +245,8 @@ public abstract class CoordinateReader {
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean isKnown = false;
|
boolean isKnown = false;
|
||||||
for (int i = 0; i < posnames.length; i++) {
|
for (String posname : posnames) {
|
||||||
if (posnames[i].equals(n.name)) {
|
if (posname.equals(n.name)) {
|
||||||
isKnown = true;
|
isKnown = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -116,18 +265,4 @@ public abstract class CoordinateReader {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract void readPointmap() throws Exception;
|
|
||||||
|
|
||||||
|
|
||||||
public static CoordinateReader obtainValidReader(String basedir) throws Exception {
|
|
||||||
return obtainValidReader(basedir, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static CoordinateReader obtainValidReader(String basedir, boolean nogosOnly) throws Exception {
|
|
||||||
CoordinateReader cor = new CoordinateReaderInternal(basedir);
|
|
||||||
cor.nogosOnly = nogosOnly;
|
|
||||||
cor.readFromTo();
|
|
||||||
return cor;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,186 +0,0 @@
|
||||||
package btools.routingapp;
|
|
||||||
|
|
||||||
import android.graphics.Point;
|
|
||||||
|
|
||||||
import org.xmlpull.v1.XmlPullParser;
|
|
||||||
import org.xmlpull.v1.XmlPullParserFactory;
|
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileNotFoundException;
|
|
||||||
import java.io.FileReader;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import btools.router.OsmNodeNamed;
|
|
||||||
import btools.router.OsmNogoPolygon;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Read coordinates from a gpx-file
|
|
||||||
*/
|
|
||||||
public class CoordinateReaderInternal extends CoordinateReader {
|
|
||||||
private String internalDir;
|
|
||||||
|
|
||||||
public CoordinateReaderInternal(String basedir) {
|
|
||||||
this(basedir, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public CoordinateReaderInternal(String basedir, boolean shortPath) {
|
|
||||||
super(basedir);
|
|
||||||
if (shortPath) {
|
|
||||||
internalDir = basedir;
|
|
||||||
tracksdir = "/tracks";
|
|
||||||
rootdir = "";
|
|
||||||
} else {
|
|
||||||
internalDir = basedir + "/brouter/import";
|
|
||||||
tracksdir = "/brouter/import/tracks";
|
|
||||||
rootdir = "/brouter/import";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public long getTimeStamp() throws Exception {
|
|
||||||
long t1 = new File(internalDir + "/favourites_bak.gpx").lastModified();
|
|
||||||
long t2 = new File(internalDir + "/favourites.gpx").lastModified();
|
|
||||||
return t1 > t2 ? t1 : t2;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getTurnInstructionMode() {
|
|
||||||
return 4; // comment style
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* read the from and to position from a gpx-file
|
|
||||||
* (with hardcoded name for now)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void readPointmap() throws Exception {
|
|
||||||
if (!_readPointmap(internalDir + "/favourites_bak.gpx")) {
|
|
||||||
_readPointmap(internalDir + "/favourites.gpx");
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
_readNogoLines(basedir + tracksdir);
|
|
||||||
} catch (IOException ioe) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean _readPointmap(String filename) throws Exception {
|
|
||||||
BufferedReader br = null;
|
|
||||||
try {
|
|
||||||
br = new BufferedReader(
|
|
||||||
new InputStreamReader(
|
|
||||||
new FileInputStream(filename)));
|
|
||||||
} catch (FileNotFoundException e) {
|
|
||||||
// ignore until it's reading error
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
OsmNodeNamed n = null;
|
|
||||||
|
|
||||||
for (; ; ) {
|
|
||||||
String line = br.readLine();
|
|
||||||
if (line == null) break;
|
|
||||||
|
|
||||||
int idx0 = line.indexOf(" lat=\"");
|
|
||||||
int idx10 = line.indexOf("<name>");
|
|
||||||
if (idx0 >= 0) {
|
|
||||||
n = new OsmNodeNamed();
|
|
||||||
idx0 += 6;
|
|
||||||
int idx1 = line.indexOf('"', idx0);
|
|
||||||
n.ilat = (int) ((Double.parseDouble(line.substring(idx0, idx1)) + 90.) * 1000000. + 0.5);
|
|
||||||
int idx2 = line.indexOf(" lon=\"");
|
|
||||||
if (idx2 < 0) continue;
|
|
||||||
idx2 += 6;
|
|
||||||
int idx3 = line.indexOf('"', idx2);
|
|
||||||
n.ilon = (int) ((Double.parseDouble(line.substring(idx2, idx3)) + 180.) * 1000000. + 0.5);
|
|
||||||
if (idx3 < 0) continue;
|
|
||||||
}
|
|
||||||
if (n != null && idx10 >= 0) {
|
|
||||||
idx10 += 6;
|
|
||||||
int idx11 = line.indexOf("</name>", idx10);
|
|
||||||
if (idx11 >= 0) {
|
|
||||||
n.name = line.substring(idx10, idx11).trim();
|
|
||||||
checkAddPoint("(one-for-all)", n);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
br.close();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void _readNogoLines(String dirname) throws IOException {
|
|
||||||
|
|
||||||
File dir = new File(dirname);
|
|
||||||
|
|
||||||
if (dir.exists() && dir.isDirectory()) {
|
|
||||||
for (final File file : dir.listFiles()) {
|
|
||||||
final String name = file.getName();
|
|
||||||
if (name.startsWith("nogo") && name.endsWith(".gpx")) {
|
|
||||||
try {
|
|
||||||
_readNogoLine(file);
|
|
||||||
} catch (Exception e) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void _readNogoLine(File file) throws Exception {
|
|
||||||
XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
|
|
||||||
factory.setNamespaceAware(false);
|
|
||||||
XmlPullParser xpp = factory.newPullParser();
|
|
||||||
|
|
||||||
xpp.setInput(new FileReader(file));
|
|
||||||
|
|
||||||
List<Point> tmpPts = new ArrayList<Point>();
|
|
||||||
int eventType = xpp.getEventType();
|
|
||||||
int numSeg = 0;
|
|
||||||
while (eventType != XmlPullParser.END_DOCUMENT) {
|
|
||||||
switch (eventType) {
|
|
||||||
case XmlPullParser.START_TAG: {
|
|
||||||
if (xpp.getName().equals("trkpt") || xpp.getName().equals("rtept")) {
|
|
||||||
final String lon = xpp.getAttributeValue(null, "lon");
|
|
||||||
final String lat = xpp.getAttributeValue(null, "lat");
|
|
||||||
if (lon != null && lat != null) {
|
|
||||||
tmpPts.add(new Point(
|
|
||||||
(int) ((Double.parseDouble(lon) + 180.) * 1000000. + 0.5),
|
|
||||||
(int) ((Double.parseDouble(lat) + 90.) * 1000000. + 0.5)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case XmlPullParser.END_TAG: {
|
|
||||||
if (xpp.getName().equals("trkseg") || xpp.getName().equals("rte")) { // rte has no segment
|
|
||||||
OsmNogoPolygon nogo = null;
|
|
||||||
if (tmpPts.size() >= 0) {
|
|
||||||
if (tmpPts.get(0).x == tmpPts.get(tmpPts.size() - 1).x &&
|
|
||||||
tmpPts.get(0).y == tmpPts.get(tmpPts.size() - 1).y) {
|
|
||||||
nogo = new OsmNogoPolygon(true);
|
|
||||||
} else {
|
|
||||||
nogo = new OsmNogoPolygon(false);
|
|
||||||
}
|
|
||||||
for (Point p : tmpPts) {
|
|
||||||
nogo.addVertex(p.x, p.y);
|
|
||||||
}
|
|
||||||
nogo.calcBoundingCircle();
|
|
||||||
final String name = file.getName();
|
|
||||||
nogo.name = name.substring(0, name.length() - 4);
|
|
||||||
if (numSeg > 0) {
|
|
||||||
nogo.name += Integer.toString(numSeg + 1);
|
|
||||||
}
|
|
||||||
numSeg++;
|
|
||||||
checkAddPoint("(one-for-all)", nogo);
|
|
||||||
}
|
|
||||||
tmpPts.clear();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
eventType = xpp.next();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue