Changeset 32865 in osm for applications

Timestamp:

2016-08-21T23:36:28+02:00 (8 years ago)

Author:

donvip

Message:

fix #josm11169 - NPE trying to save invalid/incomplete data as .osm.pbf (patch by Gerd Petermann, modified)

Location:

applications/editors/josm/plugins/pbf

Files:

• src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java (modified) (8 diffs)
• test/unit/org/openstreetmap/josm/plugins/pbf/io/PbfExporterTest.java (modified) (2 diffs)

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map.Entry;
@@ -98 +99 @@
                         stable.incr(tag.getValue());
                     }
-                    if (!omit_metadata && i.getUser() != null) {
-                        stable.incr(i.getUser().getName());
-                    }
-                }
+                    if (!omit_metadata) {
+                        stable.incr(getUserId(i));
+                    }
+                }
+            }
+
+            private String getUserId(OsmPrimitive osm) {
+                String userId = osm.getUser() != null ? osm.getUser().getName() : null;
+                if (userId == null)
+                    userId = "";
+                return userId;
             }
 
@@ -117 +125 @@
 
                     int uid = e.getUser() == null ? -1 : (int) e.getUser().getId();
-                    int userSid = stable.getIndex(e.getUser() == null ? "" : e.getUser().getName());
+                    int userSid = stable.getIndex(getUserId(e));
                     int timestamp = (int) (e.getTimestamp().getTime() / date_granularity);
                     int version = e.getVersion();
@@ -187 +195 @@
 
                 for (Node i : contents) {
-                    long id = i.getId();
+                    long id = i.getUniqueId();
                     bi.addId(id - lastid);
                     lastid = id;
@@ -225 +233 @@
                 Osmformat.PrimitiveGroup.Builder builder = Osmformat.PrimitiveGroup.newBuilder();
                 for (Node i : contents) {
-                    long id = i.getId();
+                    long id = i.getUniqueId();
                     LatLon coor = i.getCoor();
                     int lat = mapDegrees(coor.lat());
@@ -258 +266 @@
                 for (Way i : contents) {
                     Osmformat.Way.Builder bi = Osmformat.Way.newBuilder();
-                    bi.setId(i.getId());
+                    bi.setId(i.getUniqueId());
                     long lastid = 0;
                     for (Node j : i.getNodes()) {
-                        long id = j.getId();
+                        long id = j.getUniqueId();
                         bi.addRefs(id - lastid);
                         lastid = id;
@@ -300 +308 @@
                 for (Relation i : contents) {
                     Osmformat.Relation.Builder bi = Osmformat.Relation.newBuilder();
-                    bi.setId(i.getId());
+                    bi.setId(i.getUniqueId());
                     RelationMember[] arr = new RelationMember[i.getMembers().size()];
                     i.getMembers().toArray(arr);
                     long lastid = 0;
                     for (RelationMember j : i.getMembers()) {
-                        long id = j.getMember().getId();
+                        long id = j.getMember().getUniqueId();
                         bi.addMemids(id - lastid);
                         lastid = id;
@@ -477 +485 @@
         public void process(DataSet ds) {
             processor.processSources(ds.dataSources);
-            for (Node n : ds.getNodes()) {
-                processor.processNode(n);
-            }
-            for (Way w : ds.getWays()) {
-                processor.processWay(w);
-            }
-            for (Relation r : ds.getRelations()) {
-                processor.processRelation(r);
-            }
+            Comparator<OsmPrimitive> cmp = Comparator.comparingLong(OsmPrimitive::getUniqueId);
+            ds.getNodes().stream().sorted(cmp).filter(n -> n.isLatLonKnown()).forEach(processor::processNode);
+            ds.getWays().stream().sorted(cmp).filter(w -> w.getNodesCount() > 0).forEach(processor::processWay);
+            ds.getRelations().stream().sorted(cmp).filter(r -> r.getMembersCount() > 0).forEach(processor::processRelation);
         }
 

applications/editors/josm/plugins/pbf/test/unit/org/openstreetmap/josm/plugins/pbf/io/PbfExporterTest.java

@@ -7 +7 @@
 import java.nio.file.Path;
 
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -33 +32 @@
      */
     @Test
-    @Ignore("TODO: to fix")
     public void testTicket11169() throws Exception {
         try (InputStream is = Compression.ZIP.getUncompressedInputStream(