Skip to content

Commit a66564a

Browse files
committed
setting geometry collections in conversions and crops
1 parent 79407e5 commit a66564a

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

src/main/java/mil/nga/sf/util/GeometryUtils.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,6 +1491,7 @@ public static Geometry degreesToMeters(Geometry geometry) {
14911491
for (Geometry subGeometry : geomCollection.getGeometries()) {
14921492
metersCollection.addGeometry(degreesToMeters(subGeometry));
14931493
}
1494+
meters = metersCollection;
14941495
break;
14951496
default:
14961497
break;
@@ -1798,12 +1799,13 @@ public static Geometry metersToDegrees(Geometry geometry) {
17981799
case GEOMETRYCOLLECTION:
17991800
case MULTICURVE:
18001801
case MULTISURFACE:
1801-
GeometryCollection<Geometry> metersCollection = new GeometryCollection<>();
1802+
GeometryCollection<Geometry> degreesCollection = new GeometryCollection<>();
18021803
@SuppressWarnings("unchecked")
18031804
GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;
18041805
for (Geometry subGeometry : geomCollection.getGeometries()) {
1805-
metersCollection.addGeometry(metersToDegrees(subGeometry));
1806+
degreesCollection.addGeometry(metersToDegrees(subGeometry));
18061807
}
1808+
degrees = degreesCollection;
18071809
break;
18081810
default:
18091811
break;
@@ -2187,12 +2189,13 @@ public static Geometry crop(Geometry geometry, GeometryEnvelope envelope) {
21872189
case GEOMETRYCOLLECTION:
21882190
case MULTICURVE:
21892191
case MULTISURFACE:
2190-
GeometryCollection<Geometry> metersCollection = new GeometryCollection<>();
2192+
GeometryCollection<Geometry> cropCollection = new GeometryCollection<>();
21912193
@SuppressWarnings("unchecked")
21922194
GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;
21932195
for (Geometry subGeometry : geomCollection.getGeometries()) {
2194-
metersCollection.addGeometry(crop(subGeometry, envelope));
2196+
cropCollection.addGeometry(crop(subGeometry, envelope));
21952197
}
2198+
crop = cropCollection;
21962199
break;
21972200
default:
21982201
break;

0 commit comments

Comments
 (0)