Update for changes in SIS internal API.

desruisseaux · desruisseaux · commit 613798b0199a · 2024-07-23T15:24:56.000+02:00
diff --git a/geotk-observation-store/src/main/java/org/geotoolkit/observation/OMUtils.java b/geotk-observation-store/src/main/java/org/geotoolkit/observation/OMUtils.java
@@ -35,8 +35,8 @@
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.wrapper.Geometries;
 import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.metadata.internal.RecordSchemaSIS;
-import static org.apache.sis.metadata.internal.RecordSchemaSIS.INSTANCE;
+import org.apache.sis.metadata.privy.RecordSchemaSIS;
+import static org.apache.sis.metadata.privy.RecordSchemaSIS.INSTANCE;
 import org.apache.sis.measure.Units;
 import org.apache.sis.metadata.ModifiableMetadata;
 import org.apache.sis.metadata.iso.DefaultIdentifier;
diff --git a/geotk-render2d/src/main/java/org/geotoolkit/display2d/ext/scalebar/J2DScaleBarUtilities.java b/geotk-render2d/src/main/java/org/geotoolkit/display2d/ext/scalebar/J2DScaleBarUtilities.java
@@ -175,7 +175,7 @@ public static double paint(CoordinateReferenceSystem objectiveCRS,
             throw new NullPointerException("no unit for one axi.");
         }
         double logicalLength;
-        final Ellipsoid ellipsoid = ReferencingUtilities.getEllipsoidOfGeographicCRS(mapCRS);
+        final Ellipsoid ellipsoid = ReferencingUtilities.getEllipsoid(mapCRS);
         try {
 
             if (ellipsoid != null) {

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public static double paint(CoordinateReferenceSystem objectiveCRS,`
`175`	`175`	`throw new NullPointerException("no unit for one axi.");`
`176`	`176`	`}`
`177`	`177`	`double logicalLength;`
`178`		`- final Ellipsoid ellipsoid = ReferencingUtilities.getEllipsoidOfGeographicCRS(mapCRS);`
	`178`	`+ final Ellipsoid ellipsoid = ReferencingUtilities.getEllipsoid(mapCRS);`
`179`	`179`	`try {`
`180`	`180`
`181`	`181`	`if (ellipsoid != null) {`