[sis] branch geoapi-4.0 updated (28a532b -> 313cbc9)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git. from 28a532b Changes for consistency with EPSG geodetic dataset 9.9.1. Some EPSG codes have been deprecated. new c72e901 Update the classes that generate the list of supported EPSG codes and coordinate operations. This is a follow up of https://issues.apache.org/jira/browse/SIS-517 new 313cbc9 Add a test case for https://issues.apache.org/jira/browse/SIS-489 For now, we assume that Apache SIS is correct (see issue comment). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../referencing/provider/PseudoPlateCarree.java| 14 +++- .../internal/referencing/provider/Wraparound.java | 11 +++ .../transform/CartesianToSphericalTest.java| 2 +- .../report/CoordinateOperationMethods.java | 16 ++--- .../report/CoordinateReferenceSystems.java | 11 ++- .../test/integration/CoordinateOperationTest.java | 80 +- 6 files changed, 114 insertions(+), 20 deletions(-)
[sis] 02/02: Add a test case for https://issues.apache.org/jira/browse/SIS-489 For now, we assume that Apache SIS is correct (see issue comment).
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 313cbc961a577a7a87c520756f32c9981d858bcf
Author: Martin Desruisseaux
AuthorDate: Thu Sep 23 18:47:52 2021 +0200
Add a test case for https://issues.apache.org/jira/browse/SIS-489
For now, we assume that Apache SIS is correct (see issue comment).
---
.../transform/CartesianToSphericalTest.java| 2 +-
.../test/integration/CoordinateOperationTest.java | 80 +-
2 files changed, 79 insertions(+), 3 deletions(-)
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
index 58ec3fc..b914e47 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
@@ -76,7 +76,7 @@ public final strictfp class CartesianToSphericalTest extends
TransformTestCase {
public void testConsistency() throws FactoryException, TransformException {
transform =
CartesianToSpherical.INSTANCE.completeTransform(SphericalToCartesianTest.factory());
derivativeDeltas = new double[] {1E-6, 1E-6, 1E-6};
-tolerance = 2E-6;
+tolerance = 3E-6;
verifyInDomain(new double[] {-100, -100, -100}, // Minimal
coordinates
new double[] {+100, +100, +100}, // Maximal
coordinates
new int[]{ 10, 10, 10},
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
index f7223d7..4d4fd7f 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
@@ -18,21 +18,29 @@ package org.apache.sis.test.integration;
import java.util.Random;
import org.opengis.util.FactoryException;
+import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.datum.Ellipsoid;
+import org.opengis.referencing.crs.ProjectedCRS;
+import org.opengis.referencing.crs.CRSAuthorityFactory;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.CoordinateOperationFactory;
+import org.opengis.referencing.operation.CoordinateOperationAuthorityFactory;
import org.apache.sis.math.MathFunctions;
+import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.crs.AbstractCRS;
import org.apache.sis.referencing.cs.AxesConvention;
+import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.internal.referencing.CoordinateOperations;
+import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.apache.sis.test.Assert.*;
/**
@@ -40,6 +48,7 @@ import static org.junit.Assert.*;
* orthodromic distances, etc.
*
* @author Martin Desruisseaux (IRD, Geomatys)
+ * @author Olivier Lhemann (OSDU)
* @version 1.1
* @since 0.8
* @module
@@ -101,7 +110,7 @@ public final strictfp class CoordinateOperationTest extends
MathTransformTestCas
array0[9]=180; // Antipodes;
distance should be 2*6378.137 km
distance[1] = ellipsoid.getSemiMajorAxis() * 2;
- array0[13]=-90;
+array0[12]= 0; array0[13]=-90;
array0[15]=180; array0[16]=+90; // Antipodes;
distance should be 2*6356.752 km
distance[2] = ellipsoid.getSemiMinorAxis() * 2;
@@ -148,4 +157,71 @@ public final strictfp class CoordinateOperationTest
extends MathTransformTestCas
}
}
}
+
+/**
+ * Tests manual concatenation of transforms for MGI Ferro.
+ * The transformation tested here involve an unusual case where the
coordinate operation (EPSG:3966)
+ * explicitly declares a Longitude rotation parameter value
slightly different than the
+ * Greenwich longitude value defined by the prime meridian,
even if the target meridian
+ * is Greenwich in both cases. Apache SIS follows exactly the steps
described by the coordinate operation,
+ * i.e. it applies a
[sis] 01/02: Update the classes that generate the list of supported EPSG codes and coordinate operations. This is a follow up of https://issues.apache.org/jira/browse/SIS-517
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit c72e901aafd57984364607db3bba9149e05f53bd
Author: Martin Desruisseaux
AuthorDate: Thu Sep 23 15:23:43 2021 +0200
Update the classes that generate the list of supported EPSG codes and
coordinate operations.
This is a follow up of https://issues.apache.org/jira/browse/SIS-517
---
.../internal/referencing/provider/PseudoPlateCarree.java | 14 +-
.../sis/internal/referencing/provider/Wraparound.java| 11 +++
.../referencing/report/CoordinateOperationMethods.java | 16 ++--
.../referencing/report/CoordinateReferenceSystems.java | 11 +--
4 files changed, 35 insertions(+), 17 deletions(-)
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoPlateCarree.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoPlateCarree.java
index 75e4961..eb0a09e 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoPlateCarree.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoPlateCarree.java
@@ -19,6 +19,7 @@ package org.apache.sis.internal.referencing.provider;
import javax.xml.bind.annotation.XmlTransient;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.referencing.operation.Conversion;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.MathTransformFactory;
import org.apache.sis.referencing.operation.transform.MathTransforms;
@@ -34,7 +35,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
* axis units are degrees.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.0
+ * @version 1.1
*
* @see Equirectangular
*
@@ -63,6 +64,17 @@ public final class PseudoPlateCarree extends
AbstractProvider {
}
/**
+ * Returns the operation type. We do not declare that operation method as a
+ * {@link org.opengis.referencing.operation.Projection} because axis units
are degrees.
+ *
+ * @return interface implemented by all coordinate operations that use
this method.
+ */
+@Override
+public final Class getOperationType() {
+return Conversion.class;
+}
+
+/**
* Creates an Pseudo Plate Carrée projection from the specified group of
parameter values.
*
* @param factory ignored.
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Wraparound.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Wraparound.java
index 331f3ef..fda2130 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Wraparound.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Wraparound.java
@@ -21,6 +21,7 @@ import org.opengis.util.FactoryException;
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.parameter.ParameterValueGroup;
+import org.opengis.referencing.operation.Conversion;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.MathTransformFactory;
import org.apache.sis.parameter.Parameters;
@@ -100,6 +101,16 @@ public final class Wraparound extends AbstractProvider {
}
/**
+ * Returns the operation type.
+ *
+ * @return interface implemented by all coordinate operations that use
this method.
+ */
+@Override
+public final Class getOperationType() {
+return Conversion.class;
+}
+
+/**
* Creates a wraparound transform from the specified group of parameter
values.
*
* @param factory the factory to use for creating concatenated
transforms.
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
index 89dff77..49d4949 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
@@ -35,7 +35,9 @@ import org.opengis.referencing.crs.GeneralDerivedCRS;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.internal.util.Constants;
import org.apache.sis.internal.referencing.provider.Affine;
+import org.apache.sis.internal.referencing.provider.AlbersEqualArea;
import org.apache.sis.internal.referencing.provider.LambertConformal2SP;
+import org.apache.sis.internal.referencing.provider.ObliqueMercator;
import
[jira] [Commented] (SIS-489) Inaccurate result for MGI Ferro transform (see test case attached)
[
https://issues.apache.org/jira/browse/SIS-489?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17419305#comment-17419305
]
Martin Desruisseaux commented on SIS-489:
-
Hello Olivier. I investigated this issue and I would like a confirmation of
what should be the right answer. The core issue is with the value of the
_longitude rotation_ parameter in the EPSG:3966 concatenated operation. It can
be checked online in the EPSG registry as below.
* Go on https://epsg.org/concatenated-operation_3966/MGI-Ferro-to-WGS-84-1.html
* Click on _Source CRS: MGI (Ferro)_ for expanding details about the source CRS.
* In the expanded section, click on _Datum: Militar-Geographische Institut
(Ferro)_.
* In the expanded datum section, click on _Prime Meridian: Ferro_.
* Note the value of the _Greenwich longitude_ parameter: it is *17°40'00" W*.
* Back to the main section, click on _Operation 1: MGI (Ferro) to MGI 1901 (1)_.
* Note the value of the _Longitude offset_ parameter: it is *17°39'46.02" W*.
So we are in the (unusual?) case where in order to rotate to the Greenwich
longitude, the coordinate operation explicitly tells us to apply a rotation
slightly different than the _Greenwich longitude_ value defined by the prime
meridian. Apache SIS follows exactly the steps described by the EPSG:3966
coordinate operation, i.e. it applies a rotation of 17°39'46.02" W, even if it
disagree with the _Greenwich meridian_ value declared in the prime meridian. I
verified that if I force SIS to use a rotation of 17°40'00" W instead, then we
get the values expected by the test case in the description. The table below
summarizes the coordinates transformed by SIS:
|| Axis || Source coordinates || 17°39'46.02" W rotation || 17°40'00" W
rotation ||
| X | 16°E| -25394.59 |-25097.74
|
| Y | 46.72°N| 175688.20 |175686.95
|
The last column appears to be exactly the value expected by the test case. So
my question is, how those expected values were computed? Are we sure that we
want to ignore the longitude rotation declared in EPSG:3966 and use the
_Greenwich longityde_ value instead?
> Inaccurate result for MGI Ferro transform (see test case attached)
> --
>
> Key: SIS-489
> URL: https://issues.apache.org/jira/browse/SIS-489
> Project: Spatial Information Systems
> Issue Type: Bug
> Components: Referencing
>Affects Versions: 1.0
>Reporter: Olivier Lhemann
>Assignee: Martin Desruisseaux
>Priority: Major
> Fix For: 1.1
>
>
> {code:java}
> public void TransformTest() throws FactoryException,
> MismatchedDimensionException, TransformException {
> double latitude = 46.72;
> double longitude = 16;
> double x = -25097.740155822;
> double y = 175686.952118893;
> CRSAuthorityFactory crsFactory = CRS.getAuthorityFactory("EPSG");
> CoordinateOperationAuthorityFactory opFactory =
> (CoordinateOperationAuthorityFactory) crsFactory;
> // MGI (Ferro) to WGS 84 (1)
> CoordinateOperation datumOperation =
> opFactory.createCoordinateOperation("3966");
> // MGI (Ferro) / Austria GK East Zone
> CoordinateReferenceSystem targetCRS =
> crsFactory.createCoordinateReferenceSystem("31253");
> // normalize the axis for the target
> targetCRS =
> AbstractCRS.castOrCopy(targetCRS).forConvention(AxesConvention.DISPLAY_ORIENTED);
> CoordinateOperation targetOperation =
> CRS.findOperation(datumOperation.getSourceCRS(), targetCRS, null);
> /*
> * We have two operations to concatenate
> */
> MathTransform step1 = datumOperation.getMathTransform().inverse();
> MathTransform step2 = targetOperation.getMathTransform();
> MathTransform completeTransform = MathTransforms.concatenate(step1,
> step2);
> /*
> * transform to x,y in one step
> */
> DirectPosition source = new DirectPosition2D(latitude, longitude);
> DirectPosition target = completeTransform.transform(source, null);
> double[] coordinate = target.getCoordinate();
> //System.out.println(operation.getSourceCRS().toString());
> Assert.assertEquals(x, coordinate[0], 0.1);
> Assert.assertEquals(y, coordinate[1], 0.1);
> }
> {code}
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Assigned] (SIS-489) Inaccurate result for MGI Ferro transform (see test case attached)
[
https://issues.apache.org/jira/browse/SIS-489?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Martin Desruisseaux reassigned SIS-489:
---
Fix Version/s: 1.1
Affects Version/s: 1.0
Assignee: Martin Desruisseaux
> Inaccurate result for MGI Ferro transform (see test case attached)
> --
>
> Key: SIS-489
> URL: https://issues.apache.org/jira/browse/SIS-489
> Project: Spatial Information Systems
> Issue Type: Bug
> Components: Referencing
>Affects Versions: 1.0
>Reporter: Olivier Lhemann
>Assignee: Martin Desruisseaux
>Priority: Major
> Fix For: 1.1
>
>
> {code:java}
> public void TransformTest() throws FactoryException,
> MismatchedDimensionException, TransformException {
> double latitude = 46.72;
> double longitude = 16;
> double x = -25097.740155822;
> double y = 175686.952118893;
> CRSAuthorityFactory crsFactory = CRS.getAuthorityFactory("EPSG");
> CoordinateOperationAuthorityFactory opFactory =
> (CoordinateOperationAuthorityFactory) crsFactory;
> // MGI (Ferro) to WGS 84 (1)
> CoordinateOperation datumOperation =
> opFactory.createCoordinateOperation("3966");
> // MGI (Ferro) / Austria GK East Zone
> CoordinateReferenceSystem targetCRS =
> crsFactory.createCoordinateReferenceSystem("31253");
> // normalize the axis for the target
> targetCRS =
> AbstractCRS.castOrCopy(targetCRS).forConvention(AxesConvention.DISPLAY_ORIENTED);
> CoordinateOperation targetOperation =
> CRS.findOperation(datumOperation.getSourceCRS(), targetCRS, null);
> /*
> * We have two operations to concatenate
> */
> MathTransform step1 = datumOperation.getMathTransform().inverse();
> MathTransform step2 = targetOperation.getMathTransform();
> MathTransform completeTransform = MathTransforms.concatenate(step1,
> step2);
> /*
> * transform to x,y in one step
> */
> DirectPosition source = new DirectPosition2D(latitude, longitude);
> DirectPosition target = completeTransform.transform(source, null);
> double[] coordinate = target.getCoordinate();
> //System.out.println(operation.getSourceCRS().toString());
> Assert.assertEquals(x, coordinate[0], 0.1);
> Assert.assertEquals(y, coordinate[1], 0.1);
> }
> {code}
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Closed] (SIS-44) Update the 'demo.jsp' file in the SIS webapp to use an open source maps API
[
https://issues.apache.org/jira/browse/SIS-44?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Martin Desruisseaux closed SIS-44.
--
> Update the 'demo.jsp' file in the SIS webapp to use an open source maps API
> ---
>
> Key: SIS-44
> URL: https://issues.apache.org/jira/browse/SIS-44
> Project: Spatial Information Systems
> Issue Type: Improvement
> Components: Web services, Web site
>Reporter: Ross Laidlaw
>Assignee: Chris A. Mattmann
>Priority: Minor
> Labels: javascript
> Fix For: 0.3
>
> Attachments: SIS-44.rlaidlaw.2012-04-09.patch,
> demo_openlayers_experiment.jsp, demo_openlayers_experiment.png,
> screenshot_with_leaflet_bbox.png, screenshot_with_leaflet_pointradius.png
>
>
> A suggestion was made on one of the SIS wiki pages to update the 'demo.jsp'
> file in the SIS webapp to use an open source maps API, such as Leaflet
> (http://leaflet.cloudmade.com), rather than Google maps.
> For reference, below is a copy of the comment from Paul Ramirez, see
> https://cwiki.apache.org/confluence/display/SIS/OODT+File+Manager+to+SIS+Connection+Demo
> for details:
> Instead of using Google Maps you may want to use Leaflet
> (http://leaflet.cloudmade.com/) or OpenLayers (http://openlayers.org/) due to
> required API key for the map. This might matter if you are going to host this
> example on the SIS Wiki or OODT Wiki as the required API would be attached to
> you.
> Here's a snippet of Leaflet code to setup the map:
> {code}
> var map = new L.Map('map');
> // Setup the basemap
> var osm = new
> L.TileLayer('http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {
> minZoom: 1,
> attribution: 'Basemap href="http://creativecommons.org/licenses/by-sa/2.0/;
> target="_blank">CC-BY-SA by http://openstreetmap.org/;
> target="_blank">OpenStreetMap, Tiles Courtesy of href="http://open.mapquest.com; target="_blank">MapQuest',
> subdomains: ['1','2','3','4']
> });
> // Add the basemap to the map
> map.addLayer(osm);
> // Create a marker for the map and add it
> var marker = new L.Marker(new L.LatLng(10.0, 30.0));
> map.addLayer(marker);
> // Attach a given HTML content to the marker. For brevity I truncated the
> content
> marker.bindPopup("Title: geodata.txtLink: href='http://localhost:8080...'>...");
> {code}
> Unlike the GoogleMap API this does not require a key and is an open source
> product as is the basemap (e.g. Open Street Map served by Mapquest). Then
> this would be a complete open source solution from top to bottom.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Resolved] (SIS-491) sis-embedded-data database fails to start on Apache Spark
[
https://issues.apache.org/jira/browse/SIS-491?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Martin Desruisseaux resolved SIS-491.
-
Fix Version/s: 1.1
Resolution: Cannot Reproduce
I'm closing on the assumption that the problem was caused by Spark using an
older version of Apache Derby than Apache SIS. It seems that later Spark
versions use Derby 10.14.2, which is the same version than Apache SIS (the last
Derby version running on Java 8). So I presume that the problem can be resolved
by upgrading the Spark version.
> sis-embedded-data database fails to start on Apache Spark
> -
>
> Key: SIS-491
> URL: https://issues.apache.org/jira/browse/SIS-491
> Project: Spatial Information Systems
> Issue Type: Bug
> Components: Metadata
>Affects Versions: 0.8, 1.0
> Environment: Spark version 2.4.4
> Hadoop version 2.7.6
> Scala version 2.11.12
> Java version 1.8.0_242
> OS: Linux 4.15.0-88-generic #88-Ubuntu SMP Tue Feb 11 20:11:34 UTC
> 2020 x86_64 x86_64 x86_64 GNU/Linux
>Reporter: Derrick Oswald
>Assignee: Martin Desruisseaux
>Priority: Minor
> Fix For: 1.1
>
>
> Operation _CRS_.forCode fails when used within the Apache Spark environment.
> Steps to reproduce (see full log below):
> 1) Start spark-shell with the --packages argument specifying the
> sis-embedded-data artifact
> 2) Execute CRS.forCode ("EPSG:21781") {color:#808080}// Swiss coordinate
> system [https://epsg.io/21781]{color}
> {color:#172b4d}Result:{color}
> {color:#172b4d} NoSuchAuthorityCodeException (with a prior warning
> message: Failed to start database
> 'classpath:SIS_DATA/Databases/SpatialMetadata'){color}
> {color:#172b4d}Expected result:{color}
> {color:#172b4d} Returns a valid CoordinateReferenceSystem for
> "EPSG:21781".{color}
> {color:#172b4d}Workaround:{color}
> {color:#172b4d} Use _CRS.fromWKT_ instead.{color}
> {color:#172b4d}Note:{color}
> {{{color:#172b4d}It works fine in a stand-alone Scala program with
> build.sbt:{color}}}
> {{{color:#660e7a}name {color}:= {color:#008000}"ApacheSISTest"{color}}}
> {{{color:#660e7a}version {color}:=
> {color:#008000}"0.1"{color}{color:#660e7a}scalaVersion {color}:=
> {color:#008000}"2.11.12"{color}}}
> {{{color:#660e7a}libraryDependencies {color}+=
> {color:#008000}"org.apache.sis.core" {color}%
> {color:#008000}"sis-referencing" {color}% {color:#008000}"1.0"{color}+}}
> {{+{color:#660e7a}libraryDependencies{color}+ =
> {color:#008000}"org.apache.sis.non-free" {color}%
> {color:#008000}"sis-embedded-data" {color}% {color:#008000}"1.0"{color}}}
> and code
> {color:#80}import {color}org.apache.sis.geometry.DirectPosition2D
> {color:#80}import {color}org.apache.sis.referencing.CRS
> {color:#80}object {color}Test {color:#80}extends {color}App {
> {color:#80}val {color}{color:#660e7a}position {color}=
> {color:#80}new {color}DirectPosition2D
> ({color:#ff}678544.6095273666{color},
> {color:#ff}248462.881516265{color})
> println ({color:#008000}"Source: " {color}+
> {color:#660e7a}position{color})
> {color:#80}val {color}{color:#660e7a}sourceCRS {color}= CRS.forCode
> ({color:#008000}"EPSG:21781"{color}) {color:#808080}// Swiss coordinate
> system [https://epsg.io/21781]{color}
> {color:#80}val {color}{color:#660e7a}targetCRS {color}= CRS.forCode
> ({color:#008000}"EPSG:4326"{color}) {color:#808080}// WGS 84
> [https://epsg.io/4326]{color}
> {color:#80}val {color}{color:#660e7a}operation {color}=
> CRS.findOperation ({color:#660e7a}sourceCRS{color},
> {color:#660e7a}targetCRS{color}, {color:#80}null{color})
> {color:#80}val {color}{color:#660e7a}transform {color}=
> {color:#660e7a}operation{color}.getMathTransform
> {color:#80}val {color}{color:#660e7a}latlong {color}=
> {color:#660e7a}transform{color}.transform ({color:#660e7a}position{color},
> {color:#80}null{color}) {color:#808080}// °N, °E{color}
> println ({color:#008000}"Target: " {color}+ {color:#660e7a}latlong{color})
> }
>
> {color:#172b4d}Full Spark log:{color}
> $ *spark-shell --master local[*] --verbose --packages
> org.apache.sis.core:sis-referencing:1.0,org.apache.sis.non-free:sis-embedded-data:1.0*
> Using properties file: null
> 20/03/08 15:41:42 WARN Utils: Your hostname, resolves to a
> loopback address: 127.0.1.1; using 192.168.10.221 instead (on interface
> wlp4s0)
> 20/03/08 15:41:42 WARN Utils: Set SPARK_LOCAL_IP if you need to bind to
> another address
> Parsed arguments:
> master local[*]
> deployMode null
> executorMemory null
> executorCores null
> totalExecutorCores null
> propertiesFile null
> driverMemory null
> driverCores null
> driverExtraClassPath null
> driverExtraLibraryPath null
>
[jira] [Resolved] (SIS-517) Update EPSG geodetic dataset to version 9.9.1
[ https://issues.apache.org/jira/browse/SIS-517?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Martin Desruisseaux resolved SIS-517. - Resolution: Fixed > Update EPSG geodetic dataset to version 9.9.1 > - > > Key: SIS-517 > URL: https://issues.apache.org/jira/browse/SIS-517 > Project: Spatial Information Systems > Issue Type: Task > Components: Referencing >Affects Versions: 1.0 >Reporter: Martin Desruisseaux >Assignee: Martin Desruisseaux >Priority: Major > Fix For: 1.1 > > > EPSG dataset 9.9.1 (September 2020) is the last version before the 10._x_ > series of EPSG dataset. The 10._x_ series have changes in SQL schema and can > not be integrated immediately in Apache SIS. Consequently EPSG 9.9.1 is the > last version we can support until we do necessary adaptation work for the new > EPSG schema. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[sis] 01/01: Changes for consistency with EPSG geodetic dataset 9.9.1. Some EPSG codes have been deprecated.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 28a532b2891b49b4a3b91c8dd5b1da93bcc5cffe
Author: Martin Desruisseaux
AuthorDate: Thu Sep 23 13:05:34 2021 +0200
Changes for consistency with EPSG geodetic dataset 9.9.1.
Some EPSG codes have been deprecated.
https://issues.apache.org/jira/browse/SIS-517
---
.../main/java/org/apache/sis/referencing/CRS.java | 1 -
.../java/org/apache/sis/referencing/CommonCRS.java | 8 +++
.../sis/referencing/StandardDefinitions.java | 8 +++
.../factory/GeodeticAuthorityFactory.java | 1 -
.../sis/referencing/factory/sql/EPSG_Prepare.sql | 1 +
.../java/org/apache/sis/referencing/CRSTest.java | 21
.../org/apache/sis/referencing/CommonCRSTest.java | 2 +-
.../apache/sis/referencing/factory/GIGS2004.java | 28 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 12 ++
9 files changed, 65 insertions(+), 17 deletions(-)
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
index 1669ab6..55592f6 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
@@ -164,7 +164,6 @@ public final class CRS extends Static {
* CRS:27{@link CommonCRS#NAD27 NAD27}
Geographic Like EPSG:4267 except for (longitude,
latitude) axis order
* CRS:83{@link CommonCRS#NAD83 NAD83}
Geographic Like EPSG:4269 except for (longitude,
latitude) axis order
* CRS:84{@link CommonCRS#WGS84 WGS84}
Geographic Like EPSG:4326 except for (longitude,
latitude) axis order
- * EPSG:4047 {@link CommonCRS#SPHERE SPHERE}
Geographic GRS 1980 Authalic Sphere
* EPSG:4230 {@link CommonCRS#ED50 ED50}
Geographic European Datum 1950
* EPSG:4258 {@link CommonCRS#ETRS89 ETRS89}
Geographic European Terrestrial Reference Frame 1989
* EPSG:4267 {@link CommonCRS#NAD27 NAD27}
Geographic North American Datum 1927
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
index c119ad7..18122a9 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
@@ -278,7 +278,7 @@ public enum CommonCRS {
*
*
* GRS1980 properties
- * EPSG identifiers:4019 (datum:
6019, ellipsoid: 7019)
+ * EPSG identifiers:4019
(datum: 6019, ellipsoid: 7019)
* Primary names: "Unknown datum based upon
the GRS 1980 ellipsoid."
* Prime meridian: Greenwich
* Semi-major axis length: 6378137
@@ -297,7 +297,7 @@ public enum CommonCRS {
*
*
* Sphere properties
- * EPSG identifiers:4047 (datum:
6047, ellipsoid: 7048)
+ * EPSG identifiers:4047
(datum: 6047, ellipsoid: 7048)
* Primary names: "Unspecified datum based
upon the GRS 1980 Authalic Sphere"
* Prime meridian: Greenwich
* Semi-major axis length: 6371007
@@ -622,8 +622,8 @@ public enum CommonCRS {
* ETRS89 {@link #ETRS89}
4258
* NAD27{@link #NAD27}
4267
* NAD83{@link #NAD83}
4269
- * GRS 1980 {@link
#GRS1980}4019
- * GRS 1980 Authalic Sphere {@link #SPHERE}
4047
+ * GRS 1980 {@link
#GRS1980}4019
+ * GRS 1980 Authalic Sphere {@link #SPHERE}
4047
* WGS 72 {@link #WGS72}
4322
* WGS 84 {@link #WGS84}
4326
*
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
index 2da050b..0607a10 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
@@ -338,10 +338,10 @@ final class StandardDefinitions {
int dim = 2;// Number of dimension, default to 2.
short axisCode; // Code of first axis + dim (or code
after the last axis).
switch (code) {
-case ELLIPSOIDAL_2D: name = "Ellipsoidal 2D"; type = 2;
axisCode = 108; break;
-case ELLIPSOIDAL_3D: name = "Ellipsoidal 3D"; type = 2; dim = 3;
axisCode = 111; break;
-case SPHERICAL: name = "Spherical"; type = 1; dim = 3;
[sis] branch geoapi-4.0 updated (1dec837 -> 28a532b)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git. discard 1dec837 Changes for consistency with EPSG geodetic dataset 9.9.1. Some EPSG codes have been deprecated. new 28a532b Changes for consistency with EPSG geodetic dataset 9.9.1. Some EPSG codes have been deprecated. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1dec837) \ N -- N -- N refs/heads/geoapi-4.0 (28a532b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
[sis] branch geoapi-4.0 updated: Changes for consistency with EPSG geodetic dataset 9.9.1. Some EPSG codes have been deprecated.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 1dec837 Changes for consistency with EPSG geodetic dataset 9.9.1.
Some EPSG codes have been deprecated.
1dec837 is described below
commit 1dec8376a4db55dee19a2a29fca8370808fc62c9
Author: Martin Desruisseaux
AuthorDate: Thu Sep 23 13:05:34 2021 +0200
Changes for consistency with EPSG geodetic dataset 9.9.1.
Some EPSG codes have been deprecated.
---
.../main/java/org/apache/sis/referencing/CRS.java | 1 -
.../java/org/apache/sis/referencing/CommonCRS.java | 8 +++
.../sis/referencing/StandardDefinitions.java | 8 +++
.../factory/GeodeticAuthorityFactory.java | 1 -
.../sis/referencing/factory/sql/EPSG_Prepare.sql | 1 +
.../java/org/apache/sis/referencing/CRSTest.java | 21
.../org/apache/sis/referencing/CommonCRSTest.java | 2 +-
.../apache/sis/referencing/factory/GIGS2004.java | 28 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 12 ++
9 files changed, 65 insertions(+), 17 deletions(-)
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
index 1669ab6..55592f6 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
@@ -164,7 +164,6 @@ public final class CRS extends Static {
* CRS:27{@link CommonCRS#NAD27 NAD27}
Geographic Like EPSG:4267 except for (longitude,
latitude) axis order
* CRS:83{@link CommonCRS#NAD83 NAD83}
Geographic Like EPSG:4269 except for (longitude,
latitude) axis order
* CRS:84{@link CommonCRS#WGS84 WGS84}
Geographic Like EPSG:4326 except for (longitude,
latitude) axis order
- * EPSG:4047 {@link CommonCRS#SPHERE SPHERE}
Geographic GRS 1980 Authalic Sphere
* EPSG:4230 {@link CommonCRS#ED50 ED50}
Geographic European Datum 1950
* EPSG:4258 {@link CommonCRS#ETRS89 ETRS89}
Geographic European Terrestrial Reference Frame 1989
* EPSG:4267 {@link CommonCRS#NAD27 NAD27}
Geographic North American Datum 1927
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
index c119ad7..18122a9 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
@@ -278,7 +278,7 @@ public enum CommonCRS {
*
*
* GRS1980 properties
- * EPSG identifiers:4019 (datum:
6019, ellipsoid: 7019)
+ * EPSG identifiers:4019
(datum: 6019, ellipsoid: 7019)
* Primary names: "Unknown datum based upon
the GRS 1980 ellipsoid."
* Prime meridian: Greenwich
* Semi-major axis length: 6378137
@@ -297,7 +297,7 @@ public enum CommonCRS {
*
*
* Sphere properties
- * EPSG identifiers:4047 (datum:
6047, ellipsoid: 7048)
+ * EPSG identifiers:4047
(datum: 6047, ellipsoid: 7048)
* Primary names: "Unspecified datum based
upon the GRS 1980 Authalic Sphere"
* Prime meridian: Greenwich
* Semi-major axis length: 6371007
@@ -622,8 +622,8 @@ public enum CommonCRS {
* ETRS89 {@link #ETRS89}
4258
* NAD27{@link #NAD27}
4267
* NAD83{@link #NAD83}
4269
- * GRS 1980 {@link
#GRS1980}4019
- * GRS 1980 Authalic Sphere {@link #SPHERE}
4047
+ * GRS 1980 {@link
#GRS1980}4019
+ * GRS 1980 Authalic Sphere {@link #SPHERE}
4047
* WGS 72 {@link #WGS72}
4322
* WGS 84 {@link #WGS84}
4326
*
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
index 2da050b..0607a10 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
@@ -338,10 +338,10 @@ final class StandardDefinitions {
int dim = 2;// Number of dimension, default to 2.
short axisCode; // Code of first axis + dim (or code
after the last axis).
switch (code) {
-case ELLIPSOIDAL_2D: name = "Ellipsoidal 2D"; type = 2;
axisCode = 108; break;
-case
[sis] branch master updated (a56028b -> 880d42d)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sis.git. from a56028b Merge branch 'geoapi-3.1' add d4b8541 Rename the `metadata` parameter for avoiding confusion with the `metadata` field. They do not always have the same value because of the same class being used both as a `XmlAdapter` and a wrapper object. add 8d0380b Update SIS version number. add 138552b Compatibility with Java 17 and upgrade to NetBeans 12.5. add 19acaac Fix unmarshalling of . add 7485605 Move `RasterLoadingStrategy` to public API. add 75db362 Move `WraparoundAdjustment` outside of `sis-referencing` module. It is specific to grid coverage support. add 93868d7 Rename `FolderStoreProvider` as `StoreProvider` for consistency with other internal store provider. The `Folder` prefix is redundant with package names and these providers are no expected to be used directly. add 63a6974 Use better method names for some `SQLBuilder` methods. add 975a191 Rename `insert(…)` as `insertDimension` and `reduce(…)` as `reduceDimension`. add c3bb6f3 Remove link to UCAR Javadoc. The link seems to not work anymore. add a493472 Remove provided in declarations of Jakarta API dependency. Environments providing JAXB by default are rare now. add d859b67 Merge branch 'geoapi-4.0' into geoapi-3.1 new 880d42d Merge branch 'geoapi-3.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: application/sis-console/pom.xml| 4 - application/sis-console/src/main/artifact/README | 6 +- application/sis-javafx/pom.xml | 5 - application/sis-openoffice/pom.xml | 5 - .../apache/sis/coverage/grid/GridDerivation.java | 1 - .../org/apache/sis/coverage/grid/GridExtent.java | 34 - .../org/apache/sis/coverage/grid/GridGeometry.java | 2 +- .../apache/sis/coverage/grid/SliceGeometry.java| 2 +- .../sis/coverage/grid}/WraparoundAdjustment.java | 47 +-- .../sis/coverage/grid/GridDerivationTest.java | 2 +- .../apache/sis/coverage/grid/GridExtentTest.java | 16 +-- .../coverage/grid}/WraparoundAdjustmentTest.java | 19 +-- .../apache/sis/test/suite/FeatureTestSuite.java| 1 + .../sis/internal/jaxb/metadata/CI_Address.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Citation.java| 16 +-- .../sis/internal/jaxb/metadata/CI_Contact.java | 16 +-- .../apache/sis/internal/jaxb/metadata/CI_Date.java | 16 +-- .../internal/jaxb/metadata/CI_OnlineResource.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Party.java | 16 +-- .../internal/jaxb/metadata/CI_Responsibility.java | 16 +-- .../jaxb/metadata/CI_ResponsibleParty.java | 22 ++-- .../sis/internal/jaxb/metadata/CI_Series.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Telephone.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_DataQuality.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_Element.java | 16 +-- .../jaxb/metadata/DQ_PositionalAccuracy.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_Result.java | 16 +-- .../sis/internal/jaxb/metadata/EX_Extent.java | 16 +-- .../jaxb/metadata/EX_GeographicExtent.java | 16 +-- .../internal/jaxb/metadata/EX_TemporalExtent.java | 16 +-- .../internal/jaxb/metadata/EX_VerticalExtent.java | 16 +-- .../sis/internal/jaxb/metadata/LE_Algorithm.java | 16 +-- .../jaxb/metadata/LE_NominalResolution.java| 16 +-- .../jaxb/metadata/LE_ProcessStepReport.java| 16 +-- .../sis/internal/jaxb/metadata/LE_Processing.java | 16 +-- .../sis/internal/jaxb/metadata/LI_Lineage.java | 16 +-- .../sis/internal/jaxb/metadata/LI_ProcessStep.java | 16 +-- .../sis/internal/jaxb/metadata/LI_Source.java | 16 +-- .../jaxb/metadata/MD_AggregateInformation.java | 16 +-- .../metadata/MD_ApplicationSchemaInformation.java | 16 +-- .../internal/jaxb/metadata/MD_AttributeGroup.java | 16 +-- .../internal/jaxb/metadata/MD_BrowseGraphic.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Constraints.java | 16 +-- .../jaxb/metadata/MD_ContentInformation.java | 16 +-- .../jaxb/metadata/MD_DataIdentification.java | 16 +-- .../jaxb/metadata/MD_DigitalTransferOptions.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Dimension.java | 16 +-- .../internal/jaxb/metadata/MD_Distribution.java| 16 +-- .../sis/internal/jaxb/metadata/MD_Distributor.java | 16 +-- .../metadata/MD_ExtendedElementInformation.java| 16 +-- .../internal/jaxb/metadata/MD_FeatureTypeInfo.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Format.java | 16 +--
[sis] 01/01: Merge branch 'geoapi-3.1'
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sis.git commit 880d42d9998d4cbcdca5eab3f4350558470d6302 Merge: a56028b d859b67 Author: Martin Desruisseaux AuthorDate: Thu Sep 23 12:25:22 2021 +0200 Merge branch 'geoapi-3.1' application/sis-console/pom.xml| 4 - application/sis-console/src/main/artifact/README | 6 +- application/sis-javafx/pom.xml | 5 - application/sis-openoffice/pom.xml | 5 - .../apache/sis/coverage/grid/GridDerivation.java | 1 - .../org/apache/sis/coverage/grid/GridExtent.java | 34 - .../org/apache/sis/coverage/grid/GridGeometry.java | 2 +- .../apache/sis/coverage/grid/SliceGeometry.java| 2 +- .../sis/coverage/grid}/WraparoundAdjustment.java | 47 +-- .../sis/coverage/grid/GridDerivationTest.java | 2 +- .../apache/sis/coverage/grid/GridExtentTest.java | 16 +-- .../coverage/grid}/WraparoundAdjustmentTest.java | 19 +-- .../apache/sis/test/suite/FeatureTestSuite.java| 1 + .../sis/internal/jaxb/metadata/CI_Address.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Citation.java| 16 +-- .../sis/internal/jaxb/metadata/CI_Contact.java | 16 +-- .../apache/sis/internal/jaxb/metadata/CI_Date.java | 16 +-- .../internal/jaxb/metadata/CI_OnlineResource.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Party.java | 16 +-- .../internal/jaxb/metadata/CI_Responsibility.java | 16 +-- .../jaxb/metadata/CI_ResponsibleParty.java | 22 ++-- .../sis/internal/jaxb/metadata/CI_Series.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Telephone.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_DataQuality.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_Element.java | 16 +-- .../jaxb/metadata/DQ_PositionalAccuracy.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_Result.java | 16 +-- .../sis/internal/jaxb/metadata/EX_Extent.java | 16 +-- .../jaxb/metadata/EX_GeographicExtent.java | 16 +-- .../internal/jaxb/metadata/EX_TemporalExtent.java | 16 +-- .../internal/jaxb/metadata/EX_VerticalExtent.java | 16 +-- .../sis/internal/jaxb/metadata/LE_Algorithm.java | 16 +-- .../jaxb/metadata/LE_NominalResolution.java| 16 +-- .../jaxb/metadata/LE_ProcessStepReport.java| 16 +-- .../sis/internal/jaxb/metadata/LE_Processing.java | 16 +-- .../sis/internal/jaxb/metadata/LI_Lineage.java | 16 +-- .../sis/internal/jaxb/metadata/LI_ProcessStep.java | 16 +-- .../sis/internal/jaxb/metadata/LI_Source.java | 16 +-- .../jaxb/metadata/MD_AggregateInformation.java | 16 +-- .../metadata/MD_ApplicationSchemaInformation.java | 16 +-- .../internal/jaxb/metadata/MD_AttributeGroup.java | 16 +-- .../internal/jaxb/metadata/MD_BrowseGraphic.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Constraints.java | 16 +-- .../jaxb/metadata/MD_ContentInformation.java | 16 +-- .../jaxb/metadata/MD_DataIdentification.java | 16 +-- .../jaxb/metadata/MD_DigitalTransferOptions.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Dimension.java | 16 +-- .../internal/jaxb/metadata/MD_Distribution.java| 16 +-- .../sis/internal/jaxb/metadata/MD_Distributor.java | 16 +-- .../metadata/MD_ExtendedElementInformation.java| 16 +-- .../internal/jaxb/metadata/MD_FeatureTypeInfo.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Format.java | 16 +-- .../jaxb/metadata/MD_GeometricObjects.java | 16 +-- .../internal/jaxb/metadata/MD_Identification.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Identifier.java | 16 +-- .../internal/jaxb/metadata/MD_KeywordClass.java| 16 +-- .../sis/internal/jaxb/metadata/MD_Keywords.java| 16 +-- .../jaxb/metadata/MD_MaintenanceInformation.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Medium.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Metadata.java| 16 +-- .../metadata/MD_MetadataExtensionInformation.java | 16 +-- .../internal/jaxb/metadata/MD_MetadataScope.java | 16 +-- .../metadata/MD_PortrayalCatalogueReference.java | 16 +-- .../internal/jaxb/metadata/MD_RangeDimension.java | 16 +-- .../internal/jaxb/metadata/MD_Releasability.java | 16 +-- .../jaxb/metadata/MD_RepresentativeFraction.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Resolution.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Scope.java | 18 +-- .../jaxb/metadata/MD_ScopeDescription.java | 16 +-- .../jaxb/metadata/MD_SpatialRepresentation.java| 16 +-- .../jaxb/metadata/MD_StandardOrderProcess.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Usage.java | 16 +-- .../jaxb/metadata/MI_AcquisitionInformation.java | 16 +-- .../jaxb/metadata/MI_EnvironmentalRecord.java | 16 +-- .../sis/internal/jaxb/metadata/MI_Event.java | 16 +--
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit d859b6789c201de654b6fcab3e69aa7ebe916aeb Merge: e495c9f a493472 Author: Martin Desruisseaux AuthorDate: Thu Sep 23 12:07:51 2021 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 application/sis-console/pom.xml| 4 - application/sis-console/src/main/artifact/README | 6 +- application/sis-javafx/pom.xml | 5 - application/sis-openoffice/pom.xml | 5 - .../src/main/unopkg/build-instruction.html | 2 +- .../apache/sis/coverage/grid/GridDerivation.java | 1 - .../org/apache/sis/coverage/grid/GridExtent.java | 34 - .../org/apache/sis/coverage/grid/GridGeometry.java | 2 +- .../apache/sis/coverage/grid/SliceGeometry.java| 2 +- .../sis/coverage/grid}/WraparoundAdjustment.java | 47 +-- .../sis/coverage/grid/GridDerivationTest.java | 2 +- .../apache/sis/coverage/grid/GridExtentTest.java | 16 +-- .../coverage/grid}/WraparoundAdjustmentTest.java | 19 +-- .../apache/sis/test/suite/FeatureTestSuite.java| 1 + .../sis/internal/jaxb/metadata/CI_Address.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Citation.java| 16 +-- .../sis/internal/jaxb/metadata/CI_Contact.java | 16 +-- .../apache/sis/internal/jaxb/metadata/CI_Date.java | 16 +-- .../internal/jaxb/metadata/CI_OnlineResource.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Party.java | 16 +-- .../internal/jaxb/metadata/CI_Responsibility.java | 16 +-- .../jaxb/metadata/CI_ResponsibleParty.java | 22 ++-- .../sis/internal/jaxb/metadata/CI_Series.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Telephone.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_DataQuality.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_Element.java | 16 +-- .../jaxb/metadata/DQ_PositionalAccuracy.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_Result.java | 16 +-- .../sis/internal/jaxb/metadata/EX_Extent.java | 16 +-- .../jaxb/metadata/EX_GeographicExtent.java | 16 +-- .../internal/jaxb/metadata/EX_TemporalExtent.java | 16 +-- .../internal/jaxb/metadata/EX_VerticalExtent.java | 16 +-- .../sis/internal/jaxb/metadata/LE_Algorithm.java | 16 +-- .../jaxb/metadata/LE_NominalResolution.java| 16 +-- .../jaxb/metadata/LE_ProcessStepReport.java| 16 +-- .../sis/internal/jaxb/metadata/LE_Processing.java | 16 +-- .../sis/internal/jaxb/metadata/LI_Lineage.java | 16 +-- .../sis/internal/jaxb/metadata/LI_ProcessStep.java | 16 +-- .../sis/internal/jaxb/metadata/LI_Source.java | 16 +-- .../jaxb/metadata/MD_AggregateInformation.java | 16 +-- .../metadata/MD_ApplicationSchemaInformation.java | 16 +-- .../jaxb/metadata/MD_AssociatedResource.java | 16 +-- .../internal/jaxb/metadata/MD_AttributeGroup.java | 16 +-- .../internal/jaxb/metadata/MD_BrowseGraphic.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Constraints.java | 16 +-- .../jaxb/metadata/MD_ContentInformation.java | 16 +-- .../jaxb/metadata/MD_DataIdentification.java | 16 +-- .../jaxb/metadata/MD_DigitalTransferOptions.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Dimension.java | 16 +-- .../internal/jaxb/metadata/MD_Distribution.java| 16 +-- .../sis/internal/jaxb/metadata/MD_Distributor.java | 16 +-- .../metadata/MD_ExtendedElementInformation.java| 16 +-- .../internal/jaxb/metadata/MD_FeatureTypeInfo.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Format.java | 16 +-- .../jaxb/metadata/MD_GeometricObjects.java | 16 +-- .../internal/jaxb/metadata/MD_Identification.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Identifier.java | 16 +-- .../internal/jaxb/metadata/MD_KeywordClass.java| 16 +-- .../sis/internal/jaxb/metadata/MD_Keywords.java| 16 +-- .../jaxb/metadata/MD_MaintenanceInformation.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Medium.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Metadata.java| 16 +-- .../metadata/MD_MetadataExtensionInformation.java | 16 +-- .../internal/jaxb/metadata/MD_MetadataScope.java | 16 +-- .../metadata/MD_PortrayalCatalogueReference.java | 16 +-- .../internal/jaxb/metadata/MD_RangeDimension.java | 16 +-- .../internal/jaxb/metadata/MD_Releasability.java | 16 +-- .../jaxb/metadata/MD_RepresentativeFraction.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Resolution.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Scope.java | 18 +-- .../jaxb/metadata/MD_ScopeDescription.java | 16 +-- .../jaxb/metadata/MD_SpatialRepresentation.java| 16 +-- .../jaxb/metadata/MD_StandardOrderProcess.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Usage.java | 16 +-- .../jaxb/metadata/MI_AcquisitionInformation.java
[sis] branch geoapi-3.1 updated (e495c9f -> d859b67)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git. from e495c9f Fix the lost of `Scope` element in `DataQuality` at unmarshalling time. The problem and the fix are specific to the geoapi-3.x branches. add d4b8541 Rename the `metadata` parameter for avoiding confusion with the `metadata` field. They do not always have the same value because of the same class being used both as a `XmlAdapter` and a wrapper object. add 8d0380b Update SIS version number. add 138552b Compatibility with Java 17 and upgrade to NetBeans 12.5. add 19acaac Fix unmarshalling of . add 7485605 Move `RasterLoadingStrategy` to public API. add 75db362 Move `WraparoundAdjustment` outside of `sis-referencing` module. It is specific to grid coverage support. add 93868d7 Rename `FolderStoreProvider` as `StoreProvider` for consistency with other internal store provider. The `Folder` prefix is redundant with package names and these providers are no expected to be used directly. add 63a6974 Use better method names for some `SQLBuilder` methods. add 975a191 Rename `insert(…)` as `insertDimension` and `reduce(…)` as `reduceDimension`. add c3bb6f3 Remove link to UCAR Javadoc. The link seems to not work anymore. add a493472 Remove provided in declarations of Jakarta API dependency. Environments providing JAXB by default are rare now. new d859b67 Merge branch 'geoapi-4.0' into geoapi-3.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: application/sis-console/pom.xml| 4 - application/sis-console/src/main/artifact/README | 6 +- application/sis-javafx/pom.xml | 5 - application/sis-openoffice/pom.xml | 5 - .../src/main/unopkg/build-instruction.html | 2 +- .../apache/sis/coverage/grid/GridDerivation.java | 1 - .../org/apache/sis/coverage/grid/GridExtent.java | 34 - .../org/apache/sis/coverage/grid/GridGeometry.java | 2 +- .../apache/sis/coverage/grid/SliceGeometry.java| 2 +- .../sis/coverage/grid}/WraparoundAdjustment.java | 47 +-- .../sis/coverage/grid/GridDerivationTest.java | 2 +- .../apache/sis/coverage/grid/GridExtentTest.java | 16 +-- .../coverage/grid}/WraparoundAdjustmentTest.java | 19 +-- .../apache/sis/test/suite/FeatureTestSuite.java| 1 + .../sis/internal/jaxb/metadata/CI_Address.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Citation.java| 16 +-- .../sis/internal/jaxb/metadata/CI_Contact.java | 16 +-- .../apache/sis/internal/jaxb/metadata/CI_Date.java | 16 +-- .../internal/jaxb/metadata/CI_OnlineResource.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Party.java | 16 +-- .../internal/jaxb/metadata/CI_Responsibility.java | 16 +-- .../jaxb/metadata/CI_ResponsibleParty.java | 22 ++-- .../sis/internal/jaxb/metadata/CI_Series.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Telephone.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_DataQuality.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_Element.java | 16 +-- .../jaxb/metadata/DQ_PositionalAccuracy.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_Result.java | 16 +-- .../sis/internal/jaxb/metadata/EX_Extent.java | 16 +-- .../jaxb/metadata/EX_GeographicExtent.java | 16 +-- .../internal/jaxb/metadata/EX_TemporalExtent.java | 16 +-- .../internal/jaxb/metadata/EX_VerticalExtent.java | 16 +-- .../sis/internal/jaxb/metadata/LE_Algorithm.java | 16 +-- .../jaxb/metadata/LE_NominalResolution.java| 16 +-- .../jaxb/metadata/LE_ProcessStepReport.java| 16 +-- .../sis/internal/jaxb/metadata/LE_Processing.java | 16 +-- .../sis/internal/jaxb/metadata/LI_Lineage.java | 16 +-- .../sis/internal/jaxb/metadata/LI_ProcessStep.java | 16 +-- .../sis/internal/jaxb/metadata/LI_Source.java | 16 +-- .../jaxb/metadata/MD_AggregateInformation.java | 16 +-- .../metadata/MD_ApplicationSchemaInformation.java | 16 +-- .../jaxb/metadata/MD_AssociatedResource.java | 16 +-- .../internal/jaxb/metadata/MD_AttributeGroup.java | 16 +-- .../internal/jaxb/metadata/MD_BrowseGraphic.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Constraints.java | 16 +-- .../jaxb/metadata/MD_ContentInformation.java | 16 +-- .../jaxb/metadata/MD_DataIdentification.java | 16 +-- .../jaxb/metadata/MD_DigitalTransferOptions.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Dimension.java | 16 +-- .../internal/jaxb/metadata/MD_Distribution.java| 16 +-- .../sis/internal/jaxb/metadata/MD_Distributor.java | 16 +--
svn commit: r1893538 [2/2] - /sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql
Modified: sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql?rev=1893538=1893537=1893538=diff == --- sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql [UTF-8] (original) +++ sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql [UTF-8] Thu Sep 23 08:47:26 2021 @@ -1,6 +1,6 @@ --- ---Copyright International Association of Oil and Gas Producers (IOGP) See http://www.epsg.org/TermsOfUse.aspx (a copy is in ./LICENSE.txt). +---See https://epsg.org/terms-of-use.html (a copy is in ./LICENSE.txt). --- ---This file has been reformatted (without any change in the data) for the needs of Apache SIS project. ---See org.apache.sis.referencing.factory.sql.epsg.DataScriptFormatter. @@ -449,7 +449,6 @@ INSERT INTO epsg_alias VALUES (1197,'Unit of Measure',9086,7306,'yd[Ind62]',''), (1198,'Unit of Measure',9087,7306,'yd[Ind75]',''), (1199,'Unit of Measure',9093,1041,'mi',''), -(12,'Coordinate_Operation',1149,7301,'ETRF89 to WGS 84 (1)',''), (120,'Coordinate_Operation',17920,7301,'Mount Pleasant Circuit 1949',''), (1200,'Unit of Measure',9094,7306,'ft[GC]',''), (1201,'Datum',1161,7301,'Deutsches Haupthöhennetz 1912',''), @@ -510,26 +509,21 @@ INSERT INTO epsg_alias VALUES (12217,'Coordinate_Operation',5026,7301,'Sao Braz to PTRA08 (3)',''), (12219,'Coordinate_Operation',5036,7302,'D73 to ETRS89(4)',''), (1222,'Coordinate Reference System',2165,7301,'Cote d''Ivoire / TM 5 NW','Same alias is ambiguous as used for Locodjo 1965 / TM 5 NW (code 2164).'), -(12220,'Coordinate_Operation',5036,7301,'Datum 73 to ETRF89 (4)',''), (1,'Coordinate_Operation',5037,7302,'D73 to ETRS89(5)',''), -(12223,'Coordinate_Operation',5037,7301,'Datum 73 to ETRF89 (5)',''), -(12224,'Coordinate_Operation',5040,7301,'ED50 to ETRF89 (13)',''), (1223,'Coordinate Reference System',2165,7301,'Port Bouet / TM 5 NW','Same alias is ambiguous as used for Abidjan 1987 / TM 5 NW (code 2165).'), (12232,'Coordinate_Operation',5039,7302,'B DLx to ETRS89(1)',''), -(12233,'Coordinate_Operation',5039,7301,'Lisbon 1890 to ETRF89 (1)',''), (12235,'Coordinate_Operation',5038,7302,'DLx to ETRS89(3)',''), -(12236,'Coordinate_Operation',5038,7301,'Lisbon to ETRF89 (3)',''), (12237,'Coordinate_Operation',5038,7301,'Lisbon 1937 to ETRS89 (3)',''), (12239,'Coordinate_Operation',5021,7301,'Base SE to PTRA08 (1)',''), -(1224,'Coordinate_Operation',1588,7301,'ED50 to EUREF89 (1)',''), +(1224,'Coordinate_Operation',1,7301,'RGF93 to NGF IGN69 height (1)',''), (12241,'Coordinate_Operation',5022,7301,'Base SE to PTRA08 (2)',''), (12243,'Coordinate_Operation',5023,7301,'Base SE to PTRA08 (3)',''), -(1225,'Coordinate_Operation',1588,7301,'ED50 to ETRF89 (1)',''), +(1225,'Coordinate Reference System',9367,7301,'ETRS89 / TPEN11 SnakeGrid',''), (1226,'Coordinate_Operation',6739,7301,'NAD27 to NAD83(HPGN) (22)',''), (12264,'Coordinate_Operation',5033,7301,'Observatorio Flores to PTRA08 (1)',''), (12266,'Coordinate_Operation',5034,7301,'Observatorio Flores to PTRA08 (2)',''), (12268,'Coordinate_Operation',5035,7301,'Observatorio Flores to PTRA08 (3)',''), -(1227,'Coordinate_Operation',1589,7301,'ED50 to EUREF89 (3)',''), +(1227,'Coordinate Reference System',9368,7301,'ETRS89 / TPEN11 SnakeGrid + Newlyn height',''), (12272,'Coordinate_Operation',5078,7301,'Karbala 1979 (Polservice) to WGS 84 (2)',''), (12274,'Coordinate_Operation',5077,7301,'Karbala 1979 (Polservice) to IGRS (1)',''), (1228,'Coordinate Reference System',6696,7302,'JGD2000',''), @@ -572,7 +566,7 @@ INSERT INTO epsg_alias VALUES (12367,'Coordinate_Operation',15872,7301,'Karbala 1979 (Polservice) to WGS 84 (1)',''), (1237,'Datum',6818,1042,'Systém Jednotné trigonometrické sítě katastrální (Ferro)',''), (12370,'Coordinate Reference System',2393,1030,'YKG','Yhtenäiskoordinaatisto, Uniform Coordinate System.'), -(12372,'Coordinate Reference System',7405,7301,'OSGB36 / British National Grid + ODN height',''), +(12372,'Coordinate Reference System',7405,7301,'OSGB 1936 / British National Grid + Newlyn height',''), (1238,'Coordinate Reference System',2393,7301,'KKJ / Basic Coordinate System zone 3',''), (1239,'Coordinate Reference System',2391,7301,'KKJ / Basic Coordinate System zone 1',''), (124,'Coordinate_Operation',17924,7301,'Mount Nicholas Circuit 1949',''), @@ -584,49 +578,36 @@ INSERT INTO epsg_alias VALUES (12440,'Coordinate Reference System',3067,7301,'ETRS89 / TM35FIN',''), (12441,'Coordinate Reference System',3067,1030,'ETRS89-TM35FIN(E,N)',''), (12442,'Coordinate Reference System',3067,1030,'ETRS-TM35FIN(E,N)',''), -(12449,'Coordinate Reference System',3873,7301,'ETRF89 /
svn commit: r1893538 [1/2] - /sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql
Author: desruisseaux Date: Thu Sep 23 08:47:26 2021 New Revision: 1893538 URL: http://svn.apache.org/viewvc?rev=1893538=rev Log: Update EPSG geodetic dataset to version 9.9.1. https://issues.apache.org/jira/browse/SIS-517 Modified: sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql
