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

Merge branch 'fix_mapsforge'

Browse Source
This commit is contained in:
Hannes Janetzek 2013-12-03 01:19:25 +01:00
commit 467fbb386e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
View File

@ -23,6 +23,7 @@ import org.oscim.tiling.source.ITileDataSource;
import org.oscim.tiling.source.TileSource; import org.oscim.tiling.source.TileSource;
import org.oscim.tiling.source.mapfile.header.MapFileHeader; import org.oscim.tiling.source.mapfile.header.MapFileHeader;
import org.oscim.tiling.source.mapfile.header.MapFileInfo; import org.oscim.tiling.source.mapfile.header.MapFileInfo;
import org.oscim.utils.IOUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -40,6 +41,7 @@ public class MapFileTileSource extends TileSource {
IndexCache databaseIndexCache; IndexCache databaseIndexCache;
boolean experimental; boolean experimental;
File mapFile; File mapFile;
RandomAccessFile mInputFile;
public boolean setMapFile(String filename) { public boolean setMapFile(String filename) {
setOption("file", filename); setOption("file", filename);
@ -78,7 +80,7 @@ public class MapFileTileSource extends TileSource {
} }
// open the file in read only mode // open the file in read only mode
RandomAccessFile mInputFile = new RandomAccessFile(file, READ_ONLY_MODE); mInputFile = new RandomAccessFile(file, READ_ONLY_MODE);
long mFileSize = mInputFile.length(); long mFileSize = mInputFile.length();
ReadBuffer mReadBuffer = new ReadBuffer(mInputFile); ReadBuffer mReadBuffer = new ReadBuffer(mInputFile);
@ -117,7 +119,8 @@ public class MapFileTileSource extends TileSource {
@Override @Override
public void close() { public void close() {
IOUtils.closeQuietly(mInputFile);
mInputFile = null;
fileHeader = null; fileHeader = null;
fileInfo = null; fileInfo = null;
mapFile = null; mapFile = null;