Skip to content

Fixed size of symbols in legends if size is calculated #1914

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

Open
lgoltz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed size of symbols in legends if size is calculated #1914

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
28 changes: 20 additions & 8 deletions ...-rendering-2d/src/main/java/org/deegree/rendering/r2d/legends/StandardLegendRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,7 @@ else if (isLine) {
paintLegendText(origin, opts, text, textRenderer);

// normalize symbol sizes
double maxSize = 0;
if (isPoint) {
for (Styling s : stylings) {
if (s instanceof PointStyling) {
maxSize = max(((PointStyling) s).graphic.size, maxSize);
}
}
}
double maxSize = calculateMaxSize(isPoint);

if (rule == null) {
for (Styling s : stylings) {
Expand All @@ -146,6 +139,21 @@ else if (isLine) {
paintRule(isPoint, maxSize, opts, geom);
}

private double calculateMaxSize(boolean isPoint) {
double maxSize = 0;
if (isPoint) {
for (Styling s : stylings) {
if (s instanceof PointStyling) {
maxSize = max(((PointStyling) s).graphic.size, maxSize);
}
}
}
if (maxSize > 0)
return maxSize;
// fallback to default size 6 to avoid infinite legend size if maxSize is 0
return 6;
}

private void paintRule(boolean isPoint, double maxSize, LegendOptions opts, Geometry geom) {
LinkedList<Symbolizer<?>> syms = new LinkedList<Symbolizer<?>>();
rule.evaluate(syms, null, null);
Expand All @@ -159,6 +167,10 @@ private void paintRule(boolean isPoint, double maxSize, LegendOptions opts, Geom
if (styling instanceof PointStyling && isPoint) {
PointStyling ps = ((PointStyling) styling).copy();
ps.uom = Metre;
// fallback to default size 6 to avoid infinite legend size if maxSize
// is 0
if (ps.graphic.size <= 0)
ps.graphic.size = 6;
ps.graphic.size = ps.graphic.size / maxSize * min(opts.baseWidth, opts.baseHeight);
styling = ps;
}
Expand Down