From 3e295b3280da4bc879486fb094484db95cd0dfc0 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 1 Dec 2010 22:22:20 +0000
Subject: [PATCH] fix small issues

git-svn-id: https://osmand.googlecode.com/svn/trunk@742 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
---
 DataExtractionOSM/build.xml                   | 14 +++++++--
 .../src/net/osmand/data/index/batch.xml       | 29 +++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/DataExtractionOSM/build.xml b/DataExtractionOSM/build.xml
index 18c3d53a39..775190f0d8 100644
--- a/DataExtractionOSM/build.xml
+++ b/DataExtractionOSM/build.xml
@@ -28,10 +28,10 @@
 				<include name="**/*.java" />
 			</fileset>
 		</jar>
-		
+
 		<delete file="MANIFEST.MF" />
 	</target>
-	
+
 	<target name="build" depends="jar">
 		<delete dir="build"/>
 		<copy todir="build">
@@ -45,6 +45,16 @@
 				<include name="inspector.sh"/>
 				<exclude name="lib/h2*"/>
 			</fileset>
+			<fileset dir="src/net/osmand/osm/">
+				<include name="rendering_types.xml"/>
+			</fileset>
+			<fileset dir=".">
+				<include name="batch_indexing.bat"/>
+				<include name="batch_indexing.sh"/>
+			</fileset>
+			<fileset dir="src/net/osmand/data/index">
+				<include name="batch.xml" />
+			</fileset>
 		</copy>
 		<zip destfile="build.zip">
 			<fileset dir="build">
diff --git a/DataExtractionOSM/src/net/osmand/data/index/batch.xml b/DataExtractionOSM/src/net/osmand/data/index/batch.xml
index 33232a81ce..ea2a48c57d 100644
--- a/DataExtractionOSM/src/net/osmand/data/index/batch.xml
+++ b/DataExtractionOSM/src/net/osmand/data/index/batch.xml
@@ -76,6 +76,35 @@
 			-->
 		</regions>
 
+		<!-- GREAT BRITAIN (WITHOUT ENGLAND!) -->
+		<regions siteToDownload="http://download.geofabrik.de/osm/europe/great_britain/{0}.osm.pbf" region_prefix="GB_" region_suffix="_Europe">
+			<region name="scotland" esize="23"/>		
+			<region name="wales" esize="10"/>
+
+		</regions>
+
+		<!-- ENGLAND -->
+		<regions siteToDownload="http://download.geofabrik.de/osm/europe/great_britain/england/{0}.osm.pbf" region_prefix="GB_England_" region_suffix="_Europe">
+		<region name="buckinghamshire" esize="3"/>
+		<region name="cambridgeshire" esize="4"/>
+		<region name="cumbria" esize="4"/>
+		<region name="east_yorkshire_with_hull" esize="2"/>
+		<region name="essex" esize="10"/>
+		<region name="herefordshire" esize="1"/>
+		<region name="kent" esize="7"/>
+		<region name="lancashire" esize="5"/>
+		<region name="leicestershire" esize="3"/>
+		<region name="norfolk" esize="5"/>
+		<region name="nottinghamshire" esize="5"/>
+		<region name="oxfordshire" esize="4"/>
+		<region name="shropshire" esize="2"/>
+		<region name="somerset" esize="3"/>
+		<region name="suffolk" esize="3"/>
+		<region name="surrey" esize="8"/>
+		<region name="wiltshire" esize="3"/>
+
+		</regions>
+
 		<!-- FRANCE -->
 		<regions siteToDownload="http://download.geofabrik.de/osm/europe/france/{0}.osm.bz2" region_prefix="France_" 
 			skip="true" region_suffix="_Europe">