Changeset 14734 in josm

Timestamp:

2019-01-26T09:07:58+01:00 (6 years ago)

Author:

GerdP

Message:

fix #16706 (16706-improve-v2.patch)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AutoScaleAction.java (modified) (2 diffs)
• data/osm/visitor/BoundingXYVisitor.java (modified) (4 diffs)
• gui/NavigatableComponent.java (modified) (2 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -164 +164 @@
         BoundingXYVisitor bboxCalculator = new BoundingXYVisitor();
         bboxCalculator.computeBoundingBox(sel);
-        // increase bbox. This is required
-        // especially if the bbox contains one single node, but helpful
-        // in most other cases as well.
-        bboxCalculator.enlargeBoundingBox();
         if (bboxCalculator.getBounds() != null) {
             MainApplication.getMap().mapView.zoomTo(bboxCalculator);
@@ -396 +392 @@
         }
 
-        // Do not zoom if the current scale covers the selection, #16706
-        final MapView mapView = MainApplication.getMap().mapView;
-        final double mapScale = mapView.getScale();
-        final double minScale = v.getBounds().getScale(mapView.getWidth(), mapView.getHeight());
-        v.enlargeBoundingBoxLogarithmically();
-        final double maxScale = v.getBounds().getScale(mapView.getWidth(), mapView.getHeight());
-        if (minScale <= mapScale && mapScale < maxScale) {
-            mapView.zoomTo(v.getBounds().getCenter());
-        } else {
-            mapView.zoomTo(v);
-        }
+        MainApplication.getMap().mapView.zoomTo(v);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -28 +28 @@
  */
 public class BoundingXYVisitor implements OsmPrimitiveVisitor, PrimitiveVisitor {
+    /** default value for setting "edit.zoom-enlarge-bbox" */
+    private static final double ENLARGE_DEFAULT = 0.0002;
 
     private ProjectionBounds bounds;
@@ -140 +142 @@
 
     /**
-     * Enlarges the calculated bounding box by 0.001 degrees.
+     * Enlarges the calculated bounding box by 0.0002 degrees or user value
+     * given in edit.zoom-enlarge-bbox.
      * If the bounding box has not been set (<code>min</code> or <code>max</code>
      * equal <code>null</code>) this method does not do anything.
      */
     public void enlargeBoundingBox() {
-        final double enlarge = Config.getPref().getDouble("edit.zoom-enlarge-bbox", 0.001);
+        final double enlarge = Config.getPref().getDouble("edit.zoom-enlarge-bbox", ENLARGE_DEFAULT);
         enlargeBoundingBox(enlarge, enlarge);
     }
@@ -171 +174 @@
 
     /**
-     * Enlarges the bounding box up to 0.001 degrees, depending on
-     * its size. If the bounding box is small, it will be enlarged more in relation
+     * Enlarges the bounding box up to 0.0002 degrees, depending on its size and user
+     * settings in edit.zoom-enlarge-bbox. If the bounding box is small, it will be enlarged more in relation
      * to its beginning size. The larger the bounding box, the smaller the change,
      * down to 0.0 degrees.
@@ -188 +191 @@
         final double deltaLat = max.lat() - min.lat();
         final double deltaLon = max.lon() - min.lon();
-        // [0.001, 0.1] degree -> [0.001, 0.0] degree enlargement
-        final DoubleUnaryOperator enlargement = deg -> deg < 0.001
-                ? 0.001
-                : deg < 0.1
-                ? 0.001 - deg / 100
-                : 0.0;
+        final double enlarge = Config.getPref().getDouble("edit.zoom-enlarge-bbox", ENLARGE_DEFAULT);
+
+        final DoubleUnaryOperator enlargement = deltaDegress -> {
+            if (deltaDegress < enlarge) {
+                // delta is very small, use configured minimum value
+                return enlarge;
+            }
+            if (deltaDegress < 0.1) {
+                return enlarge - deltaDegress / 100;
+            }
+            return 0.0;
+        };
         enlargeBoundingBox(enlargement.applyAsDouble(deltaLon), enlargement.applyAsDouble(deltaLat));
     }

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -811 +811 @@
         if (viewport == null) return;
         if (viewport.getBounds() != null) {
-            BoundingXYVisitor box = new BoundingXYVisitor();
-            box.visit(viewport.getBounds());
-            zoomTo(box);
+            BoundingXYVisitor v = new BoundingXYVisitor();
+            v.visit(viewport.getBounds());
+            zoomTo(v);
         } else {
             zoomTo(viewport.getCenter(), viewport.getScale(), true);
@@ -821 +821 @@
     /**
      * Set the new dimension to the view.
-     * @param box box to zoom to
-     */
-    public void zoomTo(BoundingXYVisitor box) {
-        if (box == null) {
-            box = new BoundingXYVisitor();
-        }
-        if (box.getBounds() == null) {
-            box.visit(getProjection().getWorldBoundsLatLon());
-        }
-        if (!box.hasExtend()) {
-            box.enlargeBoundingBox();
-        }
-
-        zoomTo(box.getBounds());
+     * @param v box to zoom to
+     */
+    public void zoomTo(BoundingXYVisitor v) {
+        if (v == null) {
+            v = new BoundingXYVisitor();
+        }
+        if (v.getBounds() == null) {
+            v.visit(getProjection().getWorldBoundsLatLon());
+        }
+
+        // increase bbox. This is required
+        // especially if the bbox contains one single node, but helpful
+        // in most other cases as well.
+        // Do not zoom if the current scale covers the selection, #16706
+        final MapView mapView = MainApplication.getMap().mapView;
+        final double mapScale = mapView.getScale();
+        final double minScale = v.getBounds().getScale(mapView.getWidth(), mapView.getHeight());
+        v.enlargeBoundingBoxLogarithmically();
+        final double maxScale = v.getBounds().getScale(mapView.getWidth(), mapView.getHeight());
+        if (minScale <= mapScale && mapScale < maxScale) {
+            mapView.zoomTo(v.getBounds().getCenter());
+        } else {
+            zoomTo(v.getBounds());
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -433 +433 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            BoundingXYVisitor box = new BoundingXYVisitor();
+            BoundingXYVisitor v = new BoundingXYVisitor();
             Collection<OsmPrimitive> sel = model.getSelected();
             if (sel.isEmpty()) return;
-            box.computeBoundingBox(sel);
-            if (box.getBounds() == null)
+            v.computeBoundingBox(sel);
+            if (v.getBounds() == null)
                 return;
-            box.enlargeBoundingBox();
-            MainApplication.getMap().mapView.zoomTo(box);
+            MainApplication.getMap().mapView.zoomTo(v);
         }