Changeset 35631 in osm for applications/editors/josm


Ignore:
Timestamp:
2020-10-29T18:48:26+01:00 (4 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:
3 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/pbf/ivy.xml

    r35604 r35631  
    22  <info organisation="org.openstreetmap.josm.plugins" module="pbf"/>
    33  <dependencies>
    4     <dependency conf="default->default" org="org.openstreetmap.pbf" name="osmpbf" rev="1.4.0"/>
     4    <dependency conf="default->default" org="com.google.protobuf" name="protobuf-java" rev="2.5.0"/>
     5    <dependency conf="default->default" org="crosby" name="osmpbf" rev="1.3.3"/>
    56  </dependencies>
    67</ivy-module>
  • applications/editors/josm/plugins/pbf/ivy_settings.xml

    r35604 r35631  
    44  <resolvers>
    55    <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
     6    <url name="mkgmap">
     7      <ivy pattern="http://ivy.mkgmap.org.uk/repo/[organisation]/[module]/[revision]/ivys/ivy.xml"/>
     8      <artifact pattern="http://ivy.mkgmap.org.uk/repo/[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"/>
     9    </url>
    610  </resolvers>
     11  <modules>
     12    <module organisation="crosby" name="osmpbf" resolver="mkgmap"/>
     13  </modules>
    714</ivysettings>
  • applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java

    r35035 r35631  
    7575            if (header.hasBbox()) {
    7676                HeaderBBox bbox = header.getBbox();
    77                 if (bbox != null) {
    7877                    double minlat = parseRawDegrees(bbox.getBottom());
    7978                    double minlon = parseRawDegrees(bbox.getLeft());
     
    8685                        Logging.error("Invalid Bounds: "+b);
    8786                    }
    88                 }
    8987            }
    9088        }
Note: See TracChangeset for help on using the changeset viewer.