Skip to content

handle CRS transformation from 3D to 2D #473

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
cportele wants to merge 1 commit into
base: master
Choose a base branch
from
Open

handle CRS transformation from 3D to 2D #473

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
15 changes: 11 additions & 4 deletions .../src/main/java/de/ii/xtraplatform/geometries/domain/transform/CoordinatesTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/
package de.ii.xtraplatform.geometries.domain.transform;

import de.ii.xtraplatform.geometries.domain.Axes;
import de.ii.xtraplatform.geometries.domain.CircularString;
import de.ii.xtraplatform.geometries.domain.Geometry;
import de.ii.xtraplatform.geometries.domain.LineString;
Expand All @@ -24,26 +25,32 @@ public class CoordinatesTransformer implements GeometryTransformer {

private final CoordinatesTransformation transformationChain;
private final boolean simplifiesArcs;
private final Axes resultAxes;

public CoordinatesTransformer(CoordinatesTransformation transformationChain) {
this.transformationChain = transformationChain;
CoordinatesTransformation current = transformationChain;
boolean simplifiesArcs = false;
Axes resultAxes = null;
while (Objects.nonNull(current)) {
if (current.simplifiesArcs()) {
simplifiesArcs = true;
break;
}
if (current instanceof CrsTransform transform) {
final int targetDimension = transform.getCrsTransformer().getTargetDimension();
resultAxes = targetDimension == 3 ? Axes.XYZ : Axes.XY;
}
current = current.getNext().orElse(null);
}
this.simplifiesArcs = simplifiesArcs;
this.resultAxes = resultAxes;
}

@Override
public Geometry<?> visit(Point geometry) {
return Point.of(
Position.of(
geometry.getAxes(),
Objects.requireNonNullElse(resultAxes, geometry.getAxes()),
processPositions(
geometry.getValue().getCoordinates(),
geometry.getAxes().size(),
Expand All @@ -59,7 +66,7 @@ public Geometry<?> visit(SingleCurve geometry) {
if (geometry instanceof CircularString) {
PositionList posList =
PositionList.of(
geometry.getAxes(),
Objects.requireNonNullElse(resultAxes, geometry.getAxes()),
processPositions(
coordinates,
dimension,
Expand All @@ -71,7 +78,7 @@ public Geometry<?> visit(SingleCurve geometry) {
}
return LineString.of(
PositionList.of(
geometry.getAxes(),
Objects.requireNonNullElse(resultAxes, geometry.getAxes()),
processPositions(
coordinates,
dimension,
Expand Down
17 changes: 14 additions & 3 deletions ...geometries/src/main/java/de/ii/xtraplatform/geometries/domain/transform/CrsTransform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import de.ii.xtraplatform.crs.domain.CrsTransformer;
import de.ii.xtraplatform.geometries.domain.PositionList.Interpolation;
import java.io.IOException;
import java.util.Arrays;
import java.util.Optional;
import java.util.OptionalInt;
import org.immutables.value.Value;
Expand All @@ -28,14 +29,24 @@ public double[] onCoordinates(
Optional<Interpolation> interpolation,
OptionalInt minNumberOfPositions)
throws IOException {
double[] transformed =
getCrsTransformer().transform(coordinates, length / dimension, dimension);
final int positions = length / dimension;
double[] transformed = getCrsTransformer().transform(coordinates, positions, dimension);

final int targetDimension = getCrsTransformer().getTargetDimension();
if (dimension == 3 && targetDimension == 2) {
transformed = Arrays.copyOfRange(transformed, 0, positions * 2);
}

if (getNext().isEmpty()) {
return transformed;
}
return getNext()
.get()
.onCoordinates(transformed, length, dimension, interpolation, minNumberOfPositions);
.onCoordinates(
transformed,
positions * targetDimension,
targetDimension,
interpolation,
minNumberOfPositions);
}
}
Loading