Changeset 10856 in josm

Timestamp:

2016-08-19T22:47:37+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13375 - Fix icon rendering (patch by michael2402) - gsoc-core + add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/MapViewState.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -703 +703 @@
         g.setFont(text.font);
 
-        int x = (int) (p.getInViewX() + text.xOffset);
-        int y = (int) (p.getInViewY() + text.yOffset);
+        int x = (int) (Math.round(p.getInViewX()) + text.xOffset);
+        int y = (int) (Math.round(p.getInViewY()) + text.yOffset);
         /**
          *
@@ -890 +890 @@
         }
 
-        double x = p.getInViewX();
-        double y = p.getInViewY();
+        double x = Math.round(p.getInViewX());
+        double y = Math.round(p.getInViewY());
         temporaryGraphics.translate(x, y);
         temporaryGraphics.rotate(theta);

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

@@ -216 +216 @@
     public MapViewPoint getCenter() {
         return getForView(viewWidth / 2.0, viewHeight / 2.0);
+    }
+
+    /**
+     * Gets the center of the view, rounded to a pixel coordinate
+     * @return The center position.
+     * @since 10856
+     */
+    public MapViewPoint getCenterAtPixel() {
+        return getForView(viewWidth / 2, viewHeight / 2);
     }
 

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

@@ -294 +294 @@
      */
     public void zoomIn() {
-        zoomTo(getCenter(), scaleZoomIn());
+        zoomTo(state.getCenterAtPixel().getEastNorth(), scaleZoomIn());
     }
 
@@ -301 +301 @@
      */
     public void zoomOut() {
-        zoomTo(getCenter(), scaleZoomOut());
+        zoomTo(state.getCenterAtPixel().getEastNorth(), scaleZoomOut());
     }
 
@@ -408 +408 @@
      */
     public EastNorth getCenter() {
-        return state.getCenter().getEastNorth();
+        return state.getCenterAtPixel().getEastNorth();
     }
 
@@ -608 +608 @@
         if (!newCenter.equals(getCenter())) {
             EastNorth oldCenter = getCenter();
-            state = state.usingCenter(newCenter);
+            state = state.movedTo(state.getCenterAtPixel(), newCenter);
             if (!initial) {
                 firePropertyChange(PROPNAME_CENTER, oldCenter, newCenter);
@@ -617 +617 @@
             state = state.usingScale(newScale);
             // temporary. Zoom logic needs to be moved.
-            state = state.movedTo(state.getCenter(), newCenter);
+            state = state.movedTo(state.getCenterAtPixel(), newCenter);
             if (!initial) {
                 firePropertyChange(PROPNAME_SCALE, oldScale, newScale);

trunk/test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java

@@ -7 +7 @@
 import java.awt.geom.Point2D;
 import java.util.Arrays;
+import java.util.function.Function;
 
 import org.junit.Before;
@@ -23 +24 @@
 public class MapViewStateTest {
 
-    private static final int WIDTH = 300;
+    private static final int WIDTH = 301;
     private static final int HEIGHT = 200;
     private MapViewState state;
@@ -43 +44 @@
     }
 
+    private void doTestGetCenter(Function<MapViewState, MapViewPoint> getter, Function<Integer, Double> divider) {
+        MapViewPoint center = getter.apply(state);
+        assertHasViewCoords(divider.apply(WIDTH), divider.apply(HEIGHT), center);
+
+        MapViewState newState = state.movedTo(center, new EastNorth(3, 4));
+
+        // state should not change, but new state should.
+        center = getter.apply(state);
+        assertHasViewCoords(divider.apply(WIDTH), divider.apply(HEIGHT), center);
+
+        center = getter.apply(newState);
+        assertEquals("east", 3, center.getEastNorth().east(), 0.01);
+        assertEquals("north", 4, center.getEastNorth().north(), 0.01);
+    }
+
     /**
      * Test {@link MapViewState#getCenter()} returns map view center.
@@ -48 +64 @@
     @Test
     public void testGetCenter() {
-        MapViewPoint center = state.getCenter();
-        assertHasViewCoords(WIDTH / 2, HEIGHT / 2, center);
-
-        MapViewState newState = state.movedTo(center, new EastNorth(3, 4));
-
-        // state should not change, but new state should.
-        center = state.getCenter();
-        assertHasViewCoords(WIDTH / 2, HEIGHT / 2, center);
-
-        center = newState.getCenter();
-        assertEquals("east", 3, center.getEastNorth().east(), 0.01);
-        assertEquals("north", 4, center.getEastNorth().north(), 0.01);
+        doTestGetCenter(s -> s.getCenter(), t -> t / 2d);
     }
 
-    private void assertHasViewCoords(double x, double y, MapViewPoint center) {
+    /**
+     * Test {@link MapViewState#getCenterAtPixel()} returns map view center.
+     */
+    @Test
+    public void testGetCenterAtPixel() {
+        doTestGetCenter(s -> s.getCenterAtPixel(), t -> (double) (t / 2));
+    }
+
+    private static void assertHasViewCoords(double x, double y, MapViewPoint center) {
         assertEquals("x", x, center.getInViewX(), 0.01);
         assertEquals("y", y, center.getInViewY(), 0.01);
@@ -101 +114 @@
     @Test
     public void testPointConversions() {
-        MapViewPoint p = state.getForView(WIDTH / 2, HEIGHT / 2);
-        assertHasViewCoords(WIDTH / 2, HEIGHT / 2, p);
+        MapViewPoint p = state.getForView(WIDTH / 2d, HEIGHT / 2d);
+        assertHasViewCoords(WIDTH / 2d, HEIGHT / 2d, p);
 
         EastNorth eastnorth = p.getEastNorth();
@@ -110 +123 @@
         assertEquals("north", shouldEastNorth.north(), eastnorth.north(), 0.01);
         MapViewPoint reversed = state.getPointFor(shouldEastNorth);
-        assertHasViewCoords(WIDTH / 2, HEIGHT / 2, reversed);
+        assertHasViewCoords(WIDTH / 2d, HEIGHT / 2d, reversed);
 
         LatLon latlon = p.getLatLon();