git-svn-id: https://osmand.googlecode.com/svn/trunk@444 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-08-08 13:00:54 +00:00
parent 7116f078c1
commit 2e08962813
6 changed files with 12 additions and 7 deletions

View file

@ -25,7 +25,6 @@ public class ToDoConstants {
// Improvements // Improvements
// ! Download with wget // ! Download with wget
// ! progress while map is loading // ! progress while map is loading
// ! Give voice alert before 3km to the turn & take into account speed (to say faster)
// Not clear if it is really needed // Not clear if it is really needed
// 69. Add phone information to POI // 69. Add phone information to POI

View file

@ -28,7 +28,7 @@ public class IndexBatchCreator {
private static final boolean indexPOI = true; private static final boolean indexPOI = true;
private static final boolean indexAddress = true; private static final boolean indexAddress = true;
private static final boolean indexTransport = true; private static final boolean indexTransport = true;
private static final boolean writeWayNodes = true; private static final boolean writeWayNodes = false;
protected static final Log log = LogUtil.getLog(IndexBatchCreator.class); protected static final Log log = LogUtil.getLog(IndexBatchCreator.class);
protected static final String SITE_TO_DOWNLOAD1 = "http://download.geofabrik.de/osm/europe/"; //$NON-NLS-1$ protected static final String SITE_TO_DOWNLOAD1 = "http://download.geofabrik.de/osm/europe/"; //$NON-NLS-1$
@ -420,7 +420,7 @@ public class IndexBatchCreator {
uploader.setUserName(user); uploader.setUserName(user);
uploader.setPassword(password); uploader.setPassword(password);
uploader.setLabels("Type-Archive, Testdata"); uploader.setLabels("Type-Archive, Testdata");
uploader.setSummary(summary); uploader.setSummary(summary.replace('_', ' '));
try { try {
uploader.upload(); uploader.upload();
} catch (IOException e) { } catch (IOException e) {

View file

@ -844,11 +844,15 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
val += 90; val += 90;
} }
if (currentMapRotation == OsmandSettings.ROTATE_MAP_COMPASS && !mapView.mapIsAnimating()) { if (currentMapRotation == OsmandSettings.ROTATE_MAP_COMPASS && !mapView.mapIsAnimating()) {
if(Math.abs(mapView.getRotate() + val) > 10){
mapView.setRotate(-val); mapView.setRotate(-val);
} }
}
if(currentShowingAngle){ if(currentShowingAngle){
if(locationLayer.getHeading() == null || Math.abs(locationLayer.getHeading() - val) > 10){
locationLayer.setHeading(val); locationLayer.setHeading(val);
} }
}
} }

View file

@ -67,7 +67,7 @@ public class ShowRouteInfoActivity extends ListActivity {
int minutes = (helper.getLeftTime() / 60) % 60; int minutes = (helper.getLeftTime() / 60) % 60;
header.setText(MessageFormat.format(getString(R.string.route_general_information), MapUtils.getFormattedDistance(dist), header.setText(MessageFormat.format(getString(R.string.route_general_information), MapUtils.getFormattedDistance(dist),
hours, minutes)); hours, minutes));
float f = Math.min(dm.widthPixels/dm.densityDpi,dm.heightPixels/dm.densityDpi); float f = Math.min(dm.widthPixels/(dm.density*160),dm.heightPixels/(dm.density*160));
if (f >= 3) { if (f >= 3) {
// large screen // large screen
header.setTextSize(dm.scaledDensity * 23); header.setTextSize(dm.scaledDensity * 23);

View file

@ -385,6 +385,8 @@ public class SearchPOIActivity extends ListActivity implements SensorEventListen
location = null; location = null;
amenityAdapter.notifyDataSetChanged(); amenityAdapter.notifyDataSetChanged();
searchPOILevel.setEnabled(false); searchPOILevel.setEnabled(false);
} else {
setLocation(location);
} }
if(searchNearBy && location == null){ if(searchNearBy && location == null){
searchPOILevel.setText(R.string.search_poi_location); searchPOILevel.setText(R.string.search_poi_location);

View file

@ -93,7 +93,7 @@ public class MapInfoLayer implements OsmandMapLayer {
dm = new DisplayMetrics(); dm = new DisplayMetrics();
mgr.getDefaultDisplay().getMetrics(dm); mgr.getDefaultDisplay().getMetrics(dm);
scaleCoefficient = dm.density; scaleCoefficient = dm.density;
if(Math.min(dm.widthPixels/dm.densityDpi, dm.heightPixels/dm.densityDpi) > 2.5f){ if(Math.min(dm.widthPixels/(dm.density*160), dm.heightPixels/(dm.density*160)) > 2.5f){
// large screen // large screen
scaleCoefficient *= 1.5f; scaleCoefficient *= 1.5f;
} }