Changeset 23273 in osm

Timestamp:

2010-09-19T19:27:21+02:00 (14 years ago)

Author:

upliner

Message:

'fix #j5160, update MultiOsmReader, some refactoring, some small bugfixes'

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/ChangesetReverter.java (modified) (7 diffs)
• src/reverter/DataSetCommandMerger.java (moved) (moved from applications/editors/josm/plugins/reverter/src/reverter/DataSetToCmd.java ) (2 diffs)
• src/reverter/OsmServerMultiObjectReader.java (modified) (1 diff)
• src/reverter/corehacks (added)
• src/reverter/corehacks/ChangesetDataSet.java (added)
• src/reverter/corehacks/MultiOsmReader.java (moved) (moved from applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java ) (5 diffs)
• src/reverter/corehacks/OsmChangesetContentParser.java (added)
• src/reverter/corehacks/OsmServerChangesetReader.java (added)

applications/editors/josm/plugins/reverter/build.xml

@@ -31 +31 @@
 
         <!-- enter the SVN commit message -->
-        <property name="commit.message" value="update to josm latest" />
+        <property name="commit.message" value="fix #j5160, update MultiOsmReader, some refactoring, some small bugfixes" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
         <property name="plugin.main.version" value="3403" />

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -15 +16 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.ChangesetDataSet;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetDataSetEntry;
-import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType;
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
@@ -34 +32 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
-import org.openstreetmap.josm.io.OsmServerChangesetReader;
 import org.openstreetmap.josm.io.OsmTransferException;
+
+import reverter.corehacks.ChangesetDataSet;
+import reverter.corehacks.OsmServerChangesetReader;
+import reverter.corehacks.ChangesetDataSet.ChangesetDataSetEntry;
+import reverter.corehacks.ChangesetDataSet.ChangesetModificationType;
 
 /**
@@ -167 +169 @@
         try {
             for (HistoryOsmPrimitive entry : updated) {
-                rdr.ReadObject(entry.getPrimitiveId(), (int)entry.getVersion()-1,
+                rdr.ReadObject(entry.getPrimitiveId(), cds.getEarliestVersion(entry.getPrimitiveId())-1,
                         progressMonitor.createSubTaskMonitor(1, true));
                 if (progressMonitor.isCancelled()) return;
             }
             for (HistoryOsmPrimitive entry : deleted) {
-                rdr.ReadObject(entry.getPrimitiveId(), (int)entry.getVersion()-1,
+                rdr.ReadObject(entry.getPrimitiveId(), cds.getEarliestVersion(entry.getPrimitiveId())-1,
                         progressMonitor.createSubTaskMonitor(1, true));
                 if (progressMonitor.isCancelled()) return;
             }
             nds = rdr.parseOsm(progressMonitor.createSubTaskMonitor(1, true));
-            addMissingIds(nds.allPrimitives());
+            for (OsmPrimitive p : nds.allPrimitives()) {
+                if (!p.isIncomplete()) addMissingIds(Collections.singleton(p));
+            }
         } finally {
             progressMonitor.finishTask();
@@ -246 +250 @@
                 RelationMember historyMember = historyMembers.get(i);
                 if (!currentMember.getRole().equals(historyMember.getRole())) return false;
-                if (currentMember.getMember().getPrimitiveId().equals(new SimplePrimitiveId(
+                if (!currentMember.getMember().getPrimitiveId().equals(new SimplePrimitiveId(
                         historyMember.getPrimitiveId(),historyMember.getPrimitiveType()))) return false;
             }
@@ -263 +267 @@
         //////////////////////////////////////////////////////////////////////////
         // Create commands to restore/update all affected objects
-        DataSetToCmd merger = new DataSetToCmd(nds,ds);
+        DataSetCommandMerger merger = new DataSetCommandMerger(nds,ds);
         LinkedList<Command> cmds = merger.getCommandList();
 

applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java

@@ -23 +23 @@
  *
  */
-final class DataSetToCmd {
+final class DataSetCommandMerger {
 
     /** the collection of conflicts created during merging */
@@ -36 +36 @@
      * constructor
      */
-    public DataSetToCmd(DataSet sourceDataSet, DataSet targetDataSet) {
+    public DataSetCommandMerger(DataSet sourceDataSet, DataSet targetDataSet) {
         this.sourceDataSet = sourceDataSet;
         this.targetDataSet = targetDataSet;

applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java

@@ -13 +13 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.xml.sax.SAXException;
+
+import reverter.corehacks.MultiOsmReader;
 
 public class OsmServerMultiObjectReader extends OsmServerReader {

applications/editors/josm/plugins/reverter/src/reverter/corehacks/MultiOsmReader.java

@@ -1 @@
-package reverter;
+package reverter.corehacks;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -57 +57 @@
      * The dataset to add parsed objects to.
      */
-    private DataSet ds = new DataSet();
+    private final DataSet ds = new DataSet();
 
     /**
@@ -97 +97 @@
      * Data structure for the remaining way objects
      */
-    private Map<Long, Collection<Long>> ways = new HashMap<Long, Collection<Long>>();
+    private final Map<Long, Collection<Long>> ways = new HashMap<Long, Collection<Long>>();
 
     /**
      * Data structure for relation objects
      */
-    private Map<Long, Collection<RelationMemberData>> relations = new HashMap<Long, Collection<RelationMemberData>>();
+    private final Map<Long, Collection<RelationMemberData>> relations = new HashMap<Long, Collection<RelationMemberData>>();
 
     private class Parser extends DefaultHandler {
@@ -121 +121 @@
         private long currentExternalId;
         private String generator;
-        private Storage<String> internedStrings = new Storage<String>();
+        private final Storage<String> internedStrings = new Storage<String>();
 
         // Memory optimization - see #2312
@@ -372 +372 @@
             } else if (action.equals("delete")) {
                 current.setDeleted(true);
-                current.setModified(true);
+                current.setModified(current.isVisible());
             } else if (action.equals("modify")) {
                 current.setModified(true);