Changeset 35825 in osm for applications

Timestamp:

2021-10-03T00:20:47+02:00 (3 years ago)

Author:

Don-vip

Message:

update to JOSM 17749 / osmpbf 1.5.0

Location:

applications/editors/josm/plugins/pbf

Files:

• build.xml (modified) (1 diff)
• ivy.xml (modified) (1 diff)
• ivy_settings.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java (modified) (4 diffs)

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

@@ -3 +3 @@
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="17334"/>
+    <property name="plugin.main.version" value="17749"/>
 
     <property name="plugin.author" value="Don-vip"/>

applications/editors/josm/plugins/pbf/ivy.xml

@@ -2 +2 @@
   <info organisation="org.openstreetmap.josm.plugins" module="pbf"/>
   <dependencies>
-    <dependency conf="default->default" org="com.google.protobuf" name="protobuf-java" rev="2.5.0"/>
-    <dependency conf="default->default" org="crosby" name="osmpbf" rev="1.3.3"/>
+    <dependency conf="default->default" org="com.google.protobuf" name="protobuf-java" rev="3.13.0"/>
+    <dependency conf="default->default" org="org.openstreetmap.pbf" name="osmpbf" rev="1.5.0"/>
   </dependencies>
 </ivy-module>

applications/editors/josm/plugins/pbf/ivy_settings.xml

@@ -4 +4 @@
   <resolvers>
     <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
-    <url name="mkgmap">
-      <ivy pattern="http://ivy.mkgmap.org.uk/repo/[organisation]/[module]/[revision]/ivys/ivy.xml"/>
-      <artifact pattern="http://ivy.mkgmap.org.uk/repo/[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"/>
-    </url>
   </resolvers>
   <modules>
-    <module organisation="crosby" name="osmpbf" resolver="mkgmap"/>
   </modules>
 </ivysettings>

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

@@ -103 +103 @@
             if (info.hasTimestamp()) {
                 checkTimestamp(info.getTimestamp());
-                osm.setTimestamp(getDate(info));
+                osm.setInstant(getDate(info).toInstant());
             }
         }
@@ -173 +173 @@
                                 timestamp += info.getTimestamp(i);
                                 checkTimestamp(timestamp);
-                                nd.setTimestamp(new Date(date_granularity * timestamp));
+                                nd.setInstant(new Date(date_granularity * timestamp).toInstant());
                             }
                         }
@@ -365 +365 @@
     }
 
+    @SuppressWarnings("resource")
     public void parse(InputStream source) throws IOException, IllegalDataException {
         new BlockInputStream(source, parser).process();

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Logging;
 
 import crosby.binary.BinarySerializer;
@@ -126 +127 @@
                     int uid = e.getUser() == null ? -1 : (int) e.getUser().getId();
                     int userSid = stable.getIndex(getUserId(e));
-                    int timestamp = (int) (e.getTimestamp().getTime() / date_granularity);
+                    int timestamp = (int) (e.getInstant().toEpochMilli() / date_granularity);
                     int version = e.getVersion();
                     long changeset = e.getChangesetId();
@@ -150 +151 @@
                         b.setUserSid(stable.getIndex(e.getUser().getName()));
                     }
-                    b.setTimestamp((int) (e.getTimestamp().getTime() / date_granularity));
+                    b.setTimestamp((int) (e.getInstant().toEpochMilli() / date_granularity));
                     b.setVersion(e.getVersion());
                     b.setChangeset(e.getChangesetId());
@@ -435 +436 @@
             } else {
                 // No data. Is this an empty file?
+                Logging.debug("No PBF data. Is this an empty file?");
             }
         }