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

fix issue 221

Browse source 
fix issue 198

git-svn-id: https://osmand.googlecode.com/svn/trunk@715 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-11-28 22:39:12 +00:00
parent 11bdabcb84
commit e5e7509a98
4 changed files with 209 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
DataExtractionOSM/src/net/osmand/data/index/DataIndexWriter.java
View file

@ -302,9 +302,15 @@ public class DataIndexWriter {
public static void createMapIndexStructure(Connection conn) throws SQLException{ public static void createMapIndexStructure(Connection conn) throws SQLException{
Statement stat = conn.createStatement(); Statement stat = conn.createStatement();
assert IndexConstants.BINARY_MAP_TABLE != null : "use constants here to show table usage "; //$NON-NLS-1$ assert IndexConstants.BINARY_MAP_TABLE != null : "use constants here to show table usage "; //$NON-NLS-1$
assert IndexConstants.LOW_LEVEL_MAP_TABLE != null : "use constants here to show table usage "; //$NON-NLS-1$
stat.executeUpdate("create table binary_map_objects (id bigint primary key, name varchar(255), " + stat.executeUpdate("create table binary_map_objects (id bigint primary key, name varchar(255), " +
"types binary, restrictions binary, nodes binary, highway int)"); "types binary, restrictions binary, nodes binary, highway int)");
stat.executeUpdate("create index binary_map_objects_ind on binary_map_objects (id)"); stat.executeUpdate("create index binary_map_objects_ind on binary_map_objects (id)");
stat.executeUpdate("create table low_level_map_objects (id bigint primary key, start_node bigint, " +
"end_node bigint, name varchar(255), nodes binary, type bigint, level smallint)");
stat.executeUpdate("create index low_level_map_objects_ind on low_level_map_objects (id)");
stat.executeUpdate("create index low_level_map_objects_ind_loc on low_level_map_objects (start_node, end_node)");
stat.close(); stat.close();
} }
@ -312,6 +318,48 @@ public class DataIndexWriter {
assert IndexConstants.BINARY_MAP_TABLE != null : "use constants here to show table usage "; //$NON-NLS-1$ assert IndexConstants.BINARY_MAP_TABLE != null : "use constants here to show table usage "; //$NON-NLS-1$
return conn.prepareStatement("insert into binary_map_objects(id, name, types, restrictions, nodes, highway) values(?, ?, ?, ?, ?, ?)"); return conn.prepareStatement("insert into binary_map_objects(id, name, types, restrictions, nodes, highway) values(?, ?, ?, ?, ?, ?)");
} }
public static PreparedStatement createStatementLowLevelMapBinaryInsert(Connection conn) throws SQLException{
assert IndexConstants.LOW_LEVEL_MAP_TABLE != null : "use constants here to show table usage "; //$NON-NLS-1$
return conn.prepareStatement("insert into low_level_map_objects(id, start_node, end_node, name, nodes, type, level) values(?, ?, ?, ?, ?, ?, ?)");
}
public static void insertLowLevelMapBinaryObject(Map<PreparedStatement, Integer> statements,
PreparedStatement mapLowLevelBinaryStat, int level,long types, long id, List<Node> nodes, String name) throws SQLException{
assert IndexConstants.LOW_LEVEL_MAP_TABLE != null : "use constants here to show table usage "; //$NON-NLS-1$
boolean first = true;
long firstId = -1;
long lastId = -1;
ByteArrayOutputStream bnodes = new ByteArrayOutputStream();
try {
for (Node n : nodes) {
if (n != null) {
if (first) {
firstId = n.getId();
first = false;
}
lastId = n.getId();
Algoritms.writeInt(bnodes, Float.floatToRawIntBits((float) n.getLatitude()));
Algoritms.writeInt(bnodes, Float.floatToRawIntBits((float) n.getLongitude()));
}
}
} catch (IOException e) {
throw new IllegalStateException(e);
}
if(firstId == -1){
return;
}
// conn.prepareStatement("insert into binary_map_objects(id, name, types, restrictions, nodes, highway) values(?, ?, ?, ?, ?, ?)");
mapLowLevelBinaryStat.setLong(1, id);
mapLowLevelBinaryStat.setLong(2, firstId);
mapLowLevelBinaryStat.setLong(3, lastId);
mapLowLevelBinaryStat.setString(4, name);
mapLowLevelBinaryStat.setBytes(5, bnodes.toByteArray());
mapLowLevelBinaryStat.setLong(6, types);
mapLowLevelBinaryStat.setShort(7, (short) level);
addBatch(statements, mapLowLevelBinaryStat);
}
public static void insertBinaryMapRenderObjectIndex(Map<PreparedStatement, Integer> statements, public static void insertBinaryMapRenderObjectIndex(Map<PreparedStatement, Integer> statements,
PreparedStatement mapBinaryStat, RTree mapTree, Entity e, String name, PreparedStatement mapBinaryStat, RTree mapTree, Entity e, String name,
long id, int type, List<Integer> typeUse, int highwayAttributes, List<Long> restrictions, long id, int type, List<Integer> typeUse, int highwayAttributes, List<Long> restrictions,

1
DataExtractionOSM/src/net/osmand/data/index/IndexConstants.java
View file

@ -45,6 +45,7 @@ public class IndexConstants {
public final static String POI_TABLE = "poi"; //$NON-NLS-1$ public final static String POI_TABLE = "poi"; //$NON-NLS-1$
public final static String BINARY_MAP_TABLE = "binary_map_objects"; //$NON-NLS-1$ public final static String BINARY_MAP_TABLE = "binary_map_objects"; //$NON-NLS-1$
public final static String LOW_LEVEL_MAP_TABLE = "low_level_map_objects"; //$NON-NLS-1$
public final static String TRANSPORT_STOP_TABLE = "transport_stop"; //$NON-NLS-1$ public final static String TRANSPORT_STOP_TABLE = "transport_stop"; //$NON-NLS-1$
public final static String TRANSPORT_ROUTE_STOP_TABLE = "transport_route_stop"; //$NON-NLS-1$ public final static String TRANSPORT_ROUTE_STOP_TABLE = "transport_route_stop"; //$NON-NLS-1$

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

@ -90,7 +90,7 @@ public class IndexCreator {
private static final String SQLITE_DIALECT = "SQLITE"; private static final String SQLITE_DIALECT = "SQLITE";
private static final String CURRENT_DB = SQLITE_DIALECT; private static final String CURRENT_DB = SQLITE_DIALECT;
public static final int BATCH_SIZE = 1000; public static final int BATCH_SIZE = 5000;
public static final int BATCH_SIZE_OSM = 10000; public static final int BATCH_SIZE_OSM = 10000;
public static final String TEMP_NODES_DB = "nodes.tmp.odb"; public static final String TEMP_NODES_DB = "nodes.tmp.odb";
@ -137,6 +137,8 @@ public class IndexCreator {
private Connection mapConnection; private Connection mapConnection;
private PreparedStatement mapBinaryStat; private PreparedStatement mapBinaryStat;
private PreparedStatement mapLowLevelBinaryStat;
private int lowLevelWays = -1;
private PreparedStatement addressCityStat; private PreparedStatement addressCityStat;
private PreparedStatement addressStreetStat; private PreparedStatement addressStreetStat;
@ -164,17 +166,6 @@ public class IndexCreator {
private Map<Long, String> multiPolygonsNames = new LinkedHashMap<Long, String>(); private Map<Long, String> multiPolygonsNames = new LinkedHashMap<Long, String>();
private Map<Long, List<Long>> highwayRestrictions = new LinkedHashMap<Long, List<Long>>(); private Map<Long, List<Long>> highwayRestrictions = new LinkedHashMap<Long, List<Long>>();
private Map<Long, List<Way>>[] lowLevelSt = new Map[MAP_ZOOMS.length - 1];
private Map<Long, List<Way>>[] lowLevelEnd = new Map[MAP_ZOOMS.length - 1];
{
for (int i = 0; i < lowLevelSt.length; i++) {
lowLevelSt[i] = new LinkedHashMap<Long, List<Way>>();
}
for (int i = 0; i < lowLevelEnd.length; i++) {
lowLevelEnd[i] = new LinkedHashMap<Long, List<Way>>();
}
}
// MEMORY address : choose what to use ? // MEMORY address : choose what to use ?
private boolean loadInMemory = true; private boolean loadInMemory = true;
private PreparedStatement addressSearchStreetStat; private PreparedStatement addressSearchStreetStat;
@ -476,7 +467,11 @@ public class IndexCreator {
log.error("Illegal configuration", e); log.error("Illegal configuration", e);
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
return DriverManager.getConnection("jdbc:sqlite:" + fileName); Connection connection = DriverManager.getConnection("jdbc:sqlite:" + fileName);
Statement statement = connection.createStatement();
statement.executeUpdate("PRAGMA synchronous = 0");
statement.close();
return connection;
} else if (usingDerby()) { } else if (usingDerby()) {
try { try {
Class.forName("org.apache.derby.jdbc.EmbeddedDriver"); Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
@ -1626,7 +1621,7 @@ public class IndexCreator {
} }
protected Way simplifyWay(Way originalE, long id, boolean hasMulti, int zoom, String name, int type, int level) { protected Way simplifyWay(Way originalE, long id, boolean hasMulti, int zoom, String name, int type, int level) throws SQLException {
List<Node> nodes = originalE.getNodes(); List<Node> nodes = originalE.getNodes();
Way way = new Way(id); Way way = new Way(id);
for (String t : originalE.getTagKeySet()) { for (String t : originalE.getTagKeySet()) {
@ -1635,8 +1630,8 @@ public class IndexCreator {
boolean cycle = originalE.getNodeIds().get(0).longValue() == originalE.getNodeIds().get(nodes.size() - 1).longValue(); boolean cycle = originalE.getNodeIds().get(0).longValue() == originalE.getNodeIds().get(nodes.size() - 1).longValue();
long longType = encodeTypesToOneLong(type); long longType = encodeTypesToOneLong(type);
boolean skip = checkForSmallAreas(nodes, zoom, 3); boolean skip = checkForSmallAreas(nodes, zoom, 3, 3);
if (skip && (cycle || !hasMulti)) { if (skip && cycle/* || !hasMulti)*/) {
return null; return null;
} }
@ -1648,98 +1643,137 @@ public class IndexCreator {
// nothing to do // nothing to do
return way; return way;
} else { } else {
way.putTag(OSMTagKey.NAME.getValue(), name); lowLevelWays ++;
way.putTag("long_type", longType + ""); DataIndexWriter.insertLowLevelMapBinaryObject(pStatements, mapLowLevelBinaryStat, level, longType, id, way.getNodes(), name);
long stId = way.getNodes().get(0).getId();
long endId = way.getNodes().get(way.getNodes().size() - 1).getId();
if (!lowLevelSt[level].containsKey(stId)) {
lowLevelSt[level].put(stId, new ArrayList<Way>(2));
}
lowLevelSt[level].get(stId).add(way);
if (!lowLevelEnd[level].containsKey(endId)) {
lowLevelEnd[level].put(endId, new ArrayList<Way>(2));
}
lowLevelEnd[level].get(endId).add(way);
return null; return null;
} }
} }
private void processingLowLevelWays() throws SQLException { private void loadNodes(byte[] nodes, List<Float> toPut){
for (int level = 1; level < MAP_ZOOMS.length - 1; level++) { toPut.clear();
for (int i = 0; i < nodes.length;) {
int lat = Algoritms.parseIntFromBytes(nodes, i);
i += 4;
int lon = Algoritms.parseIntFromBytes(nodes, i);
i += 4;
toPut.add(Float.intBitsToFloat(lat));
toPut.add(Float.intBitsToFloat(lon));
}
}
private void processingLowLevelWays(IProgress progress) throws SQLException {
restrictionsUse.clear();
mapLowLevelBinaryStat.executeBatch();
pStatements.put(mapLowLevelBinaryStat, 0);
mapConnection.commit();
PreparedStatement startStat = mapConnection.prepareStatement("SELECT id, start_node, end_node, nodes FROM "
+ IndexConstants.LOW_LEVEL_MAP_TABLE + " WHERE start_node = ? AND type=? AND level = ? AND name=?");
PreparedStatement endStat = mapConnection.prepareStatement("SELECT id, start_node, end_node, nodes FROM "
+ IndexConstants.LOW_LEVEL_MAP_TABLE + " WHERE end_node = ? AND type=? AND level = ? AND name=?");
Statement selectStatement = mapConnection.createStatement();
ResultSet rs = selectStatement.executeQuery("SELECT id, start_node, end_node, name, nodes, type, level FROM " + IndexConstants.LOW_LEVEL_MAP_TABLE);
Set<Long> visitedWays = new LinkedHashSet<Long>(); Set<Long> visitedWays = new LinkedHashSet<Long>();
int zoom = MAP_ZOOMS[MAP_ZOOMS.length - level - 1]; ArrayList<Float> list = new ArrayList<Float>(100);
for(Long stId : lowLevelSt[level].keySet()){ while(rs.next()){
for (Way w : lowLevelSt[level].get(stId)) { if(lowLevelWays != -1){
if (visitedWays.contains(w.getId())) { progress.progress(1);
}
long id = rs.getLong(1);
if(visitedWays.contains(id)){
continue; continue;
} }
visitedWays.add(w.getId());
visitedWays.add(id);
int level = rs.getInt(7);
int zoom = MAP_ZOOMS[MAP_ZOOMS.length - level - 1];
long startNode = rs.getLong(2);
long endNode = rs.getLong(3);
String name = rs.getString(4);
long ltype = rs.getLong(6);
loadNodes(rs.getBytes(5), list);
ArrayList<Float> wayNodes = new ArrayList<Float>(list);
// combine startPoint with EndPoint // combine startPoint with EndPoint
boolean combined = true; boolean combined = true;
while (combined) { while (combined) {
combined = false; combined = false;
List<Way> list = lowLevelEnd[level].get(w.getNodeIds().get(0)); endStat.setLong(1, startNode);
if (list != null) { endStat.setLong(2, ltype);
for (Way ws : list) { endStat.setShort(3, (short) level);
if (!visitedWays.contains(ws.getId()) endStat.setString(4, name);
&& Algoritms.objectEquals(ws.getTag(OSMTagKey.NAME), w.getTag(OSMTagKey.NAME)) ResultSet fs = endStat.executeQuery();
&& Algoritms.objectEquals(ws.getTag("long_type"), w.getTag("long_type"))) { while (fs.next()) {
visitedWays.add(ws.getId()); if (!visitedWays.contains(fs.getLong(1))) {
for (int i = 1; i < w.getNodes().size(); i++) {
ws.addNode(w.getNodes().get(i));
}
w = ws;
combined = true; combined = true;
break; long lid = fs.getLong(1);
startNode = fs.getLong(2);
visitedWays.add(lid);
loadNodes(fs.getBytes(4), list);
ArrayList li = new ArrayList<Float>(list);
// remove first lat/lon point
wayNodes.remove(0);
wayNodes.remove(0);
li.addAll(wayNodes);
wayNodes = li;
} }
} }
fs.close();
} }
}
// combined end point // combined end point
combined = true; combined = true;
while (combined) { while (combined) {
combined = false; combined = false;
List<Way> list = lowLevelSt[level].get(w.getNodeIds().get(w.getNodeIds().size() - 1)); startStat.setLong(1, endNode);
if (list != null) { startStat.setLong(2, ltype);
for (Way ws : list) { startStat.setShort(3, (short) level);
if (!visitedWays.contains(ws.getId()) startStat.setString(4, name);
&& Algoritms.objectEquals(ws.getTag(OSMTagKey.NAME), w.getTag(OSMTagKey.NAME)) ResultSet fs = startStat.executeQuery();
&& Algoritms.objectEquals(ws.getTag("long_type"), w.getTag("long_type"))) { while (fs.next()) {
visitedWays.add(ws.getId()); if (!visitedWays.contains(fs.getLong(1))) {
for (int i = 1; i < ws.getNodes().size(); i++) {
w.addNode(ws.getNodes().get(i));
}
combined = true; combined = true;
break; long lid = fs.getLong(1);
endNode = fs.getLong(3);
visitedWays.add(lid);
loadNodes(fs.getBytes(4), list);
for (int i = 2; i < list.size(); i++) {
wayNodes.add(list.get(i));
} }
} }
} }
fs.close();
}
List<Node> wNodes = new ArrayList<Node>();
for (int i = 0; i < wayNodes.size(); i += 2) {
wNodes.add(new Node(wayNodes.get(i), wayNodes.get(i + 1), i == 0 ? startNode : endNode));
} }
boolean skip = false; boolean skip = false;
boolean cycle = w.getNodes().get(0).getId() == w.getNodes().get(w.getNodes().size() - 1).getId(); boolean cycle = startNode == endNode;
boolean hasMulti = multiPolygonsWays[level].containsKey(w.getId() >> 3); boolean hasMulti = multiPolygonsWays[level].containsKey(id >> 3);
if(cycle || !hasMulti){ if(cycle || !hasMulti){
skip = checkForSmallAreas(w.getNodes(), zoom - 1, 4); skip = checkForSmallAreas(wNodes, zoom - 1, 1, 4);
} }
if (!skip) { if (!skip) {
Way newWs = new Way(w.getId()); Way newWs = new Way(id);
simplifyDouglasPeucker(w.getNodes(), zoom - 1 + 8, 3, newWs); simplifyDouglasPeucker(wNodes, zoom - 1 + 8, 3, newWs);
Long l = Long.parseLong(w.getTag("long_type")); int type = decodeTypesFromOneLong(ltype);
int type = decodeTypesFromOneLong(l); DataIndexWriter.insertBinaryMapRenderObjectIndex(pStatements, mapBinaryStat, mapTree[level], newWs, name,
DataIndexWriter.insertBinaryMapRenderObjectIndex(pStatements, mapBinaryStat, mapTree[level], newWs, w id, type, typeUse, 0, restrictionsUse, false, false, BATCH_SIZE);
.getTag(OSMTagKey.NAME), w.getId(), type, typeUse, 0, restrictionsUse, false, false, BATCH_SIZE);
}
}
}
}
} }
private boolean checkForSmallAreas(List<Node> nodes, int zoom, int sz) { }
}
private boolean checkForSmallAreas(List<Node> nodes, int zoom, int minz, int maxz) {
int minX = Integer.MAX_VALUE; int minX = Integer.MAX_VALUE;
int maxX = Integer.MIN_VALUE; int maxX = Integer.MIN_VALUE;
int minY = Integer.MAX_VALUE; int minY = Integer.MAX_VALUE;
@ -1759,8 +1793,8 @@ public class IndexCreator {
if (c < 2) { if (c < 2) {
return true; return true;
} }
return ((maxX - minX) <= (sz - 1) && (maxY - minY) <= (sz + 1)) || return ((maxX - minX) <= minz && (maxY - minY) <= maxz) ||
((maxX - minX) <= (sz + 1) && (maxY - minY) <= (sz - 1)); ((maxX - minX) <= maxz && (maxY - minY) <= minz);
} }
@ -2203,6 +2237,7 @@ public class IndexCreator {
cities.clear(); cities.clear();
cityManager.clear(); cityManager.clear();
lowLevelWays = -1;
postalCodeRelations.clear(); postalCodeRelations.clear();
if (normalizeStreets) { if (normalizeStreets) {
normalizeDefaultSuffixes = DataExtractionSettings.getSettings().getDefaultSuffixesToNormalizeStreets(); normalizeDefaultSuffixes = DataExtractionSettings.getSettings().getDefaultSuffixesToNormalizeStreets();
@ -2331,8 +2366,8 @@ public class IndexCreator {
// 3.4 combine all low level ways and simplify them // 3.4 combine all low level ways and simplify them
if(indexMap){ if(indexMap){
progress.setGeneralProgress("[90 of 100]"); progress.setGeneralProgress("[90 of 100]");
progress.startTask("Indexing low level ways...", -1); progress.startTask("Indexing low level ways...", lowLevelWays);
processingLowLevelWays(); processingLowLevelWays(progress);
} }
// 3.5 update all postal codes from relations // 3.5 update all postal codes from relations
@ -2373,7 +2408,7 @@ public class IndexCreator {
if (indexMap) { if (indexMap) {
progress.setGeneralProgress("[95 of 100]"); progress.setGeneralProgress("[95 of 100]");
progress.startTask("Writing map index to binary file...", -1); progress.startTask("Writing map index to binary file...", -1);
closePreparedStatements(mapBinaryStat); closePreparedStatements(mapBinaryStat, mapLowLevelBinaryStat);
mapConnection.commit(); mapConnection.commit();
writeBinaryMapIndex(writer); writeBinaryMapIndex(writer);
} }
@ -2615,6 +2650,7 @@ public class IndexCreator {
if (indexMap) { if (indexMap) {
DataIndexWriter.createMapIndexStructure(mapConnection); DataIndexWriter.createMapIndexStructure(mapConnection);
mapBinaryStat = DataIndexWriter.createStatementMapBinaryInsert(mapConnection); mapBinaryStat = DataIndexWriter.createStatementMapBinaryInsert(mapConnection);
mapLowLevelBinaryStat = DataIndexWriter.createStatementLowLevelMapBinaryInsert(mapConnection);
try { try {
mapTree = new RTree[MAP_ZOOMS.length - 1]; mapTree = new RTree[MAP_ZOOMS.length - 1];
for (int i = 0; i < MAP_ZOOMS.length - 1; i++) { for (int i = 0; i < MAP_ZOOMS.length - 1; i++) {
@ -2630,6 +2666,7 @@ public class IndexCreator {
throw new IOException(e); throw new IOException(e);
} }
pStatements.put(mapBinaryStat, 0); pStatements.put(mapBinaryStat, 0);
pStatements.put(mapLowLevelBinaryStat, 0);
} }
if (indexAddress) { if (indexAddress) {
@ -2728,12 +2765,12 @@ public class IndexCreator {
creator.recreateOnlyBinaryFile = false; creator.recreateOnlyBinaryFile = false;
creator.deleteDatabaseIndexes = true; creator.deleteDatabaseIndexes = true;
// creator.setNodesDBFile(new File("e:/Information/OSM maps/osmand/minsk.tmp.odb")); creator.setNodesDBFile(new File("e:/Information/OSM maps/osmand/minsk.tmp.odb"));
// creator.generateIndexes(new File("e:/Information/OSM maps/belarus osm/minsk.osm"), new ConsoleProgressImplementation(3), null); creator.generateIndexes(new File("e:/Information/OSM maps/belarus osm/minsk.osm"), new ConsoleProgressImplementation(3), null);
creator.setNodesDBFile(new File("e:/Information/OSM maps/osmand/belarus_nodes.tmp.odb")); // creator.setNodesDBFile(new File("e:/Information/OSM maps/osmand/belarus_nodes.tmp.odb"));
creator.generateIndexes(new File("e:/Information/OSM maps/belarus osm/belarus.osm.pbf"), new ConsoleProgressImplementation(3), null); // creator.generateIndexes(new File("e:/Information/OSM maps/belarus osm/belarus.osm.pbf"), new ConsoleProgressImplementation(3), null);
// creator.setNodesDBFile(new File("e:/Information/OSM maps/osmand/ams.tmp.odb")); // creator.setNodesDBFile(new File("e:/Information/OSM maps/osmand/ams.tmp.odb"));
// creator.generateIndexes(new File("e:/Information/OSM maps/osm_map/ams_part_map.osm"), new ConsoleProgressImplementation(3), null); // creator.generateIndexes(new File("e:/Information/OSM maps/osm_map/ams_part_map.osm"), new ConsoleProgressImplementation(3), null);

15
DataExtractionOSM/src/net/osmand/impl/ConsoleProgressImplementation.java
View file

@ -11,13 +11,16 @@ import org.apache.commons.logging.Log;
public class ConsoleProgressImplementation implements IProgress { public class ConsoleProgressImplementation implements IProgress {
public static double deltaPercentsToPrint = 3.5; public static double deltaPercentsToPrint = 3.5;
public static long deltaTimeToPrint = 1000;
private static Log log = LogUtil.getLog(ConsoleProgressImplementation.class); private static Log log = LogUtil.getLog(ConsoleProgressImplementation.class);
String currentTask; String currentTask;
int work; int work;
int currentDone; int currentDone;
double delta; double delta;
long deltaTime = deltaTimeToPrint;
private long previousTaskStarted = 0; private long previousTaskStarted = 0;
private long lastTimePrinted = 0;
double lastPercentPrint = 0; double lastPercentPrint = 0;
public ConsoleProgressImplementation(){ public ConsoleProgressImplementation(){
@ -28,6 +31,11 @@ public class ConsoleProgressImplementation implements IProgress {
delta = deltaToPrint; delta = deltaToPrint;
} }
public ConsoleProgressImplementation(double deltaToPrint, int deltaTime){
delta = deltaToPrint;
deltaToPrint = deltaTime;
}
@Override @Override
public void finishTask() { public void finishTask() {
log.info("Task " + currentTask + " is finished "); //$NON-NLS-1$ //$NON-NLS-2$ log.info("Task " + currentTask + " is finished "); //$NON-NLS-1$ //$NON-NLS-2$
@ -48,8 +56,13 @@ public class ConsoleProgressImplementation implements IProgress {
private void printIfNeeded() { private void printIfNeeded() {
if(getCurrentPercent() - lastPercentPrint >= delta){ if(getCurrentPercent() - lastPercentPrint >= delta){
System.out.println(MessageFormat.format("Done {0} %.", getCurrentPercent())); //$NON-NLS-1$
this.lastPercentPrint = getCurrentPercent(); this.lastPercentPrint = getCurrentPercent();
long now = System.currentTimeMillis();
if(now - lastTimePrinted >= deltaTimeToPrint || deltaTime < 0){
System.out.println(MessageFormat.format("Done {0} %.", getCurrentPercent())); //$NON-NLS-1$
lastTimePrinted = now;
}
} }
} }