Changeset 31836 in osm for applications/editors/josm/plugins/mapillary

Timestamp:

2015-12-16T17:16:48+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Improve the calculation of zoom bounds for a given set of images

File:

• applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java

@@ -384 +384 @@
    *          Whether the added images must be selected or not.
    */
-  public static void showPictures(final List<MapillaryAbstractImage> images,
-      final boolean select) {
+  public static void showPictures(final List<MapillaryAbstractImage> images, final boolean select) {
     if (!SwingUtilities.isEventDispatchThread()) {
       SwingUtilities.invokeLater(new Runnable() {
@@ -394 +393 @@
       });
     } else {
-      double minLat = 90;
-      double minLon = 180;
-      double maxLat = -90;
-      double maxLon = -180;
-      for (MapillaryAbstractImage img : images) {
-        if (img.getLatLon().lat() < minLat)
-          minLat = img.getLatLon().lat();
-        if (img.getLatLon().lon() < minLon)
-          minLon = img.getLatLon().lon();
-        if (img.getLatLon().lat() > maxLat)
-          maxLat = img.getLatLon().lat();
-        if (img.getLatLon().lon() > maxLon)
-          maxLon = img.getLatLon().lon();
+      Bounds zoomBounds;
+      if (images.isEmpty()) {
+        zoomBounds = new Bounds(new LatLon(0, 0));
+      } else {
+        zoomBounds = new Bounds(images.get(0).getLatLon());
+        for (MapillaryAbstractImage img : images) {
+          zoomBounds.extend(img.getLatLon());
+        }
       }
-      Bounds zoomBounds = new Bounds(new LatLon(minLat, minLon),
-          new LatLon(maxLat, maxLon));
       // The zoom rectangle must have a minimum size.
-      double latExtent = zoomBounds.getMaxLat()
-          - zoomBounds.getMinLat() >= MIN_ZOOM_SQUARE_SIDE
-              ? zoomBounds.getMaxLat() - zoomBounds.getMinLat()
-              : MIN_ZOOM_SQUARE_SIDE;
-      double lonExtent = zoomBounds.getMaxLon()
-          - zoomBounds.getMinLon() >= MIN_ZOOM_SQUARE_SIDE
-              ? zoomBounds.getMaxLon() - zoomBounds.getMinLon()
-              : MIN_ZOOM_SQUARE_SIDE;
+      double latExtent = Math.max(zoomBounds.getMaxLat() - zoomBounds.getMinLat(), MIN_ZOOM_SQUARE_SIDE);
+      double lonExtent = Math.max(zoomBounds.getMaxLon() - zoomBounds.getMinLon(), MIN_ZOOM_SQUARE_SIDE);
       zoomBounds = new Bounds(zoomBounds.getCenter(), latExtent, lonExtent);