diff --git a/vtm-android-example/src/org/oscim/android/filepicker/ValidFileFilter.java b/vtm-android-example/src/org/oscim/android/filepicker/ValidFileFilter.java
index 45f80ded..cea19fd0 100644
--- a/vtm-android-example/src/org/oscim/android/filepicker/ValidFileFilter.java
+++ b/vtm-android-example/src/org/oscim/android/filepicker/ValidFileFilter.java
@@ -16,7 +16,7 @@ package org.oscim.android.filepicker;
import java.io.FileFilter;
-import org.oscim.tiling.source.TileSource.OpenResult;
+import org.oscim.tiling.TileSource.OpenResult;
/**
* An extension of the {@link FileFilter} interface.
diff --git a/vtm-android-example/src/org/oscim/android/filepicker/ValidMapFile.java b/vtm-android-example/src/org/oscim/android/filepicker/ValidMapFile.java
index 2f668077..b916fa2a 100644
--- a/vtm-android-example/src/org/oscim/android/filepicker/ValidMapFile.java
+++ b/vtm-android-example/src/org/oscim/android/filepicker/ValidMapFile.java
@@ -16,7 +16,7 @@ package org.oscim.android.filepicker;
import java.io.File;
-import org.oscim.tiling.source.TileSource.OpenResult;
+import org.oscim.tiling.TileSource.OpenResult;
import org.oscim.tiling.source.mapfile.MapFileTileSource;
/**
diff --git a/vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java b/vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java
index ff8f799e..93728447 100644
--- a/vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java
+++ b/vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java
@@ -23,7 +23,7 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
import org.oscim.theme.RenderThemeHandler;
-import org.oscim.tiling.source.TileSource.OpenResult;
+import org.oscim.tiling.TileSource.OpenResult;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
diff --git a/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java b/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java
index 493f91d7..45ede080 100644
--- a/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java
@@ -20,7 +20,7 @@ import org.oscim.android.MapActivity;
import org.oscim.android.MapView;
import org.oscim.android.cache.TileCache;
import org.oscim.layers.tile.vector.VectorTileLayer;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import android.os.Bundle;
diff --git a/vtm-android-example/src/org/oscim/android/test/BitmapTileMapActivity.java b/vtm-android-example/src/org/oscim/android/test/BitmapTileMapActivity.java
index be3a6b78..779c7bc9 100644
--- a/vtm-android-example/src/org/oscim/android/test/BitmapTileMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/BitmapTileMapActivity.java
@@ -21,7 +21,7 @@ import org.oscim.backend.canvas.Color;
import org.oscim.layers.TileGridLayer;
import org.oscim.layers.tile.BitmapTileLayer;
import org.oscim.renderer.MapRenderer;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.bitmap.DefaultSources;
import android.os.Bundle;
diff --git a/vtm-android/src/org/oscim/android/cache/TileCache.java b/vtm-android/src/org/oscim/android/cache/TileCache.java
index 232012bc..d686bf51 100644
--- a/vtm-android/src/org/oscim/android/cache/TileCache.java
+++ b/vtm-android/src/org/oscim/android/cache/TileCache.java
@@ -24,7 +24,7 @@ import java.io.OutputStream;
import java.util.ArrayList;
import org.oscim.core.Tile;
-import org.oscim.tiling.source.ITileCache;
+import org.oscim.tiling.ITileCache;
import org.slf4j.LoggerFactory;
import android.annotation.TargetApi;
diff --git a/vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java b/vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
index 00067488..0611e38b 100644
--- a/vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
+++ b/vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
@@ -17,10 +17,10 @@
package org.oscim.tiling.source.mapnik;
import org.oscim.core.Tile;
-import org.oscim.tiling.source.ITileDataSource;
-import org.oscim.tiling.source.common.LwHttp;
-import org.oscim.tiling.source.common.UrlTileDataSource;
-import org.oscim.tiling.source.common.UrlTileSource;
+import org.oscim.tiling.ITileDataSource;
+import org.oscim.tiling.source.LwHttp;
+import org.oscim.tiling.source.UrlTileDataSource;
+import org.oscim.tiling.source.UrlTileSource;
public class MapnikVectorTileSource extends UrlTileSource {
diff --git a/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java
index 990aaf27..dff9a23d 100644
--- a/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java
+++ b/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java
@@ -25,8 +25,8 @@ import org.oscim.core.GeometryBuffer.GeometryType;
import org.oscim.core.MapElement;
import org.oscim.core.Tag;
import org.oscim.core.Tile;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.common.PbfDecoder;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.source.PbfDecoder;
import org.oscim.utils.pool.Inlist;
import org.oscim.utils.pool.Pool;
import org.slf4j.Logger;
diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java b/vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
index 9d6d7563..d6934fa4 100644
--- a/vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
+++ b/vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
@@ -16,10 +16,10 @@
*/
package org.oscim.tiling.source.oscimap;
-import org.oscim.tiling.source.ITileDataSource;
-import org.oscim.tiling.source.common.LwHttp;
-import org.oscim.tiling.source.common.UrlTileDataSource;
-import org.oscim.tiling.source.common.UrlTileSource;
+import org.oscim.tiling.ITileDataSource;
+import org.oscim.tiling.source.LwHttp;
+import org.oscim.tiling.source.UrlTileDataSource;
+import org.oscim.tiling.source.UrlTileSource;
/**
* Deprecated
diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java
index 1964eccb..1b0f5f26 100644
--- a/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java
+++ b/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java
@@ -26,8 +26,8 @@ import org.oscim.core.GeometryBuffer.GeometryType;
import org.oscim.core.MapElement;
import org.oscim.core.Tag;
import org.oscim.core.Tile;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.common.PbfDecoder;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.source.PbfDecoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java b/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
index 63b1ce50..5a8f8208 100644
--- a/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
+++ b/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
@@ -25,12 +25,12 @@ import org.oscim.core.MapElement;
import org.oscim.core.Tag;
import org.oscim.core.TagSet;
import org.oscim.core.Tile;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.ITileDataSource;
-import org.oscim.tiling.source.common.LwHttp;
-import org.oscim.tiling.source.common.PbfDecoder;
-import org.oscim.tiling.source.common.UrlTileDataSource;
-import org.oscim.tiling.source.common.UrlTileSource;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.ITileDataSource;
+import org.oscim.tiling.source.LwHttp;
+import org.oscim.tiling.source.PbfDecoder;
+import org.oscim.tiling.source.UrlTileDataSource;
+import org.oscim.tiling.source.UrlTileSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java b/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
index 50b34797..34390d33 100644
--- a/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
+++ b/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
@@ -21,7 +21,7 @@ import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.oscim.core.Tile;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import android.os.Bundle;
diff --git a/vtm-gdx-desktop/src/org/oscim/gdx/GdxMapApp.java b/vtm-gdx-desktop/src/org/oscim/gdx/GdxMapApp.java
index 2382d607..ca1cbf99 100644
--- a/vtm-gdx-desktop/src/org/oscim/gdx/GdxMapApp.java
+++ b/vtm-gdx-desktop/src/org/oscim/gdx/GdxMapApp.java
@@ -22,7 +22,7 @@ import org.oscim.awt.AwtGraphics;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GLAdapter;
import org.oscim.core.Tile;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import org.oscim.utils.FastMath;
diff --git a/vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java b/vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
index 1d42f453..bb99fee8 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
@@ -24,7 +24,7 @@ import org.oscim.core.MercatorProjection;
import org.oscim.gdx.GdxMap;
import org.oscim.layers.tile.BitmapTileLayer;
import org.oscim.renderer.MapRenderer;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.bitmap.DefaultSources.NaturalEarth;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import org.slf4j.Logger;
diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/TileLoader.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java
similarity index 95%
rename from vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/TileLoader.java
rename to vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java
index aa9e7e25..106d2804 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/TileLoader.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java
@@ -12,7 +12,10 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling;
+package org.oscim.layers.tile;
+
+import org.oscim.layers.tile.MapTile;
+import org.oscim.layers.tile.TileManager;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.Timer;
diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java
index 14442b4c..5032a7c3 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java
@@ -22,6 +22,9 @@ import org.oscim.core.PointF;
import org.oscim.core.Tag;
import org.oscim.core.TagSet;
import org.oscim.core.Tile;
+import org.oscim.layers.tile.MapTile;
+import org.oscim.layers.tile.TileLoader;
+import org.oscim.layers.tile.TileManager;
import org.oscim.renderer.elements.ElementLayers;
import org.oscim.renderer.elements.ExtrusionLayer;
import org.oscim.renderer.elements.LineLayer;
@@ -39,12 +42,9 @@ import org.oscim.theme.styles.LineSymbol;
import org.oscim.theme.styles.RenderStyle;
import org.oscim.theme.styles.Symbol;
import org.oscim.theme.styles.Text;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.TileLoader;
-import org.oscim.tiling.TileManager;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.ITileDataSource;
-import org.oscim.tiling.source.ITileDataSource.QueryResult;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.ITileDataSource;
+import org.oscim.tiling.ITileDataSource.QueryResult;
import org.oscim.utils.geom.LineClipper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/LwHttp.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/LwHttp.java
similarity index 97%
rename from vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/LwHttp.java
rename to vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/LwHttp.java
index 24051c51..e71c5fa4 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/LwHttp.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/LwHttp.java
@@ -12,13 +12,14 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling.source.common;
+package org.oscim.tiling.source;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import org.oscim.core.Tile;
+import org.oscim.tiling.source.UrlTileDataSource;
import com.google.gwt.typedarrays.client.Uint8ArrayNative;
import com.google.gwt.typedarrays.shared.Uint8Array;
diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/UrlTileDataSource.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/UrlTileDataSource.java
similarity index 87%
rename from vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/UrlTileDataSource.java
rename to vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/UrlTileDataSource.java
index fbd78177..ae334253 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/UrlTileDataSource.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/UrlTileDataSource.java
@@ -12,15 +12,18 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling.source.common;
+package org.oscim.tiling.source;
import java.io.IOException;
import java.io.InputStream;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.ITileDataSource;
+import org.oscim.layers.tile.MapTile;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.source.ITileDecoder;
+import org.oscim.tiling.source.LwHttp;
+import org.oscim.tiling.source.UrlTileDataSource;
+import org.oscim.tiling.source.UrlTileSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm-gdx/src/org/oscim/gdx/GdxMap.java b/vtm-gdx/src/org/oscim/gdx/GdxMap.java
index fbdec9e8..264a5361 100644
--- a/vtm-gdx/src/org/oscim/gdx/GdxMap.java
+++ b/vtm-gdx/src/org/oscim/gdx/GdxMap.java
@@ -28,7 +28,7 @@ import org.oscim.map.Map;
import org.oscim.map.ViewController;
import org.oscim.renderer.MapRenderer;
import org.oscim.theme.InternalRenderTheme;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.tiling.TileSource;
import com.badlogic.gdx.Application;
import com.badlogic.gdx.ApplicationListener;
diff --git a/vtm/src/org/oscim/layers/tile/BitmapTileLayer.java b/vtm/src/org/oscim/layers/tile/BitmapTileLayer.java
index bab4ba6d..057d8be1 100644
--- a/vtm/src/org/oscim/layers/tile/BitmapTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/BitmapTileLayer.java
@@ -16,7 +16,7 @@
*/
package org.oscim.layers.tile;
-import static org.oscim.tiling.MapTile.State.CANCEL;
+import static org.oscim.layers.tile.MapTile.State.CANCEL;
import java.util.concurrent.CancellationException;
@@ -28,14 +28,10 @@ import org.oscim.event.Event;
import org.oscim.map.Map;
import org.oscim.renderer.elements.BitmapLayer;
import org.oscim.renderer.elements.ElementLayers;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.TileLoader;
-import org.oscim.tiling.TileManager;
-import org.oscim.tiling.VectorTileRenderer;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.ITileDataSource;
-import org.oscim.tiling.source.ITileDataSource.QueryResult;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.ITileDataSource;
+import org.oscim.tiling.TileSource;
+import org.oscim.tiling.ITileDataSource.QueryResult;
import org.oscim.utils.FastMath;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/tiling/JobQueue.java b/vtm/src/org/oscim/layers/tile/JobQueue.java
similarity index 93%
rename from vtm/src/org/oscim/tiling/JobQueue.java
rename to vtm/src/org/oscim/layers/tile/JobQueue.java
index 0fa20706..05d1be0e 100644
--- a/vtm/src/org/oscim/tiling/JobQueue.java
+++ b/vtm/src/org/oscim/layers/tile/JobQueue.java
@@ -15,10 +15,10 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling;
+package org.oscim.layers.tile;
-import static org.oscim.tiling.MapTile.State.LOADING;
-import static org.oscim.tiling.MapTile.State.NONE;
+import static org.oscim.layers.tile.MapTile.State.LOADING;
+import static org.oscim.layers.tile.MapTile.State.NONE;
/**
* A JobQueue keeps the list of pending jobs for a MapView and prioritizes them.
diff --git a/vtm/src/org/oscim/tiling/MapTile.java b/vtm/src/org/oscim/layers/tile/MapTile.java
similarity index 99%
rename from vtm/src/org/oscim/tiling/MapTile.java
rename to vtm/src/org/oscim/layers/tile/MapTile.java
index ac1b2fc9..d54512fc 100644
--- a/vtm/src/org/oscim/tiling/MapTile.java
+++ b/vtm/src/org/oscim/layers/tile/MapTile.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General License along with
* this program. If not, see .
*/
-package org.oscim.tiling;
+package org.oscim.layers.tile;
import org.oscim.core.Tile;
import org.oscim.renderer.elements.ElementLayers;
@@ -73,7 +73,7 @@ public class MapTile extends Tile {
this.node = node;
}
- byte state;
+ protected byte state;
public boolean state(int testState) {
return (state & testState) != 0;
diff --git a/vtm/src/org/oscim/tiling/TileDistanceSort.java b/vtm/src/org/oscim/layers/tile/TileDistanceSort.java
similarity index 98%
rename from vtm/src/org/oscim/tiling/TileDistanceSort.java
rename to vtm/src/org/oscim/layers/tile/TileDistanceSort.java
index 748ab77a..fdbb38e4 100644
--- a/vtm/src/org/oscim/tiling/TileDistanceSort.java
+++ b/vtm/src/org/oscim/layers/tile/TileDistanceSort.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling;
+package org.oscim.layers.tile;
import java.util.Comparator;
diff --git a/vtm/src/org/oscim/layers/tile/TileLayer.java b/vtm/src/org/oscim/layers/tile/TileLayer.java
index 52d86feb..b1d1577f 100644
--- a/vtm/src/org/oscim/layers/tile/TileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/TileLayer.java
@@ -21,9 +21,6 @@ import org.oscim.event.Event;
import org.oscim.layers.Layer;
import org.oscim.map.Map;
import org.oscim.map.Map.UpdateListener;
-import org.oscim.tiling.TileLoader;
-import org.oscim.tiling.TileManager;
-import org.oscim.tiling.TileRenderer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/tiling/TileLoader.java b/vtm/src/org/oscim/layers/tile/TileLoader.java
similarity index 98%
rename from vtm/src/org/oscim/tiling/TileLoader.java
rename to vtm/src/org/oscim/layers/tile/TileLoader.java
index c4febc83..8539b29d 100644
--- a/vtm/src/org/oscim/tiling/TileLoader.java
+++ b/vtm/src/org/oscim/layers/tile/TileLoader.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling;
+package org.oscim.layers.tile;
import org.oscim.utils.PausableThread;
diff --git a/vtm/src/org/oscim/tiling/TileManager.java b/vtm/src/org/oscim/layers/tile/TileManager.java
similarity index 97%
rename from vtm/src/org/oscim/tiling/TileManager.java
rename to vtm/src/org/oscim/layers/tile/TileManager.java
index 31599755..9c93cad9 100644
--- a/vtm/src/org/oscim/tiling/TileManager.java
+++ b/vtm/src/org/oscim/layers/tile/TileManager.java
@@ -15,13 +15,13 @@
* this program. If not, see .
*/
-package org.oscim.tiling;
+package org.oscim.layers.tile;
-import static org.oscim.tiling.MapTile.State.CANCEL;
-import static org.oscim.tiling.MapTile.State.LOADING;
-import static org.oscim.tiling.MapTile.State.NEW_DATA;
-import static org.oscim.tiling.MapTile.State.NONE;
-import static org.oscim.tiling.MapTile.State.READY;
+import static org.oscim.layers.tile.MapTile.State.CANCEL;
+import static org.oscim.layers.tile.MapTile.State.LOADING;
+import static org.oscim.layers.tile.MapTile.State.NEW_DATA;
+import static org.oscim.layers.tile.MapTile.State.NONE;
+import static org.oscim.layers.tile.MapTile.State.READY;
import java.util.ArrayList;
import java.util.Arrays;
@@ -31,10 +31,10 @@ import org.oscim.core.Tile;
import org.oscim.event.Event;
import org.oscim.event.EventDispatcher;
import org.oscim.event.EventListener;
+import org.oscim.layers.tile.MapTile.TileNode;
import org.oscim.map.Map;
import org.oscim.map.Viewport;
import org.oscim.renderer.BufferObject;
-import org.oscim.tiling.MapTile.TileNode;
import org.oscim.utils.FastMath;
import org.oscim.utils.ScanBox;
import org.oscim.utils.quadtree.QuadTree;
diff --git a/vtm/src/org/oscim/tiling/TileRenderer.java b/vtm/src/org/oscim/layers/tile/TileRenderer.java
similarity index 98%
rename from vtm/src/org/oscim/tiling/TileRenderer.java
rename to vtm/src/org/oscim/layers/tile/TileRenderer.java
index 81c15edd..666d4c17 100644
--- a/vtm/src/org/oscim/tiling/TileRenderer.java
+++ b/vtm/src/org/oscim/layers/tile/TileRenderer.java
@@ -14,10 +14,10 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling;
+package org.oscim.layers.tile;
-import static org.oscim.tiling.MapTile.State.NEW_DATA;
-import static org.oscim.tiling.MapTile.State.READY;
+import static org.oscim.layers.tile.MapTile.State.NEW_DATA;
+import static org.oscim.layers.tile.MapTile.State.READY;
import org.oscim.backend.GL20;
import org.oscim.core.MapPosition;
diff --git a/vtm/src/org/oscim/tiling/TileSet.java b/vtm/src/org/oscim/layers/tile/TileSet.java
similarity index 98%
rename from vtm/src/org/oscim/tiling/TileSet.java
rename to vtm/src/org/oscim/layers/tile/TileSet.java
index c9717920..f420c802 100644
--- a/vtm/src/org/oscim/tiling/TileSet.java
+++ b/vtm/src/org/oscim/layers/tile/TileSet.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling;
+package org.oscim.layers.tile;
import java.util.Arrays;
import java.util.Comparator;
diff --git a/vtm/src/org/oscim/tiling/VectorTileRenderer.java b/vtm/src/org/oscim/layers/tile/VectorTileRenderer.java
similarity index 97%
rename from vtm/src/org/oscim/tiling/VectorTileRenderer.java
rename to vtm/src/org/oscim/layers/tile/VectorTileRenderer.java
index 7edf52d8..93728795 100644
--- a/vtm/src/org/oscim/tiling/VectorTileRenderer.java
+++ b/vtm/src/org/oscim/layers/tile/VectorTileRenderer.java
@@ -1,16 +1,17 @@
-package org.oscim.tiling;
+package org.oscim.layers.tile;
+import static org.oscim.layers.tile.MapTile.State.READY;
import static org.oscim.renderer.elements.RenderElement.BITMAP;
import static org.oscim.renderer.elements.RenderElement.LINE;
import static org.oscim.renderer.elements.RenderElement.MESH;
import static org.oscim.renderer.elements.RenderElement.POLYGON;
import static org.oscim.renderer.elements.RenderElement.TEXLINE;
-import static org.oscim.tiling.MapTile.State.READY;
import org.oscim.backend.GL20;
import org.oscim.backend.canvas.Color;
import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
+import org.oscim.layers.tile.MapTile.TileNode;
import org.oscim.renderer.GLMatrix;
import org.oscim.renderer.GLViewport;
import org.oscim.renderer.MapRenderer;
@@ -20,7 +21,6 @@ import org.oscim.renderer.elements.LineTexLayer;
import org.oscim.renderer.elements.MeshLayer;
import org.oscim.renderer.elements.PolygonLayer;
import org.oscim.renderer.elements.RenderElement;
-import org.oscim.tiling.MapTile.TileNode;
import org.oscim.utils.FastMath;
public class VectorTileRenderer extends TileRenderer {
@@ -132,7 +132,6 @@ public class VectorTileRenderer extends TileRenderer {
/* scale relative to zoom-level of this tile */
float scale = (float) (pos.scale / (1 << z));
- //GLViewport v = mMatrices;
v.mvp.setTransScale(x, y, scale / MapRenderer.COORD_SCALE);
v.mvp.multiplyLhs(mViewProj);
diff --git a/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java b/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java
index 49c6e6e1..275a5f41 100644
--- a/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java
@@ -20,14 +20,14 @@ import org.oscim.backend.canvas.Color;
import org.oscim.backend.canvas.Paint.Cap;
import org.oscim.core.GeometryBuffer;
import org.oscim.core.Tile;
+import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.TileLayer;
+import org.oscim.layers.tile.TileLoader;
+import org.oscim.layers.tile.TileManager;
import org.oscim.map.Map;
import org.oscim.renderer.elements.ElementLayers;
import org.oscim.renderer.elements.LineLayer;
import org.oscim.theme.styles.Line;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.TileLoader;
-import org.oscim.tiling.TileManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
index 2ab43d4f..e8d02eec 100644
--- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
@@ -17,13 +17,13 @@
package org.oscim.layers.tile.vector;
import org.oscim.layers.tile.TileLayer;
+import org.oscim.layers.tile.TileLoader;
+import org.oscim.layers.tile.TileManager;
+import org.oscim.layers.tile.VectorTileRenderer;
import org.oscim.map.Map;
import org.oscim.theme.IRenderTheme;
-import org.oscim.tiling.TileLoader;
-import org.oscim.tiling.TileManager;
-import org.oscim.tiling.VectorTileRenderer;
-import org.oscim.tiling.source.TileSource;
-import org.oscim.tiling.source.TileSource.OpenResult;
+import org.oscim.tiling.TileSource;
+import org.oscim.tiling.TileSource.OpenResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
index 15446db7..fe0dcb8d 100644
--- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
+++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
@@ -16,7 +16,7 @@
*/
package org.oscim.layers.tile.vector;
-import static org.oscim.tiling.MapTile.State.CANCEL;
+import static org.oscim.layers.tile.MapTile.State.CANCEL;
import java.util.concurrent.CancellationException;
@@ -28,6 +28,9 @@ import org.oscim.core.PointF;
import org.oscim.core.Tag;
import org.oscim.core.TagSet;
import org.oscim.core.Tile;
+import org.oscim.layers.tile.MapTile;
+import org.oscim.layers.tile.TileLoader;
+import org.oscim.layers.tile.TileManager;
import org.oscim.renderer.elements.ElementLayers;
import org.oscim.renderer.elements.ExtrusionLayer;
import org.oscim.renderer.elements.LineLayer;
@@ -45,12 +48,9 @@ import org.oscim.theme.styles.LineSymbol;
import org.oscim.theme.styles.RenderStyle;
import org.oscim.theme.styles.Symbol;
import org.oscim.theme.styles.Text;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.TileLoader;
-import org.oscim.tiling.TileManager;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.ITileDataSource;
-import org.oscim.tiling.source.ITileDataSource.QueryResult;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.ITileDataSource;
+import org.oscim.tiling.ITileDataSource.QueryResult;
import org.oscim.utils.geom.LineClipper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/layers/tile/vector/WayDecorator.java b/vtm/src/org/oscim/layers/tile/vector/WayDecorator.java
index 48b9b4f0..89148307 100644
--- a/vtm/src/org/oscim/layers/tile/vector/WayDecorator.java
+++ b/vtm/src/org/oscim/layers/tile/vector/WayDecorator.java
@@ -18,9 +18,9 @@
package org.oscim.layers.tile.vector;
import org.oscim.core.Tile;
+import org.oscim.layers.tile.MapTile;
import org.oscim.renderer.elements.TextItem;
import org.oscim.theme.styles.Text;
-import org.oscim.tiling.MapTile;
import org.oscim.utils.geom.GeometryUtils;
import org.oscim.utils.geom.LineClipper;
diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
index b4b98b6f..45c95b38 100644
--- a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
@@ -19,10 +19,10 @@ package org.oscim.layers.tile.vector.labeling;
import org.oscim.core.MapPosition;
import org.oscim.event.Event;
import org.oscim.layers.Layer;
+import org.oscim.layers.tile.MapTile;
+import org.oscim.layers.tile.TileManager;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.map.Map;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.TileManager;
import org.oscim.utils.async.SimpleWorker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java
index 5d074594..9e64df44 100644
--- a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java
+++ b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java
@@ -1,17 +1,17 @@
package org.oscim.layers.tile.vector.labeling;
-import static org.oscim.tiling.MapTile.State.NEW_DATA;
-import static org.oscim.tiling.MapTile.State.READY;
+import static org.oscim.layers.tile.MapTile.State.NEW_DATA;
+import static org.oscim.layers.tile.MapTile.State.READY;
import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
+import org.oscim.layers.tile.MapTile;
+import org.oscim.layers.tile.TileRenderer;
+import org.oscim.layers.tile.TileSet;
import org.oscim.map.Map;
import org.oscim.renderer.elements.SymbolItem;
import org.oscim.renderer.elements.SymbolLayer;
import org.oscim.renderer.elements.TextItem;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.TileRenderer;
-import org.oscim.tiling.TileSet;
import org.oscim.utils.FastMath;
import org.oscim.utils.geom.OBB2D;
diff --git a/vtm/src/org/oscim/map/Map.java b/vtm/src/org/oscim/map/Map.java
index 5fd3f9f9..3cdc8d6c 100644
--- a/vtm/src/org/oscim/map/Map.java
+++ b/vtm/src/org/oscim/map/Map.java
@@ -30,7 +30,7 @@ import org.oscim.renderer.MapRenderer;
import org.oscim.theme.IRenderTheme;
import org.oscim.theme.InternalRenderTheme;
import org.oscim.theme.ThemeLoader;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.tiling.TileSource;
import org.oscim.utils.async.AsyncExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/renderer/ExtrusionRenderer.java b/vtm/src/org/oscim/renderer/ExtrusionRenderer.java
index f54cd4ef..e1821b3b 100644
--- a/vtm/src/org/oscim/renderer/ExtrusionRenderer.java
+++ b/vtm/src/org/oscim/renderer/ExtrusionRenderer.java
@@ -16,16 +16,16 @@
*/
package org.oscim.renderer;
-import static org.oscim.tiling.MapTile.State.NEW_DATA;
-import static org.oscim.tiling.MapTile.State.READY;
+import static org.oscim.layers.tile.MapTile.State.NEW_DATA;
+import static org.oscim.layers.tile.MapTile.State.READY;
import org.oscim.backend.GL20;
import org.oscim.backend.canvas.Color;
import org.oscim.core.Tile;
+import org.oscim.layers.tile.MapTile;
+import org.oscim.layers.tile.TileRenderer;
+import org.oscim.layers.tile.TileSet;
import org.oscim.renderer.elements.ExtrusionLayer;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.TileRenderer;
-import org.oscim.tiling.TileSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/renderer/MapRenderer.java b/vtm/src/org/oscim/renderer/MapRenderer.java
index 2e7e5bd8..1b1c554d 100644
--- a/vtm/src/org/oscim/renderer/MapRenderer.java
+++ b/vtm/src/org/oscim/renderer/MapRenderer.java
@@ -25,9 +25,9 @@ import java.nio.ShortBuffer;
import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.oscim.backend.canvas.Color;
+import org.oscim.layers.tile.MapTile;
import org.oscim.map.Map;
import org.oscim.renderer.elements.ElementLayers;
-import org.oscim.tiling.MapTile;
import org.oscim.utils.pool.Inlist;
import org.oscim.utils.pool.Pool;
import org.slf4j.Logger;
diff --git a/vtm/src/org/oscim/tiling/source/ITileCache.java b/vtm/src/org/oscim/tiling/ITileCache.java
similarity index 98%
rename from vtm/src/org/oscim/tiling/source/ITileCache.java
rename to vtm/src/org/oscim/tiling/ITileCache.java
index 68bdcd29..98c05b7e 100644
--- a/vtm/src/org/oscim/tiling/source/ITileCache.java
+++ b/vtm/src/org/oscim/tiling/ITileCache.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling.source;
+package org.oscim.tiling;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/vtm/src/org/oscim/tiling/source/ITileDataSink.java b/vtm/src/org/oscim/tiling/ITileDataSink.java
similarity index 97%
rename from vtm/src/org/oscim/tiling/source/ITileDataSink.java
rename to vtm/src/org/oscim/tiling/ITileDataSink.java
index b368f3f2..f81c1dd3 100644
--- a/vtm/src/org/oscim/tiling/source/ITileDataSink.java
+++ b/vtm/src/org/oscim/tiling/ITileDataSink.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling.source;
+package org.oscim.tiling;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.core.MapElement;
diff --git a/vtm/src/org/oscim/tiling/source/ITileDataSource.java b/vtm/src/org/oscim/tiling/ITileDataSource.java
similarity index 95%
rename from vtm/src/org/oscim/tiling/source/ITileDataSource.java
rename to vtm/src/org/oscim/tiling/ITileDataSource.java
index e8af1523..161cea45 100644
--- a/vtm/src/org/oscim/tiling/source/ITileDataSource.java
+++ b/vtm/src/org/oscim/tiling/ITileDataSource.java
@@ -15,9 +15,10 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling.source;
+package org.oscim.tiling;
+
+import org.oscim.layers.tile.MapTile;
-import org.oscim.tiling.MapTile;
/**
*
diff --git a/vtm/src/org/oscim/tiling/source/TileSource.java b/vtm/src/org/oscim/tiling/TileSource.java
similarity index 99%
rename from vtm/src/org/oscim/tiling/source/TileSource.java
rename to vtm/src/org/oscim/tiling/TileSource.java
index 0a307260..a904a81d 100644
--- a/vtm/src/org/oscim/tiling/source/TileSource.java
+++ b/vtm/src/org/oscim/tiling/TileSource.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling.source;
+package org.oscim.tiling;
import java.util.HashMap;
diff --git a/vtm/src/org/oscim/tiling/source/ITileDecoder.java b/vtm/src/org/oscim/tiling/source/ITileDecoder.java
index 9f1e9d14..5f48c8f0 100644
--- a/vtm/src/org/oscim/tiling/source/ITileDecoder.java
+++ b/vtm/src/org/oscim/tiling/source/ITileDecoder.java
@@ -4,6 +4,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.oscim.core.Tile;
+import org.oscim.tiling.ITileDataSink;
public interface ITileDecoder {
diff --git a/vtm/src/org/oscim/tiling/source/common/LwHttp.java b/vtm/src/org/oscim/tiling/source/LwHttp.java
similarity index 99%
rename from vtm/src/org/oscim/tiling/source/common/LwHttp.java
rename to vtm/src/org/oscim/tiling/source/LwHttp.java
index 47758d84..6322a821 100644
--- a/vtm/src/org/oscim/tiling/source/common/LwHttp.java
+++ b/vtm/src/org/oscim/tiling/source/LwHttp.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling.source.common;
+package org.oscim.tiling.source;
import java.io.BufferedInputStream;
import java.io.IOException;
diff --git a/vtm/src/org/oscim/tiling/source/common/PbfDecoder.java b/vtm/src/org/oscim/tiling/source/PbfDecoder.java
similarity index 99%
rename from vtm/src/org/oscim/tiling/source/common/PbfDecoder.java
rename to vtm/src/org/oscim/tiling/source/PbfDecoder.java
index 16a1b015..8aee4c7a 100644
--- a/vtm/src/org/oscim/tiling/source/common/PbfDecoder.java
+++ b/vtm/src/org/oscim/tiling/source/PbfDecoder.java
@@ -14,13 +14,12 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling.source.common;
+package org.oscim.tiling.source;
import java.io.IOException;
import java.io.InputStream;
import org.oscim.core.GeometryBuffer;
-import org.oscim.tiling.source.ITileDecoder;
import org.oscim.utils.UTF8Decoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/tiling/source/common/UrlTileDataSource.java b/vtm/src/org/oscim/tiling/source/UrlTileDataSource.java
similarity index 89%
rename from vtm/src/org/oscim/tiling/source/common/UrlTileDataSource.java
rename to vtm/src/org/oscim/tiling/source/UrlTileDataSource.java
index 4db5f7e1..f2fe87ac 100644
--- a/vtm/src/org/oscim/tiling/source/common/UrlTileDataSource.java
+++ b/vtm/src/org/oscim/tiling/source/UrlTileDataSource.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling.source.common;
+package org.oscim.tiling.source;
import java.io.IOException;
import java.io.InputStream;
@@ -22,13 +22,12 @@ import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.source.ITileCache;
-import org.oscim.tiling.source.ITileCache.TileReader;
-import org.oscim.tiling.source.ITileCache.TileWriter;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.ITileDataSource;
-import org.oscim.tiling.source.ITileDecoder;
+import org.oscim.layers.tile.MapTile;
+import org.oscim.tiling.ITileCache;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.ITileDataSource;
+import org.oscim.tiling.ITileCache.TileReader;
+import org.oscim.tiling.ITileCache.TileWriter;
import org.oscim.utils.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/tiling/source/common/UrlTileSource.java b/vtm/src/org/oscim/tiling/source/UrlTileSource.java
similarity index 96%
rename from vtm/src/org/oscim/tiling/source/common/UrlTileSource.java
rename to vtm/src/org/oscim/tiling/source/UrlTileSource.java
index 3fb7adb8..ecf61dd9 100644
--- a/vtm/src/org/oscim/tiling/source/common/UrlTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/UrlTileSource.java
@@ -14,13 +14,13 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see .
*/
-package org.oscim.tiling.source.common;
+package org.oscim.tiling.source;
import java.net.MalformedURLException;
import java.net.URL;
import org.oscim.core.Tile;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.tiling.TileSource;
public abstract class UrlTileSource extends TileSource {
diff --git a/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java b/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java
index 1c4c7f9c..f5d65f61 100644
--- a/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java
@@ -6,12 +6,12 @@ import java.io.InputStream;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.core.Tile;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.ITileDataSource;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.source.ITileDecoder;
-import org.oscim.tiling.source.common.LwHttp;
-import org.oscim.tiling.source.common.UrlTileDataSource;
-import org.oscim.tiling.source.common.UrlTileSource;
+import org.oscim.tiling.source.LwHttp;
+import org.oscim.tiling.source.UrlTileDataSource;
+import org.oscim.tiling.source.UrlTileSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
index acb3ef05..c361ebb4 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
@@ -26,9 +26,9 @@ import org.oscim.core.MapElement;
import org.oscim.core.MercatorProjection;
import org.oscim.core.Tag;
import org.oscim.core.Tile;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.ITileDataSource;
+import org.oscim.layers.tile.MapTile;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.source.mapfile.header.SubFileParameter;
import org.oscim.utils.geom.TileClipper;
import org.slf4j.Logger;
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java b/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
index f334e93c..0f735709 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
@@ -21,8 +21,8 @@ import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
-import org.oscim.tiling.source.ITileDataSource;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.tiling.ITileDataSource;
+import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.mapfile.header.MapFileHeader;
import org.oscim.tiling.source.mapfile.header.MapFileInfo;
import org.oscim.utils.IOUtils;
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileHeader.java b/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileHeader.java
index e9dc2955..f27a52fe 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileHeader.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileHeader.java
@@ -18,7 +18,7 @@ package org.oscim.tiling.source.mapfile.header;
import java.io.IOException;
-import org.oscim.tiling.source.TileSource.OpenResult;
+import org.oscim.tiling.TileSource.OpenResult;
import org.oscim.tiling.source.mapfile.ReadBuffer;
/**
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/header/OptionalFields.java b/vtm/src/org/oscim/tiling/source/mapfile/header/OptionalFields.java
index 287129ed..290a809b 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/header/OptionalFields.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/header/OptionalFields.java
@@ -17,7 +17,7 @@
package org.oscim.tiling.source.mapfile.header;
import org.oscim.core.GeoPoint;
-import org.oscim.tiling.source.TileSource.OpenResult;
+import org.oscim.tiling.TileSource.OpenResult;
import org.oscim.tiling.source.mapfile.ReadBuffer;
final class OptionalFields {
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/header/RequiredFields.java b/vtm/src/org/oscim/tiling/source/mapfile/header/RequiredFields.java
index 4ba72743..619dd483 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/header/RequiredFields.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/header/RequiredFields.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.oscim.core.BoundingBox;
import org.oscim.core.Tag;
-import org.oscim.tiling.source.TileSource.OpenResult;
+import org.oscim.tiling.TileSource.OpenResult;
import org.oscim.tiling.source.mapfile.ReadBuffer;
final class RequiredFields {
diff --git a/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java b/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
index 8144ab20..2cea4fb2 100644
--- a/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
+++ b/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
@@ -16,10 +16,10 @@
*/
package org.oscim.tiling.source.oscimap4;
-import org.oscim.tiling.source.ITileDataSource;
-import org.oscim.tiling.source.common.LwHttp;
-import org.oscim.tiling.source.common.UrlTileDataSource;
-import org.oscim.tiling.source.common.UrlTileSource;
+import org.oscim.tiling.ITileDataSource;
+import org.oscim.tiling.source.LwHttp;
+import org.oscim.tiling.source.UrlTileDataSource;
+import org.oscim.tiling.source.UrlTileSource;
public class OSciMap4TileSource extends UrlTileSource {
diff --git a/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java b/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java
index 4a5b5b58..b053c59e 100644
--- a/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java
+++ b/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java
@@ -25,8 +25,8 @@ import org.oscim.core.MapElement;
import org.oscim.core.Tag;
import org.oscim.core.TagSet;
import org.oscim.core.Tile;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.common.PbfDecoder;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.source.PbfDecoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vtm/src/org/oscim/tiling/source/test/TestTileSource.java b/vtm/src/org/oscim/tiling/source/test/TestTileSource.java
index a2d9d2e9..4cfa0925 100644
--- a/vtm/src/org/oscim/tiling/source/test/TestTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/test/TestTileSource.java
@@ -19,10 +19,10 @@ package org.oscim.tiling.source.test;
import org.oscim.core.MapElement;
import org.oscim.core.Tag;
import org.oscim.core.Tile;
-import org.oscim.tiling.MapTile;
-import org.oscim.tiling.source.ITileDataSink;
-import org.oscim.tiling.source.ITileDataSource;
-import org.oscim.tiling.source.TileSource;
+import org.oscim.layers.tile.MapTile;
+import org.oscim.tiling.ITileDataSink;
+import org.oscim.tiling.ITileDataSource;
+import org.oscim.tiling.TileSource;
public class TestTileSource extends TileSource {