From cf6fc437415fa3a2b28943ea6dc77dc788fd658a Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 4 Jan 2012 21:05:31 +0100
Subject: [PATCH] Remove deprecated batch indexing API and update new one

---
 DataExtractionOSM/batch_indexing.bat          |   5 -
 DataExtractionOSM/batch_indexing.sh           |   5 -
 DataExtractionOSM/build.xml                   |  30 +-
 .../src/net/osmand/data/index/regions.xml     | 484 ------------------
 build-scripts/indexes-regions.xml             | 484 ------------------
 .../regions/3_indexes_northamerica.xml        |  18 +-
 build-scripts/regions/indexes.xml             |   4 +-
 7 files changed, 4 insertions(+), 1026 deletions(-)
 delete mode 100644 DataExtractionOSM/batch_indexing.bat
 delete mode 100644 DataExtractionOSM/batch_indexing.sh
 delete mode 100644 DataExtractionOSM/src/net/osmand/data/index/regions.xml
 delete mode 100644 build-scripts/indexes-regions.xml

diff --git a/DataExtractionOSM/batch_indexing.bat b/DataExtractionOSM/batch_indexing.bat
deleted file mode 100644
index 35f9668045..0000000000
--- a/DataExtractionOSM/batch_indexing.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-REM the JVM. With the below settings the heap size (Available memory for the application)
-REM will range from 64 megabyte up to 512 megabyte.
-
-
-start java.exe -Djava.util.logging.config.file=logging.properties -Xms64M -Xmx720M -cp "./OsmAndMapCreator.jar;./lib/*.jar" net.osmand.data.index.IndexBatchCreator ./batch.xml
\ No newline at end of file
diff --git a/DataExtractionOSM/batch_indexing.sh b/DataExtractionOSM/batch_indexing.sh
deleted file mode 100644
index 0dd3163ef0..0000000000
--- a/DataExtractionOSM/batch_indexing.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file will start the Osm Extraction UI with custom memory settings for
-# the JVM. With the below settings the heap size (Available memory for the application)
-# will range from 64 megabyte up to 512 megabyte.
-
-java -Djava.util.logging.config.file=logging.properties -Xms64M -Xmx720M -cp "./OsmAndMapCreator.jar:./lib/*.jar" net.osmand.data.index.IndexBatchCreator ./batch.xml 
diff --git a/DataExtractionOSM/build.xml b/DataExtractionOSM/build.xml
index b0d266a2b4..2807e317cc 100644
--- a/DataExtractionOSM/build.xml
+++ b/DataExtractionOSM/build.xml
@@ -92,9 +92,7 @@
 				<include name="rendering_types.xml"/>
 			</fileset>
 			<fileset dir=".">
-				<include name="batch_indexing.bat"/>
-				<include name="batch_indexing.sh"/>
-				<include name="../build-scripts/regions.xml" />
+				<include name="../build-scripts/regions/indexes.xml" />
 			</fileset>
 			<fileset dir="src/net/osmand/data/index">
 				<include name="batch.xml" />
@@ -107,30 +105,4 @@
 		<delete file="OsmAndMapCreator.jar" />
 	</target>
 
-	<!-- NOT USED now could be deleted -->
-	<typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="ant.lib.path" />
-
-	<target name="update">
-		<svn svnkit="true">
-			<update dir="." revision="HEAD" />
-			<info target="." />
-		</svn>
-		<echo>Updated to revision: ${svn.info.rev}</echo>
-	</target>
-
-	<target name="nightbuild" depends="clean,update,compile,build">
-		<move file="build.zip" tofile="${file.to.upload}"/>
-		<ftp action="del" server="download.osmand.net" userid="${ftp.user}" password="${ftp.password}">
-			<fileset>
-				<include name="night-builds/${file.to.upload}" />
-			</fileset>
-		</ftp>
-
-
-		<ftp server="download.osmand.net" remotedir="night-builds" userid="${ftp.user}" password="${ftp.password}" depends="yes">
-			<fileset dir=".">
-				<include name="${file.to.upload}" />
-			</fileset>
-		</ftp>
-	</target>
 </project>
diff --git a/DataExtractionOSM/src/net/osmand/data/index/regions.xml b/DataExtractionOSM/src/net/osmand/data/index/regions.xml
deleted file mode 100644
index 1c6911f780..0000000000
--- a/DataExtractionOSM/src/net/osmand/data/index/regions.xml
+++ /dev/null
@@ -1,484 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<regions_list>
-		<!--  in order to delete remove all skip -->
-		<!--  Overview of regions -->
-		<!-- 1. Europe : 1.1 Great Britain 1.2 France 1.3  Germany -->
-		<!-- 2. Asia : 2.1 Russia and regions 2.2 Asia from geofabric 2.3 Rest asia from cloudmade  -->
-		<!-- 3. North america : 3.1 USA 3.2 Canada 3.3 Other north america + mexico  -->
-		<!-- 4. Central america  -->
-		<!-- 5. South america  -->
-		<!-- 6. Africa  -->
-		<!-- 7. Australia  -->
-		
-        <!-- Countries to download from geofabrik or cloudmade server -->
-		<!-- 1. EUROPE [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/{0}.osm.pbf" region_prefix="" skip="true" region_suffix="_Europe">
-			<region name="albania" esize="6" />
-			<region name="andorra" esize="1" />
-			<region name="austria" esize="110" />
-			<region name="belarus" esize="45" />
-			<region name="belgium" esize="55" />
-			<region name="bosnia-herzegovina" esize="5" />
-			<region name="bulgaria" esize="15" />
-			<region name="croatia" esize="15" />
-			<region name="cyprus" esize="6" />
-			<region name="czech_republic" esize="180"/>
-			<region name="denmark" esize="80" />
-			<region name="estonia" esize="38" />
-			<region name="faroe_islands" esize="2" />
-			<region name="finland" esize="85" />
-			<region name="greece" esize="25" />
-			<region name="hungary" esize="20" />
-			<region name="iceland" esize="10" />
-			<region name="ireland" esize="30" />
-			<region name="isle_of_man" esize="1" />
-			<region name="italy" esize="255"/>
-			<region name="kosovo" esize="10" />
-			<region name="latvia" esize="10" />
-			<region name="liechtenstein" esize="1" />
-			<region name="lithuania" esize="10" />
-			<region name="luxembourg" esize="10" />
-			<region name="macedonia" esize="10" />
-			<region name="malta" esize="1" />
-			<region name="moldova" esize="5" />
-			<region name="monaco" esize="1" />
-			<region name="montenegro" esize="2" />
-			<region name="netherlands" esize="450" cityAdminLevel="10"/>
-			<region name="norway" esize="65" />
-			<region name="poland" esize="90" />
-			<region name="portugal" esize="15" />
-			<region name="romania" esize="30" />
-			<region name="serbia" esize="15" />
-			<region name="slovakia" esize="80" cityAdminLevel="6"/>
-			<region name="slovenia" esize="15" />
-			<region name="spain" esize="150" />
-			<region name="sweden" esize="90" />
-			<region name="switzerland" esize="90" />
-			<region name="turkey" esize="20" />
-			<region name="ukraine" esize="25" />
-		</regions>
-
-		<!-- 1.1 GREAT BRITAIN [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/great_britain/{0}.osm.pbf" region_prefix="GB_" skip="true" region_suffix="_Europe">
-			<region name="scotland" esize=""/>		
-			<region name="wales" esize="10"/>
-			<region name="england" esize="230"/>
-		</regions>
-
-		<!-- 1.2 FRANCE [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/france/{0}.osm.pbf" region_prefix="France_" 
-			skip="true" region_suffix="_Europe">
-			<region name="alsace" esize="" />
-			<region name="aquitaine" esize="" />
-			<region name="auvergne" esize="" />
-			<region name="basse-normandie" esize="" />
-			<region name="bourgogne" esize="" />
-			<region name="bretagne" esize="" />
-			<region name="centre" esize="" />
-			<region name="champagne-ardenne" esize="" />
-			<region name="corse" esize="" />
-			<region name="franche-comte" esize="" />
-			<region name="haute-normandie" esize="" />
-			<region name="ile-de-france" esize="" />
-			<region name="languedoc-roussillon" esize="" />
-			<region name="limousin" esize="" />
-			<region name="lorraine" esize="" />
-			<region name="midi-pyrenees" esize="" />
-			<region name="nord-pas-de-calais" esize="" />
-			<region name="pays-de-la-loire" esize="" />
-			<region name="picardie" esize="" />
-			<region name="poitou-charentes" esize="" />
-			<region name="provence-alpes-cote-d-azur" esize="" />
-			<region name="rhone-alpes" esize="" />
-		</regions>
-
-		<!-- 1.3 GERMANY [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/germany/{0}.osm.pbf" region_prefix="Germany_" skip="true" 
-			region_suffix="_Europe">
-			<region name="baden-wuerttemberg" esize="" cityAdminLevel="7"/>
-			<region name="bayern" esize="" cityAdminLevel="7"/>
-			<region name="berlin" esize="" cityAdminLevel="7"/>
-			<region name="brandenburg" esize="" cityAdminLevel="7"/>
-			<region name="bremen" esize="" cityAdminLevel="7"/>
-			<region name="hamburg" esize="" cityAdminLevel="7"/>
-			<region name="hessen" esize="" cityAdminLevel="7"/>
-			<region name="mecklenburg-vorpommern" esize="" cityAdminLevel="7"/>
-			<region name="niedersachsen" esize="" cityAdminLevel="7"/>
-			<region name="nordrhein-westfalen" esize="" cityAdminLevel="7"/>
-			<region name="rheinland-pfalz" esize="" cityAdminLevel="7"/>
-			<region name="saarland" esize="" cityAdminLevel="7"/>
-			<region name="sachsen-anhalt" esize="" cityAdminLevel="7"/>
-			<region name="sachsen" esize="" cityAdminLevel="7"/>
-			<region name="schleswig-holstein" esize="" cityAdminLevel="7"/>
-			<region name="thueringen" esize="" cityAdminLevel="7"/>
-		</regions>
-
- 	        <regions siteToDownload="http://planet.openstreetmap.nl/planet-{0}-latest.osm.pbf" region_prefix="" skip="true" region_suffix="_Europe">
-                       <region name="benelux" esize="6" />
-                </regions>
-
-        <!-- 2. ASIA -->
-		<!-- 2.1 Russia [GIS-LAB.INFO] -->
-		<regions siteToDownload="http://gis-lab.info/data/osm/{0}/{0}.osm.bz2" region_prefix="Russia_"  skip="true" region_suffix="_Asia">
-			<region name="adygeya" esize=""/>
-			<region name="altay" esize=""/>
-			<region name="altayskiy" esize=""/>
-			<region name="amur" esize=""/>
-			<region name="arkhan" esize=""/>
-			<region name="astrakhan" esize=""/>
-			<region name="bashkir" esize=""/>
-			<region name="belgorod" esize=""/>
-			<region name="bryansk" esize=""/> 
-			<region name="buryat" esize=""/>
-			<region name="chechen" esize=""/>
-			<region name="chel" esize=""/>
-			<region name="chukot" esize=""/>
-			<region name="chuvash" esize=""/>
-			<region name="dagestan" esize=""/>
-			<region name="evrey" esize=""/>
-			<region name="ingush" esize=""/>
-			<region name="irkutsk" esize=""/>
-			<region name="ivanov" esize=""/>
-			<region name="kabardin" esize=""/>
-			<region name="kalinin" esize=""/>
-			<region name="kalmyk" esize=""/>
-			<region name="kaluzh" esize=""/>
-			<region name="kamch" esize=""/>
-			<region name="karach" esize=""/>
-			<region name="karel" esize=""/>
-			<region name="kemerovo" esize=""/>
-			<region name="khabar" esize=""/>
-			<region name="khakas" esize=""/>
-			<region name="khanty" esize=""/>
-			<region name="kirov" esize=""/>
-			<region name="komi" esize=""/>
-			<region name="kostrom" esize=""/>
-			<region name="krasnodar" esize=""/>
-			<region name="krasnoyarsk" esize=""/>
-			<region name="kurgan" esize=""/>
-			<region name="kursk" esize=""/>
-			<region name="leningrad" esize=""/>
-			<region name="lipetsk" esize=""/>
-			<region name="magadan" esize=""/>
-			<region name="mariyel" esize=""/>
-			<region name="mordov" esize=""/>
-			<region name="moscow" esize=""/>
-			<region name="mosobl" esize=""/>
-			<region name="murmansk" esize=""/>
-			<region name="nenec" esize=""/>
-			<region name="nizhegorod" esize=""/>
-			<region name="novgorod" esize=""/>
-			<region name="novosib" esize=""/>
-			<region name="omsk" esize=""/>
-			<region name="orenburg" esize=""/>
-			<region name="orlovsk" esize=""/>
-			<region name="osetiya" esize=""/>
-			<region name="penz" esize=""/>
-			<region name="perm" esize=""/>
-			<region name="prim" esize=""/>
-			<region name="pskov" esize=""/>
-			<region name="rostov" esize=""/>
-			<region name="ryazan" esize=""/>
-			<region name="sakhalin" esize=""/>
-			<region name="samar" esize=""/>
-			<region name="saratov" esize=""/>
-			<region name="smol" esize=""/>
-			<region name="stavrop" esize=""/>
-			<region name="stpeter" esize=""/>
-			<region name="sverdl" esize=""/>
-			<region name="tambov" esize=""/>
-			<region name="tatar" esize=""/>
-			<region name="tomsk" esize=""/>
-			<region name="tul" esize=""/>
-			<region name="tumen" esize=""/>
-			<region name="tver" esize=""/>
-			<region name="tyva" esize=""/>
-			<region name="udmurt" esize=""/>
-			<region name="ulyan" esize=""/>
-			<region name="vladimir" esize=""/>
-			<region name="volgograd" esize=""/>
-			<region name="vologda" esize=""/>
-			<region name="voronezh" esize=""/>
-			<region name="yakut" esize=""/>
-			<region name="yamal" esize=""/>
-			<region name="yarosl" esize=""/>
-			<region name="zabaikal" esize=""/>
-		</regions>
-		
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/northern_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia"  skip="true">
-      			<region name="russia" esize="820"/> 
-	        </regions>
-		
-		<!-- 2.2 ASIA-AVAILABLE ON GEOFABRIK.DE [SOURCE: GEOFABRIK.DE] (REST OF ASIA IS BELOW FROM CLOUDMADE.COM) -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/asia/{0}.osm.pbf" region_prefix="" region_suffix="_Asia" skip="true">
-			<region name="azerbaijan" esize="15"/>
-			<region name="china" esize="4"/>
-			<region name="gaza" esize="3"/>
-			<region name="india" esize="1"/>
-			<region name="indonesia" esize="3"/>
-			<region name="iraq" esize="1"/>
-			<region name="israel_and_palestine" esize="1"/>
-			<region name="japan" esize="1"/>
-			<region name="kazakhstan" esize="1"/>
-			<region name="kyrgyzstan" esize="1"/>
-			<region name="mongolia" esize="1"/>
-			<region name="pakistan" esize="1"/>
-			<region name="philippines" esize="1"/>
-			<region name="taiwan" esize="1"/>
-			<region name="turkmenistan" esize="1"/>
-			<region name="uzbekistan" esize="1"/>
-		</regions>
-	    
-		<!-- 2.3 CENTRAL ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/central_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="true">
-			<region name="tajikistan" esize="3"/>
-		</regions>
-		
-		<!-- 2.3 EASTERN ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/eastern_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="true">
-			<region name="hong_kong" esize="67"/>
-			<region name="macao" esize="1"/>
-			<region name="north_korea" esize="5"/>
-			<region name="south_korea" esize="25"/>
-		</regions>	
-		
-		<!-- 2.3 SOUTH-EASTERN ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/south-eastern_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="true">
-			<region name="brunei" esize="1"/>
-			<region name="cambodia" esize="2"/>
-			<region name="christmas_island" esize="1"/>
-			<region name="east_timor" esize="1"/>
-			<region name="laos" esize="3"/>
-			<region name="malaysia" esize="7"/>
-			<region name="myanmar" esize="7"/>
-			<region name="singapore" esize="2"/>
-			<region name="spratly_islands" esize="1"/>
-			<region name="thailand" esize="12"/>
-			<region name="vietnam" esize=""/>
-		</regions>	
-			
-		<!-- 2.3 SOUTHERN ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/southern_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="true">
-			<region name="afghanistan" esize="6"/>
-			<region name="bangladesh" esize="3"/>
-			<region name="bhutan" esize="1"/>
-			<region name="british_indian_ocean_territory" esize="1"/>  
-			<region name="iran" esize="11"/>
-			<region name="maldives" esize="1"/>
-			<region name="nepal" esize="2"/>
-			<region name="sri_lanka" esize="2"/>			
-		</regions>		
-			
-		<!-- 2.3 WESTERN ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/western_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="true">
-			<region name="armenia" esize="1"/>
-			<region name="bahrain" esize="1"/>
-			<region name="caspian_sea" esize="1"/>
-			<region name="cyprus" esize="1"/>
-			<region name="georgia" esize="1"/>
-			<region name="jordan" esize="1"/>
-			<region name="kuwait" esize="1"/>
-			<region name="lebanon" esize="1"/>
-			<region name="oman" esize="1"/>
-			<region name="qatar" esize="1"/>
-			<region name="saudi_arabia" esize="1"/>
-			<region name="syria" esize="1"/>
-			<region name="turkey" esize="1"/>
-			<region name="united_arab_emirates" esize="1"/>
-			<region name="yemen" esize="1"/>
-		</regions>			
-		
-		
-		<!-- 3. North America  -->		
-		<!-- 3.1 USA-AVAILABLE ON GEOFABRIK.DE [SOURCE: GEOFABRIK.DE] (REST OF USA IS BELOW FROM CLOUDMADE.COM) -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/north-america/us/{0}.osm.pbf" skip="true" region_prefix="US_" region_suffix="_NorthAmerica">
-			<region name="alabama" esize=""/>
-			<region name="alaska" esize=""/>
-			<region name="arizona" esize=""/>
-			<region name="arkansas" esize=""/>
-			<region name="california" esize=""/>
-			<region name="colorado" esize=""/>
-			<region name="connecticut" esize=""/>
-			<region name="delaware" esize=""/>
-			<region name="district-of-columbia" esize=""/>
-			<region name="florida" esize=""/>
-			<region name="georgia" esize=""/>
-			<region name="hawaii" esize=""/>
-			<region name="idaho" esize=""/>
-			<region name="illinois" esize=""/>
-			<region name="indiana" esize=""/>
-			<region name="iowa" esize=""/>
-			<region name="kansas" esize=""/>
-			<region name="kentucky" esize=""/>
-			<region name="louisiana" esize=""/>
-			<region name="maine" esize=""/>
-			<region name="maryland" esize=""/>
-			<region name="massachusetts" esize=""/>
-			<region name="michigan" esize=""/>
-			<region name="minnesota" esize=""/>
-			<region name="mississippi" esize=""/>
-			<region name="missouri" esize=""/>
-			<region name="montana" esize=""/>
-			<region name="nebraska" esize=""/>
-			<region name="nevada" esize=""/>
-			<region name="new-hampshire" esize=""/>
-			<region name="new-jersey" esize=""/>
-			<region name="new-mexico" esize=""/>
-			<region name="new-york" esize=""/>
-			<region name="north-carolina" esize=""/>
-			<region name="north-dakota" esize=""/>
-			<region name="ohio" esize=""/>
-			<region name="oklahoma" esize=""/>			
-			<region name="oregon" esize=""/>
-			<region name="texas" esize=""/>
-			<region name="pennsylvania" esize=""/>
-			<region name="rhode-island" esize=""/>
-			<region name="south-carolina" esize=""/>
-			<region name="south-dakota" esize=""/>
-			<region name="tennessee" esize=""/>
-			<region name="utah" esize=""/>
-			<region name="vermont" esize=""/>
-			<region name="virginia" esize=""/>
-			<region name="washington" esize=""/>
-			<region name="west-virginia" esize=""/>
-			<region name="wisconsin" esize=""/>
-			<region name="wyoming" esize=""/>
-			
-		</regions>
-		
-		<!-- 3.1 USA [SOURCE: CLOUDMADE.COM]-->
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/northern_america/united_states/{0}/{0}.osm.bz2" skip="true" region_prefix="US_" region_suffix="_NorthAmerica">
-			<region name="guantanamo_bay" esize=""/> <!-- ??? -->
-		</regions>
-		
-		<!-- 3.1 USA MINOR OUTLYING ISLANDS [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/northern_america/united_states_minor_outlying_islands/{0}/{0}.osm.bz2" skip="true" region_prefix="US-Islands_" region_suffix="_NorthAmerica">
-			<region name="baker" esize=""/>
-			<region name="howland" esize=""/>
-			<region name="jarvis_island" esize=""/>
-			<region name="johnston" esize=""/>
-			<region name="kingman_reef" esize=""/>
-			<region name="midway" esize=""/>
-			<region name="navassa" esize=""/>
-			<region name="palmyra" esize=""/>
-			<region name="wake" esize=""/>
-		</regions>
-		
-		<!-- 3.2 CANADA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/north-america/canada/{0}.osm.pbf" region_prefix="Canada_" skip="true" region_suffix="_NorthAmerica">
-			<region name="alberta" esize="36"/>
-			<region name="british-columbia" esize=""/>
-			<region name="manitoba" esize=""/>
-			<region name="new-brunswick" esize=""/>
-			<region name="newfoundland-and-labrador" esize=""/>
-			<region name="northwest-territories" esize=""/>
-			<region name="nova-scotia" esize=""/>
-			<region name="nunavut" esize=""/>
-			<region name="ontario" esize=""/>
-			<region name="prince-edward-island" esize=""/>
-			<region name="quebec" esize=""/>
-			<region name="saskatchewan" esize=""/>
-			<region name="yukon" esize=""/>
-		</regions>
-	
-	
-		<!--  3.3 NORTH AMERICA EXCEPT USA AND CANADA [SOURCE: CLOUDMADE.COM] -->	
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/northern_america/{0}/{0}.osm.bz2" region_prefix=""  skip="true" region_suffix="_NorthAmerica">	
-			<region name="bermuda" esize=""/>
-			<region name="greenland" esize=""/>
-		</regions>	
-				
-		<!--  4. CENTRAL AMERICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix=""  skip="true" region_suffix="">
-			<region name="central-america" esize=""/>
-		</regions>	
-		<regions siteToDownload="http://download.geofabrik.de/osm/central-america/{0}.osm.pbf" region_prefix=""  skip="true" region_suffix="_CentralAmerica">
-			<region name="belize" esize="" />
-			<region name="guatemala" esize="" />
-			<region name="haiti-and-domrep" esize="" />
-			<region name="mexico" esize="" />
-			
-		</regions>
-		<!--  4. CENTRAL AMERICA [SOURCE: CLOUDMADE.DE] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/central_america/{0}/{0}.osm.bz2" region_prefix=""  skip="true" region_suffix="_CentralAmerica">
-			<region name="costa_rica" esize="" />
-			<region name="el_salvador" esize="" />
-			<region name="honduras" esize="" />
-			<region name="nicaragua" esize="" />
-			<region name="panama" esize="" />
-		</regions>
-		
-		<!--  4. CENTRAL AMERICA/CARIBBEANS [SOURCE: CLOUDMADE.DE] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/caribbean/{0}/{0}.osm.bz2" region_prefix=""  skip="true" region_suffix="_CentralAmerica">
-			<region name="trinidad_and_tobago" esize="" />
-			<region name="puerto_rico" esize="" />
-			<region name="netherlands_antilles" esize="" />
-			<region name="grenada" esize="" />
-			<region name="jamaica" esize="" />
-			<region name="haiti" esize="" />
-			<region name="guadeloupe" esize="" />
-			<region name="cuba" esize="" />
-			<region name="dominica" esize="" />
-			<region name="dominican_republic" esize="" />
-			<region name="bahamas" esize="" />
-			<region name="aruba" esize="" />
-		</regions>
-				
-		<!--  5. SOUTH AMERICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" skip="true"
-			region_suffix="">
-			<region name="south-america" esize="22"/>
-		</regions>
-		
-		<regions siteToDownload="http://download.geofabrik.de/osm/south-america/{0}.osm.pbf" region_prefix="" skip="true"
-			region_suffix="_SouthAmerica">
-			<region name="argentina" esize="" />
-			<region name="bolivia" esize="" />
-			<region name="brazil" esize="" />
-			<region name="chile" esize="" />
-			<region name="colombia" esize="" />
-		</regions>
-		
-		<!--  5. SOUTH AMERICA [SOURCE: CLOUDMADE.COM] --> 
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/south_america/{0}/{0}.osm.bz2" region_prefix=""  
-					skip="true" region_suffix="_SouthAmerica">	
-			<region name="ecuador" esize="" />
-			<region name="guyana" esize="" />
-			<region name="paraguay" esize="" />
-			<region name="peru" esize="" />
-			<region name="suriname" esize="" />
-			<region name="uruguay" esize="" />
-			<region name="venezuela" esize="" />
-		</regions>	
-		
-		
-		<!-- 6. AFRICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="true">
-			<region name="africa" esize=""/>
-		</regions>
-		<!-- 6. AFRICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/africa/{0}.osm.pbf" region_prefix="" region_suffix="_Africa"  skip="true">
-			<region name="canary_islands" esize="" />
-			<region name="ethiopia" esize="" />
-			<region name="guinea" esize="" />
-			<region name="ivory_coast" esize="" />
-			<region name="liberia" esize="" />
-			<region name="libya" esize="" />
-			<region name="madagascar" esize="" />
-			<region name="morocco" esize="" />
-			<region name="south_africa_and_lesotho" esize="" />
-			<region name="tanzania" esize="" />
-		</regions>
-			
-		<!-- 7. AUSTRALIA-OCEANIA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="true">
-			<region name="australia-oceania" esize=""/>
-		</regions>
-				
-		<!-- 7. NEW ZEALAND-AUSTRALIA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/australia-oceania/{0}.osm.pbf" region_prefix="" region_suffix="_Australia"  skip="true">
-			<region name="new-zealand" esize=""/>
-			<region name="new-caledonia" esize=""/>
-		</regions>
-							
-</regions_list> 
\ No newline at end of file
diff --git a/build-scripts/indexes-regions.xml b/build-scripts/indexes-regions.xml
deleted file mode 100644
index 7b3cfc06e0..0000000000
--- a/build-scripts/indexes-regions.xml
+++ /dev/null
@@ -1,484 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<regions_list>
-		
-		<!--  Overview of regions -->
-		<!-- 1. Europe : 1.1 Great Britain 1.2 France 1.3  Germany -->
-		<!-- 2. Asia : 2.1 Russia and regions 2.2 Asia from geofabric 2.3 Rest asia from cloudmade  -->
-		<!-- 3. North america : 3.1 USA 3.2 Canada 3.3 Other north america + mexico  -->
-		<!-- 4. Central america  -->
-		<!-- 5. South america  -->
-		<!-- 6. Africa  -->
-		<!-- 7. Australia  -->
-		
-        <!-- Countries to download from geofabrik or cloudmade server -->
-		<!-- 1. EUROPE [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/{0}.osm.pbf" region_prefix="" skip="false" region_suffix="_Europe">
-			<region name="albania" esize="6" />
-			<region name="andorra" esize="1" />
-			<region name="austria" esize="110" />
-			<region name="belarus" esize="45" />
-			<region name="belgium" esize="55" />
-			<region name="bosnia-herzegovina" esize="5" />
-			<region name="bulgaria" esize="15" />
-			<region name="croatia" esize="15" />
-			<region name="cyprus" esize="6" />
-			<region name="czech_republic" esize="180"/>
-			<region name="denmark" esize="80" />
-			<region name="estonia" esize="38" />
-			<region name="faroe_islands" esize="2" />
-			<region name="finland" esize="85" />
-			<region name="greece" esize="25" />
-			<region name="hungary" esize="20" />
-			<region name="iceland" esize="10" />
-			<region name="ireland" esize="30" />
-			<region name="isle_of_man" esize="1" />
-			<region name="italy" esize="255"/>
-			<region name="kosovo" esize="10" />
-			<region name="latvia" esize="10" />
-			<region name="liechtenstein" esize="1" />
-			<region name="lithuania" esize="10" />
-			<region name="luxembourg" esize="10" />
-			<region name="macedonia" esize="10" />
-			<region name="malta" esize="1" />
-			<region name="moldova" esize="5" />
-			<region name="monaco" esize="1" />
-			<region name="montenegro" esize="2" />
-			<region name="netherlands" esize="450" cityAdminLevel="10"/>
-			<region name="norway" esize="65" />
-			<region name="poland" esize="90" />
-			<region name="portugal" esize="15" />
-			<region name="romania" esize="30" />
-			<region name="serbia" esize="15" />
-			<region name="slovakia" esize="80" cityAdminLevel="6"/>
-			<region name="slovenia" esize="15" />
-			<region name="spain" esize="150" />
-			<region name="sweden" esize="90" />
-			<region name="switzerland" esize="90" />
-			<region name="turkey" esize="20" />
-			<region name="ukraine" esize="25" />
-		</regions>
-
-		<!-- 1.1 GREAT BRITAIN [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/great_britain/{0}.osm.pbf" region_prefix="GB_" skip="false" region_suffix="_Europe">
-			<region name="scotland" esize=""/>		
-			<region name="wales" esize="10"/>
-			<region name="england" esize="230"/>
-		</regions>
-
-		<!-- 1.2 FRANCE [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/france/{0}.osm.pbf" region_prefix="France_" 
-			skip="false" region_suffix="_Europe">
-			<region name="alsace" esize="" />
-			<region name="aquitaine" esize="" />
-			<region name="auvergne" esize="" />
-			<region name="basse-normandie" esize="" />
-			<region name="bourgogne" esize="" />
-			<region name="bretagne" esize="" />
-			<region name="centre" esize="" />
-			<region name="champagne-ardenne" esize="" />
-			<region name="corse" esize="" />
-			<region name="franche-comte" esize="" />
-			<region name="haute-normandie" esize="" />
-			<region name="ile-de-france" esize="" />
-			<region name="languedoc-roussillon" esize="" />
-			<region name="limousin" esize="" />
-			<region name="lorraine" esize="" />
-			<region name="midi-pyrenees" esize="" />
-			<region name="nord-pas-de-calais" esize="" />
-			<region name="pays-de-la-loire" esize="" />
-			<region name="picardie" esize="" />
-			<region name="poitou-charentes" esize="" />
-			<region name="provence-alpes-cote-d-azur" esize="" />
-			<region name="rhone-alpes" esize="" />
-		</regions>
-
-		<!-- 1.3 GERMANY [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/germany/{0}.osm.pbf" region_prefix="Germany_" skip="false" 
-			region_suffix="_Europe">
-			<region name="baden-wuerttemberg" esize="" cityAdminLevel="7"/>
-			<region name="bayern" esize="" cityAdminLevel="7"/>
-			<region name="berlin" esize="" cityAdminLevel="7"/>
-			<region name="brandenburg" esize="" cityAdminLevel="7"/>
-			<region name="bremen" esize="" cityAdminLevel="7"/>
-			<region name="hamburg" esize="" cityAdminLevel="7"/>
-			<region name="hessen" esize="" cityAdminLevel="7"/>
-			<region name="mecklenburg-vorpommern" esize="" cityAdminLevel="7"/>
-			<region name="niedersachsen" esize="" cityAdminLevel="7"/>
-			<region name="nordrhein-westfalen" esize="" cityAdminLevel="7"/>
-			<region name="rheinland-pfalz" esize="" cityAdminLevel="7"/>
-			<region name="saarland" esize="" cityAdminLevel="7"/>
-			<region name="sachsen-anhalt" esize="" cityAdminLevel="7"/>
-			<region name="sachsen" esize="" cityAdminLevel="7"/>
-			<region name="schleswig-holstein" esize="" cityAdminLevel="7"/>
-			<region name="thueringen" esize="" cityAdminLevel="7"/>
-		</regions>
-
- 	        <regions siteToDownload="http://planet.openstreetmap.nl/planet-{0}-latest.osm.pbf" region_prefix="" skip="false" region_suffix="_Europe">
-                       <region name="benelux" esize="6" />
-                </regions>
-
-        <!-- 2. ASIA -->
-		<!-- 2.1 Russia [GIS-LAB.INFO] -->
-		<regions siteToDownload="http://gis-lab.info/data/osm/{0}/{0}.osm.bz2" region_prefix="Russia_"  skip="false" region_suffix="_Asia">
-			<region name="adygeya" esize=""/>
-			<region name="altay" esize=""/>
-			<region name="altayskiy" esize=""/>
-			<region name="amur" esize=""/>
-			<region name="arkhan" esize=""/>
-			<region name="astrakhan" esize=""/>
-			<region name="bashkir" esize=""/>
-			<region name="belgorod" esize=""/>
-			<region name="bryansk" esize=""/> 
-			<region name="buryat" esize=""/>
-			<region name="chechen" esize=""/>
-			<region name="chel" esize=""/>
-			<region name="chukot" esize=""/>
-			<region name="chuvash" esize=""/>
-			<region name="dagestan" esize=""/>
-			<region name="evrey" esize=""/>
-			<region name="ingush" esize=""/>
-			<region name="irkutsk" esize=""/>
-			<region name="ivanov" esize=""/>
-			<region name="kabardin" esize=""/>
-			<region name="kalinin" esize=""/>
-			<region name="kalmyk" esize=""/>
-			<region name="kaluzh" esize=""/>
-			<region name="kamch" esize=""/>
-			<region name="karach" esize=""/>
-			<region name="karel" esize=""/>
-			<region name="kemerovo" esize=""/>
-			<region name="khabar" esize=""/>
-			<region name="khakas" esize=""/>
-			<region name="khanty" esize=""/>
-			<region name="kirov" esize=""/>
-			<region name="komi" esize=""/>
-			<region name="kostrom" esize=""/>
-			<region name="krasnodar" esize=""/>
-			<region name="krasnoyarsk" esize=""/>
-			<region name="kurgan" esize=""/>
-			<region name="kursk" esize=""/>
-			<region name="leningrad" esize=""/>
-			<region name="lipetsk" esize=""/>
-			<region name="magadan" esize=""/>
-			<region name="mariyel" esize=""/>
-			<region name="mordov" esize=""/>
-			<region name="moscow" esize=""/>
-			<region name="mosobl" esize=""/>
-			<region name="murmansk" esize=""/>
-			<region name="nenec" esize=""/>
-			<region name="nizhegorod" esize=""/>
-			<region name="novgorod" esize=""/>
-			<region name="novosib" esize=""/>
-			<region name="omsk" esize=""/>
-			<region name="orenburg" esize=""/>
-			<region name="orlovsk" esize=""/>
-			<region name="osetiya" esize=""/>
-			<region name="penz" esize=""/>
-			<region name="perm" esize=""/>
-			<region name="prim" esize=""/>
-			<region name="pskov" esize=""/>
-			<region name="rostov" esize=""/>
-			<region name="ryazan" esize=""/>
-			<region name="sakhalin" esize=""/>
-			<region name="samar" esize=""/>
-			<region name="saratov" esize=""/>
-			<region name="smol" esize=""/>
-			<region name="stavrop" esize=""/>
-			<region name="stpeter" esize=""/>
-			<region name="sverdl" esize=""/>
-			<region name="tambov" esize=""/>
-			<region name="tatar" esize=""/>
-			<region name="tomsk" esize=""/>
-			<region name="tul" esize=""/>
-			<region name="tumen" esize=""/>
-			<region name="tver" esize=""/>
-			<region name="tyva" esize=""/>
-			<region name="udmurt" esize=""/>
-			<region name="ulyan" esize=""/>
-			<region name="vladimir" esize=""/>
-			<region name="volgograd" esize=""/>
-			<region name="vologda" esize=""/>
-			<region name="voronezh" esize=""/>
-			<region name="yakut" esize=""/>
-			<region name="yamal" esize=""/>
-			<region name="yarosl" esize=""/>
-			<region name="zabaikal" esize=""/>
-		</regions>
-		
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/northern_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia"  skip="true">
-      			<region name="russia" esize="820"/> 
-	        </regions>
-		
-		<!-- 2.2 ASIA-AVAILABLE ON GEOFABRIK.DE [SOURCE: GEOFABRIK.DE] (REST OF ASIA IS BELOW FROM CLOUDMADE.COM) -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/asia/{0}.osm.pbf" region_prefix="" region_suffix="_Asia" skip="false">
-			<region name="azerbaijan" esize="15"/>
-			<region name="china" esize="4"/>
-			<region name="gaza" esize="3"/>
-			<region name="india" esize="1"/>
-			<region name="indonesia" esize="3"/>
-			<region name="iraq" esize="1"/>
-			<region name="israel_and_palestine" esize="1"/>
-			<region name="japan" esize="1"/>
-			<region name="kazakhstan" esize="1"/>
-			<region name="kyrgyzstan" esize="1"/>
-			<region name="mongolia" esize="1"/>
-			<region name="pakistan" esize="1"/>
-			<region name="philippines" esize="1"/>
-			<region name="taiwan" esize="1"/>
-			<region name="turkmenistan" esize="1"/>
-			<region name="uzbekistan" esize="1"/>
-		</regions>
-	    
-		<!-- 2.3 CENTRAL ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/central_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="false">
-			<region name="tajikistan" esize="3"/>
-		</regions>
-		
-		<!-- 2.3 EASTERN ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/eastern_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="false">
-			<region name="hong_kong" esize="67"/>
-			<region name="macao" esize="1"/>
-			<region name="north_korea" esize="5"/>
-			<region name="south_korea" esize="25"/>
-		</regions>	
-		
-		<!-- 2.3 SOUTH-EASTERN ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/south-eastern_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="false">
-			<region name="brunei" esize="1"/>
-			<region name="cambodia" esize="2"/>
-			<region name="christmas_island" esize="1"/>
-			<region name="east_timor" esize="1"/>
-			<region name="laos" esize="3"/>
-			<region name="malaysia" esize="7"/>
-			<region name="myanmar" esize="7"/>
-			<region name="singapore" esize="2"/>
-			<region name="spratly_islands" esize="1"/>
-			<region name="thailand" esize="12"/>
-			<region name="vietnam" esize=""/>
-		</regions>	
-			
-		<!-- 2.3 SOUTHERN ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/southern_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="false">
-			<region name="afghanistan" esize="6"/>
-			<region name="bangladesh" esize="3"/>
-			<region name="bhutan" esize="1"/>
-			<region name="british_indian_ocean_territory" esize="1"/>  
-			<region name="iran" esize="11"/>
-			<region name="maldives" esize="1"/>
-			<region name="nepal" esize="2"/>
-			<region name="sri_lanka" esize="2"/>			
-		</regions>		
-			
-		<!-- 2.3 WESTERN ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/western_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="false">
-			<region name="armenia" esize="1"/>
-			<region name="bahrain" esize="1"/>
-			<region name="caspian_sea" esize="1"/>
-			<region name="cyprus" esize="1"/>
-			<region name="georgia" esize="1"/>
-			<region name="jordan" esize="1"/>
-			<region name="kuwait" esize="1"/>
-			<region name="lebanon" esize="1"/>
-			<region name="oman" esize="1"/>
-			<region name="qatar" esize="1"/>
-			<region name="saudi_arabia" esize="1"/>
-			<region name="syria" esize="1"/>
-			<region name="turkey" esize="1"/>
-			<region name="united_arab_emirates" esize="1"/>
-			<region name="yemen" esize="1"/>
-		</regions>			
-		
-		
-		<!-- 3. North America  -->		
-		<!-- 3.1 USA-AVAILABLE ON GEOFABRIK.DE [SOURCE: GEOFABRIK.DE] (REST OF USA IS BELOW FROM CLOUDMADE.COM) -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/north-america/us/{0}.osm.pbf" skip="false" region_prefix="US_" region_suffix="_NorthAmerica">
-			<region name="alabama" esize=""/>
-			<region name="alaska" esize=""/>
-			<region name="arizona" esize=""/>
-			<region name="arkansas" esize=""/>
-			<region name="california" esize=""/>
-			<region name="colorado" esize=""/>
-			<region name="connecticut" esize=""/>
-			<region name="delaware" esize=""/>
-			<region name="district-of-columbia" esize=""/>
-			<region name="florida" esize=""/>
-			<region name="georgia" esize=""/>
-			<region name="hawaii" esize=""/>
-			<region name="idaho" esize=""/>
-			<region name="illinois" esize=""/>
-			<region name="indiana" esize=""/>
-			<region name="iowa" esize=""/>
-			<region name="kansas" esize=""/>
-			<region name="kentucky" esize=""/>
-			<region name="louisiana" esize=""/>
-			<region name="maine" esize=""/>
-			<region name="maryland" esize=""/>
-			<region name="massachusetts" esize=""/>
-			<region name="michigan" esize=""/>
-			<region name="minnesota" esize=""/>
-			<region name="mississippi" esize=""/>
-			<region name="missouri" esize=""/>
-			<region name="montana" esize=""/>
-			<region name="nebraska" esize=""/>
-			<region name="nevada" esize=""/>
-			<region name="new-hampshire" esize=""/>
-			<region name="new-jersey" esize=""/>
-			<region name="new-mexico" esize=""/>
-			<region name="new-york" esize=""/>
-			<region name="north-carolina" esize=""/>
-			<region name="north-dakota" esize=""/>
-			<region name="ohio" esize=""/>
-			<region name="oklahoma" esize=""/>			
-			<region name="oregon" esize=""/>
-			<region name="texas" esize=""/>
-			<region name="pennsylvania" esize=""/>
-			<region name="rhode-island" esize=""/>
-			<region name="south-carolina" esize=""/>
-			<region name="south-dakota" esize=""/>
-			<region name="tennessee" esize=""/>
-			<region name="utah" esize=""/>
-			<region name="vermont" esize=""/>
-			<region name="virginia" esize=""/>
-			<region name="washington" esize=""/>
-			<region name="west-virginia" esize=""/>
-			<region name="wisconsin" esize=""/>
-			<region name="wyoming" esize=""/>
-			
-		</regions>
-		
-		<!-- 3.1 USA [SOURCE: CLOUDMADE.COM]-->
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/northern_america/united_states/{0}/{0}.osm.bz2" skip="false" region_prefix="US_" region_suffix="_NorthAmerica">
-			<region name="guantanamo_bay" esize=""/> <!-- ??? -->
-		</regions>
-		
-		<!-- 3.1 USA MINOR OUTLYING ISLANDS [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/northern_america/united_states_minor_outlying_islands/{0}/{0}.osm.bz2" skip="false" region_prefix="US-Islands_" region_suffix="_NorthAmerica">
-			<region name="baker" esize=""/>
-			<region name="howland" esize=""/>
-			<region name="jarvis_island" esize=""/>
-			<region name="johnston" esize=""/>
-			<region name="kingman_reef" esize=""/>
-			<region name="midway" esize=""/>
-			<region name="navassa" esize=""/>
-			<region name="palmyra" esize=""/>
-			<region name="wake" esize=""/>
-		</regions>
-		
-		<!-- 3.2 CANADA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/north-america/canada/{0}.osm.pbf" region_prefix="Canada_" skip="false" region_suffix="_NorthAmerica">
-			<region name="alberta" esize="36"/>
-			<region name="british-columbia" esize=""/>
-			<region name="manitoba" esize=""/>
-			<region name="new-brunswick" esize=""/>
-			<region name="newfoundland-and-labrador" esize=""/>
-			<region name="northwest-territories" esize=""/>
-			<region name="nova-scotia" esize=""/>
-			<region name="nunavut" esize=""/>
-			<region name="ontario" esize=""/>
-			<region name="prince-edward-island" esize=""/>
-			<region name="quebec" esize=""/>
-			<region name="saskatchewan" esize=""/>
-			<region name="yukon" esize=""/>
-		</regions>
-	
-	
-		<!--  3.3 NORTH AMERICA EXCEPT USA AND CANADA [SOURCE: CLOUDMADE.COM] -->	
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/northern_america/{0}/{0}.osm.bz2" region_prefix=""  skip="false" region_suffix="_NorthAmerica">	
-			<region name="bermuda" esize=""/>
-			<region name="greenland" esize=""/>
-		</regions>	
-				
-		<!--  4. CENTRAL AMERICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix=""  skip="true" region_suffix="">
-			<region name="central-america" esize=""/>
-		</regions>	
-		<regions siteToDownload="http://download.geofabrik.de/osm/central-america/{0}.osm.pbf" region_prefix=""  skip="false" region_suffix="_CentralAmerica">
-			<region name="belize" esize="" />
-			<region name="guatemala" esize="" />
-			<region name="haiti-and-domrep" esize="" />
-			<region name="mexico" esize="" />
-			
-		</regions>
-		<!--  4. CENTRAL AMERICA [SOURCE: CLOUDMADE.DE] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/central_america/{0}/{0}.osm.bz2" region_prefix=""  skip="false" region_suffix="_CentralAmerica">
-			<region name="costa_rica" esize="" />
-			<region name="el_salvador" esize="" />
-			<region name="honduras" esize="" />
-			<region name="nicaragua" esize="" />
-			<region name="panama" esize="" />
-		</regions>
-		
-		<!--  4. CENTRAL AMERICA/CARIBBEANS [SOURCE: CLOUDMADE.DE] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/caribbean/{0}/{0}.osm.bz2" region_prefix=""  skip="false" region_suffix="_CentralAmerica">
-			<region name="trinidad_and_tobago" esize="" />
-			<region name="puerto_rico" esize="" />
-			<region name="netherlands_antilles" esize="" />
-			<region name="grenada" esize="" />
-			<region name="jamaica" esize="" />
-			<region name="haiti" esize="" />
-			<region name="guadeloupe" esize="" />
-			<region name="cuba" esize="" />
-			<region name="dominica" esize="" />
-			<region name="dominican_republic" esize="" />
-			<region name="bahamas" esize="" />
-			<region name="aruba" esize="" />
-		</regions>
-				
-		<!--  5. SOUTH AMERICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" skip="true"
-			region_suffix="">
-			<region name="south-america" esize="22"/>
-		</regions>
-		
-		<regions siteToDownload="http://download.geofabrik.de/osm/south-america/{0}.osm.pbf" region_prefix="" skip="false"
-			region_suffix="_SouthAmerica">
-			<region name="argentina" esize="" />
-			<region name="bolivia" esize="" />
-			<region name="brazil" esize="" />
-			<region name="chile" esize="" />
-			<region name="colombia" esize="" />
-		</regions>
-		
-		<!--  5. SOUTH AMERICA [SOURCE: CLOUDMADE.COM] --> 
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/south_america/{0}/{0}.osm.bz2" region_prefix=""  
-					skip="false" region_suffix="_SouthAmerica">	
-			<region name="ecuador" esize="" />
-			<region name="guyana" esize="" />
-			<region name="paraguay" esize="" />
-			<region name="peru" esize="" />
-			<region name="suriname" esize="" />
-			<region name="uruguay" esize="" />
-			<region name="venezuela" esize="" />
-		</regions>	
-		
-		
-		<!-- 6. AFRICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="true">
-			<region name="africa" esize=""/>
-		</regions>
-		<!-- 6. AFRICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/africa/{0}.osm.pbf" region_prefix="" region_suffix="_Africa"  skip="false">
-			<region name="canary_islands" esize="" />
-			<region name="ethiopia" esize="" />
-			<region name="guinea" esize="" />
-			<region name="ivory_coast" esize="" />
-			<region name="liberia" esize="" />
-			<region name="libya" esize="" />
-			<region name="madagascar" esize="" />
-			<region name="morocco" esize="" />
-			<region name="south_africa_and_lesotho" esize="" />
-			<region name="tanzania" esize="" />
-		</regions>
-			
-		<!-- 7. AUSTRALIA-OCEANIA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="true">
-			<region name="australia-oceania" esize=""/>
-		</regions>
-				
-		<!-- 7. NEW ZEALAND-AUSTRALIA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/australia-oceania/{0}.osm.pbf" region_prefix="" region_suffix="_Australia"  skip="false">
-			<region name="new-zealand" esize=""/>
-			<region name="new-caledonia" esize=""/>
-		</regions>
-							
-</regions_list> 
diff --git a/build-scripts/regions/3_indexes_northamerica.xml b/build-scripts/regions/3_indexes_northamerica.xml
index 99b712180f..09a346740d 100644
--- a/build-scripts/regions/3_indexes_northamerica.xml
+++ b/build-scripts/regions/3_indexes_northamerica.xml
@@ -57,23 +57,7 @@
 			
 		</regions>
 		
-		<!-- 3.1 USA [SOURCE: CLOUDMADE.COM]-->
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/northern_america/united_states/{0}/{0}.osm.bz2" skip="false" region_prefix="US_" region_suffix="_NorthAmerica">
-			<region name="guantanamo_bay" esize=""/> <!-- ??? -->
-		</regions>
-		
-		<!-- 3.1 USA MINOR OUTLYING ISLANDS [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/americas/northern_america/united_states_minor_outlying_islands/{0}/{0}.osm.bz2" skip="false" region_prefix="US-Islands_" region_suffix="_NorthAmerica">
-			<region name="baker" esize=""/>
-			<region name="howland" esize=""/>
-			<region name="jarvis_island" esize=""/>
-			<region name="johnston" esize=""/>
-			<region name="kingman_reef" esize=""/>
-			<region name="midway" esize=""/>
-			<region name="navassa" esize=""/>
-			<region name="palmyra" esize=""/>
-			<region name="wake" esize=""/>
-		</regions>
+
 		
 		<!-- 3.2 CANADA [SOURCE: GEOFABRIK.DE] -->
 		<regions siteToDownload="http://download.geofabrik.de/osm/north-america/canada/{0}.osm.pbf" region_prefix="Canada_" skip="false" region_suffix="_NorthAmerica">
diff --git a/build-scripts/regions/indexes.xml b/build-scripts/regions/indexes.xml
index 31806ed591..6598b5b5bf 100644
--- a/build-scripts/regions/indexes.xml
+++ b/build-scripts/regions/indexes.xml
@@ -346,7 +346,7 @@
 			
 		</regions>
 				
-		<!-- 3.1 USA MINOR OUTLYING ISLANDS [SOURCE: CLOUDMADE.COM] -->
+		<!-- 3.1 USA MINOR OUTLYING ISLANDS [SOURCE: CLOUDMADE.COM] 
 		<regions siteToDownload="http://downloads.cloudmade.com/americas/northern_america/united_states_minor_outlying_islands/{0}/{0}.osm.bz2" skip="true" region_prefix="US-Islands_" region_suffix="_NorthAmerica">
 			<region name="baker" esize=""/>
 			<region name="howland" esize=""/>
@@ -357,7 +357,7 @@
 			<region name="navassa" esize=""/>
 			<region name="palmyra" esize=""/>
 			<region name="wake" esize=""/>
-		</regions>
+		</regions> -->
 		
 		<!-- 3.2 CANADA [SOURCE: GEOFABRIK.DE] -->
 		<regions siteToDownload="http://download.geofabrik.de/osm/north-america/canada/{0}.osm.pbf" region_prefix="Canada_" skip="false" region_suffix="_NorthAmerica">