From 12f064c460078c488b316105c6cbdf4c13a1be34 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Wed, 1 May 2013 03:25:09 +0200 Subject: [PATCH] move MapTileLayer to layers.vector --- src/org/oscim/layers/tile/{ => vector}/MapTileLayer.java | 5 ++++- src/org/oscim/layers/tile/{ => vector}/MapTileLoader.java | 6 +++++- src/org/oscim/layers/tile/{ => vector}/WayDecorator.java | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) rename src/org/oscim/layers/tile/{ => vector}/MapTileLayer.java (97%) rename src/org/oscim/layers/tile/{ => vector}/MapTileLoader.java (98%) rename src/org/oscim/layers/tile/{ => vector}/WayDecorator.java (98%) diff --git a/src/org/oscim/layers/tile/MapTileLayer.java b/src/org/oscim/layers/tile/vector/MapTileLayer.java similarity index 97% rename from src/org/oscim/layers/tile/MapTileLayer.java rename to src/org/oscim/layers/tile/vector/MapTileLayer.java index 09162b17..1abb2e71 100644 --- a/src/org/oscim/layers/tile/MapTileLayer.java +++ b/src/org/oscim/layers/tile/vector/MapTileLayer.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.layers.tile; +package org.oscim.layers.tile.vector; import java.io.FileNotFoundException; import java.io.IOException; @@ -29,6 +29,9 @@ import org.oscim.database.MapDatabaseFactory; import org.oscim.database.MapDatabases; import org.oscim.database.MapInfo; import org.oscim.database.MapOptions; +import org.oscim.layers.tile.JobQueue; +import org.oscim.layers.tile.TileLayer; +import org.oscim.layers.tile.TileManager; import org.oscim.renderer.GLRenderer; import org.oscim.theme.ExternalRenderTheme; import org.oscim.theme.IRenderTheme; diff --git a/src/org/oscim/layers/tile/MapTileLoader.java b/src/org/oscim/layers/tile/vector/MapTileLoader.java similarity index 98% rename from src/org/oscim/layers/tile/MapTileLoader.java rename to src/org/oscim/layers/tile/vector/MapTileLoader.java index 7c5e1ffd..44c94f0d 100644 --- a/src/org/oscim/layers/tile/MapTileLoader.java +++ b/src/org/oscim/layers/tile/vector/MapTileLoader.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.layers.tile; +package org.oscim.layers.tile.vector; import static org.oscim.layers.tile.MapTile.STATE_NONE; @@ -26,6 +26,10 @@ import org.oscim.core.Tile; import org.oscim.database.IMapDatabase; import org.oscim.database.IMapDatabase.QueryResult; import org.oscim.database.IMapDatabaseCallback; +import org.oscim.layers.tile.JobQueue; +import org.oscim.layers.tile.MapTile; +import org.oscim.layers.tile.TileLoader; +import org.oscim.layers.tile.TileManager; import org.oscim.renderer.layer.ExtrusionLayer; import org.oscim.renderer.layer.Layers; import org.oscim.renderer.layer.LineLayer; diff --git a/src/org/oscim/layers/tile/WayDecorator.java b/src/org/oscim/layers/tile/vector/WayDecorator.java similarity index 98% rename from src/org/oscim/layers/tile/WayDecorator.java rename to src/org/oscim/layers/tile/vector/WayDecorator.java index c4b6e048..a872815f 100644 --- a/src/org/oscim/layers/tile/WayDecorator.java +++ b/src/org/oscim/layers/tile/vector/WayDecorator.java @@ -13,9 +13,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.layers.tile; +package org.oscim.layers.tile.vector; import org.oscim.core.Tile; +import org.oscim.layers.tile.MapTile; import org.oscim.renderer.layer.TextItem; import org.oscim.theme.renderinstruction.Text; import org.oscim.utils.GeometryUtils;