This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 374e94d4cd9b5c1bcab21797052bb74c1d3573e8 Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue May 12 10:52:57 2026 +0200 Rename the `gimi` sub-package as `geo` because the GIMI draft standard is heading toward a different approach based on RDF files. --- .../main/org/apache/sis/storage/geoheif/CoverageBuilder.java | 4 ++-- .../main/org/apache/sis/storage/isobmff/MainBoxRegistry.java | 2 +- .../main/org/apache/sis/storage/isobmff/{gimi => geo}/ModelCRS.java | 6 +++--- .../org/apache/sis/storage/isobmff/{gimi => geo}/ModelTiePoint.java | 6 +++--- .../sis/storage/isobmff/{gimi => geo}/ModelTransformation.java | 6 +++--- .../sis/storage/isobmff/{gimi => geo}/TiledImageConfiguration.java | 2 +- .../apache/sis/storage/isobmff/{gimi => geo}/UnknownProperty.java | 4 ++-- .../org/apache/sis/storage/isobmff/{gimi => geo}/package-info.java | 2 +- .../org/apache/sis/storage/isobmff/{gimi => geo}/ExtensionTest.java | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java index a489dba00a..88c7c8fbec 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java @@ -50,8 +50,8 @@ import org.apache.sis.storage.modifier.CoverageModifier; import org.apache.sis.storage.isobmff.Box; import org.apache.sis.storage.isobmff.base.ItemInfoEntry; import org.apache.sis.storage.isobmff.base.ItemProperties; -import org.apache.sis.storage.isobmff.gimi.ModelTransformation; -import org.apache.sis.storage.isobmff.gimi.ModelCRS; +import org.apache.sis.storage.isobmff.geo.ModelTransformation; +import org.apache.sis.storage.isobmff.geo.ModelCRS; import org.apache.sis.storage.isobmff.mpeg.Component; import org.apache.sis.storage.isobmff.mpeg.ComponentType; import org.apache.sis.storage.isobmff.mpeg.ComponentPalette; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/MainBoxRegistry.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/MainBoxRegistry.java index b1a1a821d3..86a0236970 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/MainBoxRegistry.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/MainBoxRegistry.java @@ -26,7 +26,7 @@ import org.apache.sis.storage.isobmff.base.*; import org.apache.sis.storage.isobmff.video.*; import org.apache.sis.storage.isobmff.image.*; import org.apache.sis.storage.isobmff.mpeg.*; -import org.apache.sis.storage.isobmff.gimi.*; +import org.apache.sis.storage.isobmff.geo.*; /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/ModelCRS.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/ModelCRS.java similarity index 96% rename from incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/ModelCRS.java rename to incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/ModelCRS.java index 2bf9c93b78..244f0fa9c7 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/ModelCRS.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/ModelCRS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.isobmff.gimi; +package org.apache.sis.storage.isobmff.geo; import java.util.UUID; import java.util.logging.Level; @@ -53,14 +53,14 @@ public final class ModelCRS extends FullBox { /** * The most significant bits of the <abbr>UUID</abbr> as a long integer. - * It was used in an older version of the <abbr>GIMI</abbr> specification. + * It was used in an older version of the GeoHEIF specification draft. * Should not be used anymore, but nevertheless kept for compatibility. */ public static final long UUID_HIGH_BITS = 0x137a1742_75ac_4747L; /** * The <abbr>UUID</abbr> that identify this extension. - * It was used in an older version of the <abbr>GIMI</abbr> specification. + * It was used in an older version of the GeoHEIF specification draft. * Should not be used anymore, but nevertheless kept for compatibility. */ public static final UUID EXTENDED_TYPE = new UUID(UUID_HIGH_BITS, 0x82bc_659576e8675bL); diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/ModelTiePoint.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/ModelTiePoint.java similarity index 95% rename from incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/ModelTiePoint.java rename to incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/ModelTiePoint.java index f845bd4ca4..64b5ccbb3b 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/ModelTiePoint.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/ModelTiePoint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.isobmff.gimi; +package org.apache.sis.storage.isobmff.geo; import java.util.UUID; import java.io.IOException; @@ -48,14 +48,14 @@ public final class ModelTiePoint extends FullBox { /** * The most significant bits of the <abbr>UUID</abbr> as a long integer. - * It was used in an older version of the <abbr>GIMI</abbr> specification. + * It was used in an older version of the GeoHEIF specification draft. * Should not be used anymore, but nevertheless kept for compatibility. */ public static final long UUID_HIGH_BITS = 0xc683364f_d6a4_48b8L; /** * The <abbr>UUID</abbr> that identify this extension. - * It was used in an older version of the <abbr>GIMI</abbr> specification. + * It was used in an older version of the GeoHEIF specification draft. * Should not be used anymore, but nevertheless kept for compatibility. */ public static final UUID EXTENDED_TYPE = new UUID(UUID_HIGH_BITS, 0xa76b_17a30af40c10L); diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/ModelTransformation.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/ModelTransformation.java similarity index 95% rename from incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/ModelTransformation.java rename to incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/ModelTransformation.java index 37120cb26b..b13f01a617 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/ModelTransformation.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/ModelTransformation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.isobmff.gimi; +package org.apache.sis.storage.isobmff.geo; import java.util.UUID; import java.io.IOException; @@ -51,14 +51,14 @@ public final class ModelTransformation extends FullBox { /** * The most significant bits of the <abbr>UUID</abbr> as a long integer. - * It was used in an older version of the <abbr>GIMI</abbr> specification. + * It was used in an older version of the GeoHEIF specification draft. * Should not be used anymore, but nevertheless kept for compatibility. */ public static final long UUID_HIGH_BITS = 0x763cf838_b630_440bL; /** * The <abbr>UUID</abbr> that identify this extension. - * It was used in an older version of the <abbr>GIMI</abbr> specification. + * It was used in an older version of the GeoHEIF specification draft. * Should not be used anymore, but nevertheless kept for compatibility. */ public static final UUID EXTENDED_TYPE = new UUID(UUID_HIGH_BITS, 0x84f8_be44bf9910afL); diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/TiledImageConfiguration.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/TiledImageConfiguration.java similarity index 97% rename from incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/TiledImageConfiguration.java rename to incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/TiledImageConfiguration.java index f26d63ecab..80be557151 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/TiledImageConfiguration.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/TiledImageConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.isobmff.gimi; +package org.apache.sis.storage.isobmff.geo; import java.io.IOException; import org.apache.sis.storage.isobmff.FullBox; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/UnknownProperty.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/UnknownProperty.java similarity index 95% rename from incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/UnknownProperty.java rename to incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/UnknownProperty.java index b2bd573745..f443468f1f 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/UnknownProperty.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/UnknownProperty.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.isobmff.gimi; +package org.apache.sis.storage.isobmff.geo; import java.util.UUID; import java.io.IOException; @@ -23,7 +23,7 @@ import org.apache.sis.storage.isobmff.Reader; /** - * Unknown property observed in GIMI test file. + * Unknown property observed in GeoHEIF test file. * For now, we keep this class only as a reminder for the pattern to use for box by UUID. * We will remove or rename this class in the future if we identify a real case of such box. * diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/package-info.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/package-info.java similarity index 96% rename from incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/package-info.java rename to incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/package-info.java index c70d74bf60..6448aae2fc 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/package-info.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/geo/package-info.java @@ -22,4 +22,4 @@ * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) */ -package org.apache.sis.storage.isobmff.gimi; +package org.apache.sis.storage.isobmff.geo; diff --git a/incubator/src/org.apache.sis.storage.geoheif/test/org/apache/sis/storage/isobmff/gimi/ExtensionTest.java b/incubator/src/org.apache.sis.storage.geoheif/test/org/apache/sis/storage/isobmff/geo/ExtensionTest.java similarity index 93% rename from incubator/src/org.apache.sis.storage.geoheif/test/org/apache/sis/storage/isobmff/gimi/ExtensionTest.java rename to incubator/src/org.apache.sis.storage.geoheif/test/org/apache/sis/storage/isobmff/geo/ExtensionTest.java index 4228c6b848..f342f25071 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/test/org/apache/sis/storage/isobmff/gimi/ExtensionTest.java +++ b/incubator/src/org.apache.sis.storage.geoheif/test/org/apache/sis/storage/isobmff/geo/ExtensionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.isobmff.gimi; +package org.apache.sis.storage.isobmff.geo; import java.util.UUID; @@ -37,7 +37,7 @@ public final class ExtensionTest { /** * Verifies the <abbr>UUID</abbr> declared in extensions. - * Some identifiers were defined in previous <abbr>GIMI</abbr> versions + * Some identifiers were defined in previous GeoHEIF specification drafts * and are supported by <abbr>SIS</abbr> for compatibility reasons. */ @Test
