new index batch creator
git-svn-id: https://osmand.googlecode.com/svn/trunk@589 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb
parent
43b5fd467c
commit
30bbe470d8
1 changed files with 145 additions and 280 deletions
|
|
@ -2,257 +2,190 @@ package net.osmand.data.index;
|
|||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipOutputStream;
|
||||
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
|
||||
import net.osmand.Algoritms;
|
||||
import net.osmand.LogUtil;
|
||||
import net.osmand.data.preparation.IndexCreator;
|
||||
import net.osmand.impl.ConsoleProgressImplementation;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import org.w3c.dom.NodeList;
|
||||
import org.xml.sax.SAXException;
|
||||
|
||||
|
||||
public class IndexBatchCreator {
|
||||
// config params
|
||||
private static final boolean indexPOI = true;
|
||||
private static final boolean indexAddress = true;
|
||||
private static final boolean indexTransport = true;
|
||||
private static final boolean writeWayNodes = false;
|
||||
private static final boolean indexMap = true;
|
||||
|
||||
// To remove downloads before updating them (google restriction)
|
||||
// THESE properties should be updated every session you run
|
||||
private static final String cookieHSID = "";
|
||||
private static final String cookieSID = "";
|
||||
private static final String pagegen = "";
|
||||
private static final String token = "";
|
||||
|
||||
|
||||
protected static final boolean deleteFilesAfterUploading = true;
|
||||
|
||||
protected static final Log log = LogUtil.getLog(IndexBatchCreator.class);
|
||||
protected static final String SITE_TO_DOWNLOAD1 = "http://download.geofabrik.de/osm/europe/"; //$NON-NLS-1$
|
||||
|
||||
// google code couldn't accept files more than 100MB so we can skip some countries
|
||||
private static final Set<String> doNotWriteWayNodesInUploading = new LinkedHashSet<String>();
|
||||
static {
|
||||
doNotWriteWayNodesInUploading.addAll(Arrays.asList(new String[]{
|
||||
"great_britain", "netherlands", "germany", "france",
|
||||
// US
|
||||
"us_alabama", "us_california", "us_florida", "us_georgia", "us_illinois", "us_indiana",
|
||||
"us_kentucky", "us_maryland", "us_massachusetts", "us_missouri", "us_new_york",
|
||||
"us_north_carolina", "us_north_dakota", "us_ohio", "us_oklahoma", "us_oregon", "us_pennsylvania",
|
||||
"us_south_carolina", "us_tennessee", "us_texas", "us_utah", "us_vermont", "us_virginia",
|
||||
"us_washington", "us_west_virginia", "us_wisconsin", "us_wyoming",
|
||||
// asia
|
||||
"japan",
|
||||
|
||||
"australia"
|
||||
}));
|
||||
public static class RegionCountries {
|
||||
String namePrefix = ""; // for states of the country
|
||||
Set<String> regionNames = new LinkedHashSet<String>();
|
||||
String siteToDownload = "";
|
||||
}
|
||||
|
||||
// andorra, bosnia, cyprus,
|
||||
protected static final String[] europeCountries = new String[] {
|
||||
// "albania", "andorra", "austria", // 5.3, 0.4, 100 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
// "belarus", "belgium", "bosnia-herzegovina", // 39, 43, 4.1 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
// "bulgaria", "croatia", "cyprus", // 13, 12, 5 //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
|
||||
// "denmark",
|
||||
// TODO map.odb
|
||||
"estonia", "faroe_islands", // 75, 38, 1.5 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"finland", "greece", "hungary", //80, 25, 14 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"iceland", "ireland", "isle_of_man", // 5.9, 27, 1.1 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"kosovo", "latvia", "liechtenstein", // 8.2, 6.5, 0.2 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"lithuania", "luxembourg", "macedonia", // 5, 5, 4 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"malta", "moldova", "monaco", //0.8, 5, 0.6 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"montenegro", "norway", "poland", // 1.2, 56, 87 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"portugal", "romania", "serbia", // 10, 25, 10 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"slovakia", "slovenia", "spain", // 69, 10, 123 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"sweden", "switzerland", "turkey", // 88, 83, 17 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"ukraine", // 19 //$NON-NLS-1$
|
||||
//TOTAL : 1129 MB
|
||||
// TODO map.odb
|
||||
// "czech_republic", "netherlands", // 168, 375,
|
||||
// "great_britain" , "italy", // 310, 246,
|
||||
//// "germany", "france", // 1100, 959 // index by states !
|
||||
// ADD TO TOTAL : 2449 MB
|
||||
|
||||
};
|
||||
|
||||
// TODO map.odb
|
||||
protected static final String[] franceProvinces = new String[] {
|
||||
"alsace","aquitaine", "auvergne", "basse-normandie", "bourgogne", "bretagne", "centre",
|
||||
"champagne-ardenne", "corse", "franche-comte", "haute-normandie", "ile-de-france",
|
||||
"languedoc-roussillon", "limousin", "lorraine", "midi-pyrenees", "nord-pas-de-calais",
|
||||
"pays-de-la-loire", "picardie","poitou-charentes", "provence-alpes-cote-d-azur", "rhone-alpes"
|
||||
};
|
||||
|
||||
// TODO map.odb
|
||||
protected static final String[] germanyLands = new String[] {
|
||||
"baden-wuerttemberg","bayern", "berlin", "brandenburg", "bremen", "hamburg", "hessen",
|
||||
"mecklenburg-vorpommern", "niedersachsen", "nordrhein-westfalen", "rheinland-pfalz", "saarland",
|
||||
"sachsen-anhalt", "sachsen", "schleswig-holstein", "thueringen",
|
||||
};
|
||||
|
||||
|
||||
protected static final String SITE_TO_DOWNLOAD2 = "http://downloads.cloudmade.com/"; //$NON-NLS-1$
|
||||
// us states
|
||||
// TODO map.odb
|
||||
protected static final String[] usStates = new String[] {
|
||||
// "Alabama", "Alaska", "Arizona", "Arkansas", "California", "Colorado", "Connecticut",
|
||||
// "Delaware", "District_of_Columbia", "Florida", "Georgia", "Guantanamo_Bay", "Hawaii",
|
||||
// "Idaho", "Illinois", "Indiana", "Iowa", "Kansas", "Kentucky", "Louisiana", "Maine",
|
||||
// "Maryland", "Massachusetts", "Michigan", "Minnesota", "Mississippi", "Missouri",
|
||||
// "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",
|
||||
};
|
||||
|
||||
// TODO map.odb
|
||||
protected static final String[] canadaStates = new String[] {
|
||||
// "Alberta","British_Columbia","Manitoba","New_Brunswick","Newfoundland",
|
||||
// "Nova_Scotia","Nunavut", "Nw_Territories","Ontario","Pr_Edwrd_Island",
|
||||
// "Quebec","Saskatchewan","Yukon",
|
||||
};
|
||||
|
||||
// NORTH AMERICA
|
||||
// TODO map.odb
|
||||
protected static final String[] northAmerica = new String[] {
|
||||
"Bahamas", "Costa_Rica", "Cuba", "Dominica", "Dominican_Republic",
|
||||
"Guatemala", "Haiti", "Honduras", "Jamaica", "Mexico",
|
||||
// TODO these
|
||||
// "Anguilla", "Antigua_and_Barbuda", "Aruba", "Barbados", "Belize", "Bermuda", "British_Virgin_Islands",
|
||||
// "El_Salvador", "Federation_of_Saint_Kitts_and_Nevis",
|
||||
// "Greenland", "Grenada", "Guadeloupe", "Martinique",
|
||||
// "Netherlands_Antilles", "Nicaragua", "Panama", "Puerto_Rico", "St_Lucia",
|
||||
// "St_Pierre_and_Miquelon", "St_Vincent_and_the_Grenadines", "Trinidad_and_Tobago", "Virgin_Islands",
|
||||
|
||||
};
|
||||
|
||||
// TODO map.odb
|
||||
protected static final String[] southAmerica = new String[] {
|
||||
"Argentina","Bolivia","Brazil","Chile","Colombia",
|
||||
"Ecuador","Falkland_Islands", "French_Guiana","Guyana","Paraguay",
|
||||
"Peru","Suriname","Uruguay","Venezuela"
|
||||
};
|
||||
|
||||
|
||||
// oceania
|
||||
protected static final String[] oceania = new String[] {
|
||||
// "Australia", "New_Zealand",
|
||||
// TODO only australia, new zealand created
|
||||
// "American_Samoa","Baker_Island","Cocos_Keeling_Islands","Cook_Islands",
|
||||
// "Federated_States_of_Micronesia","Fiji", "French_Polynesia","Guam","Howland_Island",
|
||||
// "Independent_State_of_Samoa","Jarvis_Island","Johnston_Atoll","Kiribati",
|
||||
// "Marshall_Islands","Midway_Islands","Nauru","New_Caledonia",
|
||||
// "Niue","Norfolk_Island","Northern_Mariana_Islands","Papua_New_Guinea","Pitcairn_Islands",
|
||||
// "Republic_of_Palau","Solomon_Islands","Tokelau","Tonga","Tuvalu","Vanuatu","Wake_Island","Wallis_and_Futuna",
|
||||
};
|
||||
|
||||
|
||||
protected static final String SITE_TO_DOWNLOAD3 = "http://gis-lab.info/data/osm/"; //$NON-NLS-1$
|
||||
protected static final String[] russiaStates = new String[] {
|
||||
// "adygeya", "altay", "altayskiy","amur","arkhan","astrakhan",
|
||||
// "bashkir", "belgorod","bryansk","buryat","chechen", "chel",
|
||||
// "chukot", "chuvash", "dagestan","evrey", "ingush", "irkutsk",
|
||||
// "ivanov","kabardin","kalinin","kalmyk","kaluzh","kamch","karach","karel",
|
||||
// "kemerovo", "khabar", "khakas", "khanty", "kirov", "komi", "kostrom", "krasnodar",
|
||||
// "krasnoyarsk", "kurgan", "kursk", "leningrad", "lipetsk", "magadan", "mariyel", "mordov", "moscow", "mosobl", "murmansk",
|
||||
// "nenec", "nizhegorod", "novgorod", "novosib", "omsk", "orenburg", "orlovsk", "osetiya",
|
||||
// "penz", "perm", "prim", "pskov", "rostov", "ryazan", "sakhalin", "samar", "saratov", "smol",
|
||||
// "stavrop", "stpeter", "sverdl", "tambov", "tatar", "tomsk", "tul", "tumen", "tver", "tyva", "udmurt",
|
||||
// "ulyan", "vladimir", "volgograd", "vologda", "voronezh", "yakut", "yamal", "yarosl", "zabaikal",
|
||||
};
|
||||
|
||||
// TODO map.odb
|
||||
protected static final String[] asia = new String[] {
|
||||
"Afghanistan", "Bahrain", "Bangladesh", "Bhutan", "British_Indian_Ocean_Territory", "Brunei", "Cambodia",
|
||||
"China", "Christmas_Island", "Democratic_Republic_of_Timor-Leste", "Gaza_Strip", "India", "Indonesia", "Iran",
|
||||
"Iraq", "Israel", "Jordan", "Kazakhstan", "Kuwait", "Kyrgyzstan", "Laos", "Lebanon", "Macau", "Malaysia",
|
||||
"Maldives", "Mongolia", "Nepal", "North_Korea", "Oman", "Pakistan", "Paracel_Islands", "Philippines", "Qatar",
|
||||
"Saudi_Arabia", "Singapore", "South_Korea", "Spratly_Islands", "Sri_Lanka", "Syria", "Taiwan", "Tajikistan",
|
||||
"Thailand", "Turkmenistan", "Union_of_Myanmar", "United_Arab_Emirates", "Uzbekistan", "Vietnam", "Yemen",
|
||||
// "Japan", // 420 MB
|
||||
};
|
||||
|
||||
|
||||
// africa
|
||||
protected static final String[] africa = new String[] {
|
||||
"Algeria", "Egypt", "Madagascar", "Morocco", "South_Africa",
|
||||
// TODO generate these countries
|
||||
// "Angola", "Benin", "Botswana", "Burkina_Faso", "Burundi", "Cameroon", "Cape_Verde",
|
||||
// "Central_African_Republic", "Chad", "Comoros", "Congo", "Democratic_Republic_of_the_Congo",
|
||||
// "Djibouti", "Equatorial_Guinea", "Eritrea", "Ethiopia", "Gabon", "Gambia", "Ghana",
|
||||
// "Glorioso_Islands", "Guinea", "Guinea-Bissau", "Ivory_Coast", "Juan_De_Nova_Island", "Kenya",
|
||||
// "Lesotho", "Liberia", "Libya", "Malawi", "Mali", "Mauritania", "Mauritius", "Mayotte",
|
||||
// "Mozambique", "Namibia", "Niger", "Nigeria", "Reunion", "Rwanda", "Sao_Tome_and_Principe",
|
||||
// "Senegal", "Seychelles", "Sierra_Leone", "Somalia", "St_Helena", "Sudan", "Swaziland",
|
||||
// "Togo", "Tunisia", "Uganda", "United_Republic_of_Tanzania", "Western_Sahara", "Zambia", "Zimbabwe",
|
||||
};
|
||||
|
||||
|
||||
protected static final String[] continents = new String[] {
|
||||
// "africa", // 160M
|
||||
// "australia-oceania", // 202M
|
||||
// "central-america", // 115M
|
||||
// "south-america", // 163M
|
||||
// "asia", // 911 M
|
||||
// + europe, north america
|
||||
};
|
||||
|
||||
|
||||
// process atributtes
|
||||
boolean downloadFiles = false;
|
||||
boolean generateIndexes = false;
|
||||
boolean uploadIndexes = false;
|
||||
boolean deleteFilesAfterUploading = true;
|
||||
|
||||
File osmDirFiles;
|
||||
File indexDirFiles;
|
||||
|
||||
boolean indexPOI = false;
|
||||
boolean indexTransport = false;
|
||||
boolean indexAddress = false;
|
||||
boolean writeWayNodes = false;
|
||||
boolean indexMap = false;
|
||||
|
||||
|
||||
String user;
|
||||
String password;
|
||||
String cookieHSID = "";
|
||||
String cookieSID = "";
|
||||
String pagegen = "";
|
||||
String token = "";
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
IndexBatchCreator creator = new IndexBatchCreator();
|
||||
if(args.length < 1 || !new File(args[0]).exists()) {
|
||||
throw new IllegalArgumentException("Please specify directory with .osm or .osm.bz2 files as first arg"); //$NON-NLS-1$
|
||||
if(args == null || args.length == 0){
|
||||
System.out.println("Please specify -local parameter or path to batch.xml configuration file as 1 argument.");
|
||||
throw new IllegalArgumentException("Please specify -local parameter or path to batch.xml configuration file as 1 argument.");
|
||||
}
|
||||
creator.osmDirFiles = new File(args[0]);
|
||||
if(args.length < 2 || !new File(args[1]).exists()) {
|
||||
throw new IllegalArgumentException("Please specify directory with generated index files as second arg"); //$NON-NLS-1$
|
||||
}
|
||||
creator.indexDirFiles = new File(args[1]);
|
||||
for(int i=2; i<args.length; i++){
|
||||
if("-downloadOsm".equals(args[i])){ //$NON-NLS-1$
|
||||
creator.downloadFiles = true;
|
||||
} else if("-genIndexes".equals(args[i])){ //$NON-NLS-1$
|
||||
creator.generateIndexes = true;
|
||||
} else if("-upload".equals(args[i])){ //$NON-NLS-1$
|
||||
creator.uploadIndexes = true;
|
||||
} else if(args[i].startsWith("-guser=")){ //$NON-NLS-1$
|
||||
creator.user = args[i].substring("-guser=".length()); //$NON-NLS-1$
|
||||
} else if(args[i].startsWith("-gpassword=")){ //$NON-NLS-1$
|
||||
creator.password = args[i].substring("-gpassword=".length()); //$NON-NLS-1$
|
||||
String name = args[0];
|
||||
InputStream stream;
|
||||
if(name.equals("-local")){
|
||||
stream = IndexBatchCreator.class.getResourceAsStream("batch.xml");
|
||||
} else {
|
||||
try {
|
||||
stream = new FileInputStream(name);
|
||||
} catch (FileNotFoundException e) {
|
||||
System.out.println("XML configuration file not found : " + name);
|
||||
return;
|
||||
}
|
||||
}
|
||||
creator.runBatch();
|
||||
|
||||
try {
|
||||
Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(stream);
|
||||
creator.runBatch(doc);
|
||||
} catch (SAXException e) {
|
||||
System.out.println("XML configuration file could not be read from " + name);
|
||||
e.printStackTrace();
|
||||
log.error("XML configuration file could not be read from " + name, e);
|
||||
} catch (IOException e) {
|
||||
System.out.println("XML configuration file could not be read from " + name);
|
||||
e.printStackTrace();
|
||||
log.error("XML configuration file could not be read from " + name, e);
|
||||
} catch (ParserConfigurationException e) {
|
||||
System.out.println("XML configuration file could not be read from " + name);
|
||||
e.printStackTrace();
|
||||
log.error("XML configuration file could not be read from " + name, e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void runBatch(){
|
||||
public void runBatch(Document doc){
|
||||
NodeList list = doc.getElementsByTagName("process");
|
||||
if(list.getLength() != 1){
|
||||
throw new IllegalArgumentException("You should specify exactly 1 process element!");
|
||||
}
|
||||
Element process = (Element) list.item(0);
|
||||
downloadFiles = Boolean.parseBoolean(process.getAttribute("downloadOsmFiles"));
|
||||
generateIndexes = Boolean.parseBoolean(process.getAttribute("generateIndexes"));
|
||||
uploadIndexes = Boolean.parseBoolean(process.getAttribute("uploadIndexes"));
|
||||
deleteFilesAfterUploading = Boolean.parseBoolean(process.getAttribute("deleteFilesAfterUploading"));
|
||||
|
||||
indexPOI = Boolean.parseBoolean(process.getAttribute("indexPOI"));
|
||||
indexMap = Boolean.parseBoolean(process.getAttribute("indexMap"));
|
||||
indexTransport = Boolean.parseBoolean(process.getAttribute("indexTransport"));
|
||||
indexAddress = Boolean.parseBoolean(process.getAttribute("indexAddress"));
|
||||
|
||||
String dir = process.getAttribute("directory_for_osm_files");
|
||||
if(dir == null || !new File(dir).exists()) {
|
||||
throw new IllegalArgumentException("Please specify directory with .osm or .osm.bz2 files as directory_for_osm_files (attribute)"); //$NON-NLS-1$
|
||||
}
|
||||
osmDirFiles = new File(dir);
|
||||
dir = process.getAttribute("directory_for_index_files");
|
||||
if(dir == null || !new File(dir).exists()) {
|
||||
throw new IllegalArgumentException("Please specify directory with generated index files as directory_for_index_files (attribute)"); //$NON-NLS-1$
|
||||
}
|
||||
indexDirFiles = new File(dir);
|
||||
|
||||
if(uploadIndexes){
|
||||
list = doc.getElementsByTagName("authorization_info");
|
||||
if(list.getLength() != 1){
|
||||
throw new IllegalArgumentException("You should specify exactly 1 authorization_info element to upload indexes!");
|
||||
}
|
||||
Element authorization = (Element) list.item(0);
|
||||
cookieHSID = authorization.getAttribute("cookieHSID");
|
||||
cookieSID = authorization.getAttribute("cookieSID");
|
||||
pagegen = authorization.getAttribute("pagegen");
|
||||
token = authorization.getAttribute("token");
|
||||
user = authorization.getAttribute("google_code_user");
|
||||
password = authorization.getAttribute("google_code_password");
|
||||
}
|
||||
|
||||
List<RegionCountries> countriesToDownload = new ArrayList<RegionCountries>();
|
||||
NodeList regions = doc.getElementsByTagName("regions");
|
||||
for(int i=0; i< regions.getLength(); i++){
|
||||
Element el = (Element) regions.item(i);
|
||||
if(!Boolean.parseBoolean(el.getAttribute("skip"))){
|
||||
RegionCountries countries = new RegionCountries();
|
||||
countries.siteToDownload = el.getAttribute("siteToDownload");
|
||||
if(countries.siteToDownload == null){
|
||||
continue;
|
||||
}
|
||||
countries.namePrefix = el.getAttribute("region_prefix");
|
||||
if(countries.namePrefix == null){
|
||||
countries.namePrefix = "";
|
||||
}
|
||||
NodeList ncountries = el.getElementsByTagName("region");
|
||||
for(int j=0; j< ncountries.getLength(); j++){
|
||||
Element ncountry = (Element) ncountries.item(j);
|
||||
String name = ncountry.getAttribute("name");
|
||||
if(name != null && !Boolean.parseBoolean(ncountry.getAttribute("skip"))){
|
||||
countries.regionNames.add(name);
|
||||
}
|
||||
}
|
||||
countriesToDownload.add(countries);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
runBatch(countriesToDownload);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void runBatch(List<RegionCountries> countriesToDownload ){
|
||||
Set<String> alreadyUploadedFiles = new LinkedHashSet<String>();
|
||||
Set<String> alreadyGeneratedFiles = new LinkedHashSet<String>();
|
||||
if(downloadFiles){
|
||||
downloadFiles(alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
downloadFiles(countriesToDownload, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
if(generateIndexes){
|
||||
generatedIndexes(alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
|
|
@ -264,90 +197,23 @@ public class IndexBatchCreator {
|
|||
|
||||
|
||||
|
||||
protected void downloadFiles(Set<String> alreadyGeneratedFiles, Set<String> alreadyUploadedFiles){
|
||||
protected void downloadFiles(List<RegionCountries> countriesToDownload, Set<String> alreadyGeneratedFiles, Set<String> alreadyUploadedFiles){
|
||||
// clean before downloading
|
||||
// for(File f : osmDirFiles.listFiles()){
|
||||
// log.info("Delete old file " + f.getName()); //$NON-NLS-1$
|
||||
// f.delete();
|
||||
// }
|
||||
// EUROPE //
|
||||
// europe
|
||||
for(String country : europeCountries){
|
||||
String url = SITE_TO_DOWNLOAD1 + country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
|
||||
// france
|
||||
for(String country : franceProvinces){
|
||||
String url = SITE_TO_DOWNLOAD1 +"france/" + country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, "France_"+country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
for(RegionCountries regionCountries : countriesToDownload){
|
||||
String prefix = regionCountries.namePrefix;
|
||||
String site = regionCountries.siteToDownload;
|
||||
for(String name : regionCountries.regionNames){
|
||||
name = name.toLowerCase();
|
||||
String url = MessageFormat.format(site, name);
|
||||
downloadFile(url, prefix+name, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
}
|
||||
|
||||
// germany
|
||||
for(String country : germanyLands){
|
||||
String url = SITE_TO_DOWNLOAD1 +"germany/" + country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, "Germany_"+country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
|
||||
|
||||
// north america //
|
||||
for(String country : northAmerica){
|
||||
country = country.toLowerCase();
|
||||
String url = SITE_TO_DOWNLOAD2 + "north_america/"+country+"/"+country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
|
||||
|
||||
// usa
|
||||
for(String country : usStates){
|
||||
country = country.toLowerCase();
|
||||
String url = SITE_TO_DOWNLOAD2 + "north_america/united_states/"+country+"/"+country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, "US_"+country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
|
||||
// canada
|
||||
for(String country : canadaStates){
|
||||
country = country.toLowerCase();
|
||||
String url = SITE_TO_DOWNLOAD2 + "north_america/canada/"+country+"/"+country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, "Canada_"+country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
|
||||
// SOUTH AMERICA//
|
||||
for(String country : southAmerica){
|
||||
country = country.toLowerCase();
|
||||
String url = SITE_TO_DOWNLOAD2 + "south_america/"+country+"/"+country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
|
||||
// ASIA //
|
||||
for(String country : asia){
|
||||
country = country.toLowerCase();
|
||||
String url = SITE_TO_DOWNLOAD2 + "asia/"+country+"/"+country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
|
||||
// africa //
|
||||
for(String country : africa){
|
||||
country = country.toLowerCase();
|
||||
String url = SITE_TO_DOWNLOAD2 + "africa/"+country+"/"+country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
|
||||
// russia
|
||||
for(String country : russiaStates){
|
||||
country = country.toLowerCase();
|
||||
String url = SITE_TO_DOWNLOAD3 + country+"/"+country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, "Russia_"+country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
|
||||
// OCEANIA //
|
||||
for(String country : oceania){
|
||||
country = country.toLowerCase();
|
||||
String url = SITE_TO_DOWNLOAD2 + "oceania/"+country+"/"+country +".osm.bz2"; //$NON-NLS-1$
|
||||
downloadFile(url, country, alreadyGeneratedFiles, alreadyUploadedFiles);
|
||||
}
|
||||
|
||||
|
||||
System.out.println("DOWNLOADING FILES FINISHED");
|
||||
}
|
||||
|
||||
|
|
@ -407,7 +273,6 @@ public class IndexBatchCreator {
|
|||
regionName = Algoritms.capitalizeFirstLetterAndLowercase(f.getName().substring(0, i));
|
||||
}
|
||||
|
||||
boolean saveAddressWays = writeWayNodes && !doNotWriteWayNodesInUploading.contains(regionName.toLowerCase());
|
||||
IndexCreator indexCreator = new IndexCreator(indexDirFiles);
|
||||
indexCreator.setIndexAddress(indexAddress);
|
||||
indexCreator.setIndexPOI(indexPOI);
|
||||
|
|
@ -415,7 +280,7 @@ public class IndexBatchCreator {
|
|||
indexCreator.setIndexMap(indexMap);
|
||||
indexCreator.setLastModifiedDate(f.lastModified());
|
||||
indexCreator.setNormalizeStreets(true);
|
||||
indexCreator.setSaveAddressWays(saveAddressWays);
|
||||
indexCreator.setSaveAddressWays(writeWayNodes);
|
||||
|
||||
|
||||
String addressFileName = regionName + "_" + IndexConstants.ADDRESS_TABLE_VERSION + IndexConstants.ADDRESS_INDEX_EXT;
|
||||
|
|
|
|||
Loading…
Reference in a new issue