Skip to content

Commit 2ae1207

Browse files
desruisseauxdesruisseaux
committed
Add a few tests and validations provided by the by GeoAPI conformance module.
1 parent e642a12 commit 2ae1207

File tree

9 files changed

+227
-13
lines changed

9 files changed

+227
-13
lines changed

‎geoapi/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
<artifactId>geoapi</artifactId>
2828
<version>3.0.2</version>
2929
</dependency>
30+
<dependency>
31+
<groupId>org.opengis</groupId>
32+
<artifactId>geoapi-conformance</artifactId>
33+
<version>3.0.2</version>
34+
<scope>test</scope>
35+
</dependency>
3036
<dependency>
3137
<groupId>org.locationtech.proj4j</groupId>
3238
<artifactId>proj4j</artifactId>

‎geoapi/src/main/java/org/locationtech/proj4j/geoapi/Alias.java

+23-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@
3434
* @author Martin Desruisseaux (Geomatys)
3535
*/
3636
@SuppressWarnings("serial")
37-
final class Alias implements LocalName, Serializable {
37+
final class Alias implements LocalName, NameSpace, Serializable {
38+
/**
39+
* Name of the global name space.
40+
*/
41+
private static final Alias GLOBAL = new Alias("global");
42+
3843
/**
3944
* The name to provide as an alias.
4045
*/
@@ -59,9 +64,12 @@ static Collection<GenericName> wrap(final String name) {
5964
return (name != null) ? Collections.singletonList(new Alias(name)) : Collections.emptyList();
6065
}
6166

67+
/**
68+
* {@return the global namespace}.
69+
*/
6270
@Override
6371
public NameSpace scope() {
64-
return null;
72+
return this;
6573
}
6674

6775
@Override
@@ -122,4 +130,17 @@ public boolean equals(Object o) {
122130
public int hashCode() {
123131
return name.hashCode() ^ getClass().hashCode();
124132
}
133+
134+
@Override
135+
public boolean isGlobal() {
136+
return true;
137+
}
138+
139+
/**
140+
* {@return the name of the global name space}.
141+
*/
142+
@Override
143+
public GenericName name() {
144+
return GLOBAL;
145+
}
125146
}

‎geoapi/src/main/java/org/locationtech/proj4j/geoapi/Services.java

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/*
2+
* Copyright 2025, PROJ4J contributors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.locationtech.proj4j.geoapi;
17+
18+
import org.locationtech.proj4j.geoapi.spi.AuthorityFactory;
19+
import org.locationtech.proj4j.geoapi.spi.OperationFactory;
20+
import org.opengis.referencing.NoSuchAuthorityCodeException;
21+
import org.opengis.referencing.crs.CRSAuthorityFactory;
22+
import org.opengis.referencing.crs.CoordinateReferenceSystem;
23+
import org.opengis.referencing.operation.CoordinateOperation;
24+
import org.opengis.referencing.operation.CoordinateOperationFactory;
25+
import org.opengis.util.FactoryException;
26+
27+
28+
/**
29+
* Default implementations of referencing services backed by PROJ4J.
30+
* Those services are accessible by {@link java.util.ServiceLoader},
31+
* which should be used by implementation-neutral applications.
32+
* This class provides shortcuts for the convenience of applications
33+
* that do not need implementation neutrality.
34+
*
35+
* @author Martin Desruisseaux (Geomatys)
36+
*/
37+
public final class Services {
38+
/**
39+
* Do not allows instantiation of this class.
40+
*/
41+
private Services() {
42+
}
43+
44+
/**
45+
* {@return the singleton factory for creating CRS from authority codes}.
46+
*/
47+
public static CRSAuthorityFactory getAuthorityFactory() {
48+
return AuthorityFactory.provider();
49+
}
50+
51+
/**
52+
* {@return the singleton factory for creating coordinate operations between a pair of CRS}.
53+
*/
54+
public static CoordinateOperationFactory getOperationFactory() {
55+
return OperationFactory.provider();
56+
}
57+
58+
/**
59+
* Creates a coordinate reference system from the given authority code.
60+
* The argument should be of the form {@code "AUTHORITY:CODE"}.
61+
* If the authority is unspecified, then {@code "EPSG"} is assumed.
62+
*
63+
* @param code the authority code
64+
* @return coordinate reference system for the given code
65+
* @throws NoSuchAuthorityCodeException if the specified {@code code} was not found
66+
* @throws FactoryException if the object creation failed for some other reason
67+
*/
68+
public static CoordinateReferenceSystem createCRS(final String code) throws FactoryException {
69+
return getAuthorityFactory().createCoordinateReferenceSystem(code);
70+
}
71+
72+
/**
73+
* Creates a coordinate operation between the given pair of coordinate reference systems.
74+
*
75+
* @param source input coordinate reference system
76+
* @param target output coordinate reference system
77+
* @return a coordinate operation from {@code source} to {@code target}
78+
* @throws FactoryException if the coordinate operation cannot be created
79+
*/
80+
public static CoordinateOperation findOperation(CoordinateReferenceSystem source, CoordinateReferenceSystem target)
81+
throws FactoryException
82+
{
83+
return getOperationFactory().createOperation(source, target);
84+
}
85+
}

‎geoapi/src/main/java/org/locationtech/proj4j/geoapi/TransformWrapper2D.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,10 @@ public void transform(double[] srcPts, int srcOff,
100100
double[] dstPts, int dstOff, int numPts) throws TransformException
101101
{
102102
checkNumPts(numPts);
103-
if (srcPts == dstPts && srcOff > dstOff) {
103+
if (srcPts == dstPts && srcOff < dstOff) {
104+
// If there is an overlap, we need a copy.
104105
int end = srcOff + numPts * BIDIMENSIONAL;
105-
if (end < dstOff) {
106+
if (end > dstOff) {
106107
srcPts = Arrays.copyOfRange(srcPts, srcOff, end);
107108
srcOff = 0;
108109
}
@@ -132,9 +133,10 @@ public void transform(float[] srcPts, int srcOff,
132133
float[] dstPts, int dstOff, int numPts) throws TransformException
133134
{
134135
checkNumPts(numPts);
135-
if (srcPts == dstPts && srcOff > dstOff) {
136+
if (srcPts == dstPts && srcOff < dstOff) {
137+
// If there is an overlap, we need a copy.
136138
int end = srcOff + numPts * BIDIMENSIONAL;
137-
if (end < dstOff) {
139+
if (end > dstOff) {
138140
srcPts = Arrays.copyOfRange(srcPts, srcOff, end);
139141
srcOff = 0;
140142
}

‎geoapi/src/main/java/org/locationtech/proj4j/geoapi/TransformWrapper3D.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ public void transform(double[] srcPts, int srcOff,
7171
double[] dstPts, int dstOff, int numPts) throws TransformException
7272
{
7373
checkNumPts(numPts);
74-
if (srcPts == dstPts && srcOff > dstOff) {
74+
if (srcPts == dstPts && srcOff < dstOff) {
75+
// If there is an overlap, we need a copy.
7576
int end = srcOff + numPts * TRIDIMENSIONAL;
76-
if (end < dstOff) {
77+
if (end > dstOff) {
7778
srcPts = Arrays.copyOfRange(srcPts, srcOff, end);
7879
srcOff = 0;
7980
}
@@ -105,9 +106,10 @@ public void transform(float[] srcPts, int srcOff,
105106
float[] dstPts, int dstOff, int numPts) throws TransformException
106107
{
107108
checkNumPts(numPts);
108-
if (srcPts == dstPts && srcOff > dstOff) {
109+
if (srcPts == dstPts && srcOff < dstOff) {
110+
// If there is an overlap, we need a copy.
109111
int end = srcOff + numPts * TRIDIMENSIONAL;
110-
if (end < dstOff) {
112+
if (end > dstOff) {
111113
srcPts = Arrays.copyOfRange(srcPts, srcOff, end);
112114
srcOff = 0;
113115
}

‎geoapi/src/main/java/org/locationtech/proj4j/geoapi/spi/AuthorityFactory.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
* @author Martin Desruisseaux (Geomatys)
3838
*/
3939
public final class AuthorityFactory implements CRSAuthorityFactory {
40+
/**
41+
* The unique instance returned by {@link #provider()}.
42+
*/
43+
private static final CRSAuthorityFactory INSTANCE = Wrappers.geoapi(new CRSFactory());
44+
4045
/**
4146
* Where to delegate all operations.
4247
*/
@@ -53,9 +58,10 @@ public AuthorityFactory() {
5358

5459
/**
5560
* {@return the factory backed by PROJ4J}.
61+
* This is the method that should be invoked when using Java 9+ module system.
5662
*/
5763
public static CRSAuthorityFactory provider() {
58-
return Wrappers.geoapi(new CRSFactory());
64+
return INSTANCE;
5965
}
6066

6167
@Override

‎geoapi/src/main/java/org/locationtech/proj4j/geoapi/spi/OperationFactory.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
* @author Martin Desruisseaux (Geomatys)
3838
*/
3939
public final class OperationFactory implements CoordinateOperationFactory {
40+
/**
41+
* The unique instance returned by {@link #provider()}.
42+
*/
43+
private static final CoordinateOperationFactory INSTANCE = Wrappers.geoapi(new CoordinateTransformFactory());
44+
4045
/**
4146
* Where to delegate all operations.
4247
*/
@@ -53,9 +58,10 @@ public OperationFactory() {
5358

5459
/**
5560
* {@return the factory backed by PROJ4J}.
61+
* This is the method that should be invoked when using Java 9+ module system.
5662
*/
5763
public static CoordinateOperationFactory provider() {
58-
return Wrappers.geoapi(new CoordinateTransformFactory());
64+
return INSTANCE;
5965
}
6066

6167
@Override

‎geoapi/src/test/java/org/locationtech/proj4j/geoapi/TransformTest.java

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/*
2+
* Copyright 2025, PROJ4J contributors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.locationtech.proj4j.geoapi;
17+
18+
import org.junit.Test;
19+
import org.opengis.referencing.operation.MathTransform;
20+
import org.opengis.referencing.operation.TransformException;
21+
import org.opengis.test.referencing.TransformTestCase;
22+
import org.opengis.util.FactoryException;
23+
24+
25+
/**
26+
* Tests some coordinate operations.
27+
*
28+
* @author Martin Desruisseaux (Geomatys)
29+
*/
30+
public class TransformTest extends TransformTestCase {
31+
/**
32+
* Creates a new test case.
33+
*/
34+
public TransformTest() {
35+
}
36+
37+
/**
38+
* Creates a transform between the given pair of coordinate reference systems.
39+
*
40+
* @param source authority code of the input coordinate reference system
41+
* @param target authority code of the output coordinate reference system
42+
* @return a coordinate operation from {@code source} to {@code target}
43+
* @throws FactoryException if the coordinate operation cannot be created
44+
*/
45+
private static MathTransform transform(String source, String target) throws FactoryException {
46+
return Services.findOperation(Services.createCRS(source), Services.createCRS(target)).getMathTransform();
47+
}
48+
49+
/**
50+
* Tests a projection from a geographic CRS to a projected CRS.
51+
*
52+
* @throws FactoryException if a CRS cannot be created
53+
* @throws TransformException if an error occurred while testing the projection of a point
54+
*/
55+
@Test
56+
public void testProjection() throws FactoryException, TransformException {
57+
transform = transform("EPSG:4326", "EPSG:2154");
58+
tolerance = 1E-3;
59+
verifyTransform(new double[] {3, 46.5}, // Coordinates to test (more can be added on this line).
60+
new double[] {700000, 6600000}); // Expected result.
61+
62+
// Random coordinates.
63+
final float[] coordinates = {
64+
3.0f, 46.5f,
65+
2.5f, 43.0f,
66+
3.5f, 46.0f,
67+
4.5f, 48.0f,
68+
1.5f, 41.0f,
69+
3.8f, 43.7f,
70+
3.1f, 42.1f,
71+
};
72+
verifyConsistency(coordinates);
73+
verifyInverse(coordinates);
74+
}
75+
}

‎geoapi/src/test/java/org/locationtech/proj4j/geoapi/WrappersTest.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.junit.Test;
2222
import org.locationtech.proj4j.CRSFactory;
2323
import org.locationtech.proj4j.ProjCoordinate;
24+
import org.locationtech.proj4j.datum.AxisOrder;
2425
import org.opengis.geometry.DirectPosition;
2526
import org.opengis.parameter.ParameterValue;
2627
import org.opengis.parameter.ParameterValueGroup;
@@ -38,8 +39,8 @@
3839
import org.opengis.referencing.operation.OperationMethod;
3940
import org.opengis.referencing.operation.Projection;
4041
import org.opengis.referencing.operation.TransformException;
41-
import org.locationtech.proj4j.datum.AxisOrder;
4242
import org.opengis.util.FactoryException;
43+
import org.opengis.test.Validators;
4344

4445
import static org.junit.Assert.*;
4546

@@ -78,6 +79,9 @@ public void testDatum() {
7879
assertEquals(6378388, ellipsoid.getSemiMajorAxis(), 0);
7980
assertEquals(6356911.95, ellipsoid.getSemiMinorAxis(), 0.005);
8081
assertEquals(297, ellipsoid.getInverseFlattening(), 5E-10);
82+
83+
// Verification by GeoAPI
84+
Validators.validate(datum);
8185
}
8286

8387
/**
@@ -131,6 +135,9 @@ public void testGeographicCRS() throws FactoryException {
131135
assertEquals(AxisDirection.NORTH, axis.getDirection());
132136
assertEquals(degree, axis.getUnit());
133137
assertSame(axis, cs.getAxis(1));
138+
139+
// Verification by GeoAPI
140+
Validators.validate(crs);
134141
}
135142

136143
/**
@@ -231,5 +238,9 @@ public void testProjectedCRS() throws FactoryException, TransformException {
231238
assertEquals(2, pt.getDimension());
232239
assertEquals(46.5, pt.getOrdinate(1), 1E-9);
233240
assertEquals( 3.0, pt.getOrdinate(0), 1E-9);
241+
242+
// Verification by GeoAPI
243+
// Disabled because one of the test is a bit too strict. This is fixed in GeoAPI 3.1.
244+
// Validators.validate(crs);
234245
}
235246
}

0 commit comments

Comments
 (0)