Changeset 35978 in osm for applications/editors/josm/plugins/pbf

Timestamp:

2022-06-15T20:10:48+02:00 (3 years ago)

Author:

taylor.smock

Message:

See #22115: Extract methods from LatLon into ILatLon where they are generally applicable

This uses the extracted methods where possible, and removes unnecessary
Node#getCoor calls.

File:

• applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java (modified) (4 diffs)

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

@@ -12 +12 @@
 
 import org.openstreetmap.josm.data.DataSource;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -200 +199 @@
                     bi.addId(id - lastid);
                     lastid = id;
-                    LatLon coor = i.getCoor();
-                    if (coor != null) {
-                        int lat = mapDegrees(coor.lat());
-                        int lon = mapDegrees(coor.lon());
+                    if (i.isLatLonKnown()) {
+                        int lat = mapDegrees(i.lat());
+                        int lon = mapDegrees(i.lon());
                         bi.addLon(lon - lastlon);
                         lastlon = lon;
@@ -235 +233 @@
                 for (Node i : contents) {
                     long id = i.getUniqueId();
-                    LatLon coor = i.getCoor();
-                    int lat = mapDegrees(coor.lat());
-                    int lon = mapDegrees(coor.lon());
+                    int lat = mapDegrees(i.lat());
+                    int lon = mapDegrees(i.lon());
                     Osmformat.Node.Builder bi = Osmformat.Node.newBuilder();
                     bi.setId(id);
@@ -385 +382 @@
                     nodes = new NodeGroup();
                 }
-                if (node.getCoor() != null) {
+                if (node.isLatLonKnown()) {
                     nodes.add(node);
                     checkLimit();