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

refactor: move tile layer classes back to layers.tile

Browse Source 
they *really* belong there
This commit is contained in:
Hannes Janetzek 2014-02-20 03:31:55 +01:00
parent 6507b1369a
commit 48fa5d5434
56 changed files with 144 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtm-android-example/src/org/oscim/android/filepicker/ValidFileFilter.java
View File

@ -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.

2
vtm-android-example/src/org/oscim/android/filepicker/ValidMapFile.java
View File

@ -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;
/**

2
vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java
View File

@ -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;

2
vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java
View File

@ -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;

2
vtm-android-example/src/org/oscim/android/test/BitmapTileMapActivity.java
View File

@ -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;

2
vtm-android/src/org/oscim/android/cache/TileCache.java vendored
View File

@ -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;

8
vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
View File

@ -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 {

4
vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java
View File

@ -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;

8
vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
View File

@ -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

4
vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java
View File

@ -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;

12
vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
View File

@ -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;

2
vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
View File

@ -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;

2
vtm-gdx-desktop/src/org/oscim/gdx/GdxMapApp.java
View File

@ -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;

2
vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
View File

@ -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;

5
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/TileLoader.java → vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java
View File

@ -12,7 +12,10 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

12
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java
View File

@ -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;

3
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/LwHttp.java → vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/LwHttp.java
View File

@ -12,13 +12,14 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

11
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/UrlTileDataSource.java → vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/UrlTileDataSource.java
View File

@ -12,15 +12,18 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

2
vtm-gdx/src/org/oscim/gdx/GdxMap.java
View File

@ -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;

14
vtm/src/org/oscim/layers/tile/BitmapTileLayer.java
View File

@ -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;

6
vtm/src/org/oscim/tiling/JobQueue.java → vtm/src/org/oscim/layers/tile/JobQueue.java
View File

@ -15,10 +15,10 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
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.

4
vtm/src/org/oscim/tiling/MapTile.java → vtm/src/org/oscim/layers/tile/MapTile.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

2
vtm/src/org/oscim/tiling/TileDistanceSort.java → vtm/src/org/oscim/layers/tile/TileDistanceSort.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.tiling;
package org.oscim.layers.tile;
import java.util.Comparator;

3
vtm/src/org/oscim/layers/tile/TileLayer.java
View File

@ -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;

2
vtm/src/org/oscim/tiling/TileLoader.java → vtm/src/org/oscim/layers/tile/TileLoader.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.tiling;
package org.oscim.layers.tile;
import org.oscim.utils.PausableThread;

14
vtm/src/org/oscim/tiling/TileManager.java → vtm/src/org/oscim/layers/tile/TileManager.java
View File

@ -15,13 +15,13 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

6
vtm/src/org/oscim/tiling/TileRenderer.java → vtm/src/org/oscim/layers/tile/TileRenderer.java
View File

@ -14,10 +14,10 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

2
vtm/src/org/oscim/tiling/TileSet.java → vtm/src/org/oscim/layers/tile/TileSet.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.tiling;
package org.oscim.layers.tile;
import java.util.Arrays;
import java.util.Comparator;

7
vtm/src/org/oscim/tiling/VectorTileRenderer.java → vtm/src/org/oscim/layers/tile/VectorTileRenderer.java
View File

@ -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);

6
vtm/src/org/oscim/layers/tile/example/TestTileLayer.java
View File

@ -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;

10
vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
View File

@ -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;

14
vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
View File

@ -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;

2
vtm/src/org/oscim/layers/tile/vector/WayDecorator.java
View File

@ -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;

4
vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
View File

@ -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;

10
vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java
View File

@ -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;

2
vtm/src/org/oscim/map/Map.java
View File

@ -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;

10
vtm/src/org/oscim/renderer/ExtrusionRenderer.java
View File

@ -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;

2
vtm/src/org/oscim/renderer/MapRenderer.java
View File

@ -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;

2
vtm/src/org/oscim/tiling/source/ITileCache.java → vtm/src/org/oscim/tiling/ITileCache.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.tiling.source;
package org.oscim.tiling;
import java.io.InputStream;
import java.io.OutputStream;

2
vtm/src/org/oscim/tiling/source/ITileDataSink.java → vtm/src/org/oscim/tiling/ITileDataSink.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.tiling.source;
package org.oscim.tiling;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.core.MapElement;

5
vtm/src/org/oscim/tiling/source/ITileDataSource.java → vtm/src/org/oscim/tiling/ITileDataSource.java
View File

@ -15,9 +15,10 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.tiling.source;
package org.oscim.tiling;
import org.oscim.layers.tile.MapTile;
import org.oscim.tiling.MapTile;
/**
*

2
vtm/src/org/oscim/tiling/source/TileSource.java → vtm/src/org/oscim/tiling/TileSource.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.tiling.source;
package org.oscim.tiling;
import java.util.HashMap;

1
vtm/src/org/oscim/tiling/source/ITileDecoder.java
View File

@ -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 {

2
vtm/src/org/oscim/tiling/source/common/LwHttp.java → vtm/src/org/oscim/tiling/source/LwHttp.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.tiling.source.common;
package org.oscim.tiling.source;
import java.io.BufferedInputStream;
import java.io.IOException;

3
vtm/src/org/oscim/tiling/source/common/PbfDecoder.java → vtm/src/org/oscim/tiling/source/PbfDecoder.java
View File

@ -14,13 +14,12 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

15
vtm/src/org/oscim/tiling/source/common/UrlTileDataSource.java → vtm/src/org/oscim/tiling/source/UrlTileDataSource.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

4
vtm/src/org/oscim/tiling/source/common/UrlTileSource.java → vtm/src/org/oscim/tiling/source/UrlTileSource.java
View File

@ -14,13 +14,13 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
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 {

10
vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java
View File

@ -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;

6
vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
View File

@ -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;

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

@ -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;

2
vtm/src/org/oscim/tiling/source/mapfile/header/MapFileHeader.java
View File

@ -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;
/**

2
vtm/src/org/oscim/tiling/source/mapfile/header/OptionalFields.java
View File

@ -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 {

2
vtm/src/org/oscim/tiling/source/mapfile/header/RequiredFields.java
View File

@ -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 {

8
vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
View File

@ -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 {

4
vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java
View File

@ -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;

8
vtm/src/org/oscim/tiling/source/test/TestTileSource.java
View File

@ -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 {