Index: trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java (revision 4489) +++ trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java (revision 4490) @@ -21,7 +21,9 @@ return memberId; } + public String getRole() { return role; } + public OsmPrimitiveType getMemberType() { return memberType; @@ -34,5 +36,5 @@ @Override public String toString() { - return memberType.getAPIName() + " " + memberId; + return (memberType != null ? memberType.getAPIName() : "undefined") + " " + memberId; } @@ -40,4 +42,5 @@ * PrimitiveId implementation. Returns the same value as {@link #getMemberType()} */ + @Override public OsmPrimitiveType getType() { return memberType; @@ -47,8 +50,10 @@ * PrimitiveId implementation. Returns the same value as {@link #getMemberId()()} */ + @Override public long getUniqueId() { return memberId; } + @Override public boolean isNew() { return memberId <= 0; Index: trunk/src/org/openstreetmap/josm/io/AbstractReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/AbstractReader.java (revision 4490) +++ trunk/src/org/openstreetmap/josm/io/AbstractReader.java (revision 4490) @@ -0,0 +1,204 @@ +// License: GPL. See LICENSE file for details. +package org.openstreetmap.josm.io; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.openstreetmap.josm.data.osm.Changeset; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.OsmPrimitiveType; +import org.openstreetmap.josm.data.osm.PrimitiveId; +import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.RelationMember; +import org.openstreetmap.josm.data.osm.RelationMemberData; +import org.openstreetmap.josm.data.osm.SimplePrimitiveId; +import org.openstreetmap.josm.data.osm.Way; + +/** + * Abstract Reader, allowing other implementations than OsmReader (PbfReader in PBF plugin for example) + * @author Vincent + * + */ +public abstract class AbstractReader { + + /** + * The dataset to add parsed objects to. + */ + protected final DataSet ds = new DataSet(); + + protected Changeset uploadChangeset; + + /** 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 + */ + protected final Map externalIdMap = new HashMap(); + + /** + * Data structure for the remaining way objects + */ + protected final Map> ways = new HashMap>(); + + /** + * Data structure for relation objects + */ + protected final Map> relations = new HashMap>(); + + /** + * Replies the parsed data set + * + * @return the parsed data set + */ + public DataSet getDataSet() { + return ds; + } + + /** + * 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); + } + } + } + + /** + * 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()) { + System.out.println(tr("Deleted node {0} is part of way {1}", id, w.getId())); + } else { + wayNodes.add(n); + } + } + w.setNodes(wayNodes); + if (w.hasIncompleteNodes()) { + System.out.println(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); + } + } + + /** + * 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 + * + */ + protected 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.getMemberId(), rm.getMemberType())); + + if (primitive == null) { + if (rm.getMemberId() <= 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.getMemberId())); + + // 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.getMemberId(), rm.getMemberType()); + if (primitive == null) { + switch (rm.getMemberType()) { + case NODE: + primitive = new Node(rm.getMemberId()); break; + case WAY: + primitive = new Way(rm.getMemberId()); break; + case RELATION: + primitive = new Relation(rm.getMemberId()); break; + default: throw new AssertionError(); // can't happen + } + + ds.addPrimitive(primitive); + externalIdMap.put(new SimplePrimitiveId(rm.getMemberId(), rm.getMemberType()), primitive); + } + } + if (primitive.isDeleted()) { + System.out.println(tr("Deleted member {0} is used by relation {1}", primitive.getId(), relation.getId())); + } else { + relationMembers.add(new RelationMember(rm.getRole(), primitive)); + } + } + relation.setMembers(relationMembers); + } + } + + protected void processChangesetAfterParsing() { + if (uploadChangeset != null) { + for (Map.Entry e : uploadChangeset.getKeys().entrySet()) { + ds.addChangeSetTag(e.getKey(), e.getValue()); + } + } + } + + protected final void prepareDataSet() throws IllegalDataException { + try { + ds.beginUpdate(); + processNodesAfterParsing(); + processWaysAfterParsing(); + processRelationsAfterParsing(); + processChangesetAfterParsing(); + } finally { + ds.endUpdate(); + } + } +} Index: trunk/src/org/openstreetmap/josm/io/OsmImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmImporter.java (revision 4489) +++ trunk/src/org/openstreetmap/josm/io/OsmImporter.java (revision 4490) @@ -43,4 +43,8 @@ final DataSet dataSet = OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE); final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile); + addDataLayer(dataSet, layer, associatedFile.getPath()); + } + + protected void addDataLayer(final DataSet dataSet, final OsmDataLayer layer, final String filePath) { // FIXME: remove UI stuff from IO subsystem // @@ -51,5 +55,5 @@ JOptionPane.showMessageDialog( Main.parent, - tr("No data found in file {0}.", associatedFile.getPath()), + tr("No data found in file {0}.", filePath), tr("Open OSM file"), JOptionPane.INFORMATION_MESSAGE); Index: trunk/src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 4489) +++ trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 4490) @@ -9,8 +9,4 @@ 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.regex.Matcher; import java.util.regex.Pattern; @@ -29,12 +25,9 @@ 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.RelationMemberData; import org.openstreetmap.josm.data.osm.Tagged; import org.openstreetmap.josm.data.osm.User; @@ -53,40 +46,7 @@ * entered, and it must point to the end of the same element, when it is exited. */ -public class OsmReader { - - /** - * 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; - } - - /** - * The dataset to add parsed objects to. - */ - private DataSet ds = new DataSet(); +public class OsmReader extends AbstractReader { private XMLStreamReader parser; - - /** 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(); - - /** - * Data structure for the remaining way objects - */ - private Map> ways = new HashMap>(); - - /** - * Data structure for relation objects - */ - private Map> relations = new HashMap>(); - - private Changeset uploadChangeset; /** @@ -96,18 +56,8 @@ */ private OsmReader() { - externalIdMap = new HashMap(); } public void setParser(XMLStreamReader parser) { this.parser = parser; - } - - /** - * Replies the parsed data set - * - * @return the parsed data set - */ - public DataSet getDataSet() { - return ds; } @@ -301,5 +251,7 @@ private RelationMemberData parseRelationMember(Relation r) throws XMLStreamException { - RelationMemberData emd = new RelationMemberData(); + String role = null; + OsmPrimitiveType type = null; + long id = 0; String value = parser.getAttributeValue(null, "ref"); if (value == null) { @@ -307,5 +259,5 @@ } try { - emd.id = Long.parseLong(value); + id = Long.parseLong(value); } catch(NumberFormatException e) { throwException(tr("Illegal value for attribute ''ref'' on member in relation {0}. Got {1}", Long.toString(r.getUniqueId()),value)); @@ -313,19 +265,19 @@ value = parser.getAttributeValue(null, "type"); if (value == null) { - throwException(tr("Missing attribute ''type'' on member {0} in relation {1}.", Long.toString(emd.id), Long.toString(r.getUniqueId()))); + throwException(tr("Missing attribute ''type'' on member {0} in relation {1}.", Long.toString(id), Long.toString(r.getUniqueId()))); } try { - emd.type = OsmPrimitiveType.fromApiTypeName(value); + 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(r.getUniqueId()), value)); + throwException(tr("Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}.", Long.toString(id), Long.toString(r.getUniqueId()), value)); } value = parser.getAttributeValue(null, "role"); - emd.role = value; - - if (emd.id == 0) { + role = value; + + if (id == 0) { throwException(tr("Incomplete specification with ref=0")); } jumpToEnd(); - return emd; + return new RelationMemberData(role, type, id); } @@ -580,134 +532,4 @@ /** - * 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); - } - } - } - - /** - * 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()) { - System.out.println(tr("Deleted node {0} is part of way {1}", id, w.getId())); - } else { - wayNodes.add(n); - } - } - w.setNodes(wayNodes); - if (w.hasIncompleteNodes()) { - System.out.println(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); - } - } - - /** - * 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()) { - System.out.println(tr("Deleted member {0} is used by relation {1}", primitive.getId(), relation.getId())); - } else { - relationMembers.add(new RelationMember(rm.role, primitive)); - } - } - relation.setMembers(relationMembers); - } - } - - private void processChangesetAfterParsing() { - if (uploadChangeset != null) { - for (Map.Entry e : uploadChangeset.getKeys().entrySet()) { - ds.addChangeSetTag(e.getKey(), e.getValue()); - } - } - } - - /** * Parse the given input source and return the dataset. * @@ -736,13 +558,5 @@ progressMonitor.indeterminateSubTask(tr("Preparing data set...")); - reader.ds.beginUpdate(); - try { - reader.processNodesAfterParsing(); - reader.processWaysAfterParsing(); - reader.processRelationsAfterParsing(); - reader.processChangesetAfterParsing(); - } finally { - reader.ds.endUpdate(); - } + reader.prepareDataSet(); progressMonitor.worked(1); return reader.getDataSet();