();
+
+ /**
+ * constructor
+ */
+ public DataSetToCmd(DataSet sourceDataSet, DataSet targetDataSet) {
+ this.sourceDataSet = sourceDataSet;
+ this.targetDataSet = targetDataSet;
+ merge();
+ }
+
+ /**
+ * Merges a primitive other of type onto my primitives.
+ *
+ * @param
the type of the other primitive
+ * @param source the other primitive
+ */
+ private void mergePrimitive(OsmPrimitive source) {
+ if (source.isIncomplete()) return;
+ if (!source.isVisible()) return;
+ OsmPrimitive target = targetDataSet.getPrimitiveById(source.getId(), source.getType());
+ if (target == null) {
+ switch(source.getType()) {
+ case NODE: target = new Node(source.getId()); break;
+ case WAY: target = new Way(source.getId()); break;
+ case RELATION: target = new Relation(source.getId()); break;
+ default: throw new AssertionError();
+ }
+ target.mergeFrom(source);
+ target.setOsmId(target.getId(), (int)source.getVersion()+1);
+ target.setModified(true);
+ cmds.add(new AddCommand(target));
+ } else {
+ OsmPrimitive newTarget = null;
+ switch(target.getType()) {
+ case NODE: newTarget = new Node((Node)target); break;
+ case WAY: newTarget = new Way((Way)target); break;
+ case RELATION: newTarget = new Relation((Relation)target); break;
+ default: throw new AssertionError();
+ }
+ newTarget.mergeFrom(source);
+ newTarget.setDeleted(false);
+ cmds.add(new ChangeCommand(target,newTarget));
+ }
+ mergedMap.put(source, target);
+ }
+
+ private OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) {
+ OsmPrimitive p = mergedMap.get(mergeSource);
+ if (p == null) p = targetDataSet.getPrimitiveById(mergeSource.getId(), mergeSource.getType());
+ return p;
+ }
+
+ /**
+ * Postprocess the dataset and fix all merged references to point to the actual
+ * data.
+ */
+ public void fixReferences() {
+ for (Way w : sourceDataSet.getWays()) {
+ mergeNodeList(w);
+ }
+ for (Relation r : sourceDataSet.getRelations()) {
+ mergeRelationMembers(r);
+ }
+ }
+
+ /**
+ * Merges the node list of a source way onto its target way.
+ *
+ * @param source the source way
+ * @throws IllegalStateException thrown if no target way can be found for the source way
+ * @throws IllegalStateException thrown if there isn't a target node for one of the nodes in the source way
+ *
+ */
+ private void mergeNodeList(Way source) throws IllegalStateException {
+ if (source.isIncomplete()) return;
+ if (!source.isVisible()) return;
+ Way target = (Way)getMergeTarget(source);
+ if (target == null)
+ throw new IllegalStateException(tr("Missing merge target for way with id {0}", source.getUniqueId()));
+
+ List newNodes = new ArrayList(source.getNodesCount());
+ for (Node sourceNode : source.getNodes()) {
+ Node targetNode = (Node)getMergeTarget(sourceNode);
+ if (targetNode == null)
+ throw new IllegalStateException(tr("Missing merge target for node with id {0}", sourceNode.getUniqueId()));
+
+ newNodes.add(targetNode);
+ }
+ cmds.add(new ChangeNodesCommand(target,newNodes));
+ }
+
+ /**
+ * Merges the relation members of a source relation onto the corresponding target relation.
+ * @param source the source relation
+ * @throws IllegalStateException thrown if there is no corresponding target relation
+ * @throws IllegalStateException thrown if there isn't a corresponding target object for one of the relation
+ * members in source
+ */
+ private void mergeRelationMembers(Relation source) throws IllegalStateException {
+ if (source.isIncomplete()) return;
+ if (!source.isVisible()) return;
+ Relation target = (Relation) getMergeTarget(source);
+ if (target == null)
+ throw new IllegalStateException(tr("Missing merge target for relation with id {0}", source.getUniqueId()));
+ LinkedList newMembers = new LinkedList();
+ for (RelationMember sourceMember : source.getMembers()) {
+ OsmPrimitive targetMember = getMergeTarget(sourceMember.getMember());
+ if (targetMember == null)
+ throw new IllegalStateException(tr("Missing merge target of type {0} with id {1}", sourceMember.getType(), sourceMember.getUniqueId()));
+ newMembers.add(new RelationMember(sourceMember.getRole(), targetMember));
+ }
+ Relation newRelation = new Relation(target);
+ newRelation.setMembers(newMembers);
+ cmds.add(new ChangeCommand(target,newRelation));
+ }
+ private void merge()
+ {
+ for (Node node: sourceDataSet.getNodes()) {
+ mergePrimitive(node);
+ }
+ for (Way way: sourceDataSet.getWays()) {
+ mergePrimitive(way);
+ }
+ for (Relation relation: sourceDataSet.getRelations()) {
+ mergePrimitive(relation);
+ }
+ fixReferences();
+ }
+
+ public LinkedList getCommandList() {
+ return cmds;
+ }
+}
Index: applications/editors/josm/plugins/reverter/src/reverter/ModifiyUploadOrderHook.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/ModifiyUploadOrderHook.java (revision 21201)
+++ applications/editors/josm/plugins/reverter/src/reverter/ModifiyUploadOrderHook.java (revision 21201)
@@ -0,0 +1,49 @@
+// License: GPL. For details, see LICENSE file.
+package reverter;
+
+import java.util.Collections;
+import java.util.Comparator;
+
+import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+
+import org.openstreetmap.josm.actions.upload.UploadHook;
+
+/**
+ * Sort modified objects before uploading in order: nodes, ways, relations
+ * It is needed because objects undeleted by reverter is marked as "modified",
+ * but in fact they're re-added to JOSM. Without this the "precondition failed"
+ * error appears when trying to upload objects undeleted by reverter.
+ *
+ */
+public class ModifiyUploadOrderHook implements UploadHook {
+
+ public boolean checkUpload(APIDataSet apiDataSet) {
+ Collections.sort(
+ apiDataSet.getPrimitivesToUpdate(),
+ new Comparator() {
+ public int compare(OsmPrimitive o1, OsmPrimitive o2) {
+ if (o1 instanceof Node && o2 instanceof Node)
+ return 0;
+ else if (o1 instanceof Node)
+ return -1;
+ else if (o2 instanceof Node)
+ return 1;
+
+ if (o1 instanceof Way && o2 instanceof Way)
+ return 0;
+ else if (o1 instanceof Way && o2 instanceof Relation)
+ return -1;
+ else if (o2 instanceof Way && o1 instanceof Relation)
+ return 1;
+
+ return 0;
+ }
+ }
+ );
+ return true;
+ }
+}
Index: applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java (revision 21201)
+++ applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java (revision 21201)
@@ -0,0 +1,566 @@
+package reverter;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeData;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveData;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationData;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.data.osm.Storage;
+import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WayData;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.io.OsmDataParsingException;
+import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.tools.DateUtils;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Parser for the Osm Api. Read from an input stream and construct a dataset out of it.
+ *
+ */
+public class MultiOsmReader {
+ static private final Logger logger = Logger.getLogger(OsmReader.class.getName());
+
+ /**
+ * The dataset to add parsed objects to.
+ */
+ private DataSet ds = new DataSet();
+
+ /**
+ * Replies the parsed data set
+ *
+ * @return the parsed data set
+ */
+ public DataSet getDataSet() {
+ return ds;
+ }
+
+ /** the map from external ids to read OsmPrimitives. External ids are
+ * longs too, but in contrast to internal ids negative values are used
+ * to identify primitives unknown to the OSM server
+ */
+ private Map externalIdMap = new HashMap();
+
+ /**
+ * constructor (for private use only)
+ *
+ * @see #parseDataSet(InputStream, DataSet, ProgressMonitor)
+ * @see #parseDataSetOsm(InputStream, DataSet, ProgressMonitor)
+ */
+ public MultiOsmReader() {
+ externalIdMap = new HashMap();
+ }
+
+ /**
+ * Used as a temporary storage for relation members, before they
+ * are resolved into pointers to real objects.
+ */
+ private static class RelationMemberData {
+ public OsmPrimitiveType type;
+ public long id;
+ public String role;
+ }
+
+ /**
+ * Data structure for the remaining way objects
+ */
+ private Map> ways = new HashMap>();
+
+ /**
+ * Data structure for relation objects
+ */
+ private Map> relations = new HashMap>();
+
+ private class Parser extends DefaultHandler {
+ private Locator locator;
+
+ @Override
+ public void setDocumentLocator(Locator locator) {
+ this.locator = locator;
+ }
+
+ protected void throwException(String msg) throws OsmDataParsingException{
+ throw new OsmDataParsingException(msg).rememberLocation(locator);
+ }
+ /**
+ * The current osm primitive to be read.
+ */
+ private OsmPrimitive currentPrimitive;
+ private long currentExternalId;
+ private String generator;
+ private Storage internedStrings = new Storage();
+
+ // Memory optimization - see #2312
+ private String intern(String s) {
+ String result = internedStrings.get(s);
+ if (result == null) {
+ internedStrings.put(s);
+ return s;
+ } else
+ return result;
+ }
+
+ @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
+
+ if (qName.equals("osm")) {
+ if (atts == null) {
+ throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}.", "version", "osm"));
+ }
+ String v = atts.getValue("version");
+ if (v == null) {
+ throwException(tr("Missing mandatory attribute ''{0}''.", "version"));
+ }
+ if (!(v.equals("0.5") || v.equals("0.6"))) {
+ throwException(tr("Unsupported version: {0}", v));
+ }
+ // save generator attribute for later use when creating DataSource objects
+ generator = atts.getValue("generator");
+ ds.setVersion(v);
+
+ } else if (qName.equals("bounds")) {
+ // new style bounds.
+ String minlon = atts.getValue("minlon");
+ String minlat = atts.getValue("minlat");
+ String maxlon = atts.getValue("maxlon");
+ String maxlat = atts.getValue("maxlat");
+ String origin = atts.getValue("origin");
+ if (minlon != null && maxlon != null && minlat != null && maxlat != null) {
+ if (origin == null) {
+ origin = generator;
+ }
+ Bounds bounds = new Bounds(
+ new LatLon(Double.parseDouble(minlat), Double.parseDouble(minlon)),
+ new LatLon(Double.parseDouble(maxlat), Double.parseDouble(maxlon)));
+ DataSource src = new DataSource(bounds, origin);
+ ds.dataSources.add(src);
+ } else {
+ throwException(tr(
+ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.",
+ minlon, minlat, maxlon, maxlat, origin
+ ));
+ }
+
+ // ---- PARSING NODES AND WAYS ----
+
+ } else if (qName.equals("node")) {
+ NodeData nd = new NodeData();
+ nd.setCoor(new LatLon(getDouble(atts, "lat"), getDouble(atts, "lon")));
+ readCommon(atts, nd);
+ Node n = new Node(nd.getId(), nd.getVersion());
+ n.load(nd);
+ externalIdMap.put(nd.getPrimitiveId(), n);
+ currentPrimitive = n;
+ currentExternalId = nd.getUniqueId();
+ } else if (qName.equals("way")) {
+ WayData wd = new WayData();
+ readCommon(atts, wd);
+ Way w = new Way(wd.getId(), wd.getVersion());
+ w.load(wd);
+ externalIdMap.put(wd.getPrimitiveId(), w);
+ ways.put(wd.getUniqueId(), new ArrayList());
+ currentPrimitive = w;
+ currentExternalId = wd.getUniqueId();
+ } else if (qName.equals("nd")) {
+ Collection list = ways.get(currentExternalId);
+ if (list == null) {
+ throwException(
+ tr("Found XML element not as direct child of element .")
+ );
+ }
+ if (atts.getValue("ref") == null) {
+ throwException(
+ tr("Missing mandatory attribute ''{0}'' on of way {1}.", "ref", currentPrimitive.getUniqueId())
+ );
+ }
+ long id = getLong(atts, "ref");
+ if (id == 0) {
+ throwException(
+ tr("Illegal value of attribute ''ref'' of element . Got {0}.", id)
+ );
+ }
+ if (currentPrimitive.isDeleted()) {
+ logger.info(tr("Deleted way {0} contains nodes", currentPrimitive.getUniqueId()));
+ } else {
+ list.add(id);
+ }
+
+ // ---- PARSING RELATIONS ----
+
+ } else if (qName.equals("relation")) {
+ RelationData rd = new RelationData();
+ readCommon(atts, rd);
+ Relation r = new Relation(rd.getId(), rd.getVersion());
+ r.load(rd);
+ externalIdMap.put(rd.getPrimitiveId(), r);
+ relations.put(rd.getUniqueId(), new LinkedList());
+ currentPrimitive = r;
+ currentExternalId = rd.getUniqueId();
+ } else if (qName.equals("member")) {
+ Collection list = relations.get(currentExternalId);
+ if (list == null) {
+ throwException(
+ tr("Found XML element not as direct child of element .")
+ );
+ }
+ RelationMemberData emd = new RelationMemberData();
+ String value = atts.getValue("ref");
+ if (value == null) {
+ throwException(tr("Missing attribute ''ref'' on member in relation {0}.",currentPrimitive.getUniqueId()));
+ }
+ try {
+ emd.id = Long.parseLong(value);
+ } catch(NumberFormatException e) {
+ throwException(tr("Illegal value for attribute ''ref'' on member in relation {0}. Got {1}", Long.toString(currentPrimitive.getUniqueId()),value));
+ }
+ value = atts.getValue("type");
+ if (value == null) {
+ throwException(tr("Missing attribute ''type'' on member {0} in relation {1}.", Long.toString(emd.id), Long.toString(currentPrimitive.getUniqueId())));
+ }
+ try {
+ emd.type = OsmPrimitiveType.fromApiTypeName(value);
+ } catch(IllegalArgumentException e) {
+ throwException(tr("Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}.", Long.toString(emd.id), Long.toString(currentPrimitive.getUniqueId()), value));
+ }
+ value = atts.getValue("role");
+ emd.role = value;
+
+ if (emd.id == 0) {
+ throwException(tr("Incomplete specification with ref=0"));
+ }
+
+ if (currentPrimitive.isDeleted()) {
+ logger.info(tr("Deleted relation {0} contains members", currentPrimitive.getUniqueId()));
+ } else {
+ list.add(emd);
+ }
+
+ // ---- PARSING TAGS (applicable to all objects) ----
+
+ } else if (qName.equals("tag")) {
+ String key = atts.getValue("k");
+ String value = atts.getValue("v");
+ currentPrimitive.put(intern(key), intern(value));
+
+ } else {
+ System.out.println(tr("Undefined element ''{0}'' found in input stream. Skipping.", qName));
+ }
+ }
+
+ private double getDouble(Attributes atts, String value) {
+ return Double.parseDouble(atts.getValue(value));
+ }
+
+ private User createUser(String uid, String name) throws SAXException {
+ if (uid == null) {
+ if (name == null)
+ return null;
+ return User.createLocalUser(name);
+ }
+ try {
+ long id = Long.parseLong(uid);
+ return User.createOsmUser(id, name);
+ } catch(NumberFormatException e) {
+ throwException(MessageFormat.format("Illegal value for attribute ''uid''. Got ''{0}''.", uid));
+ }
+ return null;
+ }
+ /**
+ * Read out the common attributes from atts and put them into this.current.
+ */
+ void readCommon(Attributes atts, PrimitiveData current) throws SAXException {
+ current.setId(getLong(atts, "id"));
+ if (current.getUniqueId() == 0) {
+ throwException(tr("Illegal object with ID=0."));
+ }
+
+ String time = atts.getValue("timestamp");
+ if (time != null && time.length() != 0) {
+ current.setTimestamp(DateUtils.fromString(time));
+ }
+
+ // user attribute added in 0.4 API
+ String user = atts.getValue("user");
+ // uid attribute added in 0.6 API
+ String uid = atts.getValue("uid");
+ current.setUser(createUser(uid, user));
+
+ // visible attribute added in 0.4 API
+ String visible = atts.getValue("visible");
+ if (visible != null) {
+ current.setVisible(Boolean.parseBoolean(visible));
+ }
+
+ String versionString = atts.getValue("version");
+ int version = 0;
+ if (versionString != null) {
+ try {
+ version = Integer.parseInt(versionString);
+ } catch(NumberFormatException e) {
+ throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.getUniqueId()), versionString));
+ }
+ if (ds.getVersion().equals("0.6")){
+ if (version <= 0 && current.getUniqueId() > 0) {
+ throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.getUniqueId()), versionString));
+ } else if (version < 0 && current.getUniqueId() <= 0) {
+ System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.6"));
+ version = 0;
+ }
+ } else if (ds.getVersion().equals("0.5")) {
+ if (version <= 0 && current.getUniqueId() > 0) {
+ System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
+ version = 1;
+ } else if (version < 0 && current.getUniqueId() <= 0) {
+ System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.5"));
+ version = 0;
+ }
+ } else {
+ // should not happen. API version has been checked before
+ throwException(tr("Unknown or unsupported API version. Got {0}.", ds.getVersion()));
+ }
+ } else {
+ // version expected for OSM primitives with an id assigned by the server (id > 0), since API 0.6
+ //
+ if (current.getUniqueId() > 0 && ds.getVersion() != null && ds.getVersion().equals("0.6")) {
+ throwException(tr("Missing attribute ''version'' on OSM primitive with ID {0}.", Long.toString(current.getUniqueId())));
+ } else if (current.getUniqueId() > 0 && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
+ // default version in 0.5 files for existing primitives
+ System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
+ version= 1;
+ } else if (current.getUniqueId() <= 0 && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
+ // default version in 0.5 files for new primitives, no warning necessary. This is
+ // (was) legal in API 0.5
+ version= 0;
+ }
+ }
+ current.setVersion(version);
+
+ String action = atts.getValue("action");
+ if (action == null) {
+ // do nothing
+ } else if (action.equals("delete")) {
+ current.setDeleted(true);
+ current.setModified(true);
+ } else if (action.equals("modify")) {
+ current.setModified(true);
+ }
+
+ String v = atts.getValue("changeset");
+ if (v == null) {
+ current.setChangesetId(0);
+ } else {
+ try {
+ current.setChangesetId(Integer.parseInt(v));
+ } catch(NumberFormatException e) {
+ if (current.getUniqueId() <= 0) {
+ // for a new primitive we just log a warning
+ System.out.println(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
+ current.setChangesetId(0);
+ } else {
+ // for an existing primitive this is a problem
+ throwException(tr("Illegal value for attribute ''changeset''. Got {0}.", v));
+ }
+ }
+ if (current.getChangesetId() <=0) {
+ if (current.getUniqueId() <= 0) {
+ // for a new primitive we just log a warning
+ System.out.println(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
+ current.setChangesetId(0);
+ } else {
+ // for an existing primitive this is a problem
+ throwException(tr("Illegal value for attribute ''changeset''. Got {0}.", v));
+ }
+ }
+ }
+ }
+
+ private long getLong(Attributes atts, String name) throws SAXException {
+ String value = atts.getValue(name);
+ if (value == null) {
+ throwException(tr("Missing required attribute ''{0}''.",name));
+ }
+ try {
+ return Long.parseLong(value);
+ } catch(NumberFormatException e) {
+ throwException(tr("Illegal long value for attribute ''{0}''. Got ''{1}''.",name, value));
+ }
+ return 0; // should not happen
+ }
+ }
+
+ /**
+ * Processes the ways after parsing. Rebuilds the list of nodes of each way and
+ * adds the way to the dataset
+ *
+ * @throws IllegalDataException thrown if a data integrity problem is detected
+ */
+ protected void processWaysAfterParsing() throws IllegalDataException{
+ for (Long externalWayId: ways.keySet()) {
+ Way w = (Way)externalIdMap.get(new SimplePrimitiveId(externalWayId, OsmPrimitiveType.WAY));
+ List wayNodes = new ArrayList();
+ for (long id : ways.get(externalWayId)) {
+ Node n = (Node)externalIdMap.get(new SimplePrimitiveId(id, OsmPrimitiveType.NODE));
+ if (n == null) {
+ if (id <= 0)
+ throw new IllegalDataException (
+ tr("Way with external ID ''{0}'' includes missing node with external ID ''{1}''.",
+ externalWayId,
+ id));
+ // create an incomplete node if necessary
+ //
+ n = (Node)ds.getPrimitiveById(id,OsmPrimitiveType.NODE);
+ if (n == null) {
+ n = new Node(id);
+ ds.addPrimitive(n);
+ }
+ }
+ if (n.isDeleted()) {
+ logger.warning(tr("Deleted node {0} is part of way {1}", id, w.getId()));
+ } else {
+ wayNodes.add(n);
+ }
+ }
+ w.setNodes(wayNodes);
+ if (w.hasIncompleteNodes()) {
+ if (logger.isLoggable(Level.FINE)) {
+ logger.fine(tr("Way {0} with {1} nodes has incomplete nodes because at least one node was missing in the loaded data.",
+ externalWayId, w.getNodesCount()));
+ }
+ }
+ ds.addPrimitive(w);
+ }
+ }
+
+ /**
+ * Processes the parsed nodes after parsing. Just adds them to
+ * the dataset
+ *
+ */
+ protected void processNodesAfterParsing() {
+ for (OsmPrimitive primitive: externalIdMap.values()) {
+ if (primitive instanceof Node) {
+ this.ds.addPrimitive(primitive);
+ }
+ }
+ }
+
+ /**
+ * Completes the parsed relations with its members.
+ *
+ * @throws IllegalDataException thrown if a data integrity problem is detected, i.e. if a
+ * relation member refers to a local primitive which wasn't available in the data
+ *
+ */
+ private void processRelationsAfterParsing() throws IllegalDataException {
+
+ // First add all relations to make sure that when relation reference other relation, the referenced will be already in dataset
+ for (Long externalRelationId : relations.keySet()) {
+ Relation relation = (Relation) externalIdMap.get(
+ new SimplePrimitiveId(externalRelationId, OsmPrimitiveType.RELATION)
+ );
+ ds.addPrimitive(relation);
+ }
+
+ for (Long externalRelationId : relations.keySet()) {
+ Relation relation = (Relation) externalIdMap.get(
+ new SimplePrimitiveId(externalRelationId, OsmPrimitiveType.RELATION)
+ );
+ List relationMembers = new ArrayList();
+ for (RelationMemberData rm : relations.get(externalRelationId)) {
+ OsmPrimitive primitive = null;
+
+ // lookup the member from the map of already created primitives
+ primitive = externalIdMap.get(new SimplePrimitiveId(rm.id, rm.type));
+
+ if (primitive == null) {
+ if (rm.id <= 0)
+ // relation member refers to a primitive with a negative id which was not
+ // found in the data. This is always a data integrity problem and we abort
+ // with an exception
+ //
+ throw new IllegalDataException(
+ tr("Relation with external id ''{0}'' refers to a missing primitive with external id ''{1}''.",
+ externalRelationId,
+ rm.id));
+
+ // member refers to OSM primitive which was not present in the parsed data
+ // -> create a new incomplete primitive and add it to the dataset
+ //
+ primitive = ds.getPrimitiveById(rm.id, rm.type);
+ if (primitive == null) {
+ switch (rm.type) {
+ case NODE:
+ primitive = new Node(rm.id); break;
+ case WAY:
+ primitive = new Way(rm.id); break;
+ case RELATION:
+ primitive = new Relation(rm.id); break;
+ default: throw new AssertionError(); // can't happen
+ }
+
+ ds.addPrimitive(primitive);
+ externalIdMap.put(new SimplePrimitiveId(rm.id, rm.type), primitive);
+ }
+ }
+ if (primitive.isDeleted()) {
+ logger.warning(tr("Deleted member {0} is used by relation {1}", primitive.getId(), relation.getId()));
+ } else {
+ relationMembers.add(new RelationMember(rm.role, primitive));
+ }
+ }
+ relation.setMembers(relationMembers);
+ }
+ }
+
+ public void AddData(InputStream source) throws IllegalDataException {
+ try {
+ InputSource inputSource = new InputSource(new InputStreamReader(source, "UTF-8"));
+ SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new Parser());
+ } catch(ParserConfigurationException e) {
+ throw new IllegalDataException(e.getMessage(), e);
+ } catch(SAXException e) {
+ throw new IllegalDataException(e.getMessage(), e);
+ } catch(Exception e) {
+ throw new IllegalDataException(e);
+ }
+ }
+ public void ProcessData() throws IllegalDataException
+ {
+ processNodesAfterParsing();
+ processWaysAfterParsing();
+ processRelationsAfterParsing();
+ }
+
+
+}
Index: applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java (revision 21201)
+++ applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java (revision 21201)
@@ -0,0 +1,29 @@
+package reverter;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.tools.Shortcut;
+
+@SuppressWarnings("serial")
+public class ObjectsHistoryAction extends JosmAction {
+
+ public ObjectsHistoryAction()
+ {
+ super(tr("Objects history"),null,tr("History reverter"),
+ Shortcut.registerShortcut("tool:history",
+ "Tool: Display objects history dialog",
+ KeyEvent.VK_H, Shortcut.GROUP_EDIT,
+ Shortcut.SHIFT_DEFAULT),
+ true);
+ setEnabled(false);
+ }
+// private ObjectsHistoryDialog dlg = null;
+ public void actionPerformed(ActionEvent arg0) {
+// if (dlg.get)
+ new ObjectsHistoryDialog().setVisible(true);
+ }
+}
Index: applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryDialog.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryDialog.java (revision 21201)
+++ applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryDialog.java (revision 21201)
@@ -0,0 +1,22 @@
+package reverter;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagLayout;
+
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.tools.GBC;
+
+@SuppressWarnings("serial")
+public class ObjectsHistoryDialog extends ExtendedDialog {
+ public ObjectsHistoryDialog() {
+ super(Main.parent, tr("Objects history"), new String[] {"Revert","Cancel"}, false);
+ contentConstraints = GBC.eol().fill().insets(10,10,10,5);
+ setButtonIcons(new String[] {"ok.png", "cancel.png" });
+ setContent(new JPanel(new GridBagLayout()));
+ setupDialog();
+ }
+}
Index: applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java (revision 21201)
+++ applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java (revision 21201)
@@ -0,0 +1,62 @@
+package reverter;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.OsmServerReader;
+import org.openstreetmap.josm.io.OsmTransferException;
+import org.xml.sax.SAXException;
+
+public class OsmServerMultiObjectReader extends OsmServerReader {
+ private MultiOsmReader rdr = new MultiOsmReader();
+ public void ReadObject(long id,int version,OsmPrimitiveType type,ProgressMonitor progressMonitor) throws OsmTransferException
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append(type.getAPIName());
+ sb.append("/");
+ sb.append(id);
+ sb.append("/");
+ sb.append(version);
+ progressMonitor.beginTask("", 1);
+ InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true));
+ try {
+ rdr.AddData(in);
+ } catch (Exception e) {
+ throw new OsmTransferException(e);
+ } finally {
+ progressMonitor.finishTask();
+ if (in!=null) {
+ try {
+ in.close();
+ } catch(Exception e) {}
+ }
+ }
+ }
+ /**
+ * Method to parse downloaded objects
+ * @return the data requested
+ * @throws SAXException
+ * @throws IOException
+ */
+ @Override
+ public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
+ progressMonitor.beginTask("", 1);
+ progressMonitor.subTask(tr("Preparing history data..."));
+ try {
+ rdr.ProcessData();
+ return rdr.getDataSet();
+ } catch (Exception e) {
+ throw new OsmTransferException(e);
+ } finally
+ {
+ progressMonitor.finishTask();
+ activeConnection = null;
+ }
+ }
+
+}
Index: applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java (revision 21201)
+++ applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java (revision 21201)
@@ -0,0 +1,64 @@
+package reverter;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.List;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.Shortcut;
+
+@SuppressWarnings("serial")
+public class RevertChangesetAction extends JosmAction {
+
+ public RevertChangesetAction()
+ {
+ super(tr("Revert changeset"),null,tr("Revert changeset"),
+ Shortcut.registerShortcut("tool:revert",
+ "Tool: Revert changeset",
+ KeyEvent.VK_T, Shortcut.GROUP_EDIT,
+ Shortcut.SHIFT_DEFAULT),
+ true);
+ }
+// private ObjectsHistoryDialog dlg = null;
+ public void actionPerformed(ActionEvent arg0) {
+
+ ChangesetIdQuery dlg = new ChangesetIdQuery();
+ dlg.setVisible(true);
+ System.out.println(tr("reverter: {0}",dlg.getValue()));
+ if (dlg.getValue() != 1) return;
+ final int changesetId = dlg.ChangesetId();
+ if (changesetId == 0) return;
+ Main.worker.submit(new PleaseWaitRunnable("Reverting...") {
+ @Override
+ protected void realRun() {
+ try {
+ ChangesetReverter rev = new ChangesetReverter(changesetId);
+ rev.RevertChangeset(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, true));
+ List cmds = rev.getCommands();
+ Command cmd = new SequenceCommand(tr("Revert changeset #{0}",changesetId),cmds);
+ Main.main.undoRedo.add(cmd);
+ } catch (OsmTransferException e) {
+ e.printStackTrace();
+ } finally {
+ }
+ }
+
+ @Override
+ protected void cancel() {
+ }
+
+ @Override
+ protected void finish() {
+ }
+ });
+ }
+
+}
Index: applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java (revision 21201)
+++ applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java (revision 21201)
@@ -0,0 +1,27 @@
+package reverter;
+
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.marktr;
+
+import java.awt.event.KeyEvent;
+
+import javax.swing.JMenu;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.UploadAction;
+import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
+
+public class ReverterPlugin extends Plugin {
+ public ReverterPlugin(PluginInformation info)
+ {
+ super(info);
+ JMenu historyMenu = Main.main.menu.addMenu(marktr("History"), KeyEvent.VK_R, Main.main.menu.defaultMenuPos,ht("/Plugin/Reverter"));
+ MainMenu.add(historyMenu, new ObjectsHistoryAction());
+ MainMenu.add(historyMenu, new RevertChangesetAction());
+ UploadAction.registerUploadHook(new ModifiyUploadOrderHook());
+
+ //TODO: Download deleted objects
+ }
+}