From d3a5fe8b27b281a54a6daec09bd0ce65bfdbddb3 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 24 Jun 2014 19:07:33 +0300 Subject: [PATCH 1/3] fixed issue with geo targeting on string geo:59.5,29.5?z=18&q=59.5,29.5. Jira bug 107 --- .../net/osmand/plus/activities/search/GeoIntentActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java index f38e6096ec..4113c21362 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java @@ -105,6 +105,8 @@ public class GeoIntentActivity extends OsmandListActivity { { Thread.sleep(200); } + String scheme = intent.getScheme(); + Uri data = intent.getData(); return extract(intent.getScheme(), intent.getData()).execute(); } catch (Exception e) From be10b3dfbb893c152d09138a555f4bdee2f20b2d Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Jun 2014 19:18:34 +0300 Subject: [PATCH 2/3] fixed jira issue 92. Cancelling recalculation of route if it was already calculated. --- OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index 71382bbe1f..74f28ce817 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -288,7 +288,11 @@ public class RoutingHelper { if (calculateRoute) { recalculateRouteInBackground(false, currentLocation, finalLocation, intermediatePoints, currentGPXRoute, previousRoute.isCalculated() ? previousRoute : null); + } else if (currentRunningJob != null && currentRunningJob instanceof RouteRecalculationThread) { + RouteRecalculationThread thread = (RouteRecalculationThread) currentRunningJob; + thread.stopCalculation(); } + double projectDist = mode != null && mode.hasFastSpeed() ? posTolerance : posTolerance / 2; if(returnUpdatedLocation && locationProjection != null && currentLocation.distanceTo(locationProjection) < projectDist) { return locationProjection; From 88738cb22dc55afd1ad52cf510620af5e61a0ad3 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Jun 2014 19:33:05 +0300 Subject: [PATCH 3/3] removed unused files --- .../net/osmand/plus/activities/search/GeoIntentActivity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java index 4113c21362..f38e6096ec 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java @@ -105,8 +105,6 @@ public class GeoIntentActivity extends OsmandListActivity { { Thread.sleep(200); } - String scheme = intent.getScheme(); - Uri data = intent.getData(); return extract(intent.getScheme(), intent.getData()).execute(); } catch (Exception e)