You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2024/02/03 11:07:58 UTC
(sis) branch geoapi-3.1 updated (9f95c712fa -> fadb6e856b)
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 9f95c712fa Merge branch 'geoapi-4.0' into geoapi-3.1: - Bug fixes in warning logs during XML unmarshalling. - Bug fixes in WKT formatting with ANSI colors. - Fix a few cases where "xlink:href" were still not handled. - Fix a few cases where fragments in URL were not handled. - Grammatical fixes in comments.
add 1a7a2aac78 Post-merge automatic import reorganization.
new fadb6e856b Merge branch 'geoapi-4.0' into geoapi-3.1: - Post-merge import reorganization.
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:
.../org/apache/sis/console/OperationParser.java | 2 +-
.../sis/geometry/wrapper/GeometryWrapper.java | 2 +-
.../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +-
.../main/org/apache/sis/xml/util/URISource.java | 2 +-
.../apache/sis/map/service/GraphicsPortrayer.java | 1 +
.../apache/sis/map/service/RenderingException.java | 1 +
.../main/org/apache/sis/map/service/Scene2D.java | 1 +
.../org/apache/sis/map/service/StylePainter.java | 1 +
.../apache/sis/map/service/se1/LineToScene2D.java | 23 +++++++++++-----------
.../apache/sis/map/service/se1/PointToScene2D.java | 3 ++-
.../sis/map/service/se1/PolygonToScene2D.java | 3 ++-
.../sis/map/service/se1/PresentationToScene2D.java | 12 +++++------
.../sis/map/service/se1/RasterToScene2D.java | 11 ++++++-----
.../apache/sis/map/service/se1/RenderedShape.java | 1 +
.../org/apache/sis/map/service/se1/SEPainter.java | 1 +
.../sis/map/service/se1/SymbolizerCache.java | 1 +
.../sis/map/service/se1/SymbolizerToScene2D.java | 7 ++++---
.../apache/sis/map/service/se1/TextToScene2D.java | 3 ++-
.../sis/map/service/GraphicsPortrayerTest.java | 17 +++++++++-------
19 files changed, 55 insertions(+), 39 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: - Post-merge import reorganization.
Posted by de...@apache.org.
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 fadb6e856b3ecf819f703f473ac7ae3228d97292
Merge: 9f95c712fa 1a7a2aac78
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Feb 3 12:05:31 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1:
- Post-merge import reorganization.
.../org/apache/sis/console/OperationParser.java | 2 +-
.../sis/geometry/wrapper/GeometryWrapper.java | 2 +-
.../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +-
.../main/org/apache/sis/xml/util/URISource.java | 2 +-
.../apache/sis/map/service/GraphicsPortrayer.java | 1 +
.../apache/sis/map/service/RenderingException.java | 1 +
.../main/org/apache/sis/map/service/Scene2D.java | 1 +
.../org/apache/sis/map/service/StylePainter.java | 1 +
.../apache/sis/map/service/se1/LineToScene2D.java | 23 +++++++++++-----------
.../apache/sis/map/service/se1/PointToScene2D.java | 3 ++-
.../sis/map/service/se1/PolygonToScene2D.java | 3 ++-
.../sis/map/service/se1/PresentationToScene2D.java | 12 +++++------
.../sis/map/service/se1/RasterToScene2D.java | 11 ++++++-----
.../apache/sis/map/service/se1/RenderedShape.java | 1 +
.../org/apache/sis/map/service/se1/SEPainter.java | 1 +
.../sis/map/service/se1/SymbolizerCache.java | 1 +
.../sis/map/service/se1/SymbolizerToScene2D.java | 7 ++++---
.../apache/sis/map/service/se1/TextToScene2D.java | 3 ++-
.../sis/map/service/GraphicsPortrayerTest.java | 17 +++++++++-------
19 files changed, 55 insertions(+), 39 deletions(-)
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
index 882fa1e96d,7771d235e7..7df811b0ea
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
@@@ -28,7 -28,8 +28,8 @@@ import org.opengis.geometry.Geometry
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.CoordinateOperation;
-import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
++import org.opengis.referencing.operation.MathTransform;
import org.opengis.util.FactoryException;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.filter.sqlmm.SQLMM;
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
index aeede8b8a3,695fe65cd1..afa8873d61
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
@@@ -45,7 -45,8 +45,8 @@@ import org.opengis.util.FactoryExceptio
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.CoordinateOperation;
-import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
++import org.opengis.referencing.operation.MathTransform;
import org.apache.sis.referencing.util.ReferencingUtilities;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.geometry.GeneralDirectPosition;