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

use zoomTable from map file

Browse Source
This commit is contained in:
Hannes Janetzek 2013-05-15 03:03:33 +02:00
parent fddc8416f3
commit e6b284c019
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/oscim/database/mapfile/header/MapFileHeader.java
View File

@ -153,21 +153,6 @@ public class MapFileHeader {
if (!openResult.isSuccess()) { if (!openResult.isSuccess()) {
return openResult; return openResult;
} }
int[] level = new int[20];
level[17] = 16;
level[16] = 16;
level[15] = 16;
level[14] = 13;
level[13] = 13;
level[12] = 13;
level[11] = 10;
level[10] = 10;
level[9] = 10;
level[8] = 7;
level[7] = 7;
level[6] = 7;
mapFileInfoBuilder.zoomLevel = level;
this.mapFileInfo = mapFileInfoBuilder.build(); this.mapFileInfo = mapFileInfoBuilder.build();
@ -247,10 +232,15 @@ public class MapFileHeader {
updateZoomLevelInformation(tempSubFileParameters[currentSubFile]); updateZoomLevelInformation(tempSubFileParameters[currentSubFile]);
} }
mapFileInfoBuilder.zoomLevel = new int[numberOfSubFiles];
// create and fill the lookup table for the sub-files // create and fill the lookup table for the sub-files
this.subFileParameters = new SubFileParameter[this.zoomLevelMaximum + 1]; this.subFileParameters = new SubFileParameter[this.zoomLevelMaximum + 1];
for (int currentMapFile = 0; currentMapFile < numberOfSubFiles; ++currentMapFile) { for (int currentMapFile = 0; currentMapFile < numberOfSubFiles; ++currentMapFile) {
SubFileParameter subFileParameter = tempSubFileParameters[currentMapFile]; SubFileParameter subFileParameter = tempSubFileParameters[currentMapFile];
mapFileInfoBuilder.zoomLevel[currentMapFile] = subFileParameter.baseZoomLevel;
for (byte zoomLevel = subFileParameter.zoomLevelMin; zoomLevel <= subFileParameter.zoomLevelMax; ++zoomLevel) { for (byte zoomLevel = subFileParameter.zoomLevelMin; zoomLevel <= subFileParameter.zoomLevelMax; ++zoomLevel) {
this.subFileParameters[zoomLevel] = subFileParameter; this.subFileParameters[zoomLevel] = subFileParameter;
} }