diff --git a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/legends/LegendBuilder.java b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/legends/LegendBuilder.java index f0668bfcf12..9b51e81c17c 100644 --- a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/legends/LegendBuilder.java +++ b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/legends/LegendBuilder.java @@ -53,10 +53,7 @@ Occam Labs UG (haftungsbeschränkt) import java.net.URL; import java.util.List; -import javax.imageio.ImageIO; - import org.deegree.commons.utils.Pair; -import org.deegree.commons.utils.net.HttpUtils; import org.deegree.geometry.Envelope; import org.deegree.geometry.GeometryFactory; import org.deegree.rendering.r2d.Java2DRasterRenderer; @@ -92,6 +89,9 @@ List prepareLegend(Style style, Graphics2D g, int width, int height) } Pair getLegendSize(Style style) { + if (style.getLegendSize() != null) { + return style.getLegendSize(); + } URL url = style.getLegendURL(); File file = style.getLegendFile(); if (url == null) { @@ -108,7 +108,7 @@ Pair getLegendSize(Style style) { try { BufferedImage legend = get(IMAGE, url.toExternalForm(), null); if (legend != null) { - return new Pair(legend.getWidth(), legend.getHeight()); + style.setLegendSize(new Pair<>(legend.getWidth(), legend.getHeight())); } else { LOG.warn("Legend file {} could not be read, using dynamic legend.", url); @@ -131,7 +131,8 @@ Pair getLegendSize(Style style) { res.second = 2 * opts.spacing + opts.baseWidth; } - return res; + style.setLegendSize(res); + return style.getLegendSize(); } } diff --git a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/unevaluated/Style.java b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/unevaluated/Style.java index a3995d78f8b..9c88a4e598b 100644 --- a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/unevaluated/Style.java +++ b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/unevaluated/Style.java @@ -120,6 +120,8 @@ public class Style implements Copyable