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

final fixes for 0.2.1

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@298 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-07-07 11:16:02 +00:00
parent 57f2513784
commit 45410f6ed0
6 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
DataExtractionOSM/src/com/osmand/ToDoConstants.java
View file

@ -13,10 +13,11 @@ public class ToDoConstants {
*/ */
public int DESCRIBE_ABOUT_AUTHORS = 8; public int DESCRIBE_ABOUT_AUTHORS = 8;
// pinch zoom, fix bugs with test data
// TODO ANDROID // TODO ANDROID
// Prepare update v 0.2.1: screenshots, // android description, sites(osmand/wiki), US/canada indexes & poi/transport.index // Prepare update v 0.2.1: screenshots, android description, sites(osmand/wiki), US/canada indexes & poi/transport.index
// 61. Provide route information for YOURS (calclate turns/angle/expected time). // 61. Provide route information for YOURS (calclate turns/angle/expected time).
// Fix some missing turns in CloudMade (for secondary roads wo name). Add them (if dist to prev/next turn > 150m) [dacha] // Fix some missing turns in CloudMade (for secondary roads wo name). Add them (if dist to prev/next turn > 150m) [dacha]

8
OsmAnd/res/values/strings.xml
View file

@ -156,13 +156,13 @@ See osmand.googlecode.com.</string>
<string name="choose_street">Choose street</string> <string name="choose_street">Choose street</string>
<string name="choose_city">Choose city</string> <string name="choose_city">Choose city</string>
<string name="ChooseCountry">Choose country</string> <string name="ChooseCountry">Choose country</string>
<string name="position_on_map_descr">Choose postion on the map</string> <string name="position_on_map_descr">Choose position on the map</string>
<string name="position_on_map">Position on the map</string> <string name="position_on_map">Position on the map</string>
<string name="map_specify_point">Specify point</string> <string name="map_specify_point">Specify point</string>
<string name="show_view_angle_descr">Show aspect of vew based on compass</string> <string name="show_view_angle_descr">Show aspect of view based on compass</string>
<string name="show_view_angle">Show aspect of view</string> <string name="show_view_angle">Show aspect of view</string>
<string name="stop_navigation">Unmark location</string> <string name="stop_navigation">Clear point</string>
<string name="navigate_to_point">Mark location</string> <string name="navigate_to_point">Mark point</string>
<string name="map_view_3d_descr">Enable 3D view of the map</string> <string name="map_view_3d_descr">Enable 3D view of the map</string>
<string name="map_view_3d">Map View 3D</string> <string name="map_view_3d">Map View 3D</string>
<string name="rotate_map_to_bearing_descr">Rotate map to bearing of your direction</string> <string name="rotate_map_to_bearing_descr">Rotate map to bearing of your direction</string>

2
OsmAnd/src/com/osmand/activities/MainMenuActivity.java
View file

@ -49,7 +49,7 @@ public class MainMenuActivity extends Activity {
public void startApplication(){ public void startApplication(){
if(!applicationAlreadyStarted){ if(!applicationAlreadyStarted){
// Algoritms.removeAllFiles(new File(Environment.getExternalStorageDirectory(), "/osmand/tiles/Mapnik/18"));
final ProgressDialog dlg = ProgressDialog.show(this, getString(R.string.loading_data), getString(R.string.reading_indexes), true); final ProgressDialog dlg = ProgressDialog.show(this, getString(R.string.loading_data), getString(R.string.reading_indexes), true);
final ProgressDialogImplementation impl = new ProgressDialogImplementation(dlg); final ProgressDialogImplementation impl = new ProgressDialogImplementation(dlg);
impl.setRunnable("Initializing app", new Runnable(){ //$NON-NLS-1$ impl.setRunnable("Initializing app", new Runnable(){ //$NON-NLS-1$

2
OsmAnd/src/com/osmand/activities/SavingTrackHelper.java
View file

@ -154,7 +154,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
file.mkdirs(); file.mkdirs();
if (file.exists()) { if (file.exists()) {
Cursor query = db.rawQuery("SELECT " + TRACK_COL_LAT + "," + TRACK_COL_LON + "," + TRACK_COL_ALTITUDE + "," //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ Cursor query = db.rawQuery("SELECT " + TRACK_COL_LAT + "," + TRACK_COL_LON + "," + TRACK_COL_ALTITUDE + "," //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ TRACK_COL_SPEED + "," + TRACK_COL_DATE + " FROM " + TRACK_NAME, null); //$NON-NLS-1$ //$NON-NLS-2$ + TRACK_COL_SPEED + "," + TRACK_COL_DATE + " FROM " + TRACK_NAME +" ORDER BY " + TRACK_COL_DATE +" ASC", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
long previousTime = 0; long previousTime = 0;
Map<String, List<List<TrkPt>>> data = new LinkedHashMap<String, List<List<TrkPt>>>(); Map<String, List<List<TrkPt>>> data = new LinkedHashMap<String, List<List<TrkPt>>>();
List<TrkPt> segment = new ArrayList<TrkPt>(); List<TrkPt> segment = new ArrayList<TrkPt>();

1
OsmAnd/src/com/osmand/activities/SettingsActivity.java
View file

@ -336,6 +336,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
if(preset == ApplicationMode.CAR){ if(preset == ApplicationMode.CAR){
edit.putBoolean(OsmandSettings.USE_INTERNET_TO_DOWNLOAD_TILES, true); edit.putBoolean(OsmandSettings.USE_INTERNET_TO_DOWNLOAD_TILES, true);
// edit.putBoolean(OsmandSettings.SHOW_POI_OVER_MAP, _); // edit.putBoolean(OsmandSettings.SHOW_POI_OVER_MAP, _);
edit.putBoolean(OsmandSettings.SHOW_TRANSPORT_OVER_MAP, false);
edit.putBoolean(OsmandSettings.ROTATE_MAP_TO_BEARING, true); edit.putBoolean(OsmandSettings.ROTATE_MAP_TO_BEARING, true);
edit.putBoolean(OsmandSettings.SHOW_VIEW_ANGLE, false); edit.putBoolean(OsmandSettings.SHOW_VIEW_ANGLE, false);
edit.putBoolean(OsmandSettings.AUTO_ZOOM_MAP, true); edit.putBoolean(OsmandSettings.AUTO_ZOOM_MAP, true);

7
OsmAnd/src/com/osmand/activities/search/SearchPOIActivity.java
View file

@ -65,7 +65,8 @@ public class SearchPOIActivity extends ListActivity implements LocationListener,
public static final String SEARCH_LON = "com.osmand.am_search_lon"; //$NON-NLS-1$ public static final String SEARCH_LON = "com.osmand.am_search_lon"; //$NON-NLS-1$
private static final int GPS_TIMEOUT_REQUEST = 2000; private static final int GPS_TIMEOUT_REQUEST = 2000;
private static final int GPS_DIST_REQUEST = 5; private static final int GPS_DIST_REQUEST = 5;
private static final int MIN_DISTANCE_TO_RESEARCH = 70;
private static final int MIN_DISTANCE_TO_UPDATE = 6;
private Button searchPOILevel; private Button searchPOILevel;
@ -164,10 +165,10 @@ public class SearchPOIActivity extends ListActivity implements LocationListener,
searchPOILevel.setEnabled(filter.isSearchFurtherAvailable()); searchPOILevel.setEnabled(filter.isSearchFurtherAvailable());
searchArea.setText(filter.getSearchArea()); searchArea.setText(filter.getSearchArea());
handled = true; handled = true;
} else if (searchedLocation != null && l.distanceTo(searchedLocation) > 80) { } else if (searchedLocation != null && l.distanceTo(searchedLocation) > MIN_DISTANCE_TO_RESEARCH) {
amenityAdapter.setNewModel(filter.searchAgain(l.getLatitude(), l.getLongitude())); amenityAdapter.setNewModel(filter.searchAgain(l.getLatitude(), l.getLongitude()));
handled = true; handled = true;
} else if(location.distanceTo(l) > 6){ } else if(location.distanceTo(l) > MIN_DISTANCE_TO_UPDATE){
handled = true; handled = true;
} }
} else { } else {