Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix NPE

Browse source
This commit is contained in:
Victor Shcherb 2012-01-03 22:09:57 +01:00
parent db28f122b4
commit f092be50d0
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java
View file

@ -352,6 +352,9 @@ public class IndexCreator {
// if(LevelDBAccess.load()){ // if(LevelDBAccess.load()){
// dialect = DBDialect.NOSQL; // dialect = DBDialect.NOSQL;
// } // }
if(logMapDataWarn == null) {
log = logMapDataWarn;
}
if (renderingTypes == null) { if (renderingTypes == null) {
renderingTypes = MapRenderingTypes.getDefault(); renderingTypes = MapRenderingTypes.getDefault();
@ -648,13 +651,13 @@ public class IndexCreator {
MapZooms zooms = MapZooms.getDefault(); // MapZooms.parseZooms("15-"); MapZooms zooms = MapZooms.getDefault(); // MapZooms.parseZooms("15-");
creator.setNodesDBFile(new File("/home/victor/projects/OsmAnd/data/osm-gen/nodes.tmp.odb")); creator.setNodesDBFile(new File("/home/victor/projects/OsmAnd/data/osm-gen/nodes.tmp.odb"));
// creator.generateIndexes(new File("/home/victor/projects/OsmAnd/data/osm-maps/mecklenburg-vorpommern.osm.pbf"), // creator.generateIndexes(new File("/home/victor/projects/OsmAnd/data/osm-maps/mecklenburg-vorpommern.osm.pbf"),
// new ConsoleProgressImplementation(1), null, zooms, rt, null); // new ConsoleProgressImplementation(1), null, zooms, rt, log);
creator.generateIndexes(new File("/home/victor/projects/OsmAnd/download/RU-MOW.osm.bz2"), creator.generateIndexes(new File("/home/victor/projects/OsmAnd/download/RU-MOW.osm.bz2"),
new ConsoleProgressImplementation(1), null, zooms, rt, null); new ConsoleProgressImplementation(1), null, zooms, rt, log);
// creator.setNodesDBFile(new File("/home/victor/projects/OsmAnd/data/osm-gen/nodes3.tmp.odb")); // creator.setNodesDBFile(new File("/home/victor/projects/OsmAnd/data/osm-gen/nodes3.tmp.odb"));
// creator.generateIndexes(new File("/home/victor/projects/OsmAnd/data/osm-maps/stadion-dynamo.osm"), // creator.generateIndexes(new File("/home/victor/projects/OsmAnd/data/osm-maps/stadion-dynamo.osm"),
// new ConsoleProgressImplementation(1), null, MapZooms.getDefault(), null); // new ConsoleProgressImplementation(1), null, MapZooms.getDefault(), log);
@ -672,7 +675,7 @@ public class IndexCreator {
// creator.generateIndexes(new File( // creator.generateIndexes(new File(
// "/home/victor/projects/OsmAnd/download/basemap/basemap_1.osm" // "/home/victor/projects/OsmAnd/download/basemap/basemap_1.osm"
// ), // ),
// new ConsoleProgressImplementation(1), null, mapZooms, null); // new ConsoleProgressImplementation(1), null, mapZooms, log);

2
DataExtractionOSM/src/net/osmand/swing/OsmExtractionUI.java
View file

@ -462,7 +462,7 @@ public class OsmExtractionUI implements IMapLocationListener {
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
} }
creator.setZoomWaySmothness(smoothness); creator.setZoomWaySmothness(smoothness);
creator.generateIndexes(f, dlg, filter, DataExtractionSettings.getSettings().getMapZooms(), types, null); creator.generateIndexes(f, dlg, filter, DataExtractionSettings.getSettings().getMapZooms(), types, log);
} catch (IOException e) { } catch (IOException e) {
throw new IllegalArgumentException(e); throw new IllegalArgumentException(e);
} catch (SAXException e) { } catch (SAXException e) {