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

Update location provider

Browse source
This commit is contained in:
vshcherb 2013-10-28 22:46:29 +01:00
parent 44d26dd308
commit 9ffedce020
2 changed files with 74 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd-java/src/net/osmand/util/MapUtils.java
View file

@ -423,12 +423,12 @@ public class MapUtils {
public static QuadPoint getProjectionPoint31(int px, int py, int st31x, int st31y,int end31x, int end31y) { public static QuadPoint getProjectionPoint31(int px, int py, int st31x, int st31y,int end31x, int end31y) {
double mDist = squareRootDist31(end31x, end31y, st31x,
st31y);
int prx = end31x;
int pry = end31y;
double projection = calculateProjection31TileMetric(st31x, st31y, end31x, double projection = calculateProjection31TileMetric(st31x, st31y, end31x,
end31y, px, py); end31y, px, py);
double mDist = squareRootDist31(end31x, end31y, st31x,
st31y);
int pry = end31y;
int prx = end31x;
if (projection < 0) { if (projection < 0) {
prx = st31x; prx = st31x;
pry = st31y; pry = st31y;

81
OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
View file

@ -12,6 +12,7 @@ import net.osmand.access.NavigationInfo;
import net.osmand.binary.BinaryMapDataObject; import net.osmand.binary.BinaryMapDataObject;
import net.osmand.binary.RouteDataObject; import net.osmand.binary.RouteDataObject;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.QuadPoint;
import net.osmand.plus.OsmandSettings.OsmandPreference; import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.RoutingHelper;
import net.osmand.util.MapUtils; import net.osmand.util.MapUtils;
@ -97,32 +98,90 @@ public class OsmAndLocationProvider implements SensorEventListener {
private OsmandPreference<Boolean> USE_MAGNETIC_FIELD_SENSOR_COMPASS; private OsmandPreference<Boolean> USE_MAGNETIC_FIELD_SENSOR_COMPASS;
private OsmandPreference<Boolean> USE_FILTER_FOR_COMPASS; private OsmandPreference<Boolean> USE_FILTER_FOR_COMPASS;
private static double squareDist(int x1, int y1, int x2, int y2) {
// translate into meters
double dy = MapUtils.convert31YToMeters(y1, y2);
double dx = MapUtils. convert31XToMeters(x1, x2);
return dx * dx + dy * dy;
}
private class SimulationSegment { public class SimulationSegment {
private List<BinaryMapDataObject> simulateRoads = new ArrayList<BinaryMapDataObject>(); private List<BinaryMapDataObject> simulateRoads = new ArrayList<BinaryMapDataObject>();
private float currentSimulationLength = 0; private float currentSimulationLength = 0;
private long simulationStarted = 0; private int currentRoad;
private float simulationSpeedMS = 0; private int currentSegment;
private double currentProjection;
private net.osmand.Location startLocation;
private List<BinaryMapDataObject> roads;
public void startSimulation(List<BinaryMapDataObject> roads, public void startSimulation(List<BinaryMapDataObject> roads,
Location currentLocation) { net.osmand.Location currentLocation) {
simulationStarted = currentLocation.getTime(); roads = roads;
simulationSpeedMS = currentLocation.getSpeed(); startLocation = new net.osmand.Location(currentLocation);
double orthDistance = 10000; long ms = System.currentTimeMillis();
int currentRoad = 0; if(ms - startLocation.getTime() > 5000 ||
int currentSegment = 0; ms < startLocation.getTime()) {
startLocation.setTime(ms);
}
currentRoad = -1;
int px = MapUtils.get31TileNumberX(currentLocation.getLongitude());
int py = MapUtils.get31TileNumberY(currentLocation.getLatitude());
double dist = 1000;
for(int i = 0; i < roads.size(); i++) { for(int i = 0; i < roads.size(); i++) {
BinaryMapDataObject road = roads.get(i); BinaryMapDataObject road = roads.get(i);
for(int j = 1; j < road.getPointsLength(); j++) { for(int j = 1; j < road.getPointsLength(); j++) {
QuadPoint proj = MapUtils.getProjectionPoint31(px, py, road.getPoint31XTile(j-1), road.getPoint31YTile(j-1),
road.getPoint31XTile(j), road.getPoint31YTile(j));
double dd = squareDist((int)proj.x, (int)proj.y, px, py);
if (dd < dist) {
dist = dd;
currentRoad = i;
currentSegment = j;
currentProjection = MapUtils.calculateProjection31TileMetric(road.getPoint31XTile(j-1), road.getPoint31YTile(j-1),
road.getPoint31XTile(j), road.getPoint31YTile(j), px, py);
}
} }
} }
}
private void proceedMeters() {
/*for(int i = 0; i < roads.size(); i++) {
BinaryMapDataObject road = roads.get(i);
for(int j = 1; j < road.getPointsLength(); j++) {
QuadPoint proj = MapUtils.getProjectionPoint31(px, py, road.getPoint31XTile(j-1), road.getPoint31YTile(j-1),
road.getPoint31XTile(j), road.getPoint31YTile(j));
double dd = squareDist((int)proj.x, (int)proj.y, px, py);
if (dd < dist) {
dist = dd;
currentRoad = i;
currentSegment = j;
currentProjection = MapUtils.calculateProjection31TileMetric(road.getPoint31XTile(j-1), road.getPoint31YTile(j-1),
road.getPoint31XTile(j), road.getPoint31YTile(j), px, py);
}
}
}*/
}
/**
* @return null if it is not available of far from boundaries
*/
public Location getSimulatedLocation() {
if(!isSimulatedDataAvailable()) {
return null;
}
Location loc = new Location("OsmAnd");
loc.setSpeed(startLocation.getSpeed());
loc.setAltitude(startLocation.getAltitude());
loc.setTime(System.currentTimeMillis());
float meters = (System.currentTimeMillis() - startLocation.getTime()) / startLocation.getSpeed();
return loc;
} }
public boolean isSimulatedDataAvailable() { public boolean isSimulatedDataAvailable() {
return simulationStarted > 0 && simulationSpeedMS > 0; return startLocation != null && startLocation.getSpeed() > 0 && currentRoad >= 0;
} }
} }