diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dcdbeb29..32610036 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -19,7 +19,7 @@ android:label="@string/application_name" android:theme="@style/Theme.TileMap" > @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/TileData.proto b/TileData.proto index 757bad4b..23d9950d 100644 --- a/TileData.proto +++ b/TileData.proto @@ -1,6 +1,6 @@ -package org.mapsforge.database.pbmap; +package org.oscim.database.pbmap; -option java_package = "org.mapsforge.database.pbmap"; +option java_package = "org.oscim.database.pbmap"; option optimize_for = LITE_RUNTIME; message Data { diff --git a/assets/globe2.png b/assets/globe2.png new file mode 100644 index 00000000..64c4e31a Binary files /dev/null and b/assets/globe2.png differ diff --git a/gen/org/mapsforge/app/BuildConfig.java b/gen/org/mapsforge/app/BuildConfig.java deleted file mode 100644 index 780923ae..00000000 --- a/gen/org/mapsforge/app/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.mapsforge.app; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/res/layout/activity_tilemap.xml b/res/layout/activity_tilemap.xml index 87753b92..1ae9c064 100644 --- a/res/layout/activity_tilemap.xml +++ b/res/layout/activity_tilemap.xml @@ -5,7 +5,7 @@ android:layout_height="fill_parent" android:windowActionBarOverlay="true" > - diff --git a/res/menu/options_menu.xml b/res/menu/options_menu.xml index f2318ef1..2fffa911 100644 --- a/res/menu/options_menu.xml +++ b/res/menu/options_menu.xml @@ -13,9 +13,9 @@ - + android:title="@string/menu_position_last_known"/> --> diff --git a/res/menu/options_menu_pre_honeycomb.xml b/res/menu/options_menu_pre_honeycomb.xml index 185788c2..8af3d5c0 100644 --- a/res/menu/options_menu_pre_honeycomb.xml +++ b/res/menu/options_menu_pre_honeycomb.xml @@ -13,19 +13,27 @@ - + android:title="@string/menu_position_last_known"/> --> - - + + + . - */ -/** - * The mapsforge-map library allows applications to render and display a map without Internet connection. It can - * be used on all Android devices running version 1.5 or higher. An application needs to extend the - * {@link org.mapsforge.android.MapActivity} class in order to use a - * {@link org.mapsforge.android.MapView}. More than one MapView instance may be used simultaneously. - *

- * The most important classes and methods from the Google APIs Add-On are implemented. However, no API key is required and no abstract methods - * must be overridden. - *

- * This software is a part of the mapsforge project and - * distributed under the LGPL3 license. All - * map data (c) OpenStreetMap contributors, CC-BY-SA license. - */ -package org.mapsforge.android; - diff --git a/src/org/mapsforge/app/FileUtils.java b/src/org/oscim/app/FileUtils.java similarity index 98% rename from src/org/mapsforge/app/FileUtils.java rename to src/org/oscim/app/FileUtils.java index fd770c66..14ec3591 100644 --- a/src/org/mapsforge/app/FileUtils.java +++ b/src/org/oscim/app/FileUtils.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.mapsforge.app; +package org.oscim.app; import java.text.DecimalFormat; diff --git a/src/org/mapsforge/app/InfoView.java b/src/org/oscim/app/InfoView.java similarity index 98% rename from src/org/mapsforge/app/InfoView.java rename to src/org/oscim/app/InfoView.java index 7ebd48df..0b0482aa 100644 --- a/src/org/mapsforge/app/InfoView.java +++ b/src/org/oscim/app/InfoView.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.mapsforge.app; +package org.oscim.app; import android.app.Activity; import android.os.Bundle; diff --git a/src/org/mapsforge/app/LocationHandler.java b/src/org/oscim/app/LocationHandler.java similarity index 88% rename from src/org/mapsforge/app/LocationHandler.java rename to src/org/oscim/app/LocationHandler.java index 310a8e34..82284bd0 100644 --- a/src/org/mapsforge/app/LocationHandler.java +++ b/src/org/oscim/app/LocationHandler.java @@ -12,9 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.app; +package org.oscim.app; -import org.mapsforge.core.GeoPoint; +import org.oscim.core.GeoPoint; +import org.oscim.core.MapPosition; import android.content.Context; import android.location.Criteria; @@ -43,7 +44,7 @@ public class LocationHandler { mTileMap = tileMap; mLocationManager = (LocationManager) tileMap .getSystemService(Context.LOCATION_SERVICE); - mLocationListener = new MyLocationListener(tileMap); + mLocationListener = new MyLocationListener(); mSnapToLocationView = (ToggleButton) tileMap .findViewById(R.id.snapToLocationView); @@ -63,6 +64,8 @@ public class LocationHandler { boolean enableShowMyLocation(boolean centerAtFirstFix) { Log.d("TileMap", "enableShowMyLocation " + mShowMyLocation); + gotoLastKnownPosition(); + if (!mShowMyLocation) { Criteria criteria = new Criteria(); criteria.setAccuracy(Criteria.ACCURACY_FINE); @@ -77,7 +80,7 @@ public class LocationHandler { Log.d("TileMap", "enableShowMyLocation " + mShowMyLocation); - mLocationListener.setCenterAtFirstFix(centerAtFirstFix); + mLocationListener.setFirstCenter(centerAtFirstFix); mLocationManager.requestLocationUpdates(bestProvider, 1000, 0, mLocationListener); @@ -92,6 +95,7 @@ public class LocationHandler { void gotoLastKnownPosition() { Location currentLocation; Location bestLocation = null; + for (String provider : mLocationManager.getProviders(true)) { currentLocation = mLocationManager.getLastKnownLocation(provider); if (currentLocation == null) @@ -103,10 +107,14 @@ public class LocationHandler { } if (bestLocation != null) { - GeoPoint point = new GeoPoint(bestLocation.getLatitude(), - bestLocation.getLongitude()); + byte zoom = mTileMap.mMapView.getMapPosition().getZoomLevel(); + if (zoom < 12) + zoom = (byte) 12; - mTileMap.mMapView.setCenter(point); + MapPosition mapPosition = new MapPosition(bestLocation.getLatitude(), + bestLocation.getLongitude(), zoom, 1, 0); + + mTileMap.mMapView.setMapCenter(mapPosition); } else { mTileMap.showToastOnUiThread(mTileMap @@ -197,12 +205,8 @@ public class LocationHandler { } class MyLocationListener implements LocationListener { - private final TileMap tileMap; - private boolean centerAtFirstFix; - MyLocationListener(TileMap tileMap) { - this.tileMap = tileMap; - } + private boolean mSetCenter; @Override public void onLocationChanged(Location location) { @@ -222,9 +226,9 @@ public class LocationHandler { // this.advancedMapViewer.circleOverlay.requestRedraw(); // this.advancedMapViewer.itemizedOverlay.requestRedraw(); - if (this.centerAtFirstFix || isSnapToLocationEnabled()) { - this.centerAtFirstFix = false; - this.tileMap.mMapView.setCenter(point); + if (mSetCenter || isSnapToLocationEnabled()) { + mSetCenter = false; + mTileMap.mMapView.setCenter(point); } } @@ -243,12 +247,12 @@ public class LocationHandler { // do nothing } - boolean isCenterAtFirstFix() { - return this.centerAtFirstFix; + boolean isFirstCenter() { + return mSetCenter; } - void setCenterAtFirstFix(boolean centerAtFirstFix) { - this.centerAtFirstFix = centerAtFirstFix; + void setFirstCenter(boolean center) { + mSetCenter = center; } } } diff --git a/src/org/mapsforge/app/TileMap.java b/src/org/oscim/app/TileMap.java similarity index 96% rename from src/org/mapsforge/app/TileMap.java rename to src/org/oscim/app/TileMap.java index f59e091d..3e55a429 100755 --- a/src/org/mapsforge/app/TileMap.java +++ b/src/org/oscim/app/TileMap.java @@ -1,21 +1,21 @@ -package org.mapsforge.app; +package org.oscim.app; import java.io.FileFilter; import java.io.FileNotFoundException; -import org.mapsforge.android.DebugSettings; -import org.mapsforge.android.MapActivity; -import org.mapsforge.android.MapView; -import org.mapsforge.android.mapgenerator.MapDatabases; -import org.mapsforge.android.rendertheme.InternalRenderTheme; -import org.mapsforge.android.utils.AndroidUtils; -import org.mapsforge.app.filefilter.FilterByFileExtension; -import org.mapsforge.app.filefilter.ValidMapFile; -import org.mapsforge.app.filefilter.ValidRenderTheme; -import org.mapsforge.app.filepicker.FilePicker; -import org.mapsforge.app.preferences.EditPreferences; -import org.mapsforge.core.GeoPoint; -import org.mapsforge.core.MapPosition; +import org.oscim.app.filefilter.FilterByFileExtension; +import org.oscim.app.filefilter.ValidMapFile; +import org.oscim.app.filefilter.ValidRenderTheme; +import org.oscim.app.filepicker.FilePicker; +import org.oscim.app.preferences.EditPreferences; +import org.oscim.core.GeoPoint; +import org.oscim.core.MapPosition; +import org.oscim.database.MapDatabases; +import org.oscim.theme.InternalRenderTheme; +import org.oscim.view.DebugSettings; +import org.oscim.view.MapActivity; +import org.oscim.view.MapView; +import org.oscim.view.utils.AndroidUtils; import android.annotation.TargetApi; import android.app.ActionBar; @@ -140,9 +140,9 @@ public class TileMap extends MapActivity { mLocation.disableShowMyLocation()); return true; - case R.id.menu_position_last_known: - mLocation.gotoLastKnownPosition(); - return true; + // case R.id.menu_position_last_known: + // mLocation.gotoLastKnownPosition(); + // return true; case R.id.menu_position_enter_coordinates: showDialog(DIALOG_ENTER_COORDINATES); diff --git a/src/org/mapsforge/app/filefilter/FilterByFileExtension.java b/src/org/oscim/app/filefilter/FilterByFileExtension.java similarity index 97% rename from src/org/mapsforge/app/filefilter/FilterByFileExtension.java rename to src/org/oscim/app/filefilter/FilterByFileExtension.java index 9868eb15..771fe81c 100644 --- a/src/org/mapsforge/app/filefilter/FilterByFileExtension.java +++ b/src/org/oscim/app/filefilter/FilterByFileExtension.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.mapsforge.app.filefilter; +package org.oscim.app.filefilter; import java.io.File; import java.io.FileFilter; diff --git a/src/org/mapsforge/app/filefilter/ValidFileFilter.java b/src/org/oscim/app/filefilter/ValidFileFilter.java similarity index 92% rename from src/org/mapsforge/app/filefilter/ValidFileFilter.java rename to src/org/oscim/app/filefilter/ValidFileFilter.java index c7a6e062..9ca60672 100644 --- a/src/org/mapsforge/app/filefilter/ValidFileFilter.java +++ b/src/org/oscim/app/filefilter/ValidFileFilter.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.app.filefilter; +package org.oscim.app.filefilter; import java.io.FileFilter; -import org.mapsforge.database.OpenResult; +import org.oscim.database.OpenResult; /** * An extension of the {@link FileFilter} interface. diff --git a/src/org/mapsforge/app/filefilter/ValidMapFile.java b/src/org/oscim/app/filefilter/ValidMapFile.java similarity index 88% rename from src/org/mapsforge/app/filefilter/ValidMapFile.java rename to src/org/oscim/app/filefilter/ValidMapFile.java index 11a46d57..5ca10f38 100644 --- a/src/org/mapsforge/app/filefilter/ValidMapFile.java +++ b/src/org/oscim/app/filefilter/ValidMapFile.java @@ -12,14 +12,14 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.app.filefilter; +package org.oscim.app.filefilter; import java.io.File; import java.util.HashMap; -import org.mapsforge.database.IMapDatabase; -import org.mapsforge.database.OpenResult; -import org.mapsforge.database.mapfile.MapDatabase; +import org.oscim.database.IMapDatabase; +import org.oscim.database.OpenResult; +import org.oscim.database.mapfile.MapDatabase; /** * Accepts all valid map files. diff --git a/src/org/mapsforge/app/filefilter/ValidRenderTheme.java b/src/org/oscim/app/filefilter/ValidRenderTheme.java similarity index 93% rename from src/org/mapsforge/app/filefilter/ValidRenderTheme.java rename to src/org/oscim/app/filefilter/ValidRenderTheme.java index 5f396811..98b3575a 100644 --- a/src/org/mapsforge/app/filefilter/ValidRenderTheme.java +++ b/src/org/oscim/app/filefilter/ValidRenderTheme.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.mapsforge.app.filefilter; +package org.oscim.app.filefilter; import java.io.File; import java.io.FileInputStream; @@ -22,8 +22,8 @@ import java.io.InputStream; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; -import org.mapsforge.android.rendertheme.RenderThemeHandler; -import org.mapsforge.database.OpenResult; +import org.oscim.database.OpenResult; +import org.oscim.theme.RenderThemeHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; diff --git a/src/org/mapsforge/app/filepicker/FilePicker.java b/src/org/oscim/app/filepicker/FilePicker.java similarity index 98% rename from src/org/mapsforge/app/filepicker/FilePicker.java rename to src/org/oscim/app/filepicker/FilePicker.java index 406f63b3..64706621 100755 --- a/src/org/mapsforge/app/filepicker/FilePicker.java +++ b/src/org/oscim/app/filepicker/FilePicker.java @@ -12,15 +12,15 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.app.filepicker; +package org.oscim.app.filepicker; import java.io.File; import java.io.FileFilter; import java.util.Arrays; import java.util.Comparator; -import org.mapsforge.app.R; -import org.mapsforge.app.filefilter.ValidFileFilter; +import org.oscim.app.R; +import org.oscim.app.filefilter.ValidFileFilter; import android.annotation.TargetApi; import android.app.Activity; diff --git a/src/org/mapsforge/app/filepicker/FilePickerIconAdapter.java b/src/org/oscim/app/filepicker/FilePickerIconAdapter.java similarity index 97% rename from src/org/mapsforge/app/filepicker/FilePickerIconAdapter.java rename to src/org/oscim/app/filepicker/FilePickerIconAdapter.java index f27dd40d..11450a03 100755 --- a/src/org/mapsforge/app/filepicker/FilePickerIconAdapter.java +++ b/src/org/oscim/app/filepicker/FilePickerIconAdapter.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.app.filepicker; +package org.oscim.app.filepicker; import java.io.File; -import org.mapsforge.app.R; +import org.oscim.app.R; import android.content.Context; import android.view.Gravity; diff --git a/src/org/mapsforge/app/preferences/EditPreferences.java b/src/org/oscim/app/preferences/EditPreferences.java similarity index 96% rename from src/org/mapsforge/app/preferences/EditPreferences.java rename to src/org/oscim/app/preferences/EditPreferences.java index 2c1bf905..72ad362d 100644 --- a/src/org/mapsforge/app/preferences/EditPreferences.java +++ b/src/org/oscim/app/preferences/EditPreferences.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.app.preferences; +package org.oscim.app.preferences; -import org.mapsforge.app.R; +import org.oscim.app.R; import android.annotation.TargetApi; import android.os.Build; diff --git a/src/org/mapsforge/app/preferences/SeekBarPreference.java b/src/org/oscim/app/preferences/SeekBarPreference.java similarity index 99% rename from src/org/mapsforge/app/preferences/SeekBarPreference.java rename to src/org/oscim/app/preferences/SeekBarPreference.java index 777e716d..a4f4fe1b 100644 --- a/src/org/mapsforge/app/preferences/SeekBarPreference.java +++ b/src/org/oscim/app/preferences/SeekBarPreference.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.mapsforge.app.preferences; +package org.oscim.app.preferences; import android.content.Context; import android.content.DialogInterface; diff --git a/src/org/mapsforge/core/BoundingBox.java b/src/org/oscim/core/BoundingBox.java similarity index 99% rename from src/org/mapsforge/core/BoundingBox.java rename to src/org/oscim/core/BoundingBox.java index 59a5b7fb..6f08943b 100644 --- a/src/org/mapsforge/core/BoundingBox.java +++ b/src/org/oscim/core/BoundingBox.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.mapsforge.core; +package org.oscim.core; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/org/mapsforge/core/GeoPoint.java b/src/org/oscim/core/GeoPoint.java similarity index 99% rename from src/org/mapsforge/core/GeoPoint.java rename to src/org/oscim/core/GeoPoint.java index 0f1bc0bc..f944b9eb 100644 --- a/src/org/mapsforge/core/GeoPoint.java +++ b/src/org/oscim/core/GeoPoint.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.mapsforge.core; +package org.oscim.core; /** diff --git a/src/org/mapsforge/core/LRUCache.java b/src/org/oscim/core/LRUCache.java similarity index 98% rename from src/org/mapsforge/core/LRUCache.java rename to src/org/oscim/core/LRUCache.java index a1f06dbb..7a7f65c4 100644 --- a/src/org/mapsforge/core/LRUCache.java +++ b/src/org/oscim/core/LRUCache.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.mapsforge.core; +package org.oscim.core; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/org/mapsforge/core/MapPosition.java b/src/org/oscim/core/MapPosition.java similarity index 98% rename from src/org/mapsforge/core/MapPosition.java rename to src/org/oscim/core/MapPosition.java index 158ca9af..7b81bb1a 100644 --- a/src/org/mapsforge/core/MapPosition.java +++ b/src/org/oscim/core/MapPosition.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.mapsforge.core; +package org.oscim.core; /** * A MapPosition represents an immutable pair of {@link GeoPoint} and zoom level. diff --git a/src/org/mapsforge/core/MercatorProjection.java b/src/org/oscim/core/MercatorProjection.java similarity index 99% rename from src/org/mapsforge/core/MercatorProjection.java rename to src/org/oscim/core/MercatorProjection.java index f59a6c69..8406e48b 100644 --- a/src/org/mapsforge/core/MercatorProjection.java +++ b/src/org/oscim/core/MercatorProjection.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.mapsforge.core; +package org.oscim.core; /** * An implementation of the spherical Mercator projection. diff --git a/src/org/mapsforge/core/Tag.java b/src/org/oscim/core/Tag.java similarity index 99% rename from src/org/mapsforge/core/Tag.java rename to src/org/oscim/core/Tag.java index 334cfec9..962fc7b6 100644 --- a/src/org/mapsforge/core/Tag.java +++ b/src/org/oscim/core/Tag.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.mapsforge.core; +package org.oscim.core; /** * A tag represents an immutable key-value pair. diff --git a/src/org/mapsforge/core/Tile.java b/src/org/oscim/core/Tile.java similarity index 99% rename from src/org/mapsforge/core/Tile.java rename to src/org/oscim/core/Tile.java index 7e744890..49f7b8a7 100644 --- a/src/org/mapsforge/core/Tile.java +++ b/src/org/oscim/core/Tile.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.mapsforge.core; +package org.oscim.core; /** * A tile represents a rectangular part of the world map. All tiles can be identified by their X and Y number together diff --git a/src/org/mapsforge/core/WebMercator.java b/src/org/oscim/core/WebMercator.java similarity index 99% rename from src/org/mapsforge/core/WebMercator.java rename to src/org/oscim/core/WebMercator.java index ca9b836a..024e113c 100644 --- a/src/org/mapsforge/core/WebMercator.java +++ b/src/org/oscim/core/WebMercator.java @@ -13,7 +13,7 @@ * this program. If not, see . */ -package org.mapsforge.core; +package org.oscim.core; /** * diff --git a/src/org/mapsforge/database/IMapDatabase.java b/src/org/oscim/database/IMapDatabase.java similarity index 95% rename from src/org/mapsforge/database/IMapDatabase.java rename to src/org/oscim/database/IMapDatabase.java index 24841129..b4c9139a 100644 --- a/src/org/mapsforge/database/IMapDatabase.java +++ b/src/org/oscim/database/IMapDatabase.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database; +package org.oscim.database; import java.util.Map; -import org.mapsforge.android.mapgenerator.JobTile; +import org.oscim.view.mapgenerator.JobTile; /** * diff --git a/src/org/mapsforge/database/IMapDatabaseCallback.java b/src/org/oscim/database/IMapDatabaseCallback.java similarity index 94% rename from src/org/mapsforge/database/IMapDatabaseCallback.java rename to src/org/oscim/database/IMapDatabaseCallback.java index a57891d6..7a716b64 100644 --- a/src/org/mapsforge/database/IMapDatabaseCallback.java +++ b/src/org/oscim/database/IMapDatabaseCallback.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database; +package org.oscim.database; -import org.mapsforge.core.Tag; -import org.mapsforge.database.mapfile.MapDatabase; +import org.oscim.core.Tag; +import org.oscim.database.mapfile.MapDatabase; /** * Callback methods which can be triggered from the {@link MapDatabase}. diff --git a/src/org/mapsforge/database/IMapTileData.java b/src/org/oscim/database/IMapTileData.java similarity index 95% rename from src/org/mapsforge/database/IMapTileData.java rename to src/org/oscim/database/IMapTileData.java index 77121b96..9703fff6 100644 --- a/src/org/mapsforge/database/IMapTileData.java +++ b/src/org/oscim/database/IMapTileData.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.mapsforge.database; +package org.oscim.database; public interface IMapTileData { diff --git a/src/org/mapsforge/android/mapgenerator/MapDatabaseFactory.java b/src/org/oscim/database/MapDatabaseFactory.java similarity index 84% rename from src/org/mapsforge/android/mapgenerator/MapDatabaseFactory.java rename to src/org/oscim/database/MapDatabaseFactory.java index 3eb4476d..5380b20a 100644 --- a/src/org/mapsforge/android/mapgenerator/MapDatabaseFactory.java +++ b/src/org/oscim/database/MapDatabaseFactory.java @@ -12,9 +12,8 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.mapgenerator; +package org.oscim.database; -import org.mapsforge.database.IMapDatabase; import android.util.AttributeSet; @@ -34,7 +33,7 @@ public final class MapDatabaseFactory { String mapDatabaseName = attributeSet.getAttributeValue(null, MAP_DATABASE_ATTRIBUTE_NAME); if (mapDatabaseName == null) { - return new org.mapsforge.database.postgis.MapDatabase(); + return new org.oscim.database.postgis.MapDatabase(); } MapDatabases mapDatabaseInternal = MapDatabases.valueOf(mapDatabaseName); @@ -60,13 +59,13 @@ public final class MapDatabaseFactory { public static IMapDatabase createMapDatabase(MapDatabases mapDatabase) { switch (mapDatabase) { case MAP_READER: - return new org.mapsforge.database.mapfile.MapDatabase(); + return new org.oscim.database.mapfile.MapDatabase(); case TEST_READER: - return new org.mapsforge.database.test.MapDatabase(); + return new org.oscim.database.test.MapDatabase(); case POSTGIS_READER: - return new org.mapsforge.database.postgis.MapDatabase(); + return new org.oscim.database.postgis.MapDatabase(); case PBMAP_READER: - return new org.mapsforge.database.pbmap.MapDatabase(); + return new org.oscim.database.pbmap.MapDatabase(); } diff --git a/src/org/mapsforge/android/mapgenerator/MapDatabases.java b/src/org/oscim/database/MapDatabases.java similarity index 95% rename from src/org/mapsforge/android/mapgenerator/MapDatabases.java rename to src/org/oscim/database/MapDatabases.java index fa21fc58..6f861460 100644 --- a/src/org/mapsforge/android/mapgenerator/MapDatabases.java +++ b/src/org/oscim/database/MapDatabases.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.mapsforge.android.mapgenerator; +package org.oscim.database; /** * MapDatabase Implementations diff --git a/src/org/mapsforge/database/MapInfo.java b/src/org/oscim/database/MapInfo.java similarity index 94% rename from src/org/mapsforge/database/MapInfo.java rename to src/org/oscim/database/MapInfo.java index a842db04..5ca6109d 100644 --- a/src/org/mapsforge/database/MapInfo.java +++ b/src/org/oscim/database/MapInfo.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database; +package org.oscim.database; -import org.mapsforge.core.BoundingBox; -import org.mapsforge.core.GeoPoint; -import org.mapsforge.database.mapfile.MapDatabase; +import org.oscim.core.BoundingBox; +import org.oscim.core.GeoPoint; +import org.oscim.database.mapfile.MapDatabase; /** * Contains the immutable metadata of a map file. diff --git a/src/org/mapsforge/database/OpenResult.java b/src/org/oscim/database/OpenResult.java similarity index 98% rename from src/org/mapsforge/database/OpenResult.java rename to src/org/oscim/database/OpenResult.java index 5c4994ca..21005461 100644 --- a/src/org/mapsforge/database/OpenResult.java +++ b/src/org/oscim/database/OpenResult.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.mapsforge.database; +package org.oscim.database; /** diff --git a/src/org/mapsforge/database/QueryResult.java b/src/org/oscim/database/QueryResult.java similarity index 96% rename from src/org/mapsforge/database/QueryResult.java rename to src/org/oscim/database/QueryResult.java index 1f1fcc38..504eab1b 100644 --- a/src/org/mapsforge/database/QueryResult.java +++ b/src/org/oscim/database/QueryResult.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.mapsforge.database; +package org.oscim.database; public enum QueryResult { SUCCESS, diff --git a/src/org/mapsforge/database/mapfile/Deserializer.java b/src/org/oscim/database/mapfile/Deserializer.java similarity index 98% rename from src/org/mapsforge/database/mapfile/Deserializer.java rename to src/org/oscim/database/mapfile/Deserializer.java index 478f3e21..f5969004 100644 --- a/src/org/mapsforge/database/mapfile/Deserializer.java +++ b/src/org/oscim/database/mapfile/Deserializer.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.mapsforge.database.mapfile; +package org.oscim.database.mapfile; /** * This utility class contains methods to convert byte arrays to numbers. diff --git a/src/org/mapsforge/database/mapfile/IndexCache.java b/src/org/oscim/database/mapfile/IndexCache.java similarity index 96% rename from src/org/mapsforge/database/mapfile/IndexCache.java rename to src/org/oscim/database/mapfile/IndexCache.java index 853f9f64..507d61fe 100644 --- a/src/org/mapsforge/database/mapfile/IndexCache.java +++ b/src/org/oscim/database/mapfile/IndexCache.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.mapsforge.database.mapfile; +package org.oscim.database.mapfile; import java.io.IOException; import java.io.RandomAccessFile; @@ -20,8 +20,8 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.mapsforge.core.LRUCache; -import org.mapsforge.database.mapfile.header.SubFileParameter; +import org.oscim.core.LRUCache; +import org.oscim.database.mapfile.header.SubFileParameter; /** * A cache for database index blocks with a fixed size and LRU policy. diff --git a/src/org/mapsforge/database/mapfile/IndexCacheEntryKey.java b/src/org/oscim/database/mapfile/IndexCacheEntryKey.java similarity index 95% rename from src/org/mapsforge/database/mapfile/IndexCacheEntryKey.java rename to src/org/oscim/database/mapfile/IndexCacheEntryKey.java index d1207a93..60290145 100644 --- a/src/org/mapsforge/database/mapfile/IndexCacheEntryKey.java +++ b/src/org/oscim/database/mapfile/IndexCacheEntryKey.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.mapfile; +package org.oscim.database.mapfile; -import org.mapsforge.database.mapfile.header.SubFileParameter; +import org.oscim.database.mapfile.header.SubFileParameter; /** * An immutable container class which is the key for the index cache. diff --git a/src/org/mapsforge/database/mapfile/MapDatabase.java b/src/org/oscim/database/mapfile/MapDatabase.java similarity index 96% rename from src/org/mapsforge/database/mapfile/MapDatabase.java rename to src/org/oscim/database/mapfile/MapDatabase.java index 8b701201..cc7df9a1 100644 --- a/src/org/mapsforge/database/mapfile/MapDatabase.java +++ b/src/org/oscim/database/mapfile/MapDatabase.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.mapsforge.database.mapfile; +package org.oscim.database.mapfile; import java.io.File; import java.io.IOException; @@ -21,16 +21,16 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.core.MercatorProjection; -import org.mapsforge.core.Tag; -import org.mapsforge.database.IMapDatabase; -import org.mapsforge.database.IMapDatabaseCallback; -import org.mapsforge.database.OpenResult; -import org.mapsforge.database.QueryResult; -import org.mapsforge.database.mapfile.header.MapFileHeader; -import org.mapsforge.database.mapfile.header.MapFileInfo; -import org.mapsforge.database.mapfile.header.SubFileParameter; +import org.oscim.core.MercatorProjection; +import org.oscim.core.Tag; +import org.oscim.database.IMapDatabase; +import org.oscim.database.IMapDatabaseCallback; +import org.oscim.database.OpenResult; +import org.oscim.database.QueryResult; +import org.oscim.database.mapfile.header.MapFileHeader; +import org.oscim.database.mapfile.header.MapFileInfo; +import org.oscim.database.mapfile.header.SubFileParameter; +import org.oscim.view.mapgenerator.JobTile; /** * A class for reading binary map files. @@ -201,8 +201,8 @@ public class MapDatabase implements IMapDatabase { /* * (non-Javadoc) - * @see org.mapsforge.map.reader.IMapDatabase#executeQuery(org.mapsforge.core.Tile, - * org.mapsforge.map.reader.MapDatabaseCallback) + * @see org.oscim.map.reader.IMapDatabase#executeQuery(org.oscim.core.Tile, + * org.oscim.map.reader.MapDatabaseCallback) */ @Override public QueryResult executeQuery(JobTile tile, IMapDatabaseCallback mapDatabaseCallback) { @@ -240,7 +240,7 @@ public class MapDatabase implements IMapDatabase { /* * (non-Javadoc) - * @see org.mapsforge.map.reader.IMapDatabase#getMapFileInfo() + * @see org.oscim.map.reader.IMapDatabase#getMapFileInfo() */ @Override public MapFileInfo getMapInfo() { @@ -257,7 +257,7 @@ public class MapDatabase implements IMapDatabase { /* * (non-Javadoc) - * @see org.mapsforge.map.reader.IMapDatabase#hasOpenFile() + * @see org.oscim.map.reader.IMapDatabase#hasOpenFile() */ @Override public boolean isOpen() { @@ -266,7 +266,7 @@ public class MapDatabase implements IMapDatabase { /* * (non-Javadoc) - * @see org.mapsforge.map.reader.IMapDatabase#openFile(java.io.File) + * @see org.oscim.map.reader.IMapDatabase#openFile(java.io.File) */ @Override public OpenResult open(Map options) { @@ -324,7 +324,7 @@ public class MapDatabase implements IMapDatabase { /* * (non-Javadoc) - * @see org.mapsforge.map.reader.IMapDatabase#closeFile() + * @see org.oscim.map.reader.IMapDatabase#closeFile() */ @Override public void close() { diff --git a/src/org/mapsforge/database/mapfile/QueryCalculations.java b/src/org/oscim/database/mapfile/QueryCalculations.java similarity index 97% rename from src/org/mapsforge/database/mapfile/QueryCalculations.java rename to src/org/oscim/database/mapfile/QueryCalculations.java index f8e6507c..c90fc61d 100644 --- a/src/org/mapsforge/database/mapfile/QueryCalculations.java +++ b/src/org/oscim/database/mapfile/QueryCalculations.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.mapfile; +package org.oscim.database.mapfile; -import org.mapsforge.core.Tile; -import org.mapsforge.database.mapfile.header.SubFileParameter; +import org.oscim.core.Tile; +import org.oscim.database.mapfile.header.SubFileParameter; final class QueryCalculations { private static int getFirstLevelTileBitmask(Tile tile) { diff --git a/src/org/mapsforge/database/mapfile/QueryParameters.java b/src/org/oscim/database/mapfile/QueryParameters.java similarity index 98% rename from src/org/mapsforge/database/mapfile/QueryParameters.java rename to src/org/oscim/database/mapfile/QueryParameters.java index 7b120f3b..4da0110d 100644 --- a/src/org/mapsforge/database/mapfile/QueryParameters.java +++ b/src/org/oscim/database/mapfile/QueryParameters.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.mapsforge.database.mapfile; +package org.oscim.database.mapfile; class QueryParameters { long fromBaseTileX; diff --git a/src/org/mapsforge/database/mapfile/ReadBuffer.java b/src/org/oscim/database/mapfile/ReadBuffer.java similarity index 99% rename from src/org/mapsforge/database/mapfile/ReadBuffer.java rename to src/org/oscim/database/mapfile/ReadBuffer.java index f5b05eca..1279e846 100644 --- a/src/org/mapsforge/database/mapfile/ReadBuffer.java +++ b/src/org/oscim/database/mapfile/ReadBuffer.java @@ -12,14 +12,14 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.mapfile; +package org.oscim.database.mapfile; import java.io.IOException; import java.io.RandomAccessFile; import java.io.UnsupportedEncodingException; import java.util.logging.Logger; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; /** * Reads from a {@link RandomAccessFile} into a buffer and decodes the data. diff --git a/src/org/mapsforge/database/mapfile/header/MapFileHeader.java b/src/org/oscim/database/mapfile/header/MapFileHeader.java similarity index 98% rename from src/org/mapsforge/database/mapfile/header/MapFileHeader.java rename to src/org/oscim/database/mapfile/header/MapFileHeader.java index 0614735f..aafb1565 100644 --- a/src/org/mapsforge/database/mapfile/header/MapFileHeader.java +++ b/src/org/oscim/database/mapfile/header/MapFileHeader.java @@ -12,12 +12,12 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.mapfile.header; +package org.oscim.database.mapfile.header; import java.io.IOException; -import org.mapsforge.database.OpenResult; -import org.mapsforge.database.mapfile.ReadBuffer; +import org.oscim.database.OpenResult; +import org.oscim.database.mapfile.ReadBuffer; /** * Reads and validates the header data from a binary map file. diff --git a/src/org/mapsforge/database/mapfile/header/MapFileInfo.java b/src/org/oscim/database/mapfile/header/MapFileInfo.java similarity index 90% rename from src/org/mapsforge/database/mapfile/header/MapFileInfo.java rename to src/org/oscim/database/mapfile/header/MapFileInfo.java index 91fa4dc5..336ba943 100644 --- a/src/org/mapsforge/database/mapfile/header/MapFileInfo.java +++ b/src/org/oscim/database/mapfile/header/MapFileInfo.java @@ -12,17 +12,17 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.mapfile.header; +package org.oscim.database.mapfile.header; -import org.mapsforge.core.Tag; -import org.mapsforge.database.mapfile.MapDatabase; +import org.oscim.core.Tag; +import org.oscim.database.mapfile.MapDatabase; /** * Contains the immutable metadata of a map file. * * @see MapDatabase#getMapInfo() */ -public class MapFileInfo extends org.mapsforge.database.MapInfo { +public class MapFileInfo extends org.oscim.database.MapInfo { /** * True if the map file includes debug information, false otherwise. diff --git a/src/org/mapsforge/database/mapfile/header/MapFileInfoBuilder.java b/src/org/oscim/database/mapfile/header/MapFileInfoBuilder.java similarity index 89% rename from src/org/mapsforge/database/mapfile/header/MapFileInfoBuilder.java rename to src/org/oscim/database/mapfile/header/MapFileInfoBuilder.java index 1b8e7c6c..96b1e070 100644 --- a/src/org/mapsforge/database/mapfile/header/MapFileInfoBuilder.java +++ b/src/org/oscim/database/mapfile/header/MapFileInfoBuilder.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.mapfile.header; +package org.oscim.database.mapfile.header; -import org.mapsforge.core.BoundingBox; -import org.mapsforge.core.Tag; +import org.oscim.core.BoundingBox; +import org.oscim.core.Tag; class MapFileInfoBuilder { BoundingBox boundingBox; diff --git a/src/org/mapsforge/database/mapfile/header/OptionalFields.java b/src/org/oscim/database/mapfile/header/OptionalFields.java similarity index 96% rename from src/org/mapsforge/database/mapfile/header/OptionalFields.java rename to src/org/oscim/database/mapfile/header/OptionalFields.java index 8b70ae22..5bcc5f0b 100644 --- a/src/org/mapsforge/database/mapfile/header/OptionalFields.java +++ b/src/org/oscim/database/mapfile/header/OptionalFields.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.mapfile.header; +package org.oscim.database.mapfile.header; -import org.mapsforge.core.GeoPoint; -import org.mapsforge.database.OpenResult; -import org.mapsforge.database.mapfile.ReadBuffer; +import org.oscim.core.GeoPoint; +import org.oscim.database.OpenResult; +import org.oscim.database.mapfile.ReadBuffer; final class OptionalFields { /** diff --git a/src/org/mapsforge/database/mapfile/header/RequiredFields.java b/src/org/oscim/database/mapfile/header/RequiredFields.java similarity index 97% rename from src/org/mapsforge/database/mapfile/header/RequiredFields.java rename to src/org/oscim/database/mapfile/header/RequiredFields.java index 52cfa463..83ca63d1 100644 --- a/src/org/mapsforge/database/mapfile/header/RequiredFields.java +++ b/src/org/oscim/database/mapfile/header/RequiredFields.java @@ -12,14 +12,14 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.mapfile.header; +package org.oscim.database.mapfile.header; import java.io.IOException; -import org.mapsforge.core.BoundingBox; -import org.mapsforge.core.Tag; -import org.mapsforge.database.OpenResult; -import org.mapsforge.database.mapfile.ReadBuffer; +import org.oscim.core.BoundingBox; +import org.oscim.core.Tag; +import org.oscim.database.OpenResult; +import org.oscim.database.mapfile.ReadBuffer; final class RequiredFields { /** diff --git a/src/org/mapsforge/database/mapfile/header/SubFileParameter.java b/src/org/oscim/database/mapfile/header/SubFileParameter.java similarity index 98% rename from src/org/mapsforge/database/mapfile/header/SubFileParameter.java rename to src/org/oscim/database/mapfile/header/SubFileParameter.java index 91399ba0..ad46f2cb 100644 --- a/src/org/mapsforge/database/mapfile/header/SubFileParameter.java +++ b/src/org/oscim/database/mapfile/header/SubFileParameter.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.mapfile.header; +package org.oscim.database.mapfile.header; -import org.mapsforge.core.MercatorProjection; +import org.oscim.core.MercatorProjection; /** * Holds all parameters of a sub-file. diff --git a/src/org/mapsforge/database/mapfile/header/SubFileParameterBuilder.java b/src/org/oscim/database/mapfile/header/SubFileParameterBuilder.java similarity index 91% rename from src/org/mapsforge/database/mapfile/header/SubFileParameterBuilder.java rename to src/org/oscim/database/mapfile/header/SubFileParameterBuilder.java index cbb5ab5d..0bdaadb2 100644 --- a/src/org/mapsforge/database/mapfile/header/SubFileParameterBuilder.java +++ b/src/org/oscim/database/mapfile/header/SubFileParameterBuilder.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.mapfile.header; +package org.oscim.database.mapfile.header; -import org.mapsforge.core.BoundingBox; +import org.oscim.core.BoundingBox; class SubFileParameterBuilder { byte baseZoomLevel; diff --git a/src/org/mapsforge/database/pbmap/MapDatabase.java b/src/org/oscim/database/pbmap/MapDatabase.java similarity index 98% rename from src/org/mapsforge/database/pbmap/MapDatabase.java rename to src/org/oscim/database/pbmap/MapDatabase.java index d9f2ad4c..3a14db9d 100644 --- a/src/org/mapsforge/database/pbmap/MapDatabase.java +++ b/src/org/oscim/database/pbmap/MapDatabase.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.mapsforge.database.pbmap; +package org.oscim.database.pbmap; import java.io.BufferedOutputStream; import java.io.File; @@ -53,16 +53,16 @@ import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; import org.apache.http.protocol.RequestExpectContinue; import org.apache.http.protocol.RequestUserAgent; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.core.BoundingBox; -import org.mapsforge.core.GeoPoint; -import org.mapsforge.core.Tag; -import org.mapsforge.core.Tile; -import org.mapsforge.database.IMapDatabase; -import org.mapsforge.database.IMapDatabaseCallback; -import org.mapsforge.database.MapInfo; -import org.mapsforge.database.OpenResult; -import org.mapsforge.database.QueryResult; +import org.oscim.core.BoundingBox; +import org.oscim.core.GeoPoint; +import org.oscim.core.Tag; +import org.oscim.core.Tile; +import org.oscim.database.IMapDatabase; +import org.oscim.database.IMapDatabaseCallback; +import org.oscim.database.MapInfo; +import org.oscim.database.OpenResult; +import org.oscim.database.QueryResult; +import org.oscim.view.mapgenerator.JobTile; import android.os.Environment; import android.os.SystemClock; @@ -87,7 +87,7 @@ public class MapDatabase implements IMapDatabase { private static final boolean USE_APACHE_HTTP = false; private static final boolean USE_LW_HTTP = true; - private static final String CACHE_DIRECTORY = "/Android/data/org.mapsforge.app/cache/"; + private static final String CACHE_DIRECTORY = "/Android/data/org.oscim.app/cache/"; private static final String CACHE_FILE = "%d-%d-%d.tile"; private static final String SERVER_ADDR = "city.informatik.uni-bremen.de"; @@ -310,19 +310,15 @@ public class MapDatabase implements IMapDatabase { if (USE_CACHE) { if (cacheDir == null) { - // cacheDir = mapFile; - String externalStorageDirectory = Environment .getExternalStorageDirectory() .getAbsolutePath(); String cacheDirectoryPath = externalStorageDirectory + CACHE_DIRECTORY; cacheDir = createDirectory(cacheDirectoryPath); - - Log.d(TAG, "----------- cache dir: " + cacheDir); } } - return new OpenResult(); + return OpenResult.SUCCESS; } @Override diff --git a/src/org/mapsforge/database/pbmap/Tags.java b/src/org/oscim/database/pbmap/Tags.java similarity index 99% rename from src/org/mapsforge/database/pbmap/Tags.java rename to src/org/oscim/database/pbmap/Tags.java index e2db2d95..772538e7 100644 --- a/src/org/mapsforge/database/pbmap/Tags.java +++ b/src/org/oscim/database/pbmap/Tags.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.pbmap; +package org.oscim.database.pbmap; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; public class Tags { public final static int MAX = 654; diff --git a/src/org/mapsforge/database/postgis/Geometry.java b/src/org/oscim/database/postgis/Geometry.java similarity index 99% rename from src/org/mapsforge/database/postgis/Geometry.java rename to src/org/oscim/database/postgis/Geometry.java index b1b55b6a..8b3419a2 100644 --- a/src/org/mapsforge/database/postgis/Geometry.java +++ b/src/org/oscim/database/postgis/Geometry.java @@ -24,7 +24,7 @@ * $Id: Geometry.java 9324 2012-02-27 22:08:12Z pramsey $ */ -package org.mapsforge.database.postgis; +package org.oscim.database.postgis; import java.io.Serializable; diff --git a/src/org/mapsforge/database/postgis/MapDatabase.java b/src/org/oscim/database/postgis/MapDatabase.java similarity index 95% rename from src/org/mapsforge/database/postgis/MapDatabase.java rename to src/org/oscim/database/postgis/MapDatabase.java index f975789a..aad59b49 100644 --- a/src/org/mapsforge/database/postgis/MapDatabase.java +++ b/src/org/oscim/database/postgis/MapDatabase.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.mapsforge.database.postgis; +package org.oscim.database.postgis; import java.sql.Connection; import java.sql.DriverManager; @@ -24,16 +24,16 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.core.BoundingBox; -import org.mapsforge.core.GeoPoint; -import org.mapsforge.core.Tag; -import org.mapsforge.core.WebMercator; -import org.mapsforge.database.IMapDatabase; -import org.mapsforge.database.IMapDatabaseCallback; -import org.mapsforge.database.MapInfo; -import org.mapsforge.database.OpenResult; -import org.mapsforge.database.QueryResult; +import org.oscim.core.BoundingBox; +import org.oscim.core.GeoPoint; +import org.oscim.core.Tag; +import org.oscim.core.WebMercator; +import org.oscim.database.IMapDatabase; +import org.oscim.database.IMapDatabaseCallback; +import org.oscim.database.MapInfo; +import org.oscim.database.OpenResult; +import org.oscim.database.QueryResult; +import org.oscim.view.mapgenerator.JobTile; import org.postgresql.PGConnection; import android.util.Log; @@ -216,7 +216,7 @@ public class MapDatabase implements IMapDatabase { mCoords = new float[100000]; mIndex = new short[100000]; } - return new OpenResult(); + return OpenResult.SUCCESS; } @Override diff --git a/src/org/mapsforge/database/postgis/PGHStore.java b/src/org/oscim/database/postgis/PGHStore.java similarity index 99% rename from src/org/mapsforge/database/postgis/PGHStore.java rename to src/org/oscim/database/postgis/PGHStore.java index 245bfe81..8089311d 100644 --- a/src/org/mapsforge/database/postgis/PGHStore.java +++ b/src/org/oscim/database/postgis/PGHStore.java @@ -19,7 +19,7 @@ * *------------------------------------------------------------------------- */ -package org.mapsforge.database.postgis; +package org.oscim.database.postgis; import java.sql.SQLException; import java.util.ArrayList; diff --git a/src/org/mapsforge/database/postgis/TileData.java b/src/org/oscim/database/postgis/TileData.java similarity index 90% rename from src/org/mapsforge/database/postgis/TileData.java rename to src/org/oscim/database/postgis/TileData.java index a8f53738..d827c5c0 100644 --- a/src/org/mapsforge/database/postgis/TileData.java +++ b/src/org/oscim/database/postgis/TileData.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.postgis; +package org.oscim.database.postgis; -import org.mapsforge.database.IMapTileData; +import org.oscim.database.IMapTileData; public class TileData implements IMapTileData { diff --git a/src/org/mapsforge/database/postgis/ValueGetter.java b/src/org/oscim/database/postgis/ValueGetter.java similarity index 98% rename from src/org/mapsforge/database/postgis/ValueGetter.java rename to src/org/oscim/database/postgis/ValueGetter.java index 9f142875..c2d2e768 100644 --- a/src/org/mapsforge/database/postgis/ValueGetter.java +++ b/src/org/oscim/database/postgis/ValueGetter.java @@ -22,7 +22,7 @@ * $Id: ValueGetter.java 9324 2012-02-27 22:08:12Z pramsey $ */ -package org.mapsforge.database.postgis; +package org.oscim.database.postgis; abstract class ValueGetter { byte[] data; diff --git a/src/org/mapsforge/database/test/MapDatabase.java b/src/org/oscim/database/test/MapDatabase.java similarity index 91% rename from src/org/mapsforge/database/test/MapDatabase.java rename to src/org/oscim/database/test/MapDatabase.java index 6fd2eafb..764102bd 100644 --- a/src/org/mapsforge/database/test/MapDatabase.java +++ b/src/org/oscim/database/test/MapDatabase.java @@ -12,20 +12,20 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.database.test; +package org.oscim.database.test; import java.util.Map; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.core.BoundingBox; -import org.mapsforge.core.MercatorProjection; -import org.mapsforge.core.Tag; -import org.mapsforge.core.Tile; -import org.mapsforge.database.IMapDatabase; -import org.mapsforge.database.IMapDatabaseCallback; -import org.mapsforge.database.MapInfo; -import org.mapsforge.database.OpenResult; -import org.mapsforge.database.QueryResult; +import org.oscim.core.BoundingBox; +import org.oscim.core.MercatorProjection; +import org.oscim.core.Tag; +import org.oscim.core.Tile; +import org.oscim.database.IMapDatabase; +import org.oscim.database.IMapDatabaseCallback; +import org.oscim.database.MapInfo; +import org.oscim.database.OpenResult; +import org.oscim.database.QueryResult; +import org.oscim.view.mapgenerator.JobTile; /** * @@ -175,7 +175,7 @@ public class MapDatabase implements IMapDatabase { @Override public OpenResult open(Map options) { mOpenFile = true; - return new OpenResult(); + return OpenResult.SUCCESS; } @Override diff --git a/src/org/mapsforge/android/rendertheme/AnyMatcher.java b/src/org/oscim/theme/AnyMatcher.java similarity index 94% rename from src/org/mapsforge/android/rendertheme/AnyMatcher.java rename to src/org/oscim/theme/AnyMatcher.java index f8e91709..41a4f595 100644 --- a/src/org/mapsforge/android/rendertheme/AnyMatcher.java +++ b/src/org/oscim/theme/AnyMatcher.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; final class AnyMatcher implements AttributeMatcher { private static final AnyMatcher INSTANCE = new AnyMatcher(); diff --git a/src/org/mapsforge/android/rendertheme/AttributeMatcher.java b/src/org/oscim/theme/AttributeMatcher.java similarity index 91% rename from src/org/mapsforge/android/rendertheme/AttributeMatcher.java rename to src/org/oscim/theme/AttributeMatcher.java index 4498ae57..63cb3166 100644 --- a/src/org/mapsforge/android/rendertheme/AttributeMatcher.java +++ b/src/org/oscim/theme/AttributeMatcher.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; interface AttributeMatcher { boolean isCoveredBy(AttributeMatcher attributeMatcher); diff --git a/src/org/mapsforge/android/rendertheme/Closed.java b/src/org/oscim/theme/Closed.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/Closed.java rename to src/org/oscim/theme/Closed.java index 336ba043..b98e1ecd 100644 --- a/src/org/mapsforge/android/rendertheme/Closed.java +++ b/src/org/oscim/theme/Closed.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.mapsforge.android.rendertheme; +package org.oscim.theme; final class Closed { public static final int ANY = 0; diff --git a/src/org/mapsforge/android/rendertheme/Element.java b/src/org/oscim/theme/Element.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/Element.java rename to src/org/oscim/theme/Element.java index ce98f145..c990a291 100644 --- a/src/org/mapsforge/android/rendertheme/Element.java +++ b/src/org/oscim/theme/Element.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.mapsforge.android.rendertheme; +package org.oscim.theme; final class Element { public static final int ANY = 0; diff --git a/src/org/mapsforge/android/rendertheme/ExternalRenderTheme.java b/src/org/oscim/theme/ExternalRenderTheme.java similarity index 97% rename from src/org/mapsforge/android/rendertheme/ExternalRenderTheme.java rename to src/org/oscim/theme/ExternalRenderTheme.java index 6fee1a04..dc086c4a 100644 --- a/src/org/mapsforge/android/rendertheme/ExternalRenderTheme.java +++ b/src/org/oscim/theme/ExternalRenderTheme.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.mapsforge.android.rendertheme; +package org.oscim.theme; import java.io.File; import java.io.FileInputStream; @@ -21,7 +21,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; -import org.mapsforge.android.mapgenerator.Theme; /** * An ExternalRenderTheme allows for customizing the rendering style of the map via an XML file. diff --git a/src/org/mapsforge/android/rendertheme/IRenderCallback.java b/src/org/oscim/theme/IRenderCallback.java similarity index 90% rename from src/org/mapsforge/android/rendertheme/IRenderCallback.java rename to src/org/oscim/theme/IRenderCallback.java index 978f648e..c7070c3a 100644 --- a/src/org/mapsforge/android/rendertheme/IRenderCallback.java +++ b/src/org/oscim/theme/IRenderCallback.java @@ -12,12 +12,12 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; -import org.mapsforge.android.rendertheme.renderinstruction.Area; -import org.mapsforge.android.rendertheme.renderinstruction.Caption; -import org.mapsforge.android.rendertheme.renderinstruction.Line; -import org.mapsforge.android.rendertheme.renderinstruction.PathText; +import org.oscim.theme.renderinstruction.Area; +import org.oscim.theme.renderinstruction.Caption; +import org.oscim.theme.renderinstruction.Line; +import org.oscim.theme.renderinstruction.PathText; import android.graphics.Bitmap; import android.graphics.Paint; diff --git a/src/org/mapsforge/android/rendertheme/InternalRenderTheme.java b/src/org/oscim/theme/InternalRenderTheme.java similarity index 77% rename from src/org/mapsforge/android/rendertheme/InternalRenderTheme.java rename to src/org/oscim/theme/InternalRenderTheme.java index d0696e66..048780ee 100644 --- a/src/org/mapsforge/android/rendertheme/InternalRenderTheme.java +++ b/src/org/oscim/theme/InternalRenderTheme.java @@ -12,11 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; import java.io.InputStream; -import org.mapsforge.android.mapgenerator.Theme; /** * Enumeration of all internal rendering themes. @@ -27,9 +26,9 @@ public enum InternalRenderTheme implements Theme { * * @see Osmarender */ - OSMARENDER("/org/mapsforge/android/rendertheme/osmarender/osmarender.xml"), + OSMARENDER("/org/oscim/theme/osmarender/osmarender.xml"), - TRONRENDER("/org/mapsforge/android/rendertheme/osmarender/tronrender.xml"); + TRONRENDER("/org/oscim/theme/osmarender/tronrender.xml"); private final String mPath; @@ -39,9 +38,6 @@ public enum InternalRenderTheme implements Theme { @Override public InputStream getRenderThemeAsStream() { - // getResourceAsStream(mPath); return InternalRenderTheme.class.getResourceAsStream(mPath); - // return Thread.currentThread().getClass().getResourceAsStream(mPath); - } } diff --git a/src/org/mapsforge/android/rendertheme/MatchingCacheKey.java b/src/org/oscim/theme/MatchingCacheKey.java similarity index 96% rename from src/org/mapsforge/android/rendertheme/MatchingCacheKey.java rename to src/org/oscim/theme/MatchingCacheKey.java index 0747022b..741c90b1 100644 --- a/src/org/mapsforge/android/rendertheme/MatchingCacheKey.java +++ b/src/org/oscim/theme/MatchingCacheKey.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; class MatchingCacheKey { int mHashCodeValue; diff --git a/src/org/mapsforge/android/rendertheme/MultiKeyMatcher.java b/src/org/oscim/theme/MultiKeyMatcher.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/MultiKeyMatcher.java rename to src/org/oscim/theme/MultiKeyMatcher.java index 96805a01..96b4082a 100644 --- a/src/org/mapsforge/android/rendertheme/MultiKeyMatcher.java +++ b/src/org/oscim/theme/MultiKeyMatcher.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; import java.util.List; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; class MultiKeyMatcher implements AttributeMatcher { private final String[] mKeys; diff --git a/src/org/mapsforge/android/rendertheme/MultiValueMatcher.java b/src/org/oscim/theme/MultiValueMatcher.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/MultiValueMatcher.java rename to src/org/oscim/theme/MultiValueMatcher.java index e5b25a5a..f4d0e982 100644 --- a/src/org/mapsforge/android/rendertheme/MultiValueMatcher.java +++ b/src/org/oscim/theme/MultiValueMatcher.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; import java.util.List; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; class MultiValueMatcher implements AttributeMatcher { private final String[] mValues; diff --git a/src/org/mapsforge/android/rendertheme/NegativeMatcher.java b/src/org/oscim/theme/NegativeMatcher.java similarity index 96% rename from src/org/mapsforge/android/rendertheme/NegativeMatcher.java rename to src/org/oscim/theme/NegativeMatcher.java index 24cc18c6..ed80077f 100644 --- a/src/org/mapsforge/android/rendertheme/NegativeMatcher.java +++ b/src/org/oscim/theme/NegativeMatcher.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; import java.util.List; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; class NegativeMatcher implements AttributeMatcher { private final String[] mKeyList; diff --git a/src/org/mapsforge/android/rendertheme/NegativeRule.java b/src/org/oscim/theme/NegativeRule.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/NegativeRule.java rename to src/org/oscim/theme/NegativeRule.java index cc2b1994..6220759d 100644 --- a/src/org/mapsforge/android/rendertheme/NegativeRule.java +++ b/src/org/oscim/theme/NegativeRule.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; class NegativeRule extends Rule { final AttributeMatcher mAttributeMatcher; diff --git a/src/org/mapsforge/android/rendertheme/PositiveRule.java b/src/org/oscim/theme/PositiveRule.java similarity index 96% rename from src/org/mapsforge/android/rendertheme/PositiveRule.java rename to src/org/oscim/theme/PositiveRule.java index 9df9bcd4..f7b7558f 100644 --- a/src/org/mapsforge/android/rendertheme/PositiveRule.java +++ b/src/org/oscim/theme/PositiveRule.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; class PositiveRule extends Rule { final AttributeMatcher mKeyMatcher; diff --git a/src/org/mapsforge/android/rendertheme/RenderTheme.java b/src/org/oscim/theme/RenderTheme.java similarity index 97% rename from src/org/mapsforge/android/rendertheme/RenderTheme.java rename to src/org/oscim/theme/RenderTheme.java index 2b916534..b3237b0e 100644 --- a/src/org/mapsforge/android/rendertheme/RenderTheme.java +++ b/src/org/oscim/theme/RenderTheme.java @@ -12,14 +12,14 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; import java.util.ArrayList; import java.util.List; -import org.mapsforge.android.rendertheme.renderinstruction.RenderInstruction; -import org.mapsforge.core.LRUCache; -import org.mapsforge.core.Tag; +import org.oscim.core.LRUCache; +import org.oscim.core.Tag; +import org.oscim.theme.renderinstruction.RenderInstruction; import org.xml.sax.Attributes; import android.graphics.Color; diff --git a/src/org/mapsforge/android/rendertheme/RenderThemeHandler.java b/src/org/oscim/theme/RenderThemeHandler.java similarity index 94% rename from src/org/mapsforge/android/rendertheme/RenderThemeHandler.java rename to src/org/oscim/theme/RenderThemeHandler.java index a79cf3af..5d85e9f0 100644 --- a/src/org/mapsforge/android/rendertheme/RenderThemeHandler.java +++ b/src/org/oscim/theme/RenderThemeHandler.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.mapsforge.android.rendertheme; +package org.oscim.theme; import java.io.IOException; import java.io.InputStream; @@ -24,15 +24,15 @@ import java.util.logging.Logger; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; -import org.mapsforge.android.rendertheme.renderinstruction.Area; -import org.mapsforge.android.rendertheme.renderinstruction.AreaLevel; -import org.mapsforge.android.rendertheme.renderinstruction.Caption; -import org.mapsforge.android.rendertheme.renderinstruction.Circle; -import org.mapsforge.android.rendertheme.renderinstruction.Line; -import org.mapsforge.android.rendertheme.renderinstruction.LineSymbol; -import org.mapsforge.android.rendertheme.renderinstruction.PathText; -import org.mapsforge.android.rendertheme.renderinstruction.RenderInstruction; -import org.mapsforge.android.rendertheme.renderinstruction.Symbol; +import org.oscim.theme.renderinstruction.Area; +import org.oscim.theme.renderinstruction.AreaLevel; +import org.oscim.theme.renderinstruction.Caption; +import org.oscim.theme.renderinstruction.Circle; +import org.oscim.theme.renderinstruction.Line; +import org.oscim.theme.renderinstruction.LineSymbol; +import org.oscim.theme.renderinstruction.PathText; +import org.oscim.theme.renderinstruction.RenderInstruction; +import org.oscim.theme.renderinstruction.Symbol; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/src/org/mapsforge/android/rendertheme/Rule.java b/src/org/oscim/theme/Rule.java similarity index 98% rename from src/org/mapsforge/android/rendertheme/Rule.java rename to src/org/oscim/theme/Rule.java index 35032b31..5fd9c32b 100644 --- a/src/org/mapsforge/android/rendertheme/Rule.java +++ b/src/org/oscim/theme/Rule.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.mapsforge.android.rendertheme; +package org.oscim.theme; import java.util.ArrayList; import java.util.Arrays; @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Stack; import java.util.regex.Pattern; -import org.mapsforge.android.rendertheme.renderinstruction.RenderInstruction; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; +import org.oscim.theme.renderinstruction.RenderInstruction; import org.xml.sax.Attributes; abstract class Rule { diff --git a/src/org/mapsforge/android/rendertheme/RuleOptimizer.java b/src/org/oscim/theme/RuleOptimizer.java similarity index 98% rename from src/org/mapsforge/android/rendertheme/RuleOptimizer.java rename to src/org/oscim/theme/RuleOptimizer.java index 065b6f5e..1cc8b3d6 100644 --- a/src/org/mapsforge/android/rendertheme/RuleOptimizer.java +++ b/src/org/oscim/theme/RuleOptimizer.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.mapsforge.android.rendertheme; +package org.oscim.theme; import java.util.Stack; diff --git a/src/org/mapsforge/android/rendertheme/SingleKeyMatcher.java b/src/org/oscim/theme/SingleKeyMatcher.java similarity index 94% rename from src/org/mapsforge/android/rendertheme/SingleKeyMatcher.java rename to src/org/oscim/theme/SingleKeyMatcher.java index 4240c1f0..ffd19cd0 100644 --- a/src/org/mapsforge/android/rendertheme/SingleKeyMatcher.java +++ b/src/org/oscim/theme/SingleKeyMatcher.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; class SingleKeyMatcher implements AttributeMatcher { private final String mKey; diff --git a/src/org/mapsforge/android/rendertheme/SingleValueMatcher.java b/src/org/oscim/theme/SingleValueMatcher.java similarity index 94% rename from src/org/mapsforge/android/rendertheme/SingleValueMatcher.java rename to src/org/oscim/theme/SingleValueMatcher.java index 5c07a498..1cc8a532 100644 --- a/src/org/mapsforge/android/rendertheme/SingleValueMatcher.java +++ b/src/org/oscim/theme/SingleValueMatcher.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme; +package org.oscim.theme; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; class SingleValueMatcher implements AttributeMatcher { private final String mValue; diff --git a/src/org/mapsforge/android/mapgenerator/Theme.java b/src/org/oscim/theme/Theme.java similarity index 96% rename from src/org/mapsforge/android/mapgenerator/Theme.java rename to src/org/oscim/theme/Theme.java index c0f5c690..5089eb30 100644 --- a/src/org/mapsforge/android/mapgenerator/Theme.java +++ b/src/org/oscim/theme/Theme.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.mapsforge.android.mapgenerator; +package org.oscim.theme; import java.io.FileNotFoundException; import java.io.InputStream; diff --git a/src/org/mapsforge/android/rendertheme/osmarender/osmarender.xml b/src/org/oscim/theme/osmarender/osmarender.xml similarity index 100% rename from src/org/mapsforge/android/rendertheme/osmarender/osmarender.xml rename to src/org/oscim/theme/osmarender/osmarender.xml diff --git a/src/org/mapsforge/android/rendertheme/osmarender/tronrender.xml b/src/org/oscim/theme/osmarender/tronrender.xml similarity index 100% rename from src/org/mapsforge/android/rendertheme/osmarender/tronrender.xml rename to src/org/oscim/theme/osmarender/tronrender.xml diff --git a/src/org/mapsforge/android/rendertheme/renderTheme.xsd b/src/org/oscim/theme/renderTheme.xsd similarity index 100% rename from src/org/mapsforge/android/rendertheme/renderTheme.xsd rename to src/org/oscim/theme/renderTheme.xsd diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/Area.java b/src/org/oscim/theme/renderinstruction/Area.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/renderinstruction/Area.java rename to src/org/oscim/theme/renderinstruction/Area.java index 15bfd5de..688c56e1 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/Area.java +++ b/src/org/oscim/theme/renderinstruction/Area.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.android.rendertheme.RenderThemeHandler; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; +import org.oscim.theme.IRenderCallback; +import org.oscim.theme.RenderThemeHandler; import org.xml.sax.Attributes; import android.graphics.Color; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/AreaLevel.java b/src/org/oscim/theme/renderinstruction/AreaLevel.java similarity index 87% rename from src/org/mapsforge/android/rendertheme/renderinstruction/AreaLevel.java rename to src/org/oscim/theme/renderinstruction/AreaLevel.java index 5beb5a2f..3803f338 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/AreaLevel.java +++ b/src/org/oscim/theme/renderinstruction/AreaLevel.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; +import org.oscim.theme.IRenderCallback; public class AreaLevel extends RenderInstruction { private final Area area; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/BitmapUtils.java b/src/org/oscim/theme/renderinstruction/BitmapUtils.java similarity index 97% rename from src/org/mapsforge/android/rendertheme/renderinstruction/BitmapUtils.java rename to src/org/oscim/theme/renderinstruction/BitmapUtils.java index bf1adade..a8c30b70 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/BitmapUtils.java +++ b/src/org/oscim/theme/renderinstruction/BitmapUtils.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.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; import java.io.File; import java.io.FileInputStream; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/Caption.java b/src/org/oscim/theme/renderinstruction/Caption.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/renderinstruction/Caption.java rename to src/org/oscim/theme/renderinstruction/Caption.java index 3c4ec79f..ef9dc131 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/Caption.java +++ b/src/org/oscim/theme/renderinstruction/Caption.java @@ -12,13 +12,13 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; import java.util.Locale; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.android.rendertheme.RenderThemeHandler; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; +import org.oscim.theme.IRenderCallback; +import org.oscim.theme.RenderThemeHandler; import org.xml.sax.Attributes; import android.graphics.Color; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/Circle.java b/src/org/oscim/theme/renderinstruction/Circle.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/renderinstruction/Circle.java rename to src/org/oscim/theme/renderinstruction/Circle.java index 025d0d1d..74e6be2f 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/Circle.java +++ b/src/org/oscim/theme/renderinstruction/Circle.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.android.rendertheme.RenderThemeHandler; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; +import org.oscim.theme.IRenderCallback; +import org.oscim.theme.RenderThemeHandler; import org.xml.sax.Attributes; import android.graphics.Color; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/FontFamily.java b/src/org/oscim/theme/renderinstruction/FontFamily.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/renderinstruction/FontFamily.java rename to src/org/oscim/theme/renderinstruction/FontFamily.java index 5c72f0eb..f3e14b31 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/FontFamily.java +++ b/src/org/oscim/theme/renderinstruction/FontFamily.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.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; import android.graphics.Typeface; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/FontStyle.java b/src/org/oscim/theme/renderinstruction/FontStyle.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/renderinstruction/FontStyle.java rename to src/org/oscim/theme/renderinstruction/FontStyle.java index ab6650ee..f968d2bb 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/FontStyle.java +++ b/src/org/oscim/theme/renderinstruction/FontStyle.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.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; enum FontStyle { BOLD, BOLD_ITALIC, ITALIC, NORMAL; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/Line.java b/src/org/oscim/theme/renderinstruction/Line.java similarity index 96% rename from src/org/mapsforge/android/rendertheme/renderinstruction/Line.java rename to src/org/oscim/theme/renderinstruction/Line.java index b63d0740..25343cf5 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/Line.java +++ b/src/org/oscim/theme/renderinstruction/Line.java @@ -12,14 +12,14 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; import java.util.Locale; import java.util.regex.Pattern; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.android.rendertheme.RenderThemeHandler; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; +import org.oscim.theme.IRenderCallback; +import org.oscim.theme.RenderThemeHandler; import org.xml.sax.Attributes; import android.graphics.Color; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/LineSymbol.java b/src/org/oscim/theme/renderinstruction/LineSymbol.java similarity index 92% rename from src/org/mapsforge/android/rendertheme/renderinstruction/LineSymbol.java rename to src/org/oscim/theme/renderinstruction/LineSymbol.java index cc7e5009..b49c588c 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/LineSymbol.java +++ b/src/org/oscim/theme/renderinstruction/LineSymbol.java @@ -12,13 +12,13 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; import java.io.IOException; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.android.rendertheme.RenderThemeHandler; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; +import org.oscim.theme.IRenderCallback; +import org.oscim.theme.RenderThemeHandler; import org.xml.sax.Attributes; import android.graphics.Bitmap; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/PathText.java b/src/org/oscim/theme/renderinstruction/PathText.java similarity index 95% rename from src/org/mapsforge/android/rendertheme/renderinstruction/PathText.java rename to src/org/oscim/theme/renderinstruction/PathText.java index 2d255157..f3eab8d9 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/PathText.java +++ b/src/org/oscim/theme/renderinstruction/PathText.java @@ -12,13 +12,13 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; import java.util.Locale; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.android.rendertheme.RenderThemeHandler; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; +import org.oscim.theme.IRenderCallback; +import org.oscim.theme.RenderThemeHandler; import org.xml.sax.Attributes; import android.graphics.Color; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/RenderInstruction.java b/src/org/oscim/theme/renderinstruction/RenderInstruction.java similarity index 92% rename from src/org/mapsforge/android/rendertheme/renderinstruction/RenderInstruction.java rename to src/org/oscim/theme/renderinstruction/RenderInstruction.java index 643c965f..8b76f55e 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/RenderInstruction.java +++ b/src/org/oscim/theme/renderinstruction/RenderInstruction.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; +import org.oscim.theme.IRenderCallback; /** * A RenderInstruction is a basic graphical primitive to draw a map. diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/Symbol.java b/src/org/oscim/theme/renderinstruction/Symbol.java similarity index 91% rename from src/org/mapsforge/android/rendertheme/renderinstruction/Symbol.java rename to src/org/oscim/theme/renderinstruction/Symbol.java index 0e594cb9..506522d6 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/Symbol.java +++ b/src/org/oscim/theme/renderinstruction/Symbol.java @@ -12,13 +12,13 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; import java.io.IOException; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.android.rendertheme.RenderThemeHandler; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; +import org.oscim.theme.IRenderCallback; +import org.oscim.theme.RenderThemeHandler; import org.xml.sax.Attributes; import android.graphics.Bitmap; diff --git a/src/org/mapsforge/android/rendertheme/renderinstruction/TextKey.java b/src/org/oscim/theme/renderinstruction/TextKey.java similarity index 92% rename from src/org/mapsforge/android/rendertheme/renderinstruction/TextKey.java rename to src/org/oscim/theme/renderinstruction/TextKey.java index 8fffb116..ebaf16da 100644 --- a/src/org/mapsforge/android/rendertheme/renderinstruction/TextKey.java +++ b/src/org/oscim/theme/renderinstruction/TextKey.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.rendertheme.renderinstruction; +package org.oscim.theme.renderinstruction; -import org.mapsforge.core.Tag; +import org.oscim.core.Tag; final class TextKey { static String getInstance(String key) { diff --git a/src/org/mapsforge/android/Compass.java b/src/org/oscim/view/Compass.java similarity index 98% rename from src/org/mapsforge/android/Compass.java rename to src/org/oscim/view/Compass.java index 38f77f1a..8baa2972 100644 --- a/src/org/mapsforge/android/Compass.java +++ b/src/org/oscim/view/Compass.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.mapsforge.android; +package org.oscim.view; import android.content.Context; import android.hardware.Sensor; diff --git a/src/org/mapsforge/android/DebugSettings.java b/src/org/oscim/view/DebugSettings.java similarity index 98% rename from src/org/mapsforge/android/DebugSettings.java rename to src/org/oscim/view/DebugSettings.java index 729e5c1c..b77525e1 100644 --- a/src/org/mapsforge/android/DebugSettings.java +++ b/src/org/oscim/view/DebugSettings.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.mapsforge.android; +package org.oscim.view; /** * A simple DTO to stores flags for debugging rendered map tiles. diff --git a/src/org/mapsforge/android/IMapRenderer.java b/src/org/oscim/view/IMapRenderer.java similarity index 87% rename from src/org/mapsforge/android/IMapRenderer.java rename to src/org/oscim/view/IMapRenderer.java index bdf449dd..002ca1a1 100644 --- a/src/org/mapsforge/android/IMapRenderer.java +++ b/src/org/oscim/view/IMapRenderer.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android; +package org.oscim.view; -import org.mapsforge.android.mapgenerator.IMapGenerator; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.android.rendertheme.RenderTheme; +import org.oscim.theme.RenderTheme; +import org.oscim.view.mapgenerator.IMapGenerator; +import org.oscim.view.mapgenerator.JobTile; import android.opengl.GLSurfaceView; diff --git a/src/org/mapsforge/android/MapActivity.java b/src/org/oscim/view/MapActivity.java similarity index 96% rename from src/org/mapsforge/android/MapActivity.java rename to src/org/oscim/view/MapActivity.java index 6e540127..f6f3a00e 100644 --- a/src/org/mapsforge/android/MapActivity.java +++ b/src/org/oscim/view/MapActivity.java @@ -12,13 +12,13 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android; +package org.oscim.view; import java.io.FileNotFoundException; -import org.mapsforge.android.rendertheme.InternalRenderTheme; -import org.mapsforge.core.GeoPoint; -import org.mapsforge.core.MapPosition; +import org.oscim.core.GeoPoint; +import org.oscim.core.MapPosition; +import org.oscim.theme.InternalRenderTheme; import android.app.Activity; import android.content.SharedPreferences; diff --git a/src/org/mapsforge/android/mapgenerator/MapRendererFactory.java b/src/org/oscim/view/MapRendererFactory.java similarity index 51% rename from src/org/mapsforge/android/mapgenerator/MapRendererFactory.java rename to src/org/oscim/view/MapRendererFactory.java index 5b20ca60..8e116b0f 100644 --- a/src/org/mapsforge/android/mapgenerator/MapRendererFactory.java +++ b/src/org/oscim/view/MapRendererFactory.java @@ -12,65 +12,62 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.mapgenerator; - -import org.mapsforge.android.IMapRenderer; -import org.mapsforge.android.MapView; +package org.oscim.view; import android.util.AttributeSet; /** - * A factory for the internal MapGenerator implementations. + * A factory for the internal MapRenderer implementations. */ public final class MapRendererFactory { - private static final String MAP_GENERATOR_ATTRIBUTE_NAME = "mapGenerator"; + private static final String MAP_RENDERER_ATTRIBUTE_NAME = "mapRenderer"; /** * @param mapView * ... * @param attributeSet - * A collection of attributes which includes the desired MapGenerator. - * @return a new MapGenerator instance. + * A collection of attributes which includes the desired MapRenderer. + * @return a new MapRenderer instance. */ public static IMapRenderer createMapRenderer(MapView mapView, AttributeSet attributeSet) { - String mapGeneratorName = attributeSet.getAttributeValue(null, - MAP_GENERATOR_ATTRIBUTE_NAME); - if (mapGeneratorName == null) { - return new org.mapsforge.android.glrenderer.MapRenderer(mapView); + String mapRendererName = attributeSet.getAttributeValue(null, + MAP_RENDERER_ATTRIBUTE_NAME); + if (mapRendererName == null) { + return new org.oscim.view.glrenderer.MapRenderer(mapView); } - MapRenderers mapGeneratorInternal = MapRenderers.valueOf(mapGeneratorName); - return MapRendererFactory.createMapRenderer(mapView, mapGeneratorInternal); + MapRenderers mapRendererInternal = MapRenderers.valueOf(mapRendererName); + return MapRendererFactory.createMapRenderer(mapView, mapRendererInternal); } - public static MapRenderers getMapGenerator(AttributeSet attributeSet) { - String mapGeneratorName = attributeSet.getAttributeValue(null, - MAP_GENERATOR_ATTRIBUTE_NAME); - if (mapGeneratorName == null) { + public static MapRenderers getMapRenderer(AttributeSet attributeSet) { + String mapRendererName = attributeSet.getAttributeValue(null, + MAP_RENDERER_ATTRIBUTE_NAME); + if (mapRendererName == null) { return MapRenderers.GL_RENDERER; } - return MapRenderers.valueOf(mapGeneratorName); + return MapRenderers.valueOf(mapRendererName); } /** * @param mapView * ... - * @param mapGeneratorInternal - * the internal MapGenerator implementation. - * @return a new MapGenerator instance. + * @param mapRendererInternal + * the internal MapRenderer implementation. + * @return a new MapRenderer instance. */ public static IMapRenderer createMapRenderer(MapView mapView, - MapRenderers mapGeneratorInternal) { - switch (mapGeneratorInternal) { + MapRenderers mapRendererInternal) { + switch (mapRendererInternal) { case SW_RENDERER: - return new org.mapsforge.android.swrenderer.MapRenderer(mapView); + return new org.oscim.view.swrenderer.MapRenderer(mapView); case GL_RENDERER: - return new org.mapsforge.android.glrenderer.MapRenderer(mapView); + return new org.oscim.view.glrenderer.MapRenderer(mapView); } - throw new IllegalArgumentException("unknown enum value: " + mapGeneratorInternal); + throw new IllegalArgumentException("unknown enum value: " + mapRendererInternal); } private MapRendererFactory() { diff --git a/src/org/mapsforge/android/mapgenerator/MapRenderers.java b/src/org/oscim/view/MapRenderers.java similarity index 95% rename from src/org/mapsforge/android/mapgenerator/MapRenderers.java rename to src/org/oscim/view/MapRenderers.java index fcf36dc2..14d6385d 100644 --- a/src/org/mapsforge/android/mapgenerator/MapRenderers.java +++ b/src/org/oscim/view/MapRenderers.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.mapsforge.android.mapgenerator; +package org.oscim.view; /** * Enumeration of all internal MapGenerator implementations. diff --git a/src/org/mapsforge/android/MapScaleBar.java b/src/org/oscim/view/MapScaleBar.java similarity index 98% rename from src/org/mapsforge/android/MapScaleBar.java rename to src/org/oscim/view/MapScaleBar.java index f072eb89..39915c45 100644 --- a/src/org/mapsforge/android/MapScaleBar.java +++ b/src/org/oscim/view/MapScaleBar.java @@ -12,13 +12,13 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android; +package org.oscim.view; import java.util.HashMap; import java.util.Map; -import org.mapsforge.core.MapPosition; -import org.mapsforge.core.MercatorProjection; +import org.oscim.core.MapPosition; +import org.oscim.core.MercatorProjection; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/src/org/mapsforge/android/MapView.java b/src/org/oscim/view/MapView.java similarity index 92% rename from src/org/mapsforge/android/MapView.java rename to src/org/oscim/view/MapView.java index f8a50122..b92419b1 100644 --- a/src/org/mapsforge/android/MapView.java +++ b/src/org/oscim/view/MapView.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.mapsforge.android; +package org.oscim.view; import java.io.FileNotFoundException; import java.io.IOException; @@ -22,26 +22,24 @@ import java.util.Map; import javax.xml.parsers.ParserConfigurationException; -import org.mapsforge.android.mapgenerator.IMapGenerator; -import org.mapsforge.android.mapgenerator.JobQueue; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.android.mapgenerator.MapDatabaseFactory; -import org.mapsforge.android.mapgenerator.MapDatabases; -import org.mapsforge.android.mapgenerator.MapRendererFactory; -import org.mapsforge.android.mapgenerator.MapRenderers; -import org.mapsforge.android.mapgenerator.MapWorker; -import org.mapsforge.android.mapgenerator.Theme; -import org.mapsforge.android.rendertheme.ExternalRenderTheme; -import org.mapsforge.android.rendertheme.InternalRenderTheme; -import org.mapsforge.android.rendertheme.RenderTheme; -import org.mapsforge.android.rendertheme.RenderThemeHandler; -import org.mapsforge.android.utils.GlConfigChooser; -import org.mapsforge.core.GeoPoint; -import org.mapsforge.core.MapPosition; -import org.mapsforge.core.Tile; -import org.mapsforge.database.IMapDatabase; -import org.mapsforge.database.MapInfo; -import org.mapsforge.database.OpenResult; +import org.oscim.core.GeoPoint; +import org.oscim.core.MapPosition; +import org.oscim.core.Tile; +import org.oscim.database.IMapDatabase; +import org.oscim.database.MapDatabaseFactory; +import org.oscim.database.MapDatabases; +import org.oscim.database.MapInfo; +import org.oscim.database.OpenResult; +import org.oscim.theme.ExternalRenderTheme; +import org.oscim.theme.InternalRenderTheme; +import org.oscim.theme.RenderTheme; +import org.oscim.theme.RenderThemeHandler; +import org.oscim.theme.Theme; +import org.oscim.view.mapgenerator.IMapGenerator; +import org.oscim.view.mapgenerator.JobQueue; +import org.oscim.view.mapgenerator.JobTile; +import org.oscim.view.mapgenerator.MapWorker; +import org.oscim.view.utils.GlConfigChooser; import org.xml.sax.SAXException; import android.content.Context; @@ -107,7 +105,7 @@ public class MapView extends GLSurfaceView { */ public MapView(Context context, AttributeSet attributeSet) { this(context, attributeSet, - MapRendererFactory.getMapGenerator(attributeSet), + MapRendererFactory.getMapRenderer(attributeSet), MapDatabaseFactory.getMapDatabase(attributeSet)); } @@ -278,15 +276,14 @@ public class MapView extends GLSurfaceView { mapDatabase.close(); openResult = mapDatabase.open(null); - if (openResult != null && openResult.isSuccess()) { - mMapOptions = mapOptions; + if (openResult.isSuccess()) initialized = true; - } } mapWorkersProceed(); if (initialized) { + mMapOptions = mapOptions; mMapRenderer.updateMap(true); Log.i(TAG, "MapDatabase ready"); return true; diff --git a/src/org/mapsforge/android/MapViewPosition.java b/src/org/oscim/view/MapViewPosition.java similarity index 97% rename from src/org/mapsforge/android/MapViewPosition.java rename to src/org/oscim/view/MapViewPosition.java index eec83e50..38dd5e52 100644 --- a/src/org/mapsforge/android/MapViewPosition.java +++ b/src/org/oscim/view/MapViewPosition.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android; +package org.oscim.view; -import org.mapsforge.core.GeoPoint; -import org.mapsforge.core.MapPosition; -import org.mapsforge.core.MercatorProjection; +import org.oscim.core.GeoPoint; +import org.oscim.core.MapPosition; +import org.oscim.core.MercatorProjection; import android.util.FloatMath; import android.util.Log; diff --git a/src/org/mapsforge/android/MapViewProjection.java b/src/org/oscim/view/MapViewProjection.java similarity index 96% rename from src/org/mapsforge/android/MapViewProjection.java rename to src/org/oscim/view/MapViewProjection.java index de3cb64e..69ac2259 100644 --- a/src/org/mapsforge/android/MapViewProjection.java +++ b/src/org/oscim/view/MapViewProjection.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android; +package org.oscim.view; -import org.mapsforge.core.GeoPoint; -import org.mapsforge.core.MapPosition; -import org.mapsforge.core.MercatorProjection; +import org.oscim.core.GeoPoint; +import org.oscim.core.MapPosition; +import org.oscim.core.MercatorProjection; import android.graphics.Point; diff --git a/src/org/mapsforge/android/MapZoomControls.java b/src/org/oscim/view/MapZoomControls.java similarity index 99% rename from src/org/mapsforge/android/MapZoomControls.java rename to src/org/oscim/view/MapZoomControls.java index 0170e1a4..e27d3413 100644 --- a/src/org/mapsforge/android/MapZoomControls.java +++ b/src/org/oscim/view/MapZoomControls.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android; +package org.oscim.view; -import org.mapsforge.android.mapgenerator.IMapGenerator; +import org.oscim.view.mapgenerator.IMapGenerator; import android.content.Context; import android.os.Handler; diff --git a/src/org/mapsforge/android/Projection.java b/src/org/oscim/view/Projection.java similarity index 98% rename from src/org/mapsforge/android/Projection.java rename to src/org/oscim/view/Projection.java index 578cd40c..032d6b6e 100644 --- a/src/org/mapsforge/android/Projection.java +++ b/src/org/oscim/view/Projection.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android; +package org.oscim.view; -import org.mapsforge.core.GeoPoint; +import org.oscim.core.GeoPoint; import android.graphics.Point; diff --git a/src/org/mapsforge/android/TouchHandler.java b/src/org/oscim/view/TouchHandler.java similarity index 99% rename from src/org/mapsforge/android/TouchHandler.java rename to src/org/oscim/view/TouchHandler.java index 6db817d7..63a989c0 100644 --- a/src/org/mapsforge/android/TouchHandler.java +++ b/src/org/oscim/view/TouchHandler.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android; +package org.oscim.view; -import org.mapsforge.core.Tile; +import org.oscim.core.Tile; import android.content.Context; import android.os.CountDownTimer; diff --git a/src/org/mapsforge/android/glrenderer/LineLayer.java b/src/org/oscim/view/glrenderer/LineLayer.java similarity index 98% rename from src/org/mapsforge/android/glrenderer/LineLayer.java rename to src/org/oscim/view/glrenderer/LineLayer.java index b125ee30..2064d2f7 100644 --- a/src/org/mapsforge/android/glrenderer/LineLayer.java +++ b/src/org/oscim/view/glrenderer/LineLayer.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; -import org.mapsforge.android.rendertheme.renderinstruction.Line; -import org.mapsforge.core.Tile; +import org.oscim.core.Tile; +import org.oscim.theme.renderinstruction.Line; import android.graphics.Paint.Cap; import android.util.FloatMath; diff --git a/src/org/mapsforge/android/glrenderer/LineLayers.java b/src/org/oscim/view/glrenderer/LineLayers.java similarity index 98% rename from src/org/mapsforge/android/glrenderer/LineLayers.java rename to src/org/oscim/view/glrenderer/LineLayers.java index 3657a595..191eab38 100644 --- a/src/org/mapsforge/android/glrenderer/LineLayers.java +++ b/src/org/oscim/view/glrenderer/LineLayers.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; import static android.opengl.GLES20.GL_TRIANGLE_STRIP; import static android.opengl.GLES20.glDisableVertexAttribArray; @@ -28,8 +28,8 @@ import static android.opengl.GLES20.glVertexAttribPointer; import java.nio.ShortBuffer; -import org.mapsforge.android.rendertheme.renderinstruction.Line; -import org.mapsforge.android.utils.GlUtils; +import org.oscim.theme.renderinstruction.Line; +import org.oscim.view.utils.GlUtils; import android.opengl.GLES20; import android.util.FloatMath; diff --git a/src/org/mapsforge/android/glrenderer/MapGenerator.java b/src/org/oscim/view/glrenderer/MapGenerator.java similarity index 93% rename from src/org/mapsforge/android/glrenderer/MapGenerator.java rename to src/org/oscim/view/glrenderer/MapGenerator.java index ff9cdcf7..c0dd691a 100644 --- a/src/org/mapsforge/android/glrenderer/MapGenerator.java +++ b/src/org/oscim/view/glrenderer/MapGenerator.java @@ -12,26 +12,26 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; -import org.mapsforge.android.DebugSettings; -import org.mapsforge.android.MapView; -import org.mapsforge.android.mapgenerator.IMapGenerator; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.android.rendertheme.RenderTheme; -import org.mapsforge.android.rendertheme.renderinstruction.Area; -import org.mapsforge.android.rendertheme.renderinstruction.Caption; -import org.mapsforge.android.rendertheme.renderinstruction.Line; -import org.mapsforge.android.rendertheme.renderinstruction.PathText; -import org.mapsforge.android.rendertheme.renderinstruction.RenderInstruction; -import org.mapsforge.core.MercatorProjection; -import org.mapsforge.core.Tag; -import org.mapsforge.core.Tile; -import org.mapsforge.core.WebMercator; -import org.mapsforge.database.IMapDatabase; -import org.mapsforge.database.IMapDatabaseCallback; -import org.mapsforge.database.QueryResult; +import org.oscim.core.MercatorProjection; +import org.oscim.core.Tag; +import org.oscim.core.Tile; +import org.oscim.core.WebMercator; +import org.oscim.database.IMapDatabase; +import org.oscim.database.IMapDatabaseCallback; +import org.oscim.database.QueryResult; +import org.oscim.theme.IRenderCallback; +import org.oscim.theme.RenderTheme; +import org.oscim.theme.renderinstruction.Area; +import org.oscim.theme.renderinstruction.Caption; +import org.oscim.theme.renderinstruction.Line; +import org.oscim.theme.renderinstruction.PathText; +import org.oscim.theme.renderinstruction.RenderInstruction; +import org.oscim.view.DebugSettings; +import org.oscim.view.MapView; +import org.oscim.view.mapgenerator.IMapGenerator; +import org.oscim.view.mapgenerator.JobTile; import android.graphics.Bitmap; import android.graphics.Paint; diff --git a/src/org/mapsforge/android/glrenderer/MapRenderer.java b/src/org/oscim/view/glrenderer/MapRenderer.java similarity index 97% rename from src/org/mapsforge/android/glrenderer/MapRenderer.java rename to src/org/oscim/view/glrenderer/MapRenderer.java index 8b1b638e..f7f5eade 100644 --- a/src/org/mapsforge/android/glrenderer/MapRenderer.java +++ b/src/org/oscim/view/glrenderer/MapRenderer.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; import static android.opengl.GLES20.GL_ARRAY_BUFFER; import static android.opengl.GLES20.GL_BLEND; @@ -38,13 +38,13 @@ import java.util.ArrayList; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; -import org.mapsforge.android.MapView; -import org.mapsforge.android.mapgenerator.IMapGenerator; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.android.rendertheme.RenderTheme; -import org.mapsforge.android.utils.GlUtils; -import org.mapsforge.core.MapPosition; -import org.mapsforge.core.Tile; +import org.oscim.core.MapPosition; +import org.oscim.core.Tile; +import org.oscim.theme.RenderTheme; +import org.oscim.view.MapView; +import org.oscim.view.mapgenerator.IMapGenerator; +import org.oscim.view.mapgenerator.JobTile; +import org.oscim.view.utils.GlUtils; import android.opengl.GLES20; import android.opengl.Matrix; @@ -52,7 +52,7 @@ import android.os.SystemClock; import android.util.FloatMath; import android.util.Log; -public class MapRenderer implements org.mapsforge.android.IMapRenderer { +public class MapRenderer implements org.oscim.view.IMapRenderer { private static final String TAG = "MapRenderer"; diff --git a/src/org/mapsforge/android/glrenderer/MapTile.java b/src/org/oscim/view/glrenderer/MapTile.java similarity index 94% rename from src/org/mapsforge/android/glrenderer/MapTile.java rename to src/org/oscim/view/glrenderer/MapTile.java index 2d56f676..2ad307cc 100644 --- a/src/org/mapsforge/android/glrenderer/MapTile.java +++ b/src/org/oscim/view/glrenderer/MapTile.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; -import org.mapsforge.android.mapgenerator.JobTile; +import org.oscim.view.mapgenerator.JobTile; class MapTile extends JobTile { byte lastDraw = 0; diff --git a/src/org/mapsforge/android/glrenderer/PolygonLayer.java b/src/org/oscim/view/glrenderer/PolygonLayer.java similarity index 94% rename from src/org/mapsforge/android/glrenderer/PolygonLayer.java rename to src/org/oscim/view/glrenderer/PolygonLayer.java index 15605d3e..f0b10abc 100644 --- a/src/org/mapsforge/android/glrenderer/PolygonLayer.java +++ b/src/org/oscim/view/glrenderer/PolygonLayer.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; -import org.mapsforge.android.rendertheme.renderinstruction.Area; -import org.mapsforge.core.Tile; +import org.oscim.core.Tile; +import org.oscim.theme.renderinstruction.Area; class PolygonLayer { private static final float S = MapRenderer.COORD_MULTIPLIER; diff --git a/src/org/mapsforge/android/glrenderer/PolygonLayers.java b/src/org/oscim/view/glrenderer/PolygonLayers.java similarity index 98% rename from src/org/mapsforge/android/glrenderer/PolygonLayers.java rename to src/org/oscim/view/glrenderer/PolygonLayers.java index 8a640dbc..bfe95288 100644 --- a/src/org/mapsforge/android/glrenderer/PolygonLayers.java +++ b/src/org/oscim/view/glrenderer/PolygonLayers.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; import static android.opengl.GLES20.GL_BLEND; import static android.opengl.GLES20.GL_EQUAL; @@ -38,7 +38,7 @@ import static android.opengl.GLES20.glVertexAttribPointer; import java.nio.ShortBuffer; -import org.mapsforge.android.utils.GlUtils; +import org.oscim.view.utils.GlUtils; import android.opengl.GLES20; diff --git a/src/org/mapsforge/android/glrenderer/QuadTree.java b/src/org/oscim/view/glrenderer/QuadTree.java similarity index 98% rename from src/org/mapsforge/android/glrenderer/QuadTree.java rename to src/org/oscim/view/glrenderer/QuadTree.java index 5bf47fad..ce528ca6 100644 --- a/src/org/mapsforge/android/glrenderer/QuadTree.java +++ b/src/org/oscim/view/glrenderer/QuadTree.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.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; import android.util.Log; diff --git a/src/org/mapsforge/android/glrenderer/Shaders.java b/src/org/oscim/view/glrenderer/Shaders.java similarity index 99% rename from src/org/mapsforge/android/glrenderer/Shaders.java rename to src/org/oscim/view/glrenderer/Shaders.java index f48a3280..6a98ff6d 100644 --- a/src/org/mapsforge/android/glrenderer/Shaders.java +++ b/src/org/oscim/view/glrenderer/Shaders.java @@ -13,7 +13,7 @@ * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; class Shaders { diff --git a/src/org/mapsforge/android/glrenderer/ShortItem.java b/src/org/oscim/view/glrenderer/ShortItem.java similarity index 95% rename from src/org/mapsforge/android/glrenderer/ShortItem.java rename to src/org/oscim/view/glrenderer/ShortItem.java index 486d3f3a..38777464 100644 --- a/src/org/mapsforge/android/glrenderer/ShortItem.java +++ b/src/org/oscim/view/glrenderer/ShortItem.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.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; public class ShortItem { final short[] vertices; diff --git a/src/org/mapsforge/android/glrenderer/ShortPool.java b/src/org/oscim/view/glrenderer/ShortPool.java similarity index 98% rename from src/org/mapsforge/android/glrenderer/ShortPool.java rename to src/org/oscim/view/glrenderer/ShortPool.java index e2aae72c..edd43ad7 100644 --- a/src/org/mapsforge/android/glrenderer/ShortPool.java +++ b/src/org/oscim/view/glrenderer/ShortPool.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.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; import android.util.Log; diff --git a/src/org/mapsforge/android/glrenderer/SymbolLayer.java b/src/org/oscim/view/glrenderer/SymbolLayer.java similarity index 94% rename from src/org/mapsforge/android/glrenderer/SymbolLayer.java rename to src/org/oscim/view/glrenderer/SymbolLayer.java index 42b6e13c..c5afcb95 100644 --- a/src/org/mapsforge/android/glrenderer/SymbolLayer.java +++ b/src/org/oscim/view/glrenderer/SymbolLayer.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.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; public class SymbolLayer { diff --git a/src/org/mapsforge/android/glrenderer/TextItem.java b/src/org/oscim/view/glrenderer/TextItem.java similarity index 87% rename from src/org/mapsforge/android/glrenderer/TextItem.java rename to src/org/oscim/view/glrenderer/TextItem.java index ffde6f44..cedb8d93 100644 --- a/src/org/mapsforge/android/glrenderer/TextItem.java +++ b/src/org/oscim/view/glrenderer/TextItem.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; -import org.mapsforge.android.rendertheme.renderinstruction.Caption; -import org.mapsforge.android.rendertheme.renderinstruction.PathText; +import org.oscim.theme.renderinstruction.Caption; +import org.oscim.theme.renderinstruction.PathText; public class TextItem { TextItem next; diff --git a/src/org/mapsforge/android/glrenderer/TextRenderer.java b/src/org/oscim/view/glrenderer/TextRenderer.java similarity index 99% rename from src/org/mapsforge/android/glrenderer/TextRenderer.java rename to src/org/oscim/view/glrenderer/TextRenderer.java index e065d6cb..de8a090e 100644 --- a/src/org/mapsforge/android/glrenderer/TextRenderer.java +++ b/src/org/oscim/view/glrenderer/TextRenderer.java @@ -12,13 +12,13 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.ShortBuffer; -import org.mapsforge.android.utils.GlUtils; +import org.oscim.view.utils.GlUtils; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/src/org/mapsforge/android/glrenderer/TextTexture.java b/src/org/oscim/view/glrenderer/TextTexture.java similarity index 96% rename from src/org/mapsforge/android/glrenderer/TextTexture.java rename to src/org/oscim/view/glrenderer/TextTexture.java index 6beb1855..026f7623 100644 --- a/src/org/mapsforge/android/glrenderer/TextTexture.java +++ b/src/org/oscim/view/glrenderer/TextTexture.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.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; public class TextTexture { diff --git a/src/org/mapsforge/android/glrenderer/TileLoader.java b/src/org/oscim/view/glrenderer/TileLoader.java similarity index 97% rename from src/org/mapsforge/android/glrenderer/TileLoader.java rename to src/org/oscim/view/glrenderer/TileLoader.java index 71b99837..6ff86d69 100644 --- a/src/org/mapsforge/android/glrenderer/TileLoader.java +++ b/src/org/oscim/view/glrenderer/TileLoader.java @@ -12,17 +12,17 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; import java.util.ArrayList; import java.util.Collections; -import org.mapsforge.android.MapView; -import org.mapsforge.android.glrenderer.MapRenderer.TilesData; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.core.MapPosition; -import org.mapsforge.core.MercatorProjection; -import org.mapsforge.core.Tile; +import org.oscim.core.MapPosition; +import org.oscim.core.MercatorProjection; +import org.oscim.core.Tile; +import org.oscim.view.MapView; +import org.oscim.view.glrenderer.MapRenderer.TilesData; +import org.oscim.view.mapgenerator.JobTile; import android.util.FloatMath; import android.util.Log; diff --git a/src/org/mapsforge/android/glrenderer/VertexBufferObject.java b/src/org/oscim/view/glrenderer/VertexBufferObject.java similarity index 94% rename from src/org/mapsforge/android/glrenderer/VertexBufferObject.java rename to src/org/oscim/view/glrenderer/VertexBufferObject.java index b1a6a50f..e26ce30b 100644 --- a/src/org/mapsforge/android/glrenderer/VertexBufferObject.java +++ b/src/org/oscim/view/glrenderer/VertexBufferObject.java @@ -13,7 +13,7 @@ * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; class VertexBufferObject { int id; diff --git a/src/org/mapsforge/android/glrenderer/WayDecorator.java b/src/org/oscim/view/glrenderer/WayDecorator.java similarity index 97% rename from src/org/mapsforge/android/glrenderer/WayDecorator.java rename to src/org/oscim/view/glrenderer/WayDecorator.java index 0f999a32..87d5437b 100644 --- a/src/org/mapsforge/android/glrenderer/WayDecorator.java +++ b/src/org/oscim/view/glrenderer/WayDecorator.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.glrenderer; +package org.oscim.view.glrenderer; -import org.mapsforge.android.rendertheme.renderinstruction.PathText; -import org.mapsforge.android.utils.GeometryUtils; +import org.oscim.theme.renderinstruction.PathText; +import org.oscim.view.utils.GeometryUtils; import android.util.FloatMath; diff --git a/src/org/mapsforge/android/mapgenerator/IMapGenerator.java b/src/org/oscim/view/mapgenerator/IMapGenerator.java similarity index 90% rename from src/org/mapsforge/android/mapgenerator/IMapGenerator.java rename to src/org/oscim/view/mapgenerator/IMapGenerator.java index 8e7b4482..4577df4c 100644 --- a/src/org/mapsforge/android/mapgenerator/IMapGenerator.java +++ b/src/org/oscim/view/mapgenerator/IMapGenerator.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.mapgenerator; +package org.oscim.view.mapgenerator; -import org.mapsforge.android.rendertheme.RenderTheme; -import org.mapsforge.database.IMapDatabase; +import org.oscim.database.IMapDatabase; +import org.oscim.theme.RenderTheme; /** * A MapGenerator provides map tiles either by downloading or rendering them. diff --git a/src/org/mapsforge/android/mapgenerator/JobQueue.java b/src/org/oscim/view/mapgenerator/JobQueue.java similarity index 94% rename from src/org/mapsforge/android/mapgenerator/JobQueue.java rename to src/org/oscim/view/mapgenerator/JobQueue.java index 31aaaf1e..cfbb292e 100644 --- a/src/org/mapsforge/android/mapgenerator/JobQueue.java +++ b/src/org/oscim/view/mapgenerator/JobQueue.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.mapgenerator; +package org.oscim.view.mapgenerator; -//import static org.mapsforge.android.mapgenerator.JobTile.LOADING; +//import static org.oscim.view.mapgenerator.JobTile.LOADING; import java.util.ArrayList; import java.util.PriorityQueue; diff --git a/src/org/mapsforge/android/mapgenerator/JobTile.java b/src/org/oscim/view/mapgenerator/JobTile.java similarity index 95% rename from src/org/mapsforge/android/mapgenerator/JobTile.java rename to src/org/oscim/view/mapgenerator/JobTile.java index 7bb89495..803f2912 100644 --- a/src/org/mapsforge/android/mapgenerator/JobTile.java +++ b/src/org/oscim/view/mapgenerator/JobTile.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.mapgenerator; +package org.oscim.view.mapgenerator; -import org.mapsforge.core.Tile; +import org.oscim.core.Tile; /** * diff --git a/src/org/mapsforge/android/mapgenerator/MapWorker.java b/src/org/oscim/view/mapgenerator/MapWorker.java similarity index 93% rename from src/org/mapsforge/android/mapgenerator/MapWorker.java rename to src/org/oscim/view/mapgenerator/MapWorker.java index d0f896a6..a50f7add 100644 --- a/src/org/mapsforge/android/mapgenerator/MapWorker.java +++ b/src/org/oscim/view/mapgenerator/MapWorker.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.mapgenerator; +package org.oscim.view.mapgenerator; -import org.mapsforge.android.IMapRenderer; -import org.mapsforge.android.MapView; -import org.mapsforge.android.utils.PausableThread; +import org.oscim.view.IMapRenderer; +import org.oscim.view.MapView; +import org.oscim.view.utils.PausableThread; /** * A MapWorker uses a {@link IMapGenerator} to generate map tiles. It runs in a separate thread to avoid blocking the UI diff --git a/src/org/mapsforge/android/mapgenerator/TileDistanceSort.java b/src/org/oscim/view/mapgenerator/TileDistanceSort.java similarity index 95% rename from src/org/mapsforge/android/mapgenerator/TileDistanceSort.java rename to src/org/oscim/view/mapgenerator/TileDistanceSort.java index 6b0c04f1..9ab4f304 100644 --- a/src/org/mapsforge/android/mapgenerator/TileDistanceSort.java +++ b/src/org/oscim/view/mapgenerator/TileDistanceSort.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.mapsforge.android.mapgenerator; +package org.oscim.view.mapgenerator; import java.util.Comparator; diff --git a/src/org/oscim/view/overlay/Overlay.java b/src/org/oscim/view/overlay/Overlay.java new file mode 100644 index 00000000..23aeb6db --- /dev/null +++ b/src/org/oscim/view/overlay/Overlay.java @@ -0,0 +1,35 @@ +/* + * Copyright 2010, 2011, 2012 mapsforge.org + * + * This program is free software: you can redistribute it and/or modify it under the + * terms of the GNU Lesser General Public License as published by the Free Software + * Foundation, either version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License along with + * this program. If not, see . + */ +package org.oscim.view.overlay; + +public class Overlay { + + synchronized void move() { + + } + + synchronized void addBitmap() { + + } + + synchronized boolean onTouch() { + + return true; + } + + synchronized void draw() { + + } +} diff --git a/src/org/oscim/view/overlay/TiledOverlay.java b/src/org/oscim/view/overlay/TiledOverlay.java new file mode 100644 index 00000000..a3c68284 --- /dev/null +++ b/src/org/oscim/view/overlay/TiledOverlay.java @@ -0,0 +1,19 @@ +/* + * Copyright 2010, 2011, 2012 mapsforge.org + * + * This program is free software: you can redistribute it and/or modify it under the + * terms of the GNU Lesser General Public License as published by the Free Software + * Foundation, either version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License along with + * this program. If not, see . + */ +package org.oscim.view.overlay; + +public class TiledOverlay extends Overlay { + +} diff --git a/src/org/mapsforge/android/swrenderer/CanvasRasterer.java b/src/org/oscim/view/swrenderer/CanvasRasterer.java similarity index 99% rename from src/org/mapsforge/android/swrenderer/CanvasRasterer.java rename to src/org/oscim/view/swrenderer/CanvasRasterer.java index 7fa60d38..734b2d4f 100644 --- a/src/org/mapsforge/android/swrenderer/CanvasRasterer.java +++ b/src/org/oscim/view/swrenderer/CanvasRasterer.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import java.util.List; -import org.mapsforge.core.Tile; +import org.oscim.core.Tile; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/src/org/mapsforge/android/swrenderer/CircleContainer.java b/src/org/oscim/view/swrenderer/CircleContainer.java similarity index 95% rename from src/org/mapsforge/android/swrenderer/CircleContainer.java rename to src/org/oscim/view/swrenderer/CircleContainer.java index 759c1186..b23d24aa 100644 --- a/src/org/mapsforge/android/swrenderer/CircleContainer.java +++ b/src/org/oscim/view/swrenderer/CircleContainer.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; class CircleContainer implements ShapeContainer { diff --git a/src/org/mapsforge/android/swrenderer/DependencyCache.java b/src/org/oscim/view/swrenderer/DependencyCache.java similarity index 99% rename from src/org/mapsforge/android/swrenderer/DependencyCache.java rename to src/org/oscim/view/swrenderer/DependencyCache.java index 9ba3bae5..7a338ab3 100644 --- a/src/org/mapsforge/android/swrenderer/DependencyCache.java +++ b/src/org/oscim/view/swrenderer/DependencyCache.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import java.util.ArrayList; import java.util.Hashtable; @@ -20,7 +20,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.mapsforge.core.Tile; +import org.oscim.core.Tile; import android.graphics.Bitmap; import android.graphics.Paint; diff --git a/src/org/mapsforge/android/swrenderer/ImmutablePoint.java b/src/org/oscim/view/swrenderer/ImmutablePoint.java similarity index 98% rename from src/org/mapsforge/android/swrenderer/ImmutablePoint.java rename to src/org/oscim/view/swrenderer/ImmutablePoint.java index da5e8020..99f57372 100644 --- a/src/org/mapsforge/android/swrenderer/ImmutablePoint.java +++ b/src/org/oscim/view/swrenderer/ImmutablePoint.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; /** * An ImmutablePoint represents an fixed pair of float coordinates. diff --git a/src/org/mapsforge/android/swrenderer/LabelPlacement.java b/src/org/oscim/view/swrenderer/LabelPlacement.java similarity index 99% rename from src/org/mapsforge/android/swrenderer/LabelPlacement.java rename to src/org/oscim/view/swrenderer/LabelPlacement.java index 177b8bfe..4b6a96b2 100644 --- a/src/org/mapsforge/android/swrenderer/LabelPlacement.java +++ b/src/org/oscim/view/swrenderer/LabelPlacement.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import java.io.Serializable; import java.util.ArrayList; @@ -21,7 +21,7 @@ import java.util.LinkedList; import java.util.List; import java.util.PriorityQueue; -import org.mapsforge.core.Tile; +import org.oscim.core.Tile; import android.graphics.Rect; diff --git a/src/org/mapsforge/android/swrenderer/LayerContainer.java b/src/org/oscim/view/swrenderer/LayerContainer.java similarity index 97% rename from src/org/mapsforge/android/swrenderer/LayerContainer.java rename to src/org/oscim/view/swrenderer/LayerContainer.java index dd7ea630..4c847b94 100644 --- a/src/org/mapsforge/android/swrenderer/LayerContainer.java +++ b/src/org/oscim/view/swrenderer/LayerContainer.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import java.util.List; diff --git a/src/org/mapsforge/android/swrenderer/LevelContainer.java b/src/org/oscim/view/swrenderer/LevelContainer.java similarity index 96% rename from src/org/mapsforge/android/swrenderer/LevelContainer.java rename to src/org/oscim/view/swrenderer/LevelContainer.java index f0ce3c93..fd0fbd22 100644 --- a/src/org/mapsforge/android/swrenderer/LevelContainer.java +++ b/src/org/oscim/view/swrenderer/LevelContainer.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import java.util.ArrayList; diff --git a/src/org/mapsforge/android/swrenderer/MapGenerator.java b/src/org/oscim/view/swrenderer/MapGenerator.java similarity index 94% rename from src/org/mapsforge/android/swrenderer/MapGenerator.java rename to src/org/oscim/view/swrenderer/MapGenerator.java index d12feab5..dbefca6f 100644 --- a/src/org/mapsforge/android/swrenderer/MapGenerator.java +++ b/src/org/oscim/view/swrenderer/MapGenerator.java @@ -12,26 +12,26 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import java.util.ArrayList; import java.util.List; -import org.mapsforge.android.DebugSettings; -import org.mapsforge.android.MapView; -import org.mapsforge.android.mapgenerator.IMapGenerator; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.android.rendertheme.IRenderCallback; -import org.mapsforge.android.rendertheme.RenderTheme; -import org.mapsforge.android.rendertheme.renderinstruction.Area; -import org.mapsforge.android.rendertheme.renderinstruction.Caption; -import org.mapsforge.android.rendertheme.renderinstruction.Line; -import org.mapsforge.android.rendertheme.renderinstruction.PathText; -import org.mapsforge.core.Tag; -import org.mapsforge.core.Tile; -import org.mapsforge.database.IMapDatabase; -import org.mapsforge.database.IMapDatabaseCallback; -import org.mapsforge.database.mapfile.MapDatabase; +import org.oscim.core.Tag; +import org.oscim.core.Tile; +import org.oscim.database.IMapDatabase; +import org.oscim.database.IMapDatabaseCallback; +import org.oscim.database.mapfile.MapDatabase; +import org.oscim.theme.IRenderCallback; +import org.oscim.theme.RenderTheme; +import org.oscim.theme.renderinstruction.Area; +import org.oscim.theme.renderinstruction.Caption; +import org.oscim.theme.renderinstruction.Line; +import org.oscim.theme.renderinstruction.PathText; +import org.oscim.view.DebugSettings; +import org.oscim.view.MapView; +import org.oscim.view.mapgenerator.IMapGenerator; +import org.oscim.view.mapgenerator.JobTile; import android.graphics.Bitmap; import android.graphics.Color; diff --git a/src/org/mapsforge/android/swrenderer/MapRenderer.java b/src/org/oscim/view/swrenderer/MapRenderer.java similarity index 96% rename from src/org/mapsforge/android/swrenderer/MapRenderer.java rename to src/org/oscim/view/swrenderer/MapRenderer.java index 690b73de..118784e5 100644 --- a/src/org/mapsforge/android/swrenderer/MapRenderer.java +++ b/src/org/oscim/view/swrenderer/MapRenderer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -25,15 +25,15 @@ import java.util.Collections; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; -import org.mapsforge.android.MapView; -import org.mapsforge.android.mapgenerator.IMapGenerator; -import org.mapsforge.android.mapgenerator.JobTile; -import org.mapsforge.android.mapgenerator.TileDistanceSort; -import org.mapsforge.android.rendertheme.RenderTheme; -import org.mapsforge.android.utils.GlUtils; -import org.mapsforge.core.MapPosition; -import org.mapsforge.core.MercatorProjection; -import org.mapsforge.core.Tile; +import org.oscim.core.MapPosition; +import org.oscim.core.MercatorProjection; +import org.oscim.core.Tile; +import org.oscim.theme.RenderTheme; +import org.oscim.view.MapView; +import org.oscim.view.mapgenerator.IMapGenerator; +import org.oscim.view.mapgenerator.JobTile; +import org.oscim.view.mapgenerator.TileDistanceSort; +import org.oscim.view.utils.GlUtils; import android.opengl.GLES20; import android.opengl.Matrix; @@ -41,7 +41,7 @@ import android.opengl.Matrix; /** * */ -public class MapRenderer implements org.mapsforge.android.IMapRenderer { +public class MapRenderer implements org.oscim.view.IMapRenderer { // private static String TAG = "MapRenderer"; private static final int FLOAT_SIZE_BYTES = 4; diff --git a/src/org/mapsforge/android/swrenderer/MapTile.java b/src/org/oscim/view/swrenderer/MapTile.java similarity index 94% rename from src/org/mapsforge/android/swrenderer/MapTile.java rename to src/org/oscim/view/swrenderer/MapTile.java index bffca4c4..4ac34cc8 100644 --- a/src/org/mapsforge/android/swrenderer/MapTile.java +++ b/src/org/oscim/view/swrenderer/MapTile.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; -import org.mapsforge.android.mapgenerator.JobTile; +import org.oscim.view.mapgenerator.JobTile; /** * diff --git a/src/org/mapsforge/android/swrenderer/PointTextContainer.java b/src/org/oscim/view/swrenderer/PointTextContainer.java similarity index 98% rename from src/org/mapsforge/android/swrenderer/PointTextContainer.java rename to src/org/oscim/view/swrenderer/PointTextContainer.java index d33ae9c8..4a767e21 100644 --- a/src/org/mapsforge/android/swrenderer/PointTextContainer.java +++ b/src/org/oscim/view/swrenderer/PointTextContainer.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import android.graphics.Paint; import android.graphics.Rect; diff --git a/src/org/mapsforge/android/swrenderer/ShapeContainer.java b/src/org/oscim/view/swrenderer/ShapeContainer.java similarity index 94% rename from src/org/mapsforge/android/swrenderer/ShapeContainer.java rename to src/org/oscim/view/swrenderer/ShapeContainer.java index 7f2a92ae..d4ece9e7 100644 --- a/src/org/mapsforge/android/swrenderer/ShapeContainer.java +++ b/src/org/oscim/view/swrenderer/ShapeContainer.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; interface ShapeContainer { ShapeType getShapeType(); diff --git a/src/org/mapsforge/android/swrenderer/ShapePaintContainer.java b/src/org/oscim/view/swrenderer/ShapePaintContainer.java similarity index 95% rename from src/org/mapsforge/android/swrenderer/ShapePaintContainer.java rename to src/org/oscim/view/swrenderer/ShapePaintContainer.java index 278bdc0f..63423160 100644 --- a/src/org/mapsforge/android/swrenderer/ShapePaintContainer.java +++ b/src/org/oscim/view/swrenderer/ShapePaintContainer.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import android.graphics.Paint; diff --git a/src/org/mapsforge/android/swrenderer/ShapeType.java b/src/org/oscim/view/swrenderer/ShapeType.java similarity index 94% rename from src/org/mapsforge/android/swrenderer/ShapeType.java rename to src/org/oscim/view/swrenderer/ShapeType.java index e7679c9f..6ab6c911 100644 --- a/src/org/mapsforge/android/swrenderer/ShapeType.java +++ b/src/org/oscim/view/swrenderer/ShapeType.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; enum ShapeType { CIRCLE, WAY; diff --git a/src/org/mapsforge/android/swrenderer/SymbolContainer.java b/src/org/oscim/view/swrenderer/SymbolContainer.java similarity index 97% rename from src/org/mapsforge/android/swrenderer/SymbolContainer.java rename to src/org/oscim/view/swrenderer/SymbolContainer.java index 80b926be..29ea22fd 100644 --- a/src/org/mapsforge/android/swrenderer/SymbolContainer.java +++ b/src/org/oscim/view/swrenderer/SymbolContainer.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import android.graphics.Bitmap; diff --git a/src/org/mapsforge/android/swrenderer/WayDataContainer.java b/src/org/oscim/view/swrenderer/WayDataContainer.java similarity index 96% rename from src/org/mapsforge/android/swrenderer/WayDataContainer.java rename to src/org/oscim/view/swrenderer/WayDataContainer.java index 5af67036..da50b871 100644 --- a/src/org/mapsforge/android/swrenderer/WayDataContainer.java +++ b/src/org/oscim/view/swrenderer/WayDataContainer.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; class WayDataContainer implements ShapeContainer { // position and length of float coordinates diff --git a/src/org/mapsforge/android/swrenderer/WayDecorator.java b/src/org/oscim/view/swrenderer/WayDecorator.java similarity index 98% rename from src/org/mapsforge/android/swrenderer/WayDecorator.java rename to src/org/oscim/view/swrenderer/WayDecorator.java index b96359ea..1b70174a 100644 --- a/src/org/mapsforge/android/swrenderer/WayDecorator.java +++ b/src/org/oscim/view/swrenderer/WayDecorator.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import java.util.List; -import org.mapsforge.android.utils.GeometryUtils; +import org.oscim.view.utils.GeometryUtils; import android.graphics.Bitmap; import android.graphics.Paint; diff --git a/src/org/mapsforge/android/swrenderer/WayTextContainer.java b/src/org/oscim/view/swrenderer/WayTextContainer.java similarity index 96% rename from src/org/mapsforge/android/swrenderer/WayTextContainer.java rename to src/org/oscim/view/swrenderer/WayTextContainer.java index 17341b4f..3f1208ff 100644 --- a/src/org/mapsforge/android/swrenderer/WayTextContainer.java +++ b/src/org/oscim/view/swrenderer/WayTextContainer.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.mapsforge.android.swrenderer; +package org.oscim.view.swrenderer; import android.graphics.Paint; diff --git a/src/org/mapsforge/android/utils/AndroidUtils.java b/src/org/oscim/view/utils/AndroidUtils.java similarity index 97% rename from src/org/mapsforge/android/utils/AndroidUtils.java rename to src/org/oscim/view/utils/AndroidUtils.java index e359116e..1fb9214b 100644 --- a/src/org/mapsforge/android/utils/AndroidUtils.java +++ b/src/org/oscim/view/utils/AndroidUtils.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.mapsforge.android.utils; +package org.oscim.view.utils; import android.os.Build; import android.os.Looper; diff --git a/src/org/mapsforge/android/utils/GeometryUtils.java b/src/org/oscim/view/utils/GeometryUtils.java similarity index 99% rename from src/org/mapsforge/android/utils/GeometryUtils.java rename to src/org/oscim/view/utils/GeometryUtils.java index 9a4ae50e..07047ebc 100644 --- a/src/org/mapsforge/android/utils/GeometryUtils.java +++ b/src/org/oscim/view/utils/GeometryUtils.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.mapsforge.android.utils; +package org.oscim.view.utils; /** * diff --git a/src/org/mapsforge/android/utils/GlConfigChooser.java b/src/org/oscim/view/utils/GlConfigChooser.java similarity index 99% rename from src/org/mapsforge/android/utils/GlConfigChooser.java rename to src/org/oscim/view/utils/GlConfigChooser.java index 067bd7c8..32473c74 100644 --- a/src/org/mapsforge/android/utils/GlConfigChooser.java +++ b/src/org/oscim/view/utils/GlConfigChooser.java @@ -1,4 +1,4 @@ -package org.mapsforge.android.utils; +package org.oscim.view.utils; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; diff --git a/src/org/mapsforge/android/utils/GlUtils.java b/src/org/oscim/view/utils/GlUtils.java similarity index 99% rename from src/org/mapsforge/android/utils/GlUtils.java rename to src/org/oscim/view/utils/GlUtils.java index 3db82bfc..711b37f0 100644 --- a/src/org/mapsforge/android/utils/GlUtils.java +++ b/src/org/oscim/view/utils/GlUtils.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.mapsforge.android.utils; +package org.oscim.view.utils; import android.graphics.Bitmap; import android.opengl.GLES20; diff --git a/src/org/mapsforge/android/utils/PausableThread.java b/src/org/oscim/view/utils/PausableThread.java similarity index 98% rename from src/org/mapsforge/android/utils/PausableThread.java rename to src/org/oscim/view/utils/PausableThread.java index 998b5527..593fa5e8 100644 --- a/src/org/mapsforge/android/utils/PausableThread.java +++ b/src/org/oscim/view/utils/PausableThread.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.mapsforge.android.utils; +package org.oscim.view.utils; /** * An abstract base class for threads which support pausing and resuming.