From 19fcfda5b4bf4995f03d04a0b07c153d22b28dca Mon Sep 17 00:00:00 2001
From: Pavol Zibrita <pavol.zibrita@gmail.com>
Date: Sun, 19 Aug 2012 12:17:53 +0200
Subject: [PATCH] move address creation files to separate package

---
 .../src/net/osmand/data/preparation/IndexCreator.java    | 1 +
 .../preparation/{ => address}/CachedDBStreetDAO.java     | 2 +-
 .../data/preparation/{ => address}/DBStreetDAO.java      | 4 +++-
 .../preparation/{ => address}/IndexAddressCreator.java   | 9 +++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)
 rename DataExtractionOSM/src/net/osmand/data/preparation/{ => address}/CachedDBStreetDAO.java (98%)
 rename DataExtractionOSM/src/net/osmand/data/preparation/{ => address}/DBStreetDAO.java (98%)
 rename DataExtractionOSM/src/net/osmand/data/preparation/{ => address}/IndexAddressCreator.java (99%)

diff --git a/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java b/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java
index 1b0500113d..321b611a08 100644
--- a/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java
+++ b/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java
@@ -16,6 +16,7 @@ import net.osmand.Algoritms;
 import net.osmand.IProgress;
 import net.osmand.data.IndexConstants;
 import net.osmand.data.preparation.OsmDbAccessor.OsmDbVisitor;
+import net.osmand.data.preparation.address.IndexAddressCreator;
 import net.osmand.impl.ConsoleProgressImplementation;
 import net.osmand.osm.Entity;
 import net.osmand.osm.Entity.EntityId;
diff --git a/DataExtractionOSM/src/net/osmand/data/preparation/CachedDBStreetDAO.java b/DataExtractionOSM/src/net/osmand/data/preparation/address/CachedDBStreetDAO.java
similarity index 98%
rename from DataExtractionOSM/src/net/osmand/data/preparation/CachedDBStreetDAO.java
rename to DataExtractionOSM/src/net/osmand/data/preparation/address/CachedDBStreetDAO.java
index 4cbfde0eff..5541511b97 100644
--- a/DataExtractionOSM/src/net/osmand/data/preparation/CachedDBStreetDAO.java
+++ b/DataExtractionOSM/src/net/osmand/data/preparation/address/CachedDBStreetDAO.java
@@ -1,4 +1,4 @@
-package net.osmand.data.preparation;
+package net.osmand.data.preparation.address;
 
 import gnu.trove.set.hash.TLongHashSet;
 
diff --git a/DataExtractionOSM/src/net/osmand/data/preparation/DBStreetDAO.java b/DataExtractionOSM/src/net/osmand/data/preparation/address/DBStreetDAO.java
similarity index 98%
rename from DataExtractionOSM/src/net/osmand/data/preparation/DBStreetDAO.java
rename to DataExtractionOSM/src/net/osmand/data/preparation/address/DBStreetDAO.java
index df4ada0baf..21b11d0026 100644
--- a/DataExtractionOSM/src/net/osmand/data/preparation/DBStreetDAO.java
+++ b/DataExtractionOSM/src/net/osmand/data/preparation/address/DBStreetDAO.java
@@ -1,4 +1,4 @@
-package net.osmand.data.preparation;
+package net.osmand.data.preparation.address;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -9,6 +9,8 @@ import java.util.Set;
 
 import net.osmand.data.Building;
 import net.osmand.data.City;
+import net.osmand.data.preparation.AbstractIndexPartCreator;
+import net.osmand.data.preparation.DBDialect;
 import net.osmand.osm.Entity;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.Node;
diff --git a/DataExtractionOSM/src/net/osmand/data/preparation/IndexAddressCreator.java b/DataExtractionOSM/src/net/osmand/data/preparation/address/IndexAddressCreator.java
similarity index 99%
rename from DataExtractionOSM/src/net/osmand/data/preparation/IndexAddressCreator.java
rename to DataExtractionOSM/src/net/osmand/data/preparation/address/IndexAddressCreator.java
index 0ab96205e8..9b45135a79 100644
--- a/DataExtractionOSM/src/net/osmand/data/preparation/IndexAddressCreator.java
+++ b/DataExtractionOSM/src/net/osmand/data/preparation/address/IndexAddressCreator.java
@@ -1,4 +1,4 @@
-package net.osmand.data.preparation;
+package net.osmand.data.preparation.address;
 
 import gnu.trove.map.hash.TLongObjectHashMap;
 import gnu.trove.set.hash.TLongHashSet;
@@ -36,7 +36,12 @@ import net.osmand.data.MapObject;
 import net.osmand.data.Multipolygon;
 import net.osmand.data.Street;
 import net.osmand.data.WayBoundary;
-import net.osmand.data.preparation.DBStreetDAO.SimpleStreet;
+import net.osmand.data.preparation.AbstractIndexPartCreator;
+import net.osmand.data.preparation.BinaryFileReference;
+import net.osmand.data.preparation.BinaryMapIndexWriter;
+import net.osmand.data.preparation.DBDialect;
+import net.osmand.data.preparation.OsmDbAccessorContext;
+import net.osmand.data.preparation.address.DBStreetDAO.SimpleStreet;
 import net.osmand.osm.Entity;
 import net.osmand.osm.Entity.EntityId;
 import net.osmand.osm.LatLon;