From 50249440e26bcdf97092f64978bcfae079b4e471 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 16 Aug 2010 22:36:24 +0000 Subject: [PATCH] change net.osmand git-svn-id: https://osmand.googlecode.com/svn/trunk@455 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8 --- DataExtractionOSM/build.xml | 2 +- DataExtractionOSM/logging.properties | 2 +- .../src/{com => net}/osmand/Algoritms.java | 4 +- .../src/{com => net}/osmand/Base64.java | 2 +- .../{com => net}/osmand/ExceptionHandler.java | 5 +- .../src/{com => net}/osmand/IProgress.java | 2 +- .../src/{com => net}/osmand/LogUtil.java | 2 +- .../src/{com => net}/osmand/Messages.java | 2 +- .../{com => net}/osmand/ToDoConstants.java | 13 ++-- .../src/{com => net}/osmand/Version.java | 2 +- .../src/{com => net}/osmand/data/Amenity.java | 8 +-- .../{com => net}/osmand/data/AmenityType.java | 5 +- .../{com => net}/osmand/data/Building.java | 6 +- .../src/{com => net}/osmand/data/City.java | 11 ++-- .../osmand/data/DataTileManager.java | 5 +- .../{com => net}/osmand/data/MapObject.java | 15 +++-- .../{com => net}/osmand/data/PostCode.java | 2 +- .../src/{com => net}/osmand/data/Region.java | 15 +++-- .../src/{com => net}/osmand/data/Street.java | 17 ++--- .../osmand/data/TransportRoute.java | 9 +-- .../osmand/data/TransportStop.java | 4 +- .../osmand/data/index/DataIndexReader.java | 19 +++--- .../osmand/data/index/DataIndexWriter.java | 43 ++++++------ .../index/DownloaderIndexFromGoogleCode.java | 5 +- .../data/index/GoogleCodeUploadIndex.java | 7 +- .../osmand/data/index/IndexBatchCreator.java | 18 ++--- .../osmand/data/index/IndexConstants.java | 2 +- .../data/preparation/DataExtraction.java | 54 +++++++-------- .../osmand/data/preparation/IndexCreator.java | 65 +++++++++---------- .../data/preparation/MapTileDownloader.java | 9 +-- .../impl/ConsoleProgressImplementation.java | 9 +-- .../osmand/map/IMapLocationListener.java | 2 +- .../{com => net}/osmand/map/ITileSource.java | 2 +- .../osmand/map/TileSourceManager.java | 9 +-- .../src/{com => net}/osmand/osm/Entity.java | 5 +- .../{com => net}/osmand/osm/EntityInfo.java | 2 +- .../src/{com => net}/osmand/osm/LatLon.java | 2 +- .../src/{com => net}/osmand/osm/MapUtils.java | 7 +- .../src/{com => net}/osmand/osm/Node.java | 2 +- .../{com => net}/osmand/osm/OSMSettings.java | 2 +- .../osmand/osm/OpeningHoursParser.java | 2 +- .../src/{com => net}/osmand/osm/Relation.java | 2 +- .../src/{com => net}/osmand/osm/Way.java | 2 +- .../osmand/osm/io/IOsmStorageFilter.java | 6 +- .../osmand/osm/io/OsmBaseStorage.java | 19 +++--- .../osmand/osm/io/OsmBoundsFilter.java | 8 +-- .../osmand/osm/io/OsmStorageWriter.java | 61 ++++++++--------- .../osmand/osm/io/OsmVersionNotSupported.java | 2 +- .../osm/util/AHSupermarketResolver.java | 39 +++++------ .../osmand/osm/util/MinskTransReader.java | 37 ++++++----- .../osmand/swing/DataExtractionSettings.java | 5 +- .../osmand/swing/MapInformationLayer.java | 2 +- .../{com => net}/osmand/swing/MapPanel.java | 29 +++++---- .../osmand/swing/MapPanelLayer.java | 2 +- .../osmand/swing/MapPointsLayer.java | 13 ++-- .../osmand/swing/MapRouterLayer.java | 17 ++--- .../osmand/swing/NewTileSourceDialog.java | 7 +- .../swing/OsmExtractionPreferencesDialog.java | 2 +- .../osmand/swing/OsmExtractionUI.java | 55 ++++++++-------- .../osmand/swing/ProgressDialog.java | 7 +- .../osmand/swing/SQLiteBigPlanetIndex.java | 9 +-- .../swing/TileBundleDownloadDialog.java | 17 ++--- 62 files changed, 387 insertions(+), 353 deletions(-) rename DataExtractionOSM/src/{com => net}/osmand/Algoritms.java (94%) rename DataExtractionOSM/src/{com => net}/osmand/Base64.java (97%) rename DataExtractionOSM/src/{com => net}/osmand/ExceptionHandler.java (88%) rename DataExtractionOSM/src/{com => net}/osmand/IProgress.java (92%) rename DataExtractionOSM/src/{com => net}/osmand/LogUtil.java (92%) rename DataExtractionOSM/src/{com => net}/osmand/Messages.java (91%) rename DataExtractionOSM/src/{com => net}/osmand/ToDoConstants.java (86%) rename DataExtractionOSM/src/{com => net}/osmand/Version.java (89%) rename DataExtractionOSM/src/{com => net}/osmand/data/Amenity.java (93%) rename DataExtractionOSM/src/{com => net}/osmand/data/AmenityType.java (97%) rename DataExtractionOSM/src/{com => net}/osmand/data/Building.java (73%) rename DataExtractionOSM/src/{com => net}/osmand/data/City.java (90%) rename DataExtractionOSM/src/{com => net}/osmand/data/DataTileManager.java (94%) rename DataExtractionOSM/src/{com => net}/osmand/data/MapObject.java (83%) rename DataExtractionOSM/src/{com => net}/osmand/data/PostCode.java (92%) rename DataExtractionOSM/src/{com => net}/osmand/data/Region.java (91%) rename DataExtractionOSM/src/{com => net}/osmand/data/Street.java (87%) rename DataExtractionOSM/src/{com => net}/osmand/data/TransportRoute.java (89%) rename DataExtractionOSM/src/{com => net}/osmand/data/TransportStop.java (65%) rename DataExtractionOSM/src/{com => net}/osmand/data/index/DataIndexReader.java (88%) rename DataExtractionOSM/src/{com => net}/osmand/data/index/DataIndexWriter.java (92%) rename DataExtractionOSM/src/{com => net}/osmand/data/index/DownloaderIndexFromGoogleCode.java (95%) rename DataExtractionOSM/src/{com => net}/osmand/data/index/GoogleCodeUploadIndex.java (98%) rename DataExtractionOSM/src/{com => net}/osmand/data/index/IndexBatchCreator.java (95%) rename DataExtractionOSM/src/{com => net}/osmand/data/index/IndexConstants.java (95%) rename DataExtractionOSM/src/{com => net}/osmand/data/preparation/DataExtraction.java (94%) rename DataExtractionOSM/src/{com => net}/osmand/data/preparation/IndexCreator.java (93%) rename DataExtractionOSM/src/{com => net}/osmand/data/preparation/MapTileDownloader.java (94%) rename DataExtractionOSM/src/{com => net}/osmand/impl/ConsoleProgressImplementation.java (91%) rename DataExtractionOSM/src/{com => net}/osmand/map/IMapLocationListener.java (81%) rename DataExtractionOSM/src/{com => net}/osmand/map/ITileSource.java (88%) rename DataExtractionOSM/src/{com => net}/osmand/map/TileSourceManager.java (96%) rename DataExtractionOSM/src/{com => net}/osmand/osm/Entity.java (92%) rename DataExtractionOSM/src/{com => net}/osmand/osm/EntityInfo.java (92%) rename DataExtractionOSM/src/{com => net}/osmand/osm/LatLon.java (94%) rename DataExtractionOSM/src/{com => net}/osmand/osm/MapUtils.java (96%) rename DataExtractionOSM/src/{com => net}/osmand/osm/Node.java (91%) rename DataExtractionOSM/src/{com => net}/osmand/osm/OSMSettings.java (95%) rename DataExtractionOSM/src/{com => net}/osmand/osm/OpeningHoursParser.java (95%) rename DataExtractionOSM/src/{com => net}/osmand/osm/Relation.java (94%) rename DataExtractionOSM/src/{com => net}/osmand/osm/Way.java (93%) rename DataExtractionOSM/src/{com => net}/osmand/osm/io/IOsmStorageFilter.java (56%) rename DataExtractionOSM/src/{com => net}/osmand/osm/io/OsmBaseStorage.java (94%) rename DataExtractionOSM/src/{com => net}/osmand/osm/io/OsmBoundsFilter.java (83%) rename DataExtractionOSM/src/{com => net}/osmand/osm/io/OsmStorageWriter.java (77%) rename DataExtractionOSM/src/{com => net}/osmand/osm/io/OsmVersionNotSupported.java (84%) rename DataExtractionOSM/src/{com => net}/osmand/osm/util/AHSupermarketResolver.java (93%) rename DataExtractionOSM/src/{com => net}/osmand/osm/util/MinskTransReader.java (93%) rename DataExtractionOSM/src/{com => net}/osmand/swing/DataExtractionSettings.java (95%) rename DataExtractionOSM/src/{com => net}/osmand/swing/MapInformationLayer.java (95%) rename DataExtractionOSM/src/{com => net}/osmand/swing/MapPanel.java (93%) rename DataExtractionOSM/src/{com => net}/osmand/swing/MapPanelLayer.java (83%) rename DataExtractionOSM/src/{com => net}/osmand/swing/MapPointsLayer.java (92%) rename DataExtractionOSM/src/{com => net}/osmand/swing/MapRouterLayer.java (94%) rename DataExtractionOSM/src/{com => net}/osmand/swing/NewTileSourceDialog.java (95%) rename DataExtractionOSM/src/{com => net}/osmand/swing/OsmExtractionPreferencesDialog.java (96%) rename DataExtractionOSM/src/{com => net}/osmand/swing/OsmExtractionUI.java (94%) rename DataExtractionOSM/src/{com => net}/osmand/swing/ProgressDialog.java (94%) rename DataExtractionOSM/src/{com => net}/osmand/swing/SQLiteBigPlanetIndex.java (92%) rename DataExtractionOSM/src/{com => net}/osmand/swing/TileBundleDownloadDialog.java (93%) diff --git a/DataExtractionOSM/build.xml b/DataExtractionOSM/build.xml index b321d715a2..81113016d0 100644 --- a/DataExtractionOSM/build.xml +++ b/DataExtractionOSM/build.xml @@ -16,7 +16,7 @@ - + diff --git a/DataExtractionOSM/logging.properties b/DataExtractionOSM/logging.properties index 7467774c61..374870093f 100644 --- a/DataExtractionOSM/logging.properties +++ b/DataExtractionOSM/logging.properties @@ -2,7 +2,7 @@ handlers=java.util.logging.ConsoleHandler, java.util.logging.FileHandler # Set the default logging level for the logger named com.mycompany -com.osmand.level = ALL +net.osmand.level = ALL java.util.logging.FileHandler.pattern=%h/Application Data/Osmand/osmand.log java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter diff --git a/DataExtractionOSM/src/com/osmand/Algoritms.java b/DataExtractionOSM/src/net/osmand/Algoritms.java similarity index 94% rename from DataExtractionOSM/src/com/osmand/Algoritms.java rename to DataExtractionOSM/src/net/osmand/Algoritms.java index 00f2822109..83f214b4bb 100644 --- a/DataExtractionOSM/src/com/osmand/Algoritms.java +++ b/DataExtractionOSM/src/net/osmand/Algoritms.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.io.Closeable; import java.io.File; @@ -6,6 +6,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import net.osmand.LogUtil; + import org.apache.commons.logging.Log; /** diff --git a/DataExtractionOSM/src/com/osmand/Base64.java b/DataExtractionOSM/src/net/osmand/Base64.java similarity index 97% rename from DataExtractionOSM/src/com/osmand/Base64.java rename to DataExtractionOSM/src/net/osmand/Base64.java index f78c7b314b..815598792d 100644 --- a/DataExtractionOSM/src/com/osmand/Base64.java +++ b/DataExtractionOSM/src/net/osmand/Base64.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; /** * @source http://www.javaworld.com/javaworld/javatips/jw-javatip47.html -- 24.11.2008, (mb) diff --git a/DataExtractionOSM/src/com/osmand/ExceptionHandler.java b/DataExtractionOSM/src/net/osmand/ExceptionHandler.java similarity index 88% rename from DataExtractionOSM/src/com/osmand/ExceptionHandler.java rename to DataExtractionOSM/src/net/osmand/ExceptionHandler.java index 60cf700fde..7450b85f99 100644 --- a/DataExtractionOSM/src/com/osmand/ExceptionHandler.java +++ b/DataExtractionOSM/src/net/osmand/ExceptionHandler.java @@ -1,10 +1,11 @@ -package com.osmand; +package net.osmand; import javax.swing.JOptionPane; +import net.osmand.swing.OsmExtractionUI; + import org.apache.commons.logging.Log; -import com.osmand.swing.OsmExtractionUI; public class ExceptionHandler { private static final Log log = LogUtil.getLog(ExceptionHandler.class); diff --git a/DataExtractionOSM/src/com/osmand/IProgress.java b/DataExtractionOSM/src/net/osmand/IProgress.java similarity index 92% rename from DataExtractionOSM/src/com/osmand/IProgress.java rename to DataExtractionOSM/src/net/osmand/IProgress.java index 7c6ab87fb7..947120a18e 100644 --- a/DataExtractionOSM/src/com/osmand/IProgress.java +++ b/DataExtractionOSM/src/net/osmand/IProgress.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; /** * That common interface that could be used by background operations. diff --git a/DataExtractionOSM/src/com/osmand/LogUtil.java b/DataExtractionOSM/src/net/osmand/LogUtil.java similarity index 92% rename from DataExtractionOSM/src/com/osmand/LogUtil.java rename to DataExtractionOSM/src/net/osmand/LogUtil.java index 4c02b4f1fa..dc5d3ac96c 100644 --- a/DataExtractionOSM/src/com/osmand/LogUtil.java +++ b/DataExtractionOSM/src/net/osmand/LogUtil.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/DataExtractionOSM/src/com/osmand/Messages.java b/DataExtractionOSM/src/net/osmand/Messages.java similarity index 91% rename from DataExtractionOSM/src/com/osmand/Messages.java rename to DataExtractionOSM/src/net/osmand/Messages.java index 7726b4617c..a8c541cfa0 100644 --- a/DataExtractionOSM/src/com/osmand/Messages.java +++ b/DataExtractionOSM/src/net/osmand/Messages.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.util.ResourceBundle; diff --git a/DataExtractionOSM/src/com/osmand/ToDoConstants.java b/DataExtractionOSM/src/net/osmand/ToDoConstants.java similarity index 86% rename from DataExtractionOSM/src/com/osmand/ToDoConstants.java rename to DataExtractionOSM/src/net/osmand/ToDoConstants.java index b757ebfab1..7b20c8627d 100644 --- a/DataExtractionOSM/src/com/osmand/ToDoConstants.java +++ b/DataExtractionOSM/src/net/osmand/ToDoConstants.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; /** @@ -17,11 +17,12 @@ public class ToDoConstants { // highway (?), traffic_calming (?), barrier(?), military(?-), landuse (?), office(?), man_made(?), power(?), // railway( station, subway?) - issue 17 - // BUG custom filter : select all/deselect all - // publish on market - // rotate map gps without location - // recalculating route when location is far from ! - // Netherlands indexing albert heijns + // BUGS : + // ! VELCOM - competition + // ! search poi without gps ! + // rotate map gps without location + // recalculating route when location is far from ! + // Unscheduled (complex) diff --git a/DataExtractionOSM/src/com/osmand/Version.java b/DataExtractionOSM/src/net/osmand/Version.java similarity index 89% rename from DataExtractionOSM/src/com/osmand/Version.java rename to DataExtractionOSM/src/net/osmand/Version.java index 23c8aab554..3ed1101dac 100644 --- a/DataExtractionOSM/src/com/osmand/Version.java +++ b/DataExtractionOSM/src/net/osmand/Version.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; public class Version { diff --git a/DataExtractionOSM/src/com/osmand/data/Amenity.java b/DataExtractionOSM/src/net/osmand/data/Amenity.java similarity index 93% rename from DataExtractionOSM/src/com/osmand/data/Amenity.java rename to DataExtractionOSM/src/net/osmand/data/Amenity.java index 2a8d0e459c..b5b81343e0 100644 --- a/DataExtractionOSM/src/com/osmand/data/Amenity.java +++ b/DataExtractionOSM/src/net/osmand/data/Amenity.java @@ -1,8 +1,8 @@ -package com.osmand.data; +package net.osmand.data; -import com.osmand.osm.Entity; -import com.osmand.osm.Relation; -import com.osmand.osm.OSMSettings.OSMTagKey; +import net.osmand.osm.Entity; +import net.osmand.osm.Relation; +import net.osmand.osm.OSMSettings.OSMTagKey; public class Amenity extends MapObject { diff --git a/DataExtractionOSM/src/com/osmand/data/AmenityType.java b/DataExtractionOSM/src/net/osmand/data/AmenityType.java similarity index 97% rename from DataExtractionOSM/src/com/osmand/data/AmenityType.java rename to DataExtractionOSM/src/net/osmand/data/AmenityType.java index 02a8b88278..b940345f3e 100644 --- a/DataExtractionOSM/src/com/osmand/data/AmenityType.java +++ b/DataExtractionOSM/src/net/osmand/data/AmenityType.java @@ -1,11 +1,12 @@ -package com.osmand.data; +package net.osmand.data; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.osmand.Messages; +import net.osmand.Messages; + // http://wiki.openstreetmap.org/wiki/Amenity // POI tags : amenity, leisure, shop, sport, tourism, historic; accessories (internet-access), natural ? diff --git a/DataExtractionOSM/src/com/osmand/data/Building.java b/DataExtractionOSM/src/net/osmand/data/Building.java similarity index 73% rename from DataExtractionOSM/src/com/osmand/data/Building.java rename to DataExtractionOSM/src/net/osmand/data/Building.java index cead1188c8..943d1dca9a 100644 --- a/DataExtractionOSM/src/com/osmand/data/Building.java +++ b/DataExtractionOSM/src/net/osmand/data/Building.java @@ -1,7 +1,7 @@ -package com.osmand.data; +package net.osmand.data; -import com.osmand.osm.Entity; -import com.osmand.osm.OSMSettings.OSMTagKey; +import net.osmand.osm.Entity; +import net.osmand.osm.OSMSettings.OSMTagKey; public class Building extends MapObject { diff --git a/DataExtractionOSM/src/com/osmand/data/City.java b/DataExtractionOSM/src/net/osmand/data/City.java similarity index 90% rename from DataExtractionOSM/src/com/osmand/data/City.java rename to DataExtractionOSM/src/net/osmand/data/City.java index c7f3f5105c..2f2d09657c 100644 --- a/DataExtractionOSM/src/com/osmand/data/City.java +++ b/DataExtractionOSM/src/net/osmand/data/City.java @@ -1,4 +1,4 @@ -package com.osmand.data; +package net.osmand.data; import java.text.Collator; import java.util.ArrayList; @@ -6,10 +6,11 @@ import java.util.Collection; import java.util.Map; import java.util.TreeMap; -import com.osmand.Algoritms; -import com.osmand.osm.Entity; -import com.osmand.osm.Node; -import com.osmand.osm.OSMSettings.OSMTagKey; +import net.osmand.Algoritms; +import net.osmand.osm.Entity; +import net.osmand.osm.Node; +import net.osmand.osm.OSMSettings.OSMTagKey; + public class City extends MapObject { diff --git a/DataExtractionOSM/src/com/osmand/data/DataTileManager.java b/DataExtractionOSM/src/net/osmand/data/DataTileManager.java similarity index 94% rename from DataExtractionOSM/src/com/osmand/data/DataTileManager.java rename to DataExtractionOSM/src/net/osmand/data/DataTileManager.java index a19ae983e6..2b21a001af 100644 --- a/DataExtractionOSM/src/com/osmand/data/DataTileManager.java +++ b/DataExtractionOSM/src/net/osmand/data/DataTileManager.java @@ -1,4 +1,4 @@ -package com.osmand.data; +package net.osmand.data; import java.util.ArrayList; import java.util.Collections; @@ -6,7 +6,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.osmand.osm.MapUtils; +import net.osmand.osm.MapUtils; + /** * diff --git a/DataExtractionOSM/src/com/osmand/data/MapObject.java b/DataExtractionOSM/src/net/osmand/data/MapObject.java similarity index 83% rename from DataExtractionOSM/src/com/osmand/data/MapObject.java rename to DataExtractionOSM/src/net/osmand/data/MapObject.java index a8c5a97e95..1fb173de95 100644 --- a/DataExtractionOSM/src/com/osmand/data/MapObject.java +++ b/DataExtractionOSM/src/net/osmand/data/MapObject.java @@ -1,13 +1,14 @@ -package com.osmand.data; +package net.osmand.data; import java.text.Collator; -import com.osmand.osm.Entity; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Entity.EntityId; -import com.osmand.osm.Entity.EntityType; -import com.osmand.osm.OSMSettings.OSMTagKey; +import net.osmand.osm.Entity; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Entity.EntityId; +import net.osmand.osm.Entity.EntityType; +import net.osmand.osm.OSMSettings.OSMTagKey; + public abstract class MapObject implements Comparable { diff --git a/DataExtractionOSM/src/com/osmand/data/PostCode.java b/DataExtractionOSM/src/net/osmand/data/PostCode.java similarity index 92% rename from DataExtractionOSM/src/com/osmand/data/PostCode.java rename to DataExtractionOSM/src/net/osmand/data/PostCode.java index ead23df0f8..339f55e59b 100644 --- a/DataExtractionOSM/src/com/osmand/data/PostCode.java +++ b/DataExtractionOSM/src/net/osmand/data/PostCode.java @@ -1,4 +1,4 @@ -package com.osmand.data; +package net.osmand.data; import java.text.Collator; import java.util.Collection; diff --git a/DataExtractionOSM/src/com/osmand/data/Region.java b/DataExtractionOSM/src/net/osmand/data/Region.java similarity index 91% rename from DataExtractionOSM/src/com/osmand/data/Region.java rename to DataExtractionOSM/src/net/osmand/data/Region.java index 2f0e5fdeb6..9fa0e186f8 100644 --- a/DataExtractionOSM/src/com/osmand/data/Region.java +++ b/DataExtractionOSM/src/net/osmand/data/Region.java @@ -1,4 +1,4 @@ -package com.osmand.data; +package net.osmand.data; import java.text.Collator; import java.util.ArrayList; @@ -10,12 +10,13 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.osmand.Algoritms; -import com.osmand.data.City.CityType; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.io.OsmBaseStorage; +import net.osmand.Algoritms; +import net.osmand.data.City.CityType; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.io.OsmBaseStorage; + public class Region extends MapObject { private DataTileManager amenities = new DataTileManager(); diff --git a/DataExtractionOSM/src/com/osmand/data/Street.java b/DataExtractionOSM/src/net/osmand/data/Street.java similarity index 87% rename from DataExtractionOSM/src/com/osmand/data/Street.java rename to DataExtractionOSM/src/net/osmand/data/Street.java index 6e7fc62580..63367249a9 100644 --- a/DataExtractionOSM/src/com/osmand/data/Street.java +++ b/DataExtractionOSM/src/net/osmand/data/Street.java @@ -1,17 +1,18 @@ -package com.osmand.data; +package net.osmand.data; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import com.osmand.Algoritms; -import com.osmand.osm.Entity; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.Way; -import com.osmand.osm.OSMSettings.OSMTagKey; +import net.osmand.Algoritms; +import net.osmand.osm.Entity; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.Way; +import net.osmand.osm.OSMSettings.OSMTagKey; + public class Street extends MapObject { diff --git a/DataExtractionOSM/src/com/osmand/data/TransportRoute.java b/DataExtractionOSM/src/net/osmand/data/TransportRoute.java similarity index 89% rename from DataExtractionOSM/src/com/osmand/data/TransportRoute.java rename to DataExtractionOSM/src/net/osmand/data/TransportRoute.java index 81c16570ef..98b76bf5b0 100644 --- a/DataExtractionOSM/src/com/osmand/data/TransportRoute.java +++ b/DataExtractionOSM/src/net/osmand/data/TransportRoute.java @@ -1,12 +1,13 @@ -package com.osmand.data; +package net.osmand.data; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Relation; -import com.osmand.osm.Way; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Relation; +import net.osmand.osm.Way; + public class TransportRoute extends MapObject { private List ways; diff --git a/DataExtractionOSM/src/com/osmand/data/TransportStop.java b/DataExtractionOSM/src/net/osmand/data/TransportStop.java similarity index 65% rename from DataExtractionOSM/src/com/osmand/data/TransportStop.java rename to DataExtractionOSM/src/net/osmand/data/TransportStop.java index ef49eb61b5..e43f1ba3dd 100644 --- a/DataExtractionOSM/src/com/osmand/data/TransportStop.java +++ b/DataExtractionOSM/src/net/osmand/data/TransportStop.java @@ -1,6 +1,6 @@ -package com.osmand.data; +package net.osmand.data; -import com.osmand.osm.Entity; +import net.osmand.osm.Entity; public class TransportStop extends MapObject { diff --git a/DataExtractionOSM/src/com/osmand/data/index/DataIndexReader.java b/DataExtractionOSM/src/net/osmand/data/index/DataIndexReader.java similarity index 88% rename from DataExtractionOSM/src/com/osmand/data/index/DataIndexReader.java rename to DataExtractionOSM/src/net/osmand/data/index/DataIndexReader.java index 363c0c51e0..a3a7f1087c 100644 --- a/DataExtractionOSM/src/com/osmand/data/index/DataIndexReader.java +++ b/DataExtractionOSM/src/net/osmand/data/index/DataIndexReader.java @@ -1,4 +1,4 @@ -package com.osmand.data.index; +package net.osmand.data.index; import java.io.File; import java.sql.Connection; @@ -9,16 +9,17 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.List; +import net.osmand.LogUtil; +import net.osmand.data.Building; +import net.osmand.data.City; +import net.osmand.data.Street; +import net.osmand.data.City.CityType; +import net.osmand.data.index.IndexConstants.IndexBuildingTable; +import net.osmand.data.index.IndexConstants.IndexCityTable; +import net.osmand.data.index.IndexConstants.IndexStreetTable; + import org.apache.commons.logging.Log; -import com.osmand.LogUtil; -import com.osmand.data.Building; -import com.osmand.data.City; -import com.osmand.data.Street; -import com.osmand.data.City.CityType; -import com.osmand.data.index.IndexConstants.IndexBuildingTable; -import com.osmand.data.index.IndexConstants.IndexCityTable; -import com.osmand.data.index.IndexConstants.IndexStreetTable; public class DataIndexReader { private static final Log log = LogUtil.getLog(DataIndexReader.class); diff --git a/DataExtractionOSM/src/com/osmand/data/index/DataIndexWriter.java b/DataExtractionOSM/src/net/osmand/data/index/DataIndexWriter.java similarity index 92% rename from DataExtractionOSM/src/com/osmand/data/index/DataIndexWriter.java rename to DataExtractionOSM/src/net/osmand/data/index/DataIndexWriter.java index 69232fa23f..39fa4ec640 100644 --- a/DataExtractionOSM/src/com/osmand/data/index/DataIndexWriter.java +++ b/DataExtractionOSM/src/net/osmand/data/index/DataIndexWriter.java @@ -1,4 +1,4 @@ -package com.osmand.data.index; +package net.osmand.data.index; import java.io.File; import java.io.IOException; @@ -14,28 +14,29 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.osmand.LogUtil; +import net.osmand.data.Amenity; +import net.osmand.data.AmenityType; +import net.osmand.data.Building; +import net.osmand.data.City; +import net.osmand.data.Region; +import net.osmand.data.Street; +import net.osmand.data.TransportRoute; +import net.osmand.data.TransportStop; +import net.osmand.data.City.CityType; +import net.osmand.data.index.IndexConstants.IndexBuildingTable; +import net.osmand.data.index.IndexConstants.IndexCityTable; +import net.osmand.data.index.IndexConstants.IndexPoiTable; +import net.osmand.data.index.IndexConstants.IndexStreetNodeTable; +import net.osmand.data.index.IndexConstants.IndexStreetTable; +import net.osmand.data.index.IndexConstants.IndexTransportRoute; +import net.osmand.data.index.IndexConstants.IndexTransportRouteStop; +import net.osmand.data.index.IndexConstants.IndexTransportStop; +import net.osmand.osm.Node; +import net.osmand.osm.Way; + import org.apache.commons.logging.Log; -import com.osmand.LogUtil; -import com.osmand.data.Amenity; -import com.osmand.data.AmenityType; -import com.osmand.data.Building; -import com.osmand.data.City; -import com.osmand.data.Region; -import com.osmand.data.Street; -import com.osmand.data.TransportRoute; -import com.osmand.data.TransportStop; -import com.osmand.data.City.CityType; -import com.osmand.data.index.IndexConstants.IndexBuildingTable; -import com.osmand.data.index.IndexConstants.IndexCityTable; -import com.osmand.data.index.IndexConstants.IndexPoiTable; -import com.osmand.data.index.IndexConstants.IndexStreetNodeTable; -import com.osmand.data.index.IndexConstants.IndexStreetTable; -import com.osmand.data.index.IndexConstants.IndexTransportRoute; -import com.osmand.data.index.IndexConstants.IndexTransportRouteStop; -import com.osmand.data.index.IndexConstants.IndexTransportStop; -import com.osmand.osm.Node; -import com.osmand.osm.Way; public class DataIndexWriter { diff --git a/DataExtractionOSM/src/com/osmand/data/index/DownloaderIndexFromGoogleCode.java b/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java similarity index 95% rename from DataExtractionOSM/src/com/osmand/data/index/DownloaderIndexFromGoogleCode.java rename to DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java index 3d4f9fb2b1..a796596e63 100644 --- a/DataExtractionOSM/src/com/osmand/data/index/DownloaderIndexFromGoogleCode.java +++ b/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java @@ -1,4 +1,4 @@ -package com.osmand.data.index; +package net.osmand.data.index; import java.io.BufferedReader; import java.io.IOException; @@ -9,9 +9,10 @@ import java.net.URL; import java.util.Map; import java.util.TreeMap; +import net.osmand.LogUtil; + import org.apache.commons.logging.Log; -import com.osmand.LogUtil; public class DownloaderIndexFromGoogleCode { diff --git a/DataExtractionOSM/src/com/osmand/data/index/GoogleCodeUploadIndex.java b/DataExtractionOSM/src/net/osmand/data/index/GoogleCodeUploadIndex.java similarity index 98% rename from DataExtractionOSM/src/com/osmand/data/index/GoogleCodeUploadIndex.java rename to DataExtractionOSM/src/net/osmand/data/index/GoogleCodeUploadIndex.java index 2b68e7de96..0252f64bd3 100644 --- a/DataExtractionOSM/src/com/osmand/data/index/GoogleCodeUploadIndex.java +++ b/DataExtractionOSM/src/net/osmand/data/index/GoogleCodeUploadIndex.java @@ -3,7 +3,7 @@ * * This code belongs to Jonathan Fuerth */ -package com.osmand.data.index; +package net.osmand.data.index; import java.io.BufferedInputStream; import java.io.FileInputStream; @@ -14,10 +14,11 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; +import net.osmand.Base64; +import net.osmand.LogUtil; + import org.apache.commons.logging.Log; -import com.osmand.Base64; -import com.osmand.LogUtil; /** diff --git a/DataExtractionOSM/src/com/osmand/data/index/IndexBatchCreator.java b/DataExtractionOSM/src/net/osmand/data/index/IndexBatchCreator.java similarity index 95% rename from DataExtractionOSM/src/com/osmand/data/index/IndexBatchCreator.java rename to DataExtractionOSM/src/net/osmand/data/index/IndexBatchCreator.java index 95158e164e..f70eeb8525 100644 --- a/DataExtractionOSM/src/com/osmand/data/index/IndexBatchCreator.java +++ b/DataExtractionOSM/src/net/osmand/data/index/IndexBatchCreator.java @@ -1,4 +1,4 @@ -package com.osmand.data.index; +package net.osmand.data.index; import java.io.File; import java.io.FileInputStream; @@ -16,14 +16,15 @@ import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import net.osmand.Algoritms; +import net.osmand.LogUtil; +import net.osmand.data.Region; +import net.osmand.data.preparation.DataExtraction; +import net.osmand.data.preparation.IndexCreator; +import net.osmand.impl.ConsoleProgressImplementation; + import org.apache.commons.logging.Log; -import com.osmand.Algoritms; -import com.osmand.LogUtil; -import com.osmand.data.Region; -import com.osmand.data.preparation.DataExtraction; -import com.osmand.data.preparation.IndexCreator; -import com.osmand.impl.ConsoleProgressImplementation; public class IndexBatchCreator { // config params @@ -83,7 +84,8 @@ public class IndexBatchCreator { // "Maryland", "Massachusetts", "Michigan", // TODO // "Minnesota", "Mississippi", "Missouri", -// "Montana", "Nebraska", "Nevada", "New_Hampshire", "New_Jersey", "New_Mexico", +// "Montana", +// "Nebraska", "Nevada", "New_Hampshire", "New_Jersey", "New_Mexico", // "New_York", "North_Carolina", "North_Dakota", "Ohio", "Oklahoma", "Oregon", // "Pennsylvania", "Rhode Island", "South Carolina", "South Dakota", "Tennessee", // "Texas", "Utah", "Vermont", "Virginia", "Washington", "West_Virginia", "Wisconsin", "Wyoming", diff --git a/DataExtractionOSM/src/com/osmand/data/index/IndexConstants.java b/DataExtractionOSM/src/net/osmand/data/index/IndexConstants.java similarity index 95% rename from DataExtractionOSM/src/com/osmand/data/index/IndexConstants.java rename to DataExtractionOSM/src/net/osmand/data/index/IndexConstants.java index b07f968314..3975195515 100644 --- a/DataExtractionOSM/src/com/osmand/data/index/IndexConstants.java +++ b/DataExtractionOSM/src/net/osmand/data/index/IndexConstants.java @@ -1,4 +1,4 @@ -package com.osmand.data.index; +package net.osmand.data.index; public class IndexConstants { diff --git a/DataExtractionOSM/src/com/osmand/data/preparation/DataExtraction.java b/DataExtractionOSM/src/net/osmand/data/preparation/DataExtraction.java similarity index 94% rename from DataExtractionOSM/src/com/osmand/data/preparation/DataExtraction.java rename to DataExtractionOSM/src/net/osmand/data/preparation/DataExtraction.java index e91df0249e..15ec9daca9 100644 --- a/DataExtractionOSM/src/com/osmand/data/preparation/DataExtraction.java +++ b/DataExtractionOSM/src/net/osmand/data/preparation/DataExtraction.java @@ -1,4 +1,4 @@ -package com.osmand.data.preparation; +package net.osmand.data.preparation; import java.io.File; import java.io.FileInputStream; @@ -23,6 +23,32 @@ import java.util.Map.Entry; import javax.xml.parsers.ParserConfigurationException; +import net.osmand.Algoritms; +import net.osmand.IProgress; +import net.osmand.data.Amenity; +import net.osmand.data.Building; +import net.osmand.data.City; +import net.osmand.data.DataTileManager; +import net.osmand.data.MapObject; +import net.osmand.data.Region; +import net.osmand.data.Street; +import net.osmand.data.TransportRoute; +import net.osmand.data.TransportStop; +import net.osmand.data.City.CityType; +import net.osmand.data.index.IndexConstants; +import net.osmand.impl.ConsoleProgressImplementation; +import net.osmand.osm.Entity; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.Relation; +import net.osmand.osm.Way; +import net.osmand.osm.Entity.EntityId; +import net.osmand.osm.Entity.EntityType; +import net.osmand.osm.OSMSettings.OSMTagKey; +import net.osmand.osm.io.IOsmStorageFilter; +import net.osmand.osm.io.OsmBaseStorage; +import net.osmand.swing.DataExtractionSettings; import net.sf.junidecode.Junidecode; import org.apache.commons.logging.Log; @@ -30,32 +56,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.tools.bzip2.CBZip2InputStream; import org.xml.sax.SAXException; -import com.osmand.Algoritms; -import com.osmand.IProgress; -import com.osmand.data.Amenity; -import com.osmand.data.Building; -import com.osmand.data.City; -import com.osmand.data.DataTileManager; -import com.osmand.data.MapObject; -import com.osmand.data.Region; -import com.osmand.data.Street; -import com.osmand.data.TransportRoute; -import com.osmand.data.TransportStop; -import com.osmand.data.City.CityType; -import com.osmand.data.index.IndexConstants; -import com.osmand.impl.ConsoleProgressImplementation; -import com.osmand.osm.Entity; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.Relation; -import com.osmand.osm.Way; -import com.osmand.osm.Entity.EntityId; -import com.osmand.osm.Entity.EntityType; -import com.osmand.osm.OSMSettings.OSMTagKey; -import com.osmand.osm.io.IOsmStorageFilter; -import com.osmand.osm.io.OsmBaseStorage; -import com.osmand.swing.DataExtractionSettings; /** diff --git a/DataExtractionOSM/src/com/osmand/data/preparation/IndexCreator.java b/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java similarity index 93% rename from DataExtractionOSM/src/com/osmand/data/preparation/IndexCreator.java rename to DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java index 6dc8b90ec6..f695950ef7 100644 --- a/DataExtractionOSM/src/com/osmand/data/preparation/IndexCreator.java +++ b/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java @@ -1,4 +1,4 @@ -package com.osmand.data.preparation; +package net.osmand.data.preparation; import java.io.File; import java.io.FileInputStream; @@ -22,6 +22,37 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; +import net.osmand.Algoritms; +import net.osmand.IProgress; +import net.osmand.data.Amenity; +import net.osmand.data.Building; +import net.osmand.data.City; +import net.osmand.data.DataTileManager; +import net.osmand.data.MapObject; +import net.osmand.data.TransportRoute; +import net.osmand.data.TransportStop; +import net.osmand.data.City.CityType; +import net.osmand.data.index.DataIndexWriter; +import net.osmand.data.index.IndexConstants; +import net.osmand.data.index.IndexConstants.IndexBuildingTable; +import net.osmand.data.index.IndexConstants.IndexCityTable; +import net.osmand.data.index.IndexConstants.IndexStreetNodeTable; +import net.osmand.data.index.IndexConstants.IndexStreetTable; +import net.osmand.data.index.IndexConstants.IndexTransportRoute; +import net.osmand.data.index.IndexConstants.IndexTransportRouteStop; +import net.osmand.data.index.IndexConstants.IndexTransportStop; +import net.osmand.osm.Entity; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.Relation; +import net.osmand.osm.Way; +import net.osmand.osm.Entity.EntityId; +import net.osmand.osm.Entity.EntityType; +import net.osmand.osm.OSMSettings.OSMTagKey; +import net.osmand.osm.io.IOsmStorageFilter; +import net.osmand.osm.io.OsmBaseStorage; +import net.osmand.swing.DataExtractionSettings; import net.sf.junidecode.Junidecode; import org.apache.commons.logging.Log; @@ -29,38 +60,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.tools.bzip2.CBZip2InputStream; import org.xml.sax.SAXException; -import com.osmand.Algoritms; -import com.osmand.IProgress; -import com.osmand.data.Amenity; -import com.osmand.data.Building; -import com.osmand.data.City; -import com.osmand.data.DataTileManager; -import com.osmand.data.MapObject; -import com.osmand.data.TransportRoute; -import com.osmand.data.TransportStop; -import com.osmand.data.City.CityType; -import com.osmand.data.index.DataIndexWriter; -import com.osmand.data.index.IndexConstants; -import com.osmand.data.index.IndexConstants.IndexBuildingTable; -import com.osmand.data.index.IndexConstants.IndexCityTable; -import com.osmand.data.index.IndexConstants.IndexStreetNodeTable; -import com.osmand.data.index.IndexConstants.IndexStreetTable; -import com.osmand.data.index.IndexConstants.IndexTransportRoute; -import com.osmand.data.index.IndexConstants.IndexTransportRouteStop; -import com.osmand.data.index.IndexConstants.IndexTransportStop; -import com.osmand.impl.ConsoleProgressImplementation; -import com.osmand.osm.Entity; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.Relation; -import com.osmand.osm.Way; -import com.osmand.osm.Entity.EntityId; -import com.osmand.osm.Entity.EntityType; -import com.osmand.osm.OSMSettings.OSMTagKey; -import com.osmand.osm.io.IOsmStorageFilter; -import com.osmand.osm.io.OsmBaseStorage; -import com.osmand.swing.DataExtractionSettings; /** * That data extraction has aim, diff --git a/DataExtractionOSM/src/com/osmand/data/preparation/MapTileDownloader.java b/DataExtractionOSM/src/net/osmand/data/preparation/MapTileDownloader.java similarity index 94% rename from DataExtractionOSM/src/com/osmand/data/preparation/MapTileDownloader.java rename to DataExtractionOSM/src/net/osmand/data/preparation/MapTileDownloader.java index 3ca8c639c8..d0024ec276 100644 --- a/DataExtractionOSM/src/com/osmand/data/preparation/MapTileDownloader.java +++ b/DataExtractionOSM/src/net/osmand/data/preparation/MapTileDownloader.java @@ -1,4 +1,4 @@ -package com.osmand.data.preparation; +package net.osmand.data.preparation; import java.io.BufferedInputStream; import java.io.File; @@ -16,11 +16,12 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import net.osmand.Algoritms; +import net.osmand.LogUtil; +import net.osmand.Version; + import org.apache.commons.logging.Log; -import com.osmand.Algoritms; -import com.osmand.LogUtil; -import com.osmand.Version; public class MapTileDownloader { // Download manager tile settings diff --git a/DataExtractionOSM/src/com/osmand/impl/ConsoleProgressImplementation.java b/DataExtractionOSM/src/net/osmand/impl/ConsoleProgressImplementation.java similarity index 91% rename from DataExtractionOSM/src/com/osmand/impl/ConsoleProgressImplementation.java rename to DataExtractionOSM/src/net/osmand/impl/ConsoleProgressImplementation.java index 9793aa25a8..0d728b86d9 100644 --- a/DataExtractionOSM/src/com/osmand/impl/ConsoleProgressImplementation.java +++ b/DataExtractionOSM/src/net/osmand/impl/ConsoleProgressImplementation.java @@ -1,12 +1,13 @@ -package com.osmand.impl; +package net.osmand.impl; import java.text.MessageFormat; +import net.osmand.Algoritms; +import net.osmand.IProgress; +import net.osmand.LogUtil; + import org.apache.commons.logging.Log; -import com.osmand.Algoritms; -import com.osmand.IProgress; -import com.osmand.LogUtil; public class ConsoleProgressImplementation implements IProgress { public static double deltaPercentsToPrint = 3.5; diff --git a/DataExtractionOSM/src/com/osmand/map/IMapLocationListener.java b/DataExtractionOSM/src/net/osmand/map/IMapLocationListener.java similarity index 81% rename from DataExtractionOSM/src/com/osmand/map/IMapLocationListener.java rename to DataExtractionOSM/src/net/osmand/map/IMapLocationListener.java index 2c635a6368..bb39937ab8 100644 --- a/DataExtractionOSM/src/com/osmand/map/IMapLocationListener.java +++ b/DataExtractionOSM/src/net/osmand/map/IMapLocationListener.java @@ -1,4 +1,4 @@ -package com.osmand.map; +package net.osmand.map; public interface IMapLocationListener { void locationChanged(double newLatitude, double newLongitude, Object source); diff --git a/DataExtractionOSM/src/com/osmand/map/ITileSource.java b/DataExtractionOSM/src/net/osmand/map/ITileSource.java similarity index 88% rename from DataExtractionOSM/src/com/osmand/map/ITileSource.java rename to DataExtractionOSM/src/net/osmand/map/ITileSource.java index 791cba4247..9ac9c0e6b1 100644 --- a/DataExtractionOSM/src/com/osmand/map/ITileSource.java +++ b/DataExtractionOSM/src/net/osmand/map/ITileSource.java @@ -1,4 +1,4 @@ -package com.osmand.map; +package net.osmand.map; public interface ITileSource { diff --git a/DataExtractionOSM/src/com/osmand/map/TileSourceManager.java b/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java similarity index 96% rename from DataExtractionOSM/src/com/osmand/map/TileSourceManager.java rename to DataExtractionOSM/src/net/osmand/map/TileSourceManager.java index b52985176e..fcda89e621 100644 --- a/DataExtractionOSM/src/com/osmand/map/TileSourceManager.java +++ b/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java @@ -1,4 +1,4 @@ -package com.osmand.map; +package net.osmand.map; import java.io.BufferedReader; import java.io.File; @@ -9,11 +9,12 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.regex.Pattern; +import net.osmand.Algoritms; +import net.osmand.LogUtil; +import net.osmand.osm.MapUtils; + import org.apache.commons.logging.Log; -import com.osmand.Algoritms; -import com.osmand.LogUtil; -import com.osmand.osm.MapUtils; public class TileSourceManager { diff --git a/DataExtractionOSM/src/com/osmand/osm/Entity.java b/DataExtractionOSM/src/net/osmand/osm/Entity.java similarity index 92% rename from DataExtractionOSM/src/com/osmand/osm/Entity.java rename to DataExtractionOSM/src/net/osmand/osm/Entity.java index 8d0b1b0ef6..3a7533dcbd 100644 --- a/DataExtractionOSM/src/com/osmand/osm/Entity.java +++ b/DataExtractionOSM/src/net/osmand/osm/Entity.java @@ -1,11 +1,12 @@ -package com.osmand.osm; +package net.osmand.osm; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import com.osmand.osm.OSMSettings.OSMTagKey; +import net.osmand.osm.OSMSettings.OSMTagKey; + public abstract class Entity { public enum EntityType { diff --git a/DataExtractionOSM/src/com/osmand/osm/EntityInfo.java b/DataExtractionOSM/src/net/osmand/osm/EntityInfo.java similarity index 92% rename from DataExtractionOSM/src/com/osmand/osm/EntityInfo.java rename to DataExtractionOSM/src/net/osmand/osm/EntityInfo.java index a75b363261..3ab349b1af 100644 --- a/DataExtractionOSM/src/com/osmand/osm/EntityInfo.java +++ b/DataExtractionOSM/src/net/osmand/osm/EntityInfo.java @@ -1,4 +1,4 @@ -package com.osmand.osm; +package net.osmand.osm; /** * Additional entity info diff --git a/DataExtractionOSM/src/com/osmand/osm/LatLon.java b/DataExtractionOSM/src/net/osmand/osm/LatLon.java similarity index 94% rename from DataExtractionOSM/src/com/osmand/osm/LatLon.java rename to DataExtractionOSM/src/net/osmand/osm/LatLon.java index 2c0450773a..05021fe8fb 100644 --- a/DataExtractionOSM/src/com/osmand/osm/LatLon.java +++ b/DataExtractionOSM/src/net/osmand/osm/LatLon.java @@ -1,4 +1,4 @@ -package com.osmand.osm; +package net.osmand.osm; public class LatLon { private final double longitude; diff --git a/DataExtractionOSM/src/com/osmand/osm/MapUtils.java b/DataExtractionOSM/src/net/osmand/osm/MapUtils.java similarity index 96% rename from DataExtractionOSM/src/com/osmand/osm/MapUtils.java rename to DataExtractionOSM/src/net/osmand/osm/MapUtils.java index 714ca85ae5..ee36b80a07 100644 --- a/DataExtractionOSM/src/com/osmand/osm/MapUtils.java +++ b/DataExtractionOSM/src/net/osmand/osm/MapUtils.java @@ -1,4 +1,4 @@ -package com.osmand.osm; +package net.osmand.osm; import java.text.MessageFormat; import java.util.ArrayList; @@ -7,8 +7,9 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import com.osmand.Messages; -import com.osmand.data.MapObject; +import net.osmand.Messages; +import net.osmand.data.MapObject; + /** * This utility class includes : diff --git a/DataExtractionOSM/src/com/osmand/osm/Node.java b/DataExtractionOSM/src/net/osmand/osm/Node.java similarity index 91% rename from DataExtractionOSM/src/com/osmand/osm/Node.java rename to DataExtractionOSM/src/net/osmand/osm/Node.java index 908b277463..75795fd930 100644 --- a/DataExtractionOSM/src/com/osmand/osm/Node.java +++ b/DataExtractionOSM/src/net/osmand/osm/Node.java @@ -1,4 +1,4 @@ -package com.osmand.osm; +package net.osmand.osm; import java.util.Map; diff --git a/DataExtractionOSM/src/com/osmand/osm/OSMSettings.java b/DataExtractionOSM/src/net/osmand/osm/OSMSettings.java similarity index 95% rename from DataExtractionOSM/src/com/osmand/osm/OSMSettings.java rename to DataExtractionOSM/src/net/osmand/osm/OSMSettings.java index a33471fce0..b0a30a1545 100644 --- a/DataExtractionOSM/src/com/osmand/osm/OSMSettings.java +++ b/DataExtractionOSM/src/net/osmand/osm/OSMSettings.java @@ -1,4 +1,4 @@ -package com.osmand.osm; +package net.osmand.osm; public class OSMSettings { diff --git a/DataExtractionOSM/src/com/osmand/osm/OpeningHoursParser.java b/DataExtractionOSM/src/net/osmand/osm/OpeningHoursParser.java similarity index 95% rename from DataExtractionOSM/src/com/osmand/osm/OpeningHoursParser.java rename to DataExtractionOSM/src/net/osmand/osm/OpeningHoursParser.java index 759ab11e89..0dc7c3cd8b 100644 --- a/DataExtractionOSM/src/com/osmand/osm/OpeningHoursParser.java +++ b/DataExtractionOSM/src/net/osmand/osm/OpeningHoursParser.java @@ -1,4 +1,4 @@ -package com.osmand.osm; +package net.osmand.osm; import java.util.ArrayList; import java.util.Calendar; diff --git a/DataExtractionOSM/src/com/osmand/osm/Relation.java b/DataExtractionOSM/src/net/osmand/osm/Relation.java similarity index 94% rename from DataExtractionOSM/src/com/osmand/osm/Relation.java rename to DataExtractionOSM/src/net/osmand/osm/Relation.java index 745d94d2ce..d925a98519 100644 --- a/DataExtractionOSM/src/com/osmand/osm/Relation.java +++ b/DataExtractionOSM/src/net/osmand/osm/Relation.java @@ -1,4 +1,4 @@ -package com.osmand.osm; +package net.osmand.osm; import java.util.ArrayList; import java.util.Collection; diff --git a/DataExtractionOSM/src/com/osmand/osm/Way.java b/DataExtractionOSM/src/net/osmand/osm/Way.java similarity index 93% rename from DataExtractionOSM/src/com/osmand/osm/Way.java rename to DataExtractionOSM/src/net/osmand/osm/Way.java index fe6c5952f8..dd7dc76adf 100644 --- a/DataExtractionOSM/src/com/osmand/osm/Way.java +++ b/DataExtractionOSM/src/net/osmand/osm/Way.java @@ -1,4 +1,4 @@ -package com.osmand.osm; +package net.osmand.osm; import java.util.ArrayList; import java.util.Collections; diff --git a/DataExtractionOSM/src/com/osmand/osm/io/IOsmStorageFilter.java b/DataExtractionOSM/src/net/osmand/osm/io/IOsmStorageFilter.java similarity index 56% rename from DataExtractionOSM/src/com/osmand/osm/io/IOsmStorageFilter.java rename to DataExtractionOSM/src/net/osmand/osm/io/IOsmStorageFilter.java index 460146dd6e..67acc8a47f 100644 --- a/DataExtractionOSM/src/com/osmand/osm/io/IOsmStorageFilter.java +++ b/DataExtractionOSM/src/net/osmand/osm/io/IOsmStorageFilter.java @@ -1,7 +1,7 @@ -package com.osmand.osm.io; +package net.osmand.osm.io; -import com.osmand.osm.Entity; -import com.osmand.osm.Entity.EntityId; +import net.osmand.osm.Entity; +import net.osmand.osm.Entity.EntityId; public interface IOsmStorageFilter { diff --git a/DataExtractionOSM/src/com/osmand/osm/io/OsmBaseStorage.java b/DataExtractionOSM/src/net/osmand/osm/io/OsmBaseStorage.java similarity index 94% rename from DataExtractionOSM/src/com/osmand/osm/io/OsmBaseStorage.java rename to DataExtractionOSM/src/net/osmand/osm/io/OsmBaseStorage.java index 28e76777f3..2e25d85bc4 100644 --- a/DataExtractionOSM/src/com/osmand/osm/io/OsmBaseStorage.java +++ b/DataExtractionOSM/src/net/osmand/osm/io/OsmBaseStorage.java @@ -1,4 +1,4 @@ -package com.osmand.osm.io; +package net.osmand.osm.io; import java.io.IOException; import java.io.InputStream; @@ -13,18 +13,19 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import net.osmand.IProgress; +import net.osmand.osm.Entity; +import net.osmand.osm.EntityInfo; +import net.osmand.osm.Node; +import net.osmand.osm.Relation; +import net.osmand.osm.Way; +import net.osmand.osm.Entity.EntityId; +import net.osmand.osm.Entity.EntityType; + import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import com.osmand.IProgress; -import com.osmand.osm.Entity; -import com.osmand.osm.EntityInfo; -import com.osmand.osm.Node; -import com.osmand.osm.Relation; -import com.osmand.osm.Way; -import com.osmand.osm.Entity.EntityId; -import com.osmand.osm.Entity.EntityType; public class OsmBaseStorage extends DefaultHandler { diff --git a/DataExtractionOSM/src/com/osmand/osm/io/OsmBoundsFilter.java b/DataExtractionOSM/src/net/osmand/osm/io/OsmBoundsFilter.java similarity index 83% rename from DataExtractionOSM/src/com/osmand/osm/io/OsmBoundsFilter.java rename to DataExtractionOSM/src/net/osmand/osm/io/OsmBoundsFilter.java index 95e5e03372..7db54a677a 100644 --- a/DataExtractionOSM/src/com/osmand/osm/io/OsmBoundsFilter.java +++ b/DataExtractionOSM/src/net/osmand/osm/io/OsmBoundsFilter.java @@ -1,8 +1,8 @@ -package com.osmand.osm.io; +package net.osmand.osm.io; -import com.osmand.osm.Entity; -import com.osmand.osm.Node; -import com.osmand.osm.Entity.EntityId; +import net.osmand.osm.Entity; +import net.osmand.osm.Node; +import net.osmand.osm.Entity.EntityId; public class OsmBoundsFilter implements IOsmStorageFilter { diff --git a/DataExtractionOSM/src/com/osmand/osm/io/OsmStorageWriter.java b/DataExtractionOSM/src/net/osmand/osm/io/OsmStorageWriter.java similarity index 77% rename from DataExtractionOSM/src/com/osmand/osm/io/OsmStorageWriter.java rename to DataExtractionOSM/src/net/osmand/osm/io/OsmStorageWriter.java index c3562e2887..e4f07bbd40 100644 --- a/DataExtractionOSM/src/com/osmand/osm/io/OsmStorageWriter.java +++ b/DataExtractionOSM/src/net/osmand/osm/io/OsmStorageWriter.java @@ -1,26 +1,26 @@ -package com.osmand.osm.io; +package net.osmand.osm.io; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_CHANGESET; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_ID; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_K; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_LAT; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_LON; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_REF; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_ROLE; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_TIMESTAMP; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_TYPE; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_UID; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_USER; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_V; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_VERSION; -import static com.osmand.osm.io.OsmBaseStorage.ATTR_VISIBLE; -import static com.osmand.osm.io.OsmBaseStorage.ELEM_MEMBER; -import static com.osmand.osm.io.OsmBaseStorage.ELEM_ND; -import static com.osmand.osm.io.OsmBaseStorage.ELEM_NODE; -import static com.osmand.osm.io.OsmBaseStorage.ELEM_OSM; -import static com.osmand.osm.io.OsmBaseStorage.ELEM_RELATION; -import static com.osmand.osm.io.OsmBaseStorage.ELEM_TAG; -import static com.osmand.osm.io.OsmBaseStorage.ELEM_WAY; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_CHANGESET; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_ID; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_K; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_LAT; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_LON; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_REF; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_ROLE; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_TIMESTAMP; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_TYPE; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_UID; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_USER; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_V; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_VERSION; +import static net.osmand.osm.io.OsmBaseStorage.ATTR_VISIBLE; +import static net.osmand.osm.io.OsmBaseStorage.ELEM_MEMBER; +import static net.osmand.osm.io.OsmBaseStorage.ELEM_ND; +import static net.osmand.osm.io.OsmBaseStorage.ELEM_NODE; +import static net.osmand.osm.io.OsmBaseStorage.ELEM_OSM; +import static net.osmand.osm.io.OsmBaseStorage.ELEM_RELATION; +import static net.osmand.osm.io.OsmBaseStorage.ELEM_TAG; +import static net.osmand.osm.io.OsmBaseStorage.ELEM_WAY; import java.io.IOException; import java.io.OutputStream; @@ -34,14 +34,15 @@ import java.util.Map.Entry; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import com.osmand.Algoritms; -import com.osmand.data.MapObject; -import com.osmand.osm.Entity; -import com.osmand.osm.EntityInfo; -import com.osmand.osm.Node; -import com.osmand.osm.Relation; -import com.osmand.osm.Way; -import com.osmand.osm.Entity.EntityId; +import net.osmand.Algoritms; +import net.osmand.data.MapObject; +import net.osmand.osm.Entity; +import net.osmand.osm.EntityInfo; +import net.osmand.osm.Node; +import net.osmand.osm.Relation; +import net.osmand.osm.Way; +import net.osmand.osm.Entity.EntityId; + import com.sun.org.apache.xerces.internal.impl.PropertyManager; import com.sun.xml.internal.stream.writers.XMLStreamWriterImpl; diff --git a/DataExtractionOSM/src/com/osmand/osm/io/OsmVersionNotSupported.java b/DataExtractionOSM/src/net/osmand/osm/io/OsmVersionNotSupported.java similarity index 84% rename from DataExtractionOSM/src/com/osmand/osm/io/OsmVersionNotSupported.java rename to DataExtractionOSM/src/net/osmand/osm/io/OsmVersionNotSupported.java index 6aa28aabf1..1719158da4 100644 --- a/DataExtractionOSM/src/com/osmand/osm/io/OsmVersionNotSupported.java +++ b/DataExtractionOSM/src/net/osmand/osm/io/OsmVersionNotSupported.java @@ -1,4 +1,4 @@ -package com.osmand.osm.io; +package net.osmand.osm.io; import org.xml.sax.SAXException; diff --git a/DataExtractionOSM/src/com/osmand/osm/util/AHSupermarketResolver.java b/DataExtractionOSM/src/net/osmand/osm/util/AHSupermarketResolver.java similarity index 93% rename from DataExtractionOSM/src/com/osmand/osm/util/AHSupermarketResolver.java rename to DataExtractionOSM/src/net/osmand/osm/util/AHSupermarketResolver.java index 42756fe538..3df3812877 100644 --- a/DataExtractionOSM/src/com/osmand/osm/util/AHSupermarketResolver.java +++ b/DataExtractionOSM/src/net/osmand/osm/util/AHSupermarketResolver.java @@ -1,4 +1,4 @@ -package com.osmand.osm.util; +package net.osmand.osm.util; import java.awt.BorderLayout; import java.awt.Color; @@ -24,6 +24,25 @@ import javax.swing.JMenuBar; import javax.swing.UIManager; import javax.xml.stream.XMLStreamException; +import net.osmand.Algoritms; +import net.osmand.data.DataTileManager; +import net.osmand.impl.ConsoleProgressImplementation; +import net.osmand.osm.Entity; +import net.osmand.osm.EntityInfo; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.OpeningHoursParser; +import net.osmand.osm.Entity.EntityId; +import net.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule; +import net.osmand.osm.OpeningHoursParser.OpeningHoursRule; +import net.osmand.osm.io.IOsmStorageFilter; +import net.osmand.osm.io.OsmBaseStorage; +import net.osmand.osm.io.OsmStorageWriter; +import net.osmand.swing.DataExtractionSettings; +import net.osmand.swing.MapPanel; +import net.osmand.swing.MapPointsLayer; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONArray; @@ -32,24 +51,6 @@ import org.json.JSONObject; import org.json.JSONTokener; import org.xml.sax.SAXException; -import com.osmand.Algoritms; -import com.osmand.data.DataTileManager; -import com.osmand.impl.ConsoleProgressImplementation; -import com.osmand.osm.Entity; -import com.osmand.osm.EntityInfo; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.OpeningHoursParser; -import com.osmand.osm.Entity.EntityId; -import com.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule; -import com.osmand.osm.OpeningHoursParser.OpeningHoursRule; -import com.osmand.osm.io.IOsmStorageFilter; -import com.osmand.osm.io.OsmBaseStorage; -import com.osmand.osm.io.OsmStorageWriter; -import com.osmand.swing.DataExtractionSettings; -import com.osmand.swing.MapPanel; -import com.osmand.swing.MapPointsLayer; /** * Downloads list of Albert Heijn supermarkets and converts them to a map. diff --git a/DataExtractionOSM/src/com/osmand/osm/util/MinskTransReader.java b/DataExtractionOSM/src/net/osmand/osm/util/MinskTransReader.java similarity index 93% rename from DataExtractionOSM/src/com/osmand/osm/util/MinskTransReader.java rename to DataExtractionOSM/src/net/osmand/osm/util/MinskTransReader.java index 4e45485666..175f04fb9f 100644 --- a/DataExtractionOSM/src/com/osmand/osm/util/MinskTransReader.java +++ b/DataExtractionOSM/src/net/osmand/osm/util/MinskTransReader.java @@ -1,4 +1,4 @@ -package com.osmand.osm.util; +package net.osmand.osm.util; import java.awt.BorderLayout; import java.awt.Container; @@ -28,25 +28,26 @@ import javax.swing.JMenuBar; import javax.swing.UIManager; import javax.xml.stream.XMLStreamException; +import net.osmand.data.DataTileManager; +import net.osmand.impl.ConsoleProgressImplementation; +import net.osmand.osm.Entity; +import net.osmand.osm.EntityInfo; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.Relation; +import net.osmand.osm.Way; +import net.osmand.osm.Entity.EntityId; +import net.osmand.osm.Entity.EntityType; +import net.osmand.osm.OSMSettings.OSMTagKey; +import net.osmand.osm.io.IOsmStorageFilter; +import net.osmand.osm.io.OsmBaseStorage; +import net.osmand.osm.io.OsmStorageWriter; +import net.osmand.swing.DataExtractionSettings; +import net.osmand.swing.MapPanel; + import org.xml.sax.SAXException; -import com.osmand.data.DataTileManager; -import com.osmand.impl.ConsoleProgressImplementation; -import com.osmand.osm.Entity; -import com.osmand.osm.EntityInfo; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.Relation; -import com.osmand.osm.Way; -import com.osmand.osm.Entity.EntityId; -import com.osmand.osm.Entity.EntityType; -import com.osmand.osm.OSMSettings.OSMTagKey; -import com.osmand.osm.io.IOsmStorageFilter; -import com.osmand.osm.io.OsmBaseStorage; -import com.osmand.osm.io.OsmStorageWriter; -import com.osmand.swing.DataExtractionSettings; -import com.osmand.swing.MapPanel; public class MinskTransReader { // Routes RouteNum; Authority; City; Transport; Operator; ValidityPeriods; SpecialDates;RouteTag;RouteType;Commercial;RouteName;Weekdays;RouteID;Entry;RouteStops;Datestart diff --git a/DataExtractionOSM/src/com/osmand/swing/DataExtractionSettings.java b/DataExtractionOSM/src/net/osmand/swing/DataExtractionSettings.java similarity index 95% rename from DataExtractionOSM/src/com/osmand/swing/DataExtractionSettings.java rename to DataExtractionOSM/src/net/osmand/swing/DataExtractionSettings.java index 3c09409e0d..fdfd682545 100644 --- a/DataExtractionOSM/src/com/osmand/swing/DataExtractionSettings.java +++ b/DataExtractionOSM/src/net/osmand/swing/DataExtractionSettings.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.Rectangle; import java.io.File; @@ -6,7 +6,8 @@ import java.util.ArrayList; import java.util.List; import java.util.prefs.Preferences; -import com.osmand.osm.LatLon; +import net.osmand.osm.LatLon; + public class DataExtractionSettings { diff --git a/DataExtractionOSM/src/com/osmand/swing/MapInformationLayer.java b/DataExtractionOSM/src/net/osmand/swing/MapInformationLayer.java similarity index 95% rename from DataExtractionOSM/src/com/osmand/swing/MapInformationLayer.java rename to DataExtractionOSM/src/net/osmand/swing/MapInformationLayer.java index 5f532ecdc6..f6a5ab4934 100644 --- a/DataExtractionOSM/src/com/osmand/swing/MapInformationLayer.java +++ b/DataExtractionOSM/src/net/osmand/swing/MapInformationLayer.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.Color; import java.awt.Component; diff --git a/DataExtractionOSM/src/com/osmand/swing/MapPanel.java b/DataExtractionOSM/src/net/osmand/swing/MapPanel.java similarity index 93% rename from DataExtractionOSM/src/com/osmand/swing/MapPanel.java rename to DataExtractionOSM/src/net/osmand/swing/MapPanel.java index 2b97295c4b..fb3a40fc9a 100644 --- a/DataExtractionOSM/src/com/osmand/swing/MapPanel.java +++ b/DataExtractionOSM/src/net/osmand/swing/MapPanel.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.BorderLayout; import java.awt.Color; @@ -37,21 +37,22 @@ import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.UIManager; +import net.osmand.Algoritms; +import net.osmand.LogUtil; +import net.osmand.data.DataTileManager; +import net.osmand.data.preparation.MapTileDownloader; +import net.osmand.data.preparation.MapTileDownloader.DownloadRequest; +import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; +import net.osmand.map.IMapLocationListener; +import net.osmand.map.ITileSource; +import net.osmand.map.TileSourceManager; +import net.osmand.map.TileSourceManager.TileSourceTemplate; +import net.osmand.osm.Entity; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; + import org.apache.commons.logging.Log; -import com.osmand.Algoritms; -import com.osmand.LogUtil; -import com.osmand.data.DataTileManager; -import com.osmand.data.preparation.MapTileDownloader; -import com.osmand.data.preparation.MapTileDownloader.DownloadRequest; -import com.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; -import com.osmand.map.IMapLocationListener; -import com.osmand.map.ITileSource; -import com.osmand.map.TileSourceManager; -import com.osmand.map.TileSourceManager.TileSourceTemplate; -import com.osmand.osm.Entity; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; public class MapPanel extends JPanel implements IMapDownloaderCallback { diff --git a/DataExtractionOSM/src/com/osmand/swing/MapPanelLayer.java b/DataExtractionOSM/src/net/osmand/swing/MapPanelLayer.java similarity index 83% rename from DataExtractionOSM/src/com/osmand/swing/MapPanelLayer.java rename to DataExtractionOSM/src/net/osmand/swing/MapPanelLayer.java index e31e65e34f..1b19ab0d1a 100644 --- a/DataExtractionOSM/src/com/osmand/swing/MapPanelLayer.java +++ b/DataExtractionOSM/src/net/osmand/swing/MapPanelLayer.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.Graphics; diff --git a/DataExtractionOSM/src/com/osmand/swing/MapPointsLayer.java b/DataExtractionOSM/src/net/osmand/swing/MapPointsLayer.java similarity index 92% rename from DataExtractionOSM/src/com/osmand/swing/MapPointsLayer.java rename to DataExtractionOSM/src/net/osmand/swing/MapPointsLayer.java index f672919b81..0f962437b7 100644 --- a/DataExtractionOSM/src/com/osmand/swing/MapPointsLayer.java +++ b/DataExtractionOSM/src/net/osmand/swing/MapPointsLayer.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.Color; import java.awt.Graphics; @@ -11,11 +11,12 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.osmand.data.DataTileManager; -import com.osmand.osm.Entity; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.Way; +import net.osmand.data.DataTileManager; +import net.osmand.osm.Entity; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.Way; + public class MapPointsLayer implements MapPanelLayer { diff --git a/DataExtractionOSM/src/com/osmand/swing/MapRouterLayer.java b/DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java similarity index 94% rename from DataExtractionOSM/src/com/osmand/swing/MapRouterLayer.java rename to DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java index b1fbecc144..8e1a5404fc 100644 --- a/DataExtractionOSM/src/com/osmand/swing/MapRouterLayer.java +++ b/DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.Color; import java.awt.Graphics; @@ -20,6 +20,12 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import net.osmand.ExceptionHandler; +import net.osmand.data.DataTileManager; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Way; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -27,11 +33,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.osmand.ExceptionHandler; -import com.osmand.data.DataTileManager; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Way; public class MapRouterLayer implements MapPanelLayer { @@ -172,7 +173,7 @@ public class MapRouterLayer implements MapPanelLayer { try { double lon = Double.parseDouble(coordinate.substring(0, s)); double lat = Double.parseDouble(coordinate.substring(s + 1)); - w.addNode(new com.osmand.osm.Node(lat, lon, -1)); + w.addNode(new net.osmand.osm.Node(lat, lon, -1)); } catch (NumberFormatException e) { } } @@ -239,7 +240,7 @@ public class MapRouterLayer implements MapPanelLayer { try { double lon = Double.parseDouble(item.getAttribute("lon")); double lat = Double.parseDouble(item.getAttribute("lat")); - w.addNode(new com.osmand.osm.Node(lat, lon, -1)); + w.addNode(new net.osmand.osm.Node(lat, lon, -1)); } catch (NumberFormatException e) { } } diff --git a/DataExtractionOSM/src/com/osmand/swing/NewTileSourceDialog.java b/DataExtractionOSM/src/net/osmand/swing/NewTileSourceDialog.java similarity index 95% rename from DataExtractionOSM/src/com/osmand/swing/NewTileSourceDialog.java rename to DataExtractionOSM/src/net/osmand/swing/NewTileSourceDialog.java index ffad54c258..755f97ac37 100644 --- a/DataExtractionOSM/src/com/osmand/swing/NewTileSourceDialog.java +++ b/DataExtractionOSM/src/net/osmand/swing/NewTileSourceDialog.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.Component; import java.awt.Dimension; @@ -22,10 +22,11 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; +import net.osmand.Algoritms; +import net.osmand.LogUtil; + import org.apache.commons.logging.Log; -import com.osmand.Algoritms; -import com.osmand.LogUtil; public class NewTileSourceDialog extends JDialog { diff --git a/DataExtractionOSM/src/com/osmand/swing/OsmExtractionPreferencesDialog.java b/DataExtractionOSM/src/net/osmand/swing/OsmExtractionPreferencesDialog.java similarity index 96% rename from DataExtractionOSM/src/com/osmand/swing/OsmExtractionPreferencesDialog.java rename to DataExtractionOSM/src/net/osmand/swing/OsmExtractionPreferencesDialog.java index fad7a1474f..dfb365040d 100644 --- a/DataExtractionOSM/src/com/osmand/swing/OsmExtractionPreferencesDialog.java +++ b/DataExtractionOSM/src/net/osmand/swing/OsmExtractionPreferencesDialog.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.Component; import java.awt.Dimension; diff --git a/DataExtractionOSM/src/com/osmand/swing/OsmExtractionUI.java b/DataExtractionOSM/src/net/osmand/swing/OsmExtractionUI.java similarity index 94% rename from DataExtractionOSM/src/com/osmand/swing/OsmExtractionUI.java rename to DataExtractionOSM/src/net/osmand/swing/OsmExtractionUI.java index c4dfdaed8f..1cd769cdf0 100644 --- a/DataExtractionOSM/src/com/osmand/swing/OsmExtractionUI.java +++ b/DataExtractionOSM/src/net/osmand/swing/OsmExtractionUI.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.BorderLayout; import java.awt.Container; @@ -57,37 +57,38 @@ import javax.swing.tree.TreeCellEditor; import javax.swing.tree.TreePath; import javax.xml.stream.XMLStreamException; +import net.osmand.Algoritms; +import net.osmand.ExceptionHandler; +import net.osmand.data.Amenity; +import net.osmand.data.AmenityType; +import net.osmand.data.Building; +import net.osmand.data.City; +import net.osmand.data.DataTileManager; +import net.osmand.data.MapObject; +import net.osmand.data.Region; +import net.osmand.data.Street; +import net.osmand.data.TransportRoute; +import net.osmand.data.TransportStop; +import net.osmand.data.City.CityType; +import net.osmand.data.index.DataIndexWriter; +import net.osmand.data.preparation.DataExtraction; +import net.osmand.map.IMapLocationListener; +import net.osmand.map.ITileSource; +import net.osmand.osm.Entity; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.Way; +import net.osmand.osm.io.IOsmStorageFilter; +import net.osmand.osm.io.OsmBoundsFilter; +import net.osmand.osm.io.OsmStorageWriter; +import net.osmand.swing.MapPanel.MapSelectionArea; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tools.bzip2.CBZip2OutputStream; import org.xml.sax.SAXException; -import com.osmand.Algoritms; -import com.osmand.ExceptionHandler; -import com.osmand.data.Amenity; -import com.osmand.data.AmenityType; -import com.osmand.data.Building; -import com.osmand.data.City; -import com.osmand.data.DataTileManager; -import com.osmand.data.MapObject; -import com.osmand.data.Region; -import com.osmand.data.Street; -import com.osmand.data.TransportRoute; -import com.osmand.data.TransportStop; -import com.osmand.data.City.CityType; -import com.osmand.data.index.DataIndexWriter; -import com.osmand.data.preparation.DataExtraction; -import com.osmand.map.IMapLocationListener; -import com.osmand.map.ITileSource; -import com.osmand.osm.Entity; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.Way; -import com.osmand.osm.io.IOsmStorageFilter; -import com.osmand.osm.io.OsmBoundsFilter; -import com.osmand.osm.io.OsmStorageWriter; -import com.osmand.swing.MapPanel.MapSelectionArea; public class OsmExtractionUI implements IMapLocationListener { diff --git a/DataExtractionOSM/src/com/osmand/swing/ProgressDialog.java b/DataExtractionOSM/src/net/osmand/swing/ProgressDialog.java similarity index 94% rename from DataExtractionOSM/src/com/osmand/swing/ProgressDialog.java rename to DataExtractionOSM/src/net/osmand/swing/ProgressDialog.java index e22b67b449..e0bb79a5e5 100644 --- a/DataExtractionOSM/src/com/osmand/swing/ProgressDialog.java +++ b/DataExtractionOSM/src/net/osmand/swing/ProgressDialog.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.BorderLayout; import java.awt.Component; @@ -12,10 +12,11 @@ import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.SwingUtilities; +import net.osmand.IProgress; +import net.osmand.LogUtil; + import org.apache.commons.logging.Log; -import com.osmand.IProgress; -import com.osmand.LogUtil; public class ProgressDialog extends JDialog implements IProgress { diff --git a/DataExtractionOSM/src/com/osmand/swing/SQLiteBigPlanetIndex.java b/DataExtractionOSM/src/net/osmand/swing/SQLiteBigPlanetIndex.java similarity index 92% rename from DataExtractionOSM/src/com/osmand/swing/SQLiteBigPlanetIndex.java rename to DataExtractionOSM/src/net/osmand/swing/SQLiteBigPlanetIndex.java index b938eefa8b..dc89f98321 100644 --- a/DataExtractionOSM/src/com/osmand/swing/SQLiteBigPlanetIndex.java +++ b/DataExtractionOSM/src/net/osmand/swing/SQLiteBigPlanetIndex.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.io.File; import java.io.FileInputStream; @@ -9,11 +9,12 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; +import net.osmand.LogUtil; +import net.osmand.map.ITileSource; +import net.osmand.map.TileSourceManager.TileSourceTemplate; + import org.apache.commons.logging.Log; -import com.osmand.LogUtil; -import com.osmand.map.ITileSource; -import com.osmand.map.TileSourceManager.TileSourceTemplate; public class SQLiteBigPlanetIndex { private static final Log log = LogUtil.getLog(SQLiteBigPlanetIndex.class); diff --git a/DataExtractionOSM/src/com/osmand/swing/TileBundleDownloadDialog.java b/DataExtractionOSM/src/net/osmand/swing/TileBundleDownloadDialog.java similarity index 93% rename from DataExtractionOSM/src/com/osmand/swing/TileBundleDownloadDialog.java rename to DataExtractionOSM/src/net/osmand/swing/TileBundleDownloadDialog.java index aef78cf6be..d14d42d91c 100644 --- a/DataExtractionOSM/src/com/osmand/swing/TileBundleDownloadDialog.java +++ b/DataExtractionOSM/src/net/osmand/swing/TileBundleDownloadDialog.java @@ -1,4 +1,4 @@ -package com.osmand.swing; +package net.osmand.swing; import java.awt.BorderLayout; import java.awt.Component; @@ -24,13 +24,14 @@ import javax.swing.SpinnerNumberModel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import com.osmand.ExceptionHandler; -import com.osmand.data.preparation.MapTileDownloader; -import com.osmand.data.preparation.MapTileDownloader.DownloadRequest; -import com.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; -import com.osmand.map.ITileSource; -import com.osmand.osm.MapUtils; -import com.osmand.swing.MapPanel.MapSelectionArea; +import net.osmand.ExceptionHandler; +import net.osmand.data.preparation.MapTileDownloader; +import net.osmand.data.preparation.MapTileDownloader.DownloadRequest; +import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; +import net.osmand.map.ITileSource; +import net.osmand.osm.MapUtils; +import net.osmand.swing.MapPanel.MapSelectionArea; + public class TileBundleDownloadDialog extends JDialog {