Changeset 35631 in osm

Timestamp:

2020-10-29T18:48:26+01:00 (3 years ago)

Author:

simon04

Message:

fix #19972 - pbf: downgrade to protobuf-java 2.5.0, downgrade to osmpbf 1.3.3, resolve osmpbf from mkgmap.org.uk

Location:

applications/editors/josm/plugins/pbf

Files:

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

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

@@ -2 +2 @@
   <info organisation="org.openstreetmap.josm.plugins" module="pbf"/>
   <dependencies>
-    <dependency conf="default->default" org="org.openstreetmap.pbf" name="osmpbf" rev="1.4.0"/>
+    <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"/>
   </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

@@ -75 +75 @@
             if (header.hasBbox()) {
                 HeaderBBox bbox = header.getBbox();
-                if (bbox != null) {
                     double minlat = parseRawDegrees(bbox.getBottom());
                     double minlon = parseRawDegrees(bbox.getLeft());
@@ -86 +85 @@
                         Logging.error("Invalid Bounds: "+b);
                     }
-                }
             }
         }