Skip to content

Fixed requesting of legend graphics each time the capabilities are requested #1912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copierrj merged 1 commit into from
Jan 14, 2026
Merged

Fixed requesting of legend graphics each time the capabilities are requested #1912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions ...gree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/legends/LegendBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -92,6 +89,9 @@ List<LegendItem> prepareLegend(Style style, Graphics2D g, int width, int height)
}

Pair<Integer, Integer> getLegendSize(Style style) {
if (style.getLegendSize() != null) {
return style.getLegendSize();
}
URL url = style.getLegendURL();
File file = style.getLegendFile();
if (url == null) {
Expand All @@ -108,7 +108,7 @@ Pair<Integer, Integer> getLegendSize(Style style) {
try {
BufferedImage legend = get(IMAGE, url.toExternalForm(), null);
if (legend != null) {
return new Pair<Integer, Integer>(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);
Expand All @@ -131,7 +131,8 @@ Pair<Integer, Integer> getLegendSize(Style style) {
res.second = 2 * opts.spacing + opts.baseWidth;
}

return res;
style.setLegendSize(res);
return style.getLegendSize();
}

}
10 changes: 10 additions & 0 deletions deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/unevaluated/Style.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ public class Style implements Copyable<Style> {

private boolean prefersGetLegendGraphicUrl;

private Pair<Integer, Integer> legendSize;

/**
* @param rules
* @param labels
Expand Down Expand Up @@ -451,6 +453,14 @@ public URL getLegendURL() {
return legendUrl;
}

public Pair<Integer, Integer> getLegendSize() {
return legendSize;
}

public void setLegendSize(Pair<Integer, Integer> legendSize) {
this.legendSize = legendSize;
}

public void setPrefersGetLegendGraphicUrl(boolean prefers) {
this.prefersGetLegendGraphicUrl = prefers;
}
Expand Down