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

Fix update

Browse source
This commit is contained in:
Victor Shcherb 2015-08-01 22:39:35 +02:00
parent c961e66612
commit c7167cc468
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
View file

@ -45,6 +45,7 @@ public class IncrementalChangesManager {
for (String month : list) { for (String month : list) {
RegionUpdate ru = regionUpdateFiles.monthUpdates.get(month); RegionUpdate ru = regionUpdateFiles.monthUpdates.get(month);
if (ru.obfCreated < dateCreated) { if (ru.obfCreated < dateCreated) {
log.info("Delete overlapping month update " + ru.file.getName());
resourceManager.closeFile(ru.file.getName()); resourceManager.closeFile(ru.file.getName());
regionUpdateFiles.monthUpdates.remove(month); regionUpdateFiles.monthUpdates.remove(month);
ru.file.delete(); ru.file.delete();
@ -60,6 +61,7 @@ public class IncrementalChangesManager {
while (it.hasNext()) { while (it.hasNext()) {
RegionUpdate ru = it.next(); RegionUpdate ru = it.next();
if (ru.obfCreated < dateCreated || (monthRu != null && ru.obfCreated < monthRu.obfCreated)) { if (ru.obfCreated < dateCreated || (monthRu != null && ru.obfCreated < monthRu.obfCreated)) {
log.info("Delete overlapping day update " + ru.file.getName());
resourceManager.closeFile(ru.file.getName()); resourceManager.closeFile(ru.file.getName());
it.remove(); it.remove();
ru.file.delete(); ru.file.delete();
@ -122,7 +124,7 @@ public class IncrementalChangesManager {
if(date.endsWith("00")) { if(date.endsWith("00")) {
monthUpdates.put(monthYear, ru); monthUpdates.put(monthYear, ru);
} else { } else {
if (!dayUpdates.containsKey(date)) { if (!dayUpdates.containsKey(monthYear)) {
dayUpdates.put(monthYear, new ArrayList<IncrementalChangesManager.RegionUpdate>()); dayUpdates.put(monthYear, new ArrayList<IncrementalChangesManager.RegionUpdate>());
} }
dayUpdates.get(monthYear).add(ru); dayUpdates.get(monthYear).add(ru);