Changeset 11961 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

Timestamp:

2017-04-19T22:25:12+02:00 (7 years ago)

Author:

bastiK

Message:

see #7427 - avoid black lines at tile borders (primarily for native tiles)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -965 +965 @@
         }
         g.drawImage(toDrawImg, (int) Math.round(screen0.getX()), (int) Math.round(screen0.getY()),
-                (int) Math.round(screen1.getX() - screen0.getX()), (int) Math.round(screen1.getY() - screen0.getY()), this);
+                (int) Math.round(screen1.getX()) - (int) Math.round(screen0.getX()),
+                (int) Math.round(screen1.getY()) - (int) Math.round(screen0.getY()), this);
         if (clip != null) {
             g.setClip(oldClip);
@@ -1027 +1028 @@
     private List<Tile> paintTileImages(Graphics2D g, TileSet ts, int zoom, Tile border) {
         if (zoom <= 0) return Collections.emptyList();
-        Shape borderClip = coordinateConverter.getScreenQuadrilateralForTile(border);
+        Shape borderClip = coordinateConverter.getTileShapeScreen(border);
         List<Tile> missedTiles = new LinkedList<>();
         // The callers of this code *require* that we return any tiles that we do not draw in missedTiles.
@@ -1140 +1141 @@
             // draw tile outline in semi-transparent red
             g.setColor(new Color(255, 0, 0, 50));
-            g.draw(coordinateConverter.getScreenQuadrilateralForTile(tile));
+            g.draw(coordinateConverter.getTileShapeScreen(tile));
         }
     }