[
https://issues.apache.org/jira/browse/JENA-2213?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17480758#comment-17480758
]
Marco Neumann edited comment on JENA-2213 at 1/23/22, 11:35 PM:
----------------------------------------------------------------
diff --git
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
index 86e987a829..607f5306e7 100644
---
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
+++
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
@@ -99,7 +99,8 @@ public class SRSInfoTest {
CoordinateReferenceSystem crs = CRS.forCode(srsURI);
Boolean isAxisXY = SRSInfo.checkAxisXY(crs);
- Envelope expResult = new Envelope(-118397.00138845091,
751441.7790901454, -16627.734375018626, 1272149.3463499574);
+ Envelope expResult = new Envelope(-104009.35713717458,
688806.0073395987, -16627.734528041445, 1256558.4455361878);
Envelope result = SRSInfo.buildDomainEnvelope(crs, isAxisXY);
assertEquals(expResult, result);
}
diff --git
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
index fbeb3211e6..04c4eca967 100644
---
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
+++
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
@@ -61,10 +61,10 @@ public class SearchEnvelopeTest {
public static final double Y1 = -90;
public static final double Y2 = 90;
- public static final double OS_X1 = -118397.00138845091;
- public static final double OS_X2 = 751441.7790901454;
- public static final double OS_Y1 = -16627.734375018626;
- public static final double OS_Y2 = 1272149.3463499574;
+ public static final double OS_X1 = -104009.35713717458;
+ public static final double OS_X2 = 688806.0073395987;
+ public static final double OS_Y1 = -16627.734528041445;
+ public static final double OS_Y2 = 1256558.4455361878;
/**
* Test of build method, of class SearchEnvelope.
@@ -150,9 +150,9 @@ public class SearchEnvelopeTest {
@Test
public void testBuild_NORTH_OSGB() {
- GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(10.0 20.0)", WKTDatatype.URI);
+ GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(52.33022 -3.766409)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.NORTH;
- SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1,
OS_X2, 20, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
+ SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1,
OS_X2, -3.766409, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper,
SpatialIndexTestData.OSGB_SRS_INFO, direction);
assertEquals(expResult, result);
}
@@ -163,9 +163,9 @@ public class SearchEnvelopeTest {
@Test
public void testBuild_SOUTH_OSGB() {
- GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(10.0 20.0)", WKTDatatype.URI);
+ GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(52.33022 -3.766409)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.SOUTH;
- SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1,
OS_X2, OS_Y1, 20), SpatialIndexTestData.OSGB_SRS_INFO);
+ SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1,
OS_X2, OS_Y1, -3.766409), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper,
SpatialIndexTestData.OSGB_SRS_INFO, direction);
assertEquals(expResult, result);
}
@@ -176,9 +176,9 @@ public class SearchEnvelopeTest {
@Test
public void testBuild_EAST_OSGB() {
- GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(10.0 20.0)", WKTDatatype.URI);
+ GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(52.33022 -3.766409)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.EAST;
- SearchEnvelope expResult = new SearchEnvelope(new Envelope(10, OS_X2,
OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
+ SearchEnvelope expResult = new SearchEnvelope(new Envelope(52.33022,
OS_X2, OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper,
SpatialIndexTestData.OSGB_SRS_INFO, direction);
assertEquals(expResult, result);
}
@@ -189,9 +189,9 @@ public class SearchEnvelopeTest {
@Test
public void testBuild_WEST_OSGB() {
- GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(10.0 20.0)", WKTDatatype.URI);
+ GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(52.33022 -3.766409)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.WEST;
- SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, 10,
OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
+ SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1,
52.33022, OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper,
SpatialIndexTestData.OSGB_SRS_INFO, direction);
assertEquals(expResult, result);
}
diff --git a/pom.xml b/pom.xml
index 7a2d73811f..b0eed331d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
<ver.contract.tests>0.2.0</ver.contract.tests>
<!--- GeoSPARQL related -->
- <ver.sis>1.0</ver.sis>
+ <ver.sis>1.1</ver.sis>
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
was (Author: neumarcx):
diff --git
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
index 86e987a829..607f5306e7 100644
---
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
+++
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
@@ -99,7 +99,8 @@ public class SRSInfoTest {
CoordinateReferenceSystem crs = CRS.forCode(srsURI);
Boolean isAxisXY = SRSInfo.checkAxisXY(crs);
- Envelope expResult = new Envelope(-118397.00138845091,
751441.7790901454, -16627.734375018626, 1272149.3463499574);
+ //Envelope expResult = new Envelope(-118397.00138845091,
751441.7790901454, -16627.734375018626, 1272149.3463499574);
+ Envelope expResult = new Envelope(-104009.35713717458,
688806.0073395987, -16627.734528041445, 1256558.4455361878);
Envelope result = SRSInfo.buildDomainEnvelope(crs, isAxisXY);
assertEquals(expResult, result);
}
diff --git
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
index fbeb3211e6..04c4eca967 100644
---
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
+++
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
@@ -61,10 +61,10 @@ public class SearchEnvelopeTest {
public static final double Y1 = -90;
public static final double Y2 = 90;
- public static final double OS_X1 = -118397.00138845091;
- public static final double OS_X2 = 751441.7790901454;
- public static final double OS_Y1 = -16627.734375018626;
- public static final double OS_Y2 = 1272149.3463499574;
+ public static final double OS_X1 = -104009.35713717458;
+ public static final double OS_X2 = 688806.0073395987;
+ public static final double OS_Y1 = -16627.734528041445;
+ public static final double OS_Y2 = 1256558.4455361878;
/**
* Test of build method, of class SearchEnvelope.
@@ -150,9 +150,9 @@ public class SearchEnvelopeTest {
@Test
public void testBuild_NORTH_OSGB() {
- GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(10.0 20.0)", WKTDatatype.URI);
+ GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(52.33022 -3.766409)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.NORTH;
- SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1,
OS_X2, 20, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
+ SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1,
OS_X2, -3.766409, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper,
SpatialIndexTestData.OSGB_SRS_INFO, direction);
assertEquals(expResult, result);
}
@@ -163,9 +163,9 @@ public class SearchEnvelopeTest {
@Test
public void testBuild_SOUTH_OSGB() {
- GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(10.0 20.0)", WKTDatatype.URI);
+ GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(52.33022 -3.766409)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.SOUTH;
- SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1,
OS_X2, OS_Y1, 20), SpatialIndexTestData.OSGB_SRS_INFO);
+ SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1,
OS_X2, OS_Y1, -3.766409), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper,
SpatialIndexTestData.OSGB_SRS_INFO, direction);
assertEquals(expResult, result);
}
@@ -176,9 +176,9 @@ public class SearchEnvelopeTest {
@Test
public void testBuild_EAST_OSGB() {
- GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(10.0 20.0)", WKTDatatype.URI);
+ GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(52.33022 -3.766409)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.EAST;
- SearchEnvelope expResult = new SearchEnvelope(new Envelope(10, OS_X2,
OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
+ SearchEnvelope expResult = new SearchEnvelope(new Envelope(52.33022,
OS_X2, OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper,
SpatialIndexTestData.OSGB_SRS_INFO, direction);
assertEquals(expResult, result);
}
@@ -189,9 +189,9 @@ public class SearchEnvelopeTest {
@Test
public void testBuild_WEST_OSGB() {
- GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(10.0 20.0)", WKTDatatype.URI);
+ GeometryWrapper geometryWrapper =
GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700>
POINT(52.33022 -3.766409)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.WEST;
- SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, 10,
OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
+ SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1,
52.33022, OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper,
SpatialIndexTestData.OSGB_SRS_INFO, direction);
assertEquals(expResult, result);
}
diff --git a/pom.xml b/pom.xml
index 7a2d73811f..b0eed331d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
<ver.contract.tests>0.2.0</ver.contract.tests>
<!--- GeoSPARQL related -->
- <ver.sis>1.0</ver.sis>
+ <ver.sis>1.1</ver.sis>
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
> Jena GeoSPARQL Tests Fail With SIS 1.1
> --------------------------------------
>
> Key: JENA-2213
> URL: https://issues.apache.org/jira/browse/JENA-2213
> Project: Apache Jena
> Issue Type: Test
> Components: GeoSPARQL
> Affects Versions: Jena 4.2.0
> Environment: SIS 1.1
> Reporter: Marco Neumann
> Priority: Minor
> Attachments: Diff-SIS-1.1
>
>
> The Jena automated tests fail after upgrading from SIS 1.0 to SIS 1.1. The
> project members in SIS believe that in SIS 1.1 the "Transverse Mercator"
> projection, whose formulas have been modified in SIS 1.1 for better stability
> may cause this failure.
> {code:java}
> ERROR] Failures:
> [ERROR] SRSInfoTest.testBuildDomainEnvelope_OSGB36:104
> expected:<Env[-118397.00138845091 : 751441.7790901454, -16627.734375018626 :
> 1272149.3463499574]> but was:<Env[-104009.35713717458 : 688806.0073395987,
> -16627.734528041445 : 1256558.4455361878]>
> {code}
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
