xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make getStartPosition() public

Browse Source
This commit is contained in:
Hannes Janetzek 2013-03-09 16:30:23 +01:00
parent 9b54d81dab
commit e05921efdd
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/oscim/view/MapView.java
View File

@ -142,9 +142,7 @@ public class MapView extends RelativeLayout {
DisplayMetrics metrics = getResources().getDisplayMetrics(); DisplayMetrics metrics = getResources().getDisplayMetrics();
dpi = Math.max(metrics.xdpi, metrics.ydpi); dpi = Math.max(metrics.xdpi, metrics.ydpi);
Log.d(TAG, "dpi is: " + dpi); // TODO make this dpi dependent
// TODO set tilesize, make this dpi dependent
Tile.TILE_SIZE = 400; Tile.TILE_SIZE = 400;
MapActivity mapActivity = (MapActivity) context; MapActivity mapActivity = (MapActivity) context;
@ -179,7 +177,7 @@ public class MapView extends RelativeLayout {
if (!mMapViewPosition.isValid()) { if (!mMapViewPosition.isValid()) {
Log.d(TAG, "set default start position"); Log.d(TAG, "set default start position");
setMapCenter(getStartPosition()); setMapCenter(new MapPosition(new GeoPoint(0,0), (byte) 2, 1));
} }
LayoutParams params = new LayoutParams( LayoutParams params = new LayoutParams(
@ -342,13 +340,13 @@ public class MapView extends RelativeLayout {
return mMapOptions; return mMapOptions;
} }
private MapPosition getStartPosition() { public MapPosition getMapFileCenter() {
if (mMapDatabase == null) if (mMapDatabase == null)
return new MapPosition(); return null;
MapInfo mapInfo = mMapDatabase.getMapInfo(); MapInfo mapInfo = mMapDatabase.getMapInfo();
if (mapInfo == null) if (mapInfo == null)
return new MapPosition(); return null;
GeoPoint startPos = mapInfo.startPosition; GeoPoint startPos = mapInfo.startPosition;
@ -361,7 +359,7 @@ public class MapView extends RelativeLayout {
if (mapInfo.startZoomLevel != null) if (mapInfo.startZoomLevel != null)
return new MapPosition(startPos, (mapInfo.startZoomLevel).byteValue(), 1); return new MapPosition(startPos, (mapInfo.startZoomLevel).byteValue(), 1);
return new MapPosition(startPos, (byte) 1, 1); return new MapPosition(startPos, (byte) 12, 1);
} }
/** /**
@ -385,6 +383,8 @@ public class MapView extends RelativeLayout {
mJobQueue.clear(); mJobQueue.clear();
mMapOptions = options; mMapOptions = options;
mMapDatabase = null;
for (int i = 0; i < mNumMapWorkers; i++) { for (int i = 0; i < mNumMapWorkers; i++) {
MapWorker mapWorker = mMapWorkers[i]; MapWorker mapWorker = mMapWorkers[i];
@ -399,6 +399,10 @@ public class MapView extends RelativeLayout {
TileGenerator tileGenerator = mapWorker.getTileGenerator(); TileGenerator tileGenerator = mapWorker.getTileGenerator();
tileGenerator.setMapDatabase(mapDatabase); tileGenerator.setMapDatabase(mapDatabase);
// TODO this could be done in a cleaner way..
if (mMapDatabase == null)
mMapDatabase = mapDatabase;
} }
if (options.db == MapDatabases.OSCIMAP_READER || if (options.db == MapDatabases.OSCIMAP_READER ||