GIS field viewer completely integrated in SLC RCP

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.gis / src / main / java / org / argeo / slc / geotools / swing / VersatileZoomTool.java

diff --git a/runtime/org.argeo.slc.support.gis/src/main/java/org/argeo/slc/geotools/swing/VersatileZoomTool.java b/runtime/org.argeo.slc.support.gis/src/main/java/org/argeo/slc/geotools/swing/VersatileZoomTool.java
index b6d5189d9d60e39d70f0b5e0349caf4defb7b4ad..e0ff9fe3e32da386bbae2be6435a3376fd91ba39 100644 (file)
--- a/runtime/org.argeo.slc.support.gis/src/main/java/org/argeo/slc/geotools/swing/VersatileZoomTool.java
+++ b/runtime/org.argeo.slc.support.gis/src/main/java/org/argeo/slc/geotools/swing/VersatileZoomTool.java
@@ -94,7 +94,7 @@ public class VersatileZoomTool extends AbstractZoomTool {
                else if (SwingUtilities.isMiddleMouseButton(e)) {
                        if (fieldPosition != null) {
                                Envelope2D env = new Envelope2D();
-                               final double increment = 1d;
+                               final double increment = 0.1d;
                                env.setFrameFromDiagonal(fieldPosition.getX() - increment,
                                                fieldPosition.getY() - increment, fieldPosition.getX()
                                                                + increment, fieldPosition.getY() + increment);
@@ -217,6 +217,8 @@ public class VersatileZoomTool extends AbstractZoomTool {
                                int sign = (clicks < 0 ? -1 : 1);
 
                                ReferencedEnvelope env = getMapPane().getDisplayArea();
+                               if (env == null)
+                                       return;
                                double width = env.getWidth();
                                double delta = width * clickToZoom * sign;