Changeset 14583 in josm

Timestamp:

2018-12-22T08:49:30+01:00 (5 years ago)

Author:

GerdP

Message:

fix #17119: Improve rendering time of partly visible complex shapes

Clip all areas (shapes) to the extended visible area so that complex shapes are reduced to those points which are effective for rendering. Should have no effect on the rendered image but improves performance when many nodes of the shape are outside of the visible area.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRenderer.java (modified) (7 diffs)
• tools/ShapeClipper.java (added)

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

@@ -88 +88 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.ShapeClipper;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
@@ -437 +438 @@
      */
     protected void drawArea(MapViewPath path, Color color,
-            MapImage fillImage, Float extent, Path2D.Double pfClip, boolean disabled) {
+            MapImage fillImage, Float extent, MapViewPath pfClip, boolean disabled) {
         if (!isOutlineOnly && color.getAlpha() != 0) {
             Shape area = path;
@@ -478 +479 @@
      *
      */
-    private void computeFill(Shape shape, Float extent, Path2D.Double pfClip, float mitterLimit) {
+    private void computeFill(Shape shape, Float extent, MapViewPath pfClip, float mitterLimit) {
         if (extent == null) {
             g.fill(shape);
@@ -485 +486 @@
             Shape clip = shape;
             if (pfClip != null) {
-                clip = pfClip.createTransformedShape(mapState.getAffineTransform());
+                clip = pfClip;
             }
             g.clip(clip);
@@ -515 +516 @@
                     continue;
                 }
-                MapViewPath p = new MapViewPath(mapState);
-                p.appendFromEastNorth(pd.get());
-                p.setWindingRule(Path2D.WIND_EVEN_ODD);
-                Path2D.Double pfClip = null;
+                MapViewPath p = shapeEastNorthToMapView(pd.get());
+                MapViewPath pfClip = null;
                 if (extent != null) {
                     if (!usePartialFill(pd.getAreaAndPerimeter(null), extent, extentThreshold)) {
                         extent = null;
                     } else if (!pd.isClosed()) {
-                        pfClip = getPFClip(pd, extent * scale);
+                        pfClip = shapeEastNorthToMapView(getPFClip(pd, extent * scale));
                     }
                 }
@@ -531 +530 @@
             }
         }
+    }
+
+    /**
+     * Convert shape in EastNorth coordinates to MapViewPath and remove invisible parts.
+     * For complex shapes this improves performance drastically because the methods in Graphics2D.clip() and Graphics2D.draw() are rather slow.
+     * @param shape the shape to convert
+     * @return the converted shape
+     */
+    private MapViewPath shapeEastNorthToMapView(Path2D.Double shape) {
+        MapViewPath convertedShape = null;
+        if (shape != null) {
+            convertedShape = new MapViewPath(mapState);
+            convertedShape.appendFromEastNorth(shape);
+            convertedShape.setWindingRule(Path2D.WIND_EVEN_ODD);
+
+            Rectangle2D extViewBBox = mapState.getViewClipRectangle().getInView();
+            if (!extViewBBox.contains(convertedShape.getBounds2D())) {
+                // remove invisible parts of shape
+                Path2D.Double clipped = ShapeClipper.clipShape(convertedShape, extViewBBox);
+                if (clipped != null) {
+                    convertedShape.reset();
+                    convertedShape.append(clipped, false);
+                }
+            }
+        }
+        return convertedShape;
     }
 
@@ -547 +572 @@
      */
     public void drawArea(IWay<?> w, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled) {
-        Path2D.Double pfClip = null;
+        MapViewPath pfClip = null;
         if (extent != null) {
             if (!usePartialFill(Geometry.getAreaAndPerimeter(w.getNodes()), extent, extentThreshold)) {
                 extent = null;
             } else if (!w.isClosed()) {
-                pfClip = getPFClip(w, extent * scale);
+                pfClip = shapeEastNorthToMapView(getPFClip(w, extent * scale));
             }
         }