Changeset 33165 in osm for applications

Timestamp:

2017-02-26T05:26:25+01:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 11626

Location:

applications/editors/josm/plugins/pbf

Files:

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

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="10580"/>
+    <property name="plugin.main.version" value="11626"/>
 
     <property name="plugin.author" value="Don-vip"/>

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

@@ -79 +79 @@
                 Bounds b = new Bounds(minlat, minlon, maxlat, maxlon);
                 if (!b.isCollapsed() && areCoordinatesValid(minlat, minlon, maxlat, maxlon)) {
-                    ds.dataSources.add(new DataSource(b, header.getSource()));
+                    ds.addDataSource(new DataSource(b, header.getSource()));
                 } else {
                     Main.error("Invalid Bounds: "+b);

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

@@ -484 +484 @@
 
         public void process(DataSet ds) {
-            processor.processSources(ds.dataSources);
+            processor.processSources(ds.getDataSources());
             Comparator<OsmPrimitive> cmp = Comparator.comparingLong(OsmPrimitive::getUniqueId);
             ds.getNodes().stream().sorted(cmp).filter(n -> n.isLatLonKnown()).forEach(processor::processNode);