Index: /applications/editors/josm/plugins/pbf/.project =================================================================== --- /applications/editors/josm/plugins/pbf/.project (revision 34825) +++ /applications/editors/josm/plugins/pbf/.project (revision 34826) @@ -4,4 +4,5 @@ + josm Index: /applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java =================================================================== --- /applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java (revision 34825) +++ /applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java (revision 34826) @@ -17,12 +17,12 @@ import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.NodeData; +import org.openstreetmap.josm.data.osm.OsmPrimitiveType; +import org.openstreetmap.josm.data.osm.PrimitiveData; +import org.openstreetmap.josm.data.osm.RelationData; +import org.openstreetmap.josm.data.osm.RelationMemberData; import org.openstreetmap.josm.data.osm.UploadPolicy; -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.Relation; -import org.openstreetmap.josm.data.osm.RelationMemberData; 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.NullProgressMonitor; import org.openstreetmap.josm.gui.progress.ProgressMonitor; @@ -92,5 +92,5 @@ } - private void setMetadata(OsmPrimitive osm, Info info) throws IllegalDataException { + private void setMetadata(PrimitiveData osm, Info info) throws IllegalDataException { if (info.hasChangeset()) { checkChangesetId(info.getChangeset()); @@ -146,9 +146,10 @@ for (int i = 0; i < nodes.getIdCount(); i++) { // Id (delta) and version (normal) - Node node = new Node(nodeId += nodes.getId(i), nodes.hasDenseinfo() ? nodes.getDenseinfo().getVersion(i) : 1); + NodeData nd = new NodeData(nodeId += nodes.getId(i)); + nd.setVersion(nodes.hasDenseinfo() ? nodes.getDenseinfo().getVersion(i) : 1); // Lat/Lon (delta) - node.setCoor(new LatLon(parseLat(nodeLat += nodes.getLat(i)), + nd.setCoor(new LatLon(parseLat(nodeLat += nodes.getLat(i)), parseLon(nodeLon += nodes.getLon(i))).getRoundedToOsmPrecision()); - checkCoordinates(node.getCoor()); + checkCoordinates(nd.getCoor()); if (nodes.hasDenseinfo()) { DenseInfo info = nodes.getDenseinfo(); @@ -156,9 +157,9 @@ if (info.getChangesetCount() > i) { checkChangesetId(changesetId += info.getChangeset(i)); - node.setChangesetId((int) changesetId); + nd.setChangesetId((int) changesetId); } // User (delta) if (info.getUidCount() > i && info.getUserSidCount() > i) { - node.setUser(User.createOsmUser(uid += info.getUid(i), + nd.setUser(User.createOsmUser(uid += info.getUid(i), getStringById(suid += info.getUserSid(i)))); } @@ -166,5 +167,5 @@ if (info.getTimestampCount() > i) { checkTimestamp(timestamp += info.getTimestamp(i)); - node.setTimestamp(new Date(date_granularity * timestamp)); + nd.setTimestamp(new Date(date_granularity * timestamp)); } } @@ -183,6 +184,6 @@ } } - node.setKeys(keys); - externalIdMap.put(node.getPrimitiveId(), node); + nd.setKeys(keys); + buildPrimitive(nd); } } catch (IllegalDataException e) { @@ -200,14 +201,15 @@ if (!info.hasVersion()) discourageUpload = true; - final Node node = new Node(n.getId(), info.hasVersion() ? info.getVersion() : 1); - node.setCoor(new LatLon(parseLat(n.getLat()), parseLon(n.getLon())).getRoundedToOsmPrecision()); - checkCoordinates(node.getCoor()); - setMetadata(node, info); + NodeData nd = new NodeData(n.getId()); + nd.setVersion(info.hasVersion() ? info.getVersion() : 1); + nd.setCoor(new LatLon(parseLat(n.getLat()), parseLon(n.getLon())).getRoundedToOsmPrecision()); + checkCoordinates(nd.getCoor()); + setMetadata(nd, info); Map keys = new HashMap<>(); for (int i = 0; i < n.getKeysCount(); i++) { keys.put(getStringById(n.getKeys(i)), getStringById(n.getVals(i))); } - node.setKeys(keys); - externalIdMap.put(node.getPrimitiveId(), node); + nd.setKeys(keys); + buildPrimitive(nd); } } catch (IllegalDataException e) { @@ -225,11 +227,12 @@ if (!info.hasVersion()) discourageUpload = true; - final Way way = new Way(w.getId(), info.hasVersion() ? info.getVersion() : 1); - setMetadata(way, info); + final WayData wd = new WayData(w.getId()); + wd.setVersion(info.hasVersion() ? info.getVersion() : 1); + setMetadata(wd, info); Map keys = new HashMap<>(); for (int i = 0; i < w.getKeysCount(); i++) { keys.put(getStringById(w.getKeys(i)), getStringById(w.getVals(i))); } - way.setKeys(keys); + wd.setKeys(keys); long previousId = 0; // Node ids are delta coded Collection nodeIds = new ArrayList<>(); @@ -237,6 +240,6 @@ nodeIds.add(previousId += id); } - ways.put(way.getUniqueId(), nodeIds); - externalIdMap.put(way.getPrimitiveId(), way); + ways.put(wd.getUniqueId(), nodeIds); + buildPrimitive(wd); } } catch (IllegalDataException e) { @@ -254,11 +257,12 @@ if (!info.hasVersion()) discourageUpload = true; - final Relation rel = new Relation(r.getId(), info.hasVersion() ? info.getVersion() : 1); - setMetadata(rel, info); + final RelationData rd = new RelationData(r.getId()); + rd.setVersion(info.hasVersion() ? info.getVersion() : 1); + setMetadata(rd, info); Map keys = new HashMap<>(); for (int i = 0; i < r.getKeysCount(); i++) { keys.put(getStringById(r.getKeys(i)), getStringById(r.getVals(i))); } - rel.setKeys(keys); + rd.setKeys(keys); long previousId = 0; // Member ids are delta coded Collection members = new ArrayList<>(); @@ -269,6 +273,6 @@ previousId += r.getMemids(i))); } - relations.put(rel.getUniqueId(), members); - externalIdMap.put(rel.getPrimitiveId(), rel); + relations.put(rd.getUniqueId(), members); + buildPrimitive(rd); } } catch (IllegalDataException e) { Index: /applications/editors/josm/plugins/pbf/test/unit/org/openstreetmap/josm/plugins/pbf/io/PbfImporterTest.java =================================================================== --- /applications/editors/josm/plugins/pbf/test/unit/org/openstreetmap/josm/plugins/pbf/io/PbfImporterTest.java (revision 34825) +++ /applications/editors/josm/plugins/pbf/test/unit/org/openstreetmap/josm/plugins/pbf/io/PbfImporterTest.java (revision 34826) @@ -80,3 +80,18 @@ assertEquals(97, ds.getRelations().size()); } + + /** + * Non-regression test for Ticket #14545. + * @throws Exception if an error occurs + */ + @Test + public void testTicket14545() throws Exception { + DataSet ds = new PbfImporter().parseDataSet(TestUtils.getRegressionDataFile(14545, "reg14545.osm.pbf")); + assertNotNull(ds); + assertEquals(12, ds.getNodes().size()); + assertEquals(2, ds.getWays().size()); + assertEquals(1, ds.getRelations().size()); + } + + }