diff --git a/.gitignore b/.gitignore
index 4b9a987df90d33683e2399715cf3910c965a0d33..83eaec7bff7218dd99a1a6635c391cf53f232fca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,4 @@ bin
.project
.settings
target
-core/target
-aster/target
-aster/src/test/resources/org/orekit/rugged/geotiff/ASTGTM2_*.zip
diff --git a/aster/pom.xml b/aster/pom.xml
deleted file mode 100644
index 6ea13f95f430d22ec488ea78179b7b0ef083ad16..0000000000000000000000000000000000000000
--- a/aster/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.orekit</groupId>
- <artifactId>rugged-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>rugged-aster</artifactId>
- <packaging>bundle</packaging>
- <name>Rugged Aster support</name>
-
- <inceptionYear>2014</inceptionYear>
- <description>
- This module provides support for ASTER Digital Elevation Models.
- </description>
-
- <developers>
- <developer>
- <name>Luc Maisonobe</name>
- <id>luc</id>
- <roles>
- <role>architect</role>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Aude Espesset</name>
- </contributor>
- </contributors>
-
- <organization>
- <name>CS Systèmes d'Information</name>
- <url>http://www.c-s.fr/</url>
- </organization>
-
- <repositories>
- <repository>
- <!-- This is needed *only* because Apache Commons Imaging has not been released yet -->
- <!-- it will be removed as soon as 1.0 is officially available in maven central -->
- <id>org.apache</id>
- <url>https://repository.apache.org/content/repositories/snapshots/</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.orekit</groupId>
- <artifactId>rugged-core</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-imaging</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <type>jar</type>
- <scope>test</scope>
- <optional>false</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${rugged.maven-bundle-plugin.version}</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.orekit.rugged.aster.*;version=${project.version};-noimport:=true</Export-Package>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/aster/src/main/java/org/orekit/rugged/aster/AngularUnits.java b/aster/src/main/java/org/orekit/rugged/aster/AngularUnits.java
deleted file mode 100644
index dfb1ca4b1dc801f8cdb470a45e837120dc06bd02..0000000000000000000000000000000000000000
--- a/aster/src/main/java/org/orekit/rugged/aster/AngularUnits.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Copyright 2013-2014 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * CS licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.orekit.rugged.aster;
-
-import org.apache.commons.math3.util.FastMath;
-
-/** Enumerate for angular units.
- * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.1.4">GeoTIFF specification, section 6.3.1.4</a>
- * @author Luc Maisonobe
- */
-enum AngularUnits {
-
- // CHECKSTYLE: stop JavadocVariable check
- RADIAN(9101) {
- /** {@inheritDoc} */
- @Override
- public double toRadians(final double raw) {
- return raw;
- }
- },
-
- DEGREE(9102) {
- /** {@inheritDoc} */
- @Override
- public double toRadians(final double raw) {
- return FastMath.toRadians(raw);
- }
- },
-
- ARC_MINUTE(9103) {
- /** {@inheritDoc} */
- @Override
- public double toRadians(final double raw) {
- return FastMath.toRadians(raw / 60.0);
- }
- },
-
- ARC_SECOND(9104) {
- /** {@inheritDoc} */
- @Override
- public double toRadians(final double raw) {
- return FastMath.toRadians(raw / 3600.0);
- }
- },
-
- GRAD(9105) {
- /** {@inheritDoc} */
- @Override
- public double toRadians(final double raw) {
- return FastMath.PI * raw / 200.0;
- }
- },
-
- GON(9106) {
- /** {@inheritDoc} */
- @Override
- public double toRadians(final double raw) {
- return GRAD.toRadians(raw);
- }
- },
-
- DMS(9107) {
- /** {@inheritDoc} */
- @Override
- public double toRadians(final double raw) {
- throw new UnsupportedOperationException();
- }
- },
-
- DMS_HEMISPHERE(9108) {
- /** {@inheritDoc} */
- @Override
- public double toRadians(final double raw) {
- throw new UnsupportedOperationException();
- }
- };
-
- // CHECKSTYLE: resume JavadocVariable check
-
- /** Units ID. */
- private final int id;
-
- /** Simple constructor.
- * @param id key id
- */
- private AngularUnits(final int id) {
- this.id = id;
- }
-
- /** Convert an angle to radians.
- * @param raw angle, in instance units
- * @return angle in radians
- */
- public abstract double toRadians(final double raw);
-
- /** Get the units corresponding to an id.
- * @param id type id
- * @return the units corresponding to the id
- * @exception IllegalArgumentException if the id does not correspond to known units
- */
- public static AngularUnits getUnits(final int id) {
- for (AngularUnits units : values()) {
- if (units.id == id) {
- return units;
- }
- }
- throw new IllegalArgumentException();
- }
-
-}
diff --git a/aster/src/main/java/org/orekit/rugged/aster/AsterMessages.java b/aster/src/main/java/org/orekit/rugged/aster/AsterMessages.java
deleted file mode 100644
index f358fd93f73e0e1624ce654ca19f7d5d8a7c4931..0000000000000000000000000000000000000000
--- a/aster/src/main/java/org/orekit/rugged/aster/AsterMessages.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Copyright 2002-2014 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * CS licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.orekit.rugged.aster;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
-
-import org.apache.commons.math3.exception.util.Localizable;
-
-/**
- * Enumeration for localized messages formats.
- * <p>
- * The constants in this enumeration represent the available
- * formats as localized strings. These formats are intended to be
- * localized using simple properties files, using the constant
- * name as the key and the property value as the message format.
- * The source English format is provided in the constants themselves
- * to serve both as a reminder for developers to understand the parameters
- * needed by each format, as a basis for translators to create
- * localized properties files, and as a default format if some
- * translation is missing.
- * </p>
- * <p>
- * This class is heavily based on Orekit {@link org.orekit.errors.OrekitMessages},
- * which is distributed under the terms of the Apache License V2.
- * </p>
- */
-public enum AsterMessages implements Localizable {
-
- // CHECKSTYLE: stop JavadocVariable check
-
- NO_DEM_DATA_FOR_POINT("no Digital Elevation Model data for point {0}, {1} (should be in file {2})"),
- ERROR_PARSING_FILE("error parsing file {0}: {1}"),
- MISSING_PIXEL_SCALE("missing pixel scale GeoTIFF tag in file {0}"),
- MISSING_TIE_POINT("missing tie point GeoTIFF tag in file {0}"),
- UNSUPPORTED_GEOTIFF_VERSION("unsupported GeoTIFF version {0}/{1}.{2} in file {3} (expected {4}/{5}.{6})"),
- UNABLE_TO_RETRIEVE_VALUE_FOR_KEY("unable to retrieve value for key {0} in file {1}"),
- UNEXPECTED_GEOKEY("unexpected GeoTIFF key {0} in file {1}"),
- UNEXPECTED_GEOKEY_VALUE("GeoTIFF key {0} in file {1} has unexpected value {2} (expected {3})");
-
- // CHECKSTYLE: resume JavadocVariable check
-
- /** Base name of the resource bundle in classpath. */
- private static final String RESOURCE_BASE_NAME = "assets/org/orekit/rugged/AsterMessages";
-
- /** Source English format. */
- private final String sourceFormat;
-
- /** Simple constructor.
- * @param sourceFormat source English format to use when no
- * localized version is available
- */
- private AsterMessages(final String sourceFormat) {
- this.sourceFormat = sourceFormat;
- }
-
- /** {@inheritDoc} */
- public String getSourceString() {
- return sourceFormat;
- }
-
- /** {@inheritDoc} */
- public String getLocalizedString(final Locale locale) {
- try {
- final ResourceBundle bundle =
- ResourceBundle.getBundle(RESOURCE_BASE_NAME, locale, new UTF8Control());
- if (bundle.getLocale().getLanguage().equals(locale.getLanguage())) {
- final String translated = bundle.getString(name());
- if ((translated != null) &&
- (translated.length() > 0) &&
- (!translated.toLowerCase().contains("missing translation"))) {
- // the value of the resource is the translated format
- return translated;
- }
- }
-
- } catch (MissingResourceException mre) {
- // do nothing here
- }
-
- // either the locale is not supported or the resource is not translated or
- // it is unknown: don't translate and fall back to using the source format
- return sourceFormat;
-
- }
-
- /** Control class loading properties in UTF-8 encoding.
- * <p>
- * This class has been very slightly adapted from BalusC answer to question: <a
- * href="http://stackoverflow.com/questions/4659929/how-to-use-utf-8-in-resource-properties-with-resourcebundle">
- * How to use UTF-8 in resource properties with ResourceBundle</a>.
- * </p>
- */
- public static class UTF8Control extends ResourceBundle.Control {
-
- /** {@inheritDoc} */
- @Override
- public ResourceBundle newBundle(final String baseName, final Locale locale, final String format,
- final ClassLoader loader, final boolean reload)
- throws IllegalAccessException, InstantiationException, IOException {
- // The below is a copy of the default implementation.
- final String bundleName = toBundleName(baseName, locale);
- final String resourceName = toResourceName(bundleName, "utf8");
- ResourceBundle bundle = null;
- InputStream stream = null;
- if (reload) {
- final URL url = loader.getResource(resourceName);
- if (url != null) {
- final URLConnection connection = url.openConnection();
- if (connection != null) {
- connection.setUseCaches(false);
- stream = connection.getInputStream();
- }
- }
- } else {
- stream = loader.getResourceAsStream(resourceName);
- }
- if (stream != null) {
- try {
- // Only this line is changed to make it to read properties files as UTF-8.
- bundle = new PropertyResourceBundle(new InputStreamReader(stream, "UTF-8"));
- } finally {
- stream.close();
- }
- }
- return bundle;
- }
-
- }
-
-}
diff --git a/aster/src/main/java/org/orekit/rugged/aster/AsterTileUpdater.java b/aster/src/main/java/org/orekit/rugged/aster/AsterTileUpdater.java
deleted file mode 100644
index 5b5dc17295417ef30c360b5797c1df4dca30df91..0000000000000000000000000000000000000000
--- a/aster/src/main/java/org/orekit/rugged/aster/AsterTileUpdater.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/* Copyright 2013-2014 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * CS licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.orekit.rugged.aster;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteOrder;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.apache.commons.imaging.FormatCompliance;
-import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.common.bytesource.ByteSource;
-import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream;
-import org.apache.commons.imaging.formats.tiff.TiffContents;
-import org.apache.commons.imaging.formats.tiff.TiffDirectory;
-import org.apache.commons.imaging.formats.tiff.TiffField;
-import org.apache.commons.imaging.formats.tiff.TiffReader;
-import org.apache.commons.imaging.formats.tiff.constants.GeoTiffTagConstants;
-import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
-import org.apache.commons.math3.util.FastMath;
-import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.raster.TileUpdater;
-import org.orekit.rugged.raster.UpdatableTile;
-
-/** Digital Elevation Model Updater using Aster data.
- * @author Luc Maisonobe
- */
-public class AsterTileUpdater implements TileUpdater {
-
- /** Directory for Aster data. */
- private final File directory;
-
- /** Simple constructor.
- * @param directory directory holding Aster data.
- */
- public AsterTileUpdater(final File directory) {
- this.directory = directory;
- }
-
- /** {@inheritDoc} */
- @Override
- public void updateTile(final double latitude, final double longitude,
- final UpdatableTile tile)
- throws RuggedException {
-
- final String name = fileName(latitude, longitude);
-
- try {
-
- // build the file name
- final File file = new File(directory, name);
- if (!file.exists()) {
- throw new RuggedException(AsterMessages.NO_DEM_DATA_FOR_POINT,
- FastMath.toDegrees(latitude), FastMath.toDegrees(longitude),
- name);
- }
-
- final ZipFile zipFile = new ZipFile(file);
- for (final Enumeration<? extends ZipEntry> e = zipFile.entries(); e.hasMoreElements();) {
- final ZipEntry entry = e.nextElement();
- if ((!entry.isDirectory()) && entry.getName().endsWith("_dem.tif")) {
- load(zipFile.getInputStream(entry), file.getAbsolutePath(), tile);
- }
- }
- zipFile.close();
-
- } catch (IOException ioe) {
- final RuggedException re =
- new RuggedException(AsterMessages.ERROR_PARSING_FILE, name, ioe.getLocalizedMessage());
- re.initCause(ioe);
- throw re;
- }
-
- }
-
- /** Build the file name covering a point.
- * @param latitude point latitude
- * @param longitude point longitude
- * @return file name
- */
- private String fileName(final double latitude, final double longitude) {
- final int latCode = (int) FastMath.floor(FastMath.toDegrees(latitude));
- final int lonCode = (int) FastMath.floor(FastMath.toDegrees(longitude));
- if (latCode < 0) {
- if (lonCode < 0) {
- return String.format("ASTGTM2_S%2dW%3d.zip", -latCode, -lonCode);
- } else {
- return String.format("ASTGTM2_S%2dE%3d.zip", -latCode, lonCode);
- }
- } else {
- if (lonCode < 0) {
- return String.format("ASTGTM2_N%2dW%3d.zip", latCode, -lonCode);
- } else {
- return String.format("ASTGTM2_N%2dE%3d.zip", latCode, lonCode);
- }
- }
- }
-
- /** Load a Digital Elevation Model.
- * @param stream stream containing the Digital Elevation Model
- * @param fileName name of the file
- * @param tile tile to update
- * @exception IOException if file cannot be loaded
- * @exception RuggedException if ASTER data cannot be extracted
- */
- private void load(final InputStream stream, final String fileName, final UpdatableTile tile)
- throws RuggedException, IOException {
-
- try {
-
- // read TIFF
- final TiffReader reader = new TiffReader(true);
- final ByteSource source = new ByteSourceInputStream(stream, fileName);
- final TiffContents contents = reader.readContents(source, null, FormatCompliance.getDefault());
-
- // extract GeoTiff data
- final TiffField scalesField = contents.findField(GeoTiffTagConstants.EXIF_TAG_MODEL_PIXEL_SCALE_TAG);
- if (scalesField == null) {
- throw new RuggedException(AsterMessages.MISSING_PIXEL_SCALE, fileName);
- }
- final double[] pixelsScales = scalesField.getDoubleArrayValue();
-
- final TiffField tieField = contents.findField(GeoTiffTagConstants.EXIF_TAG_MODEL_TIEPOINT_TAG);
- if (tieField == null) {
- throw new RuggedException(AsterMessages.MISSING_TIE_POINT, fileName);
- }
- final double[] tiePoint = tieField.getDoubleArrayValue();
-
- final int latitudeRows = contents.findField(TiffTagConstants.TIFF_TAG_IMAGE_LENGTH).getIntValue();
- final int longitudeColumns = contents.findField(TiffTagConstants.TIFF_TAG_IMAGE_WIDTH).getIntValue();
-
- final int[] geoKeyDirectory = contents.findField(GeoTiffTagConstants.EXIF_TAG_GEO_KEY_DIRECTORY_TAG).getIntArrayValue();
- final int keyDirectoryVersion = geoKeyDirectory[0];
- final int keyRevision = geoKeyDirectory[1];
- final int minorRevision = geoKeyDirectory[2];
- final int numberOfKeys = geoKeyDirectory[3];
- if (keyDirectoryVersion != 1 || keyRevision != 1 || minorRevision != 0) {
- throw new RuggedException(AsterMessages.UNSUPPORTED_GEOTIFF_VERSION,
- keyDirectoryVersion, keyRevision, minorRevision, fileName,
- 1, 1, 0);
- }
-
- AngularUnits angulerUnits = AngularUnits.DEGREE;
- for (int i = 0; i < numberOfKeys; ++i) {
- final GeoKey geoKey = GeoKey.getKey(geoKeyDirectory[4 * i + 4]);
- final int location = geoKeyDirectory[4 * i + 5];
- final int count = geoKeyDirectory[4 * i + 6];
- final int valueOffset = geoKeyDirectory[4 * i + 7];
- switch(geoKey) {
- case GT_MODEL_TYPE: {
- final ModelType modelType = ModelType.getType(getShort(geoKey, location, count, valueOffset, fileName));
- if (modelType != ModelType.GEOGRAPHIC) {
- throw new RuggedException(AsterMessages.UNEXPECTED_GEOKEY_VALUE,
- geoKey, fileName, modelType, ModelType.GEOCENTRIC);
- }
- break;
- }
- case GT_RASTER_TYPE: {
- final RasterType rasterType = RasterType.getType(getShort(geoKey, location, count, valueOffset, fileName));
- if (rasterType != RasterType.RASTER_PIXEL_IS_AREA) {
- throw new RuggedException(AsterMessages.UNEXPECTED_GEOKEY_VALUE,
- geoKey, fileName, rasterType, RasterType.RASTER_PIXEL_IS_AREA);
- }
- break;
- }
- case GEOGRAPHIC_TYPE: {
- final GeographicCoordinateSystemType csType =
- GeographicCoordinateSystemType.getType(getShort(geoKey, location, count, valueOffset, fileName));
- if (csType != GeographicCoordinateSystemType.GCS_WGS_84) {
- throw new RuggedException(AsterMessages.UNEXPECTED_GEOKEY_VALUE,
- geoKey, fileName, csType, GeographicCoordinateSystemType.GCS_WGS_84);
- }
- break;
- }
- case GEOG_LINEAR_UNITS: {
- final LinearUnits linearUnits =
- LinearUnits.getUnits(getShort(geoKey, location, count, valueOffset, fileName));
- if (linearUnits != LinearUnits.METER) {
- throw new RuggedException(AsterMessages.UNEXPECTED_GEOKEY_VALUE,
- geoKey, fileName, linearUnits, LinearUnits.METER);
- }
- break;
- }
- case GEOG_ANGULAR_UNITS: {
- angulerUnits = AngularUnits.getUnits(getShort(geoKey, location, count, valueOffset, fileName));
- break;
- }
- default:
- throw new RuggedException(AsterMessages.UNEXPECTED_GEOKEY, geoKey, fileName);
- }
- }
-
- // set up geometry
- final double latitudeStep = angulerUnits.toRadians(pixelsScales[1]);
- final double longitudeStep = angulerUnits.toRadians(pixelsScales[0]);
- final double minLatitude = angulerUnits.toRadians(tiePoint[4]) - (latitudeRows - 1) * latitudeStep;
- final double minLongitude = angulerUnits.toRadians(tiePoint[3]);
- tile.setGeometry(minLatitude, minLongitude, latitudeStep, longitudeStep,
- latitudeRows, longitudeColumns);
-
- // read the raster data
- final int msbOffset = reader.getByteOrder() == ByteOrder.BIG_ENDIAN ? 0 : 1;
- final int lsbOffset = reader.getByteOrder() == ByteOrder.BIG_ENDIAN ? 1 : 0;
- int i = 0;
- for (final TiffDirectory tiffDirectory : contents.directories) {
- for (final TiffDirectory.ImageDataElement element : tiffDirectory.getTiffRawImageDataElements()) {
- final byte[] bytes = source.getBlock(element.offset, element.length);
- for (int longitudeIndex = 0; longitudeIndex < longitudeColumns; ++longitudeIndex) {
- final int msb = bytes[2 * longitudeIndex + msbOffset];
- final int lsb = 0xff & bytes[2 * longitudeIndex + lsbOffset];
- final int elevation = (msb << 8) | lsb;
- tile.setElevation(latitudeRows - 1 - i, longitudeIndex, elevation);
- }
- i++;
- }
- }
-
- } catch (ImageReadException ire) {
- throw new RuggedException(AsterMessages.ERROR_PARSING_FILE,
- fileName, ire.getLocalizedMessage());
- }
-
- }
-
- /** Get a short from the geo key directory.
- * @param key being parsed
- * @param location location of the short
- * @param count number of elements
- * @param valueOffset offset of the value
- * @param fileName name of the file
- * @return short value
- * @exception RuggedException if value cannot be retrieved
- */
- private int getShort(final GeoKey key, final int location, final int count, final int valueOffset,
- final String fileName)
- throws RuggedException {
- if (location != 0 && count != 1) {
- throw new RuggedException(AsterMessages.UNABLE_TO_RETRIEVE_VALUE_FOR_KEY, key, fileName);
- }
- return valueOffset;
- }
-
-}
diff --git a/aster/src/main/java/org/orekit/rugged/aster/GeoKey.java b/aster/src/main/java/org/orekit/rugged/aster/GeoKey.java
deleted file mode 100644
index 0263bfd4197b945e75462c6020f4c46fc4e63cc7..0000000000000000000000000000000000000000
--- a/aster/src/main/java/org/orekit/rugged/aster/GeoKey.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Copyright 2013-2014 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * CS licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.orekit.rugged.aster;
-
-
-/** Enumerate for GeoTIFF keys.
- * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.2">GeoTIFF specification, section 6.2</a>
- * @author Luc Maisonobe
- */
-enum GeoKey {
-
- // CHECKSTYLE: stop JavadocVariable check
- GT_MODEL_TYPE(1024),
- GT_RASTER_TYPE(1025),
- GT_CITATION(1026),
-
- GEOGRAPHIC_TYPE(2048),
- GEOG_CITATION(2049),
- GEOG_GEODETICDATUM(2050),
- GEOG_PRIME_MERIDIAN(2051),
- GEOG_PRIME_MERIDIAN_LONG(2061),
- GEOG_LINEAR_UNITS(2052),
- GEOG_LINEAR_UNIT_SIZE(2053),
- GEOG_ANGULAR_UNITS(2054),
- GEOG_ANGULAR_UNIT_SIZE(2055),
- GEOG_ELLIPSOID(2056),
- GEOG_SEMI_MAJOR_AXIS(2057),
- GEOG_SEMI_MINOR_AXIS(2058),
- GEOG_INV_FLATTENING(2059),
- GEOG_AZIMUTH_UNITS(2060),
-
- PROJECTED_CS_TYPE(3072),
- PCS_CITATION(3073),
- PROJECTION(3074),
- PROJ_COORD_TRANS(3075),
- PROJ_LINEAR_UNITS(3076),
- PROJ_LINEAR_UNIT_SIZE(3077),
- PROJ_STD_PARALLEL_1(3078),
- PROJ_STD_PARALLEL_2(3079),
- PROJ_NAT_ORIGIN_LONG(3080),
- PROJ_NAT_ORIGIN_LAT(3081),
- PROJ_FALSE_EASTING(3082),
- PROJ_FALSE_NORTHING(3083),
- PROJ_FALSE_ORIGIN_LONG(3084),
- PROJ_FALSE_ORIGIN_LAT(3085),
- PROJ_FALSE_ORIGIN_EASTING(3086),
- PROJ_FALSE_ORIGIN_NORTHING(3087),
- PROJ_CENTER_LONG(3088),
- PROJ_CENTER_LAT(3089),
- PROJ_CENTER_EASTING(3090),
- PROJ_FALSE_ORIGIN_NORTHING_ALTERNATE(3091),
- PROJ_SCALE_AT_NAT_ORIGIN(3092),
- PROJ_SCALE_AT_CENTER(3093),
- PROJ_AZIMUTH_ANGLE(3094),
- PROJ_STRAIGHT_VERT_POLE_LONG(3095),
-
- VERTICAL_CS_TYPE(4096),
- VERTICAL_CITATION(4097),
- VERTICAL_DATUM(4098),
- VERTICAL_UNITS(4099);
- // CHECKSTYLE: resume JavadocVariable check
-
- /** Key ID. */
- private final int id;
-
- /** Simple constructor.
- * @param id key id
- */
- private GeoKey(final int id) {
- this.id = id;
- }
-
- /** Get the key corresponding to an id.
- * @param id key id
- * @return the key corresponding to the id
- * @exception IllegalArgumentException if the id does not correspond to a known key
- */
- public static GeoKey getKey(final int id) {
- for (GeoKey key : values()) {
- if (key.id == id) {
- return key;
- }
- }
- throw new IllegalArgumentException();
- }
-
-}
diff --git a/aster/src/main/java/org/orekit/rugged/aster/GeographicCoordinateSystemType.java b/aster/src/main/java/org/orekit/rugged/aster/GeographicCoordinateSystemType.java
deleted file mode 100644
index 0a4a73e4a57ec5755e7696d5268d805f7358e3e8..0000000000000000000000000000000000000000
--- a/aster/src/main/java/org/orekit/rugged/aster/GeographicCoordinateSystemType.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Copyright 2013-2014 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * CS licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.orekit.rugged.aster;
-
-
-/** Enumerate for geographic coordinate system type.
- * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.2.1">GeoTIFF specification, section 6.3.2.1</a>
- * @author Luc Maisonobe
- */
-enum GeographicCoordinateSystemType {
-
- // CHECKSTYLE: stop JavadocVariable check
- GCS_UNDEFINED(0),
- GCS_ADINDAN(4201),
- GCS_AGD66(4202),
- GCS_AGD84(4203),
- GCS_AIN_EL_ABD(4204),
- GCS_AFGOOYE(4205),
- GCS_AGADEZ(4206),
- GCS_LISBON(4207),
- GCS_ARATU(4208),
- GCS_ARC_1950(4209),
- GCS_ARC_1960(4210),
- GCS_BATAVIA(4211),
- GCS_BARBADOS(4212),
- GCS_BEDUARAM(4213),
- GCS_BEIJING_1954(4214),
- GCS_BELGE_1950(4215),
- GCS_BERMUDA_1957(4216),
- GCS_BERN_1898(4217),
- GCS_BOGOTA(4218),
- GCS_BUKIT_RIMPAH(4219),
- GCS_CAMACUPA(4220),
- GCS_CAMPO_INCHAUSPE(4221),
- GCS_CAPE(4222),
- GCS_CARTHAGE(4223),
- GCS_CHUA(4224),
- GCS_CORREGO_ALEGRE(4225),
- GCS_COTE_D_IVOIRE(4226),
- GCS_DEIR_EZ_ZOR(4227),
- GCS_DOUALA(4228),
- GCS_EGYPT_1907(4229),
- GCS_ED50(4230),
- GCS_ED87(4231),
- GCS_FAHUD(4232),
- GCS_GANDAJIKA_1970(4233),
- GCS_GAROUA(4234),
- GCS_GUYANE_FRANCAISE(4235),
- GCS_HU_TZU_SHAN(4236),
- GCS_HD72(4237),
- GCS_ID74(4238),
- GCS_INDIAN_1954(4239),
- GCS_INDIAN_1975(4240),
- GCS_JAMAICA_1875(4241),
- GCS_JAD69(4242),
- GCS_KALIANPUR(4243),
- GCS_KANDAWALA(4244),
- GCS_KERTAU(4245),
- GCS_KOC(4246),
- GCS_LA_CANOA(4247),
- GCS_PSAD56(4248),
- GCS_LAKE(4249),
- GCS_LEIGON(4250),
- GCS_LIBERIA_1964(4251),
- GCS_LOME(4252),
- GCS_LUZON_1911(4253),
- GCS_HITO_XVIII_1963(4254),
- GCS_HERAT_NORTH(4255),
- GCS_MAHE_1971(4256),
- GCS_MAKASSAR(4257),
- GCS_EUREF89(4258),
- GCS_MALONGO_1987(4259),
- GCS_MANOCA(4260),
- GCS_MERCHICH(4261),
- GCS_MASSAWA(4262),
- GCS_MINNA(4263),
- GCS_MHAST(4264),
- GCS_MONTE_MARIO(4265),
- GCS_M_PORALOKO(4266),
- GCS_NAD27(4267),
- GCS_NAD_MICHIGAN(4268),
- GCS_NAD83(4269),
- GCS_NAHRWAN_1967(4270),
- GCS_NAPARIMA_1972(4271),
- GCS_GD49(4272),
- GCS_NGO_1948(4273),
- GCS_DATUM_73(4274),
- GCS_NTF(4275),
- GCS_NSWC_9Z_2(4276),
- GCS_OSGB_1936(4277),
- GCS_OSGB70(4278),
- GCS_OS_SN80(4279),
- GCS_PADANG(4280),
- GCS_PALESTINE_1923(4281),
- GCS_POINTE_NOIRE(4282),
- GCS_GDA94(4283),
- GCS_PULKOVO_1942(4284),
- GCS_QATAR(4285),
- GCS_QATAR_1948(4286),
- GCS_QORNOQ(4287),
- GCS_LOMA_QUINTANA(4288),
- GCS_AMERSFOORT(4289),
- GCS_RT38(4290),
- GCS_SAD69(4291),
- GCS_SAPPER_HILL_1943(4292),
- GCS_SCHWARZECK(4293),
- GCS_SEGORA(4294),
- GCS_SERINDUNG(4295),
- GCS_SUDAN(4296),
- GCS_TANANARIVE(4297),
- GCS_TIMBALAI_1948(4298),
- GCS_TM65(4299),
- GCS_TM75(4300),
- GCS_TOKYO(4301),
- GCS_TRINIDAD_1903(4302),
- GCS_TC_1948(4303),
- GCS_VOIROL_1875(4304),
- GCS_VOIROL_UNIFIE(4305),
- GCS_BERN_1938(4306),
- GCS_NORD_SAHARA_1959(4307),
- GCS_STOCKHOLM_1938(4308),
- GCS_YACARE(4309),
- GCS_YOFF(4310),
- GCS_ZANDERIJ(4311),
- GCS_MGI(4312),
- GCS_BELGE_1972(4313),
- GCS_DHDN(4314),
- GCS_CONAKRY_1905(4315),
- GCS_WGS_72(4322),
- GCS_WGS_72BE(4324),
- GCS_WGS_84(4326),
- GCS_BERN_1898_BERN(4801),
- GCS_BOGOTA_BOGOTA(4802),
- GCS_LISBON_LISBON(4803),
- GCS_MAKASSAR_JAKARTA(4804),
- GCS_MGI_FERRO(4805),
- GCS_MONTE_MARIO_ROME(4806),
- GCS_NTF_PARIS(4807),
- GCS_PADANG_JAKARTA(4808),
- GCS_BELGE_1950_BRUSSELS(4809),
- GCS_TANANARIVE_PARIS(4810),
- GCS_VOIROL_1875_PARIS(4811),
- GCS_VOIROL_UNIFIE_PARIS(4812),
- GCS_BATAVIA_JAKARTA(4813),
- GCS_ATF_PARIS(4901),
- GCS_NDG_PARIS(4902),
- GCSE_AIRY1830(4001),
- GCSE_AIRYMODIFIED1849(4002),
- GCSE_AUSTRALIANNATIONALSPHEROID(4003),
- GCSE_BESSEL1841(4004),
- GCSE_BESSELMODIFIED(4005),
- GCSE_BESSELNAMIBIA(4006),
- GCSE_CLARKE1858(4007),
- GCSE_CLARKE1866(4008),
- GCSE_CLARKE1866MICHIGAN(4009),
- GCSE_CLARKE1880_BENOIT(4010),
- GCSE_CLARKE1880_IGN(4011),
- GCSE_CLARKE1880_RGS(4012),
- GCSE_CLARKE1880_ARC(4013),
- GCSE_CLARKE1880_SGA1922(4014),
- GCSE_EVEREST1830_1937ADJUSTMENT(4015),
- GCSE_EVEREST1830_1967DEFINITION(4016),
- GCSE_EVEREST1830_1975DEFINITION(4017),
- GCSE_EVEREST1830MODIFIED(4018),
- GCSE_GRS1980(4019),
- GCSE_HELMERT1906(4020),
- GCSE_INDONESIANNATIONALSPHEROID(4021),
- GCSE_INTERNATIONAL1924(4022),
- GCSE_INTERNATIONAL1967(4023),
- GCSE_KRASSOWSKY1940(4024),
- GCSE_NWL9D(4025),
- GCSE_NWL10D(4026),
- GCSE_PLESSIS1817(4027),
- GCSE_STRUVE1860(4028),
- GCSE_WAROFFICE(4029),
- GCSE_WGS84(4030),
- GCSE_GEM10C(4031),
- GCSE_OSU86F(4032),
- GCSE_OSU91A(4033),
- GCSE_CLARKE1880(4034),
- GCSE_SPHERE(4035);
- // CHECKSTYLE: resume JavadocVariable check
-
- /** Type ID. */
- private final int id;
-
- /** Simple constructor.
- * @param id key id
- */
- private GeographicCoordinateSystemType(final int id) {
- this.id = id;
- }
-
- /** Get the type corresponding to an id.
- * @param id type id
- * @return the type corresponding to the id
- * @exception IllegalArgumentException if the id does not correspond to a known type
- */
- public static GeographicCoordinateSystemType getType(final int id) {
- for (GeographicCoordinateSystemType type : values()) {
- if (type.id == id) {
- return type;
- }
- }
- throw new IllegalArgumentException();
- }
-
-}
diff --git a/aster/src/main/java/org/orekit/rugged/aster/LinearUnits.java b/aster/src/main/java/org/orekit/rugged/aster/LinearUnits.java
deleted file mode 100644
index 3212bf2c3c0831afbfc54a34d0b4f4a20160bde1..0000000000000000000000000000000000000000
--- a/aster/src/main/java/org/orekit/rugged/aster/LinearUnits.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2013-2014 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * CS licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.orekit.rugged.aster;
-
-
-/** Enumerate for linear units.
- * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.1.3">GeoTIFF specification, section 6.3.1.3</a>
- * @author Luc Maisonobe
- */
-enum LinearUnits {
-
- // CHECKSTYLE: stop JavadocVariable check
- METER(9001),
- FOOT(9002),
- FOOT_US_SURVEY(9003),
- FOOT_MODIFIED_AMERICAN(9004),
- FOOT_CLARKE(9005),
- FOOT_INDIAN(9006),
- LINK(9007),
- LINK_BENOIT(9008),
- LINK_SEARS(9009),
- CHAIN_BENOIT(9010),
- CHAIN_SEARS(9011),
- YARD_SEARS(9012),
- YARD_INDIAN(9013),
- FATHOM(9014),
- MILE_INTERNATIONAL_NAUTICAL(9015);
- // CHECKSTYLE: resume JavadocVariable check
-
- /** Units ID. */
- private final int id;
-
- /** Simple constructor.
- * @param id key id
- */
- private LinearUnits(final int id) {
- this.id = id;
- }
-
- /** Get the units corresponding to an id.
- * @param id type id
- * @return the units corresponding to the id
- * @exception IllegalArgumentException if the id does not correspond to known units
- */
- public static LinearUnits getUnits(final int id) {
- for (LinearUnits units : values()) {
- if (units.id == id) {
- return units;
- }
- }
- throw new IllegalArgumentException();
- }
-
-}
diff --git a/aster/src/main/java/org/orekit/rugged/aster/ModelType.java b/aster/src/main/java/org/orekit/rugged/aster/ModelType.java
deleted file mode 100644
index e7c34a033c55117b53c4aaa21f2f89803871696e..0000000000000000000000000000000000000000
--- a/aster/src/main/java/org/orekit/rugged/aster/ModelType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2013-2014 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * CS licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.orekit.rugged.aster;
-
-
-/** Enumerate for model type.
- * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.1.1">GeoTIFF specification, section 6.3.1.1</a>
- * @author Luc Maisonobe
- */
-enum ModelType {
-
- // CHECKSTYLE: stop JavadocVariable check
- UNDEFINED(0),
- PROJECTED(1),
- GEOGRAPHIC(2),
- GEOCENTRIC(3);
- // CHECKSTYLE: resume JavadocVariable check
-
- /** Type ID. */
- private final int id;
-
- /** Simple constructor.
- * @param id key id
- */
- private ModelType(final int id) {
- this.id = id;
- }
-
- /** Get the type corresponding to an id.
- * @param id type id
- * @return the type corresponding to the id
- * @exception IllegalArgumentException if the id does not correspond to a known type
- */
- public static ModelType getType(final int id) {
- for (ModelType type : values()) {
- if (type.id == id) {
- return type;
- }
- }
- throw new IllegalArgumentException();
- }
-
-}
diff --git a/aster/src/main/java/org/orekit/rugged/aster/RasterType.java b/aster/src/main/java/org/orekit/rugged/aster/RasterType.java
deleted file mode 100644
index 85968e38e57cdd90e4080214260f89f9c324438c..0000000000000000000000000000000000000000
--- a/aster/src/main/java/org/orekit/rugged/aster/RasterType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2013-2014 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * CS licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.orekit.rugged.aster;
-
-
-/** Enumerate for raster types.
- * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.1.2">GeoTIFF specification, section 6.3.1.2</a>
- * @author Luc Maisonobe
- */
-enum RasterType {
-
- // CHECKSTYLE: stop JavadocVariable check
- UNDEFINED(0),
- RASTER_PIXEL_IS_AREA(1),
- RASTER_PIXEL_IS_POINT(2);
- // CHECKSTYLE: resume JavadocVariable check
-
- /** Type ID. */
- private final int id;
-
- /** Simple constructor.
- * @param id key id
- */
- private RasterType(final int id) {
- this.id = id;
- }
-
- /** Get the type corresponding to an id.
- * @param id type id
- * @return the type corresponding to the id
- * @exception IllegalArgumentException if the id does not correspond to a known type
- */
- public static RasterType getType(final int id) {
- for (RasterType type : values()) {
- if (type.id == id) {
- return type;
- }
- }
- throw new IllegalArgumentException();
- }
-
-}
diff --git a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_de.utf8 b/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_de.utf8
deleted file mode 100644
index 5d90b6f8ea4e00cd41df5a678c4f370e6ad7f765..0000000000000000000000000000000000000000
--- a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_de.utf8
+++ /dev/null
@@ -1,23 +0,0 @@
-# no Digital Elevation Model data for point {0}, {1} (should be in file {2})
-NO_DEM_DATA_FOR_POINT = keine Angaben zum digitalen Höhenlinienmodell in Punkt {0}, {1} (sollte in Punkt zwei sein {2})
-
-# error parsing file {0}: {1}
-ERROR_PARSING_FILE = Parser-Fehler in der Datei {0}: {1}
-
-# missing pixel scale GeoTIFF tag in file {0}
-MISSING_PIXEL_SCALE = fehlender GEOTIFF Hinweis zum Maßstab für die Bildschirmpunkte (Pixle) für die Datei {0}
-
-# missing tie point GeoTIFF tag in file {0}
-MISSING_TIE_POINT = fehlender gemeinsamer Verbindungspunkt im Hinweis auf die GeoTIFF Datei {0}
-
-# unsupported GeoTIFF version {0}/{1}.{2} in file {3} (expected {4}/{5}.{6})
-UNSUPPORTED_GEOTIFF_VERSION = nicht unterstützte GeoTIFF Version {0}/{1}.{2} in Datei {3} (voraussichtlich {4}/{5}.{6})
-
-# unable to retrieve value for key {0} in file {1}
-UNABLE_TO_RETRIEVE_VALUE_FOR_KEY = außerstande die Größe des Schlüssels abzufragen {0} in Datei {1}
-
-# unexpected GeoTIFF key {0} in file {1}
-UNEXPECTED_GEOKEY = unerwarteter GeoTIFF Schlüssel {0} in Datei{1}
-
-# GeoTIFF key {0} in file {1} has unexpected value {2} (expected {3})
-UNEXPECTED_GEOKEY_VALUE = der GeoTIFF Schlüssel {0} in Datei {1} hat einen unerwarteten Wert {2} (erwarteter Wert {3})
diff --git a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_en.utf8 b/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_en.utf8
deleted file mode 100644
index e19c356af3e4c16adda05e2f48802ac9c86610a5..0000000000000000000000000000000000000000
--- a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_en.utf8
+++ /dev/null
@@ -1,23 +0,0 @@
-# no Digital Elevation Model data for point {0}, {1} (should be in file {2})
-NO_DEM_DATA_FOR_POINT = no Digital Elevation Model data for point {0}, {1} (should be in file {2})
-
-# error parsing file {0}: {1}
-ERROR_PARSING_FILE = error parsing file {0}: {1}
-
-# missing pixel scale GeoTIFF tag in file {0}
-MISSING_PIXEL_SCALE = missing pixel scale GeoTIFF tag in file {0}
-
-# missing tie point GeoTIFF tag in file {0}
-MISSING_TIE_POINT = missing tie point GeoTIFF tag in file {0}
-
-# unsupported GeoTIFF version {0}/{1}.{2} in file {3} (expected {4}/{5}.{6})
-UNSUPPORTED_GEOTIFF_VERSION = unsupported GeoTIFF version {0}/{1}.{2} in file {3} (expected {4}/{5}.{6})
-
-# unable to retrieve value for key {0} in file {1}
-UNABLE_TO_RETRIEVE_VALUE_FOR_KEY = unable to retrieve value for key {0} in file {1}
-
-# unexpected GeoTIFF key {0} in file {1}
-UNEXPECTED_GEOKEY = unexpected GeoTIFF key {0} in file {1}
-
-# GeoTIFF key {0} in file {1} has unexpected value {2} (expected {3})
-UNEXPECTED_GEOKEY_VALUE = GeoTIFF key {0} in file {1} has unexpected value {2} (expected {3})
diff --git a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_es.utf8 b/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_es.utf8
deleted file mode 100644
index 4cde0e84403424a1b59832e3ad9f5bb7c7cccad7..0000000000000000000000000000000000000000
--- a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_es.utf8
+++ /dev/null
@@ -1,23 +0,0 @@
-# no Digital Elevation Model data for point {0}, {1} (should be in file {2})
-NO_DEM_DATA_FOR_POINT = no existen datos de Modelo Digital del Terreno para los puntos {0}, {1} (deberÃan estar en el fichero {2})
-
-# error parsing file {0}: {1}
-ERROR_PARSING_FILE = error de lectura del fichero {0}: {1}
-
-# missing pixel scale GeoTIFF tag in file {0}
-MISSING_PIXEL_SCALE = falta la etiqueta GeoTIFF « pixel scale » en el fichero {0}
-
-# missing tie point GeoTIFF tag in file {0}
-MISSING_TIE_POINT = falta la etiqueta GeoTIFF « tie point » en el fichero {0}
-
-# unsupported GeoTIFF version {0}/{1}.{2} in file {3} (expected {4}/{5}.{6})
-UNSUPPORTED_GEOTIFF_VERSION = versión GeoTIFF {0}/{1}.{2} en el fichero {3} no reconocida (versión esperada {4}/{5}.{6})
-
-# unable to retrieve value for key {0} in file {1}
-UNABLE_TO_RETRIEVE_VALUE_FOR_KEY = no se puede recuperar el valor que corresponde a la clave {0} en el fichero {1}
-
-# unexpected GeoTIFF key {0} in file {1}
-UNEXPECTED_GEOKEY = no se reconoce la clave GeoTIFF {0} en el fichero {1}
-
-# GeoTIFF key {0} in file {1} has unexpected value {2} (expected {3})
-UNEXPECTED_GEOKEY_VALUE = no se reconoce el valor {2} correspondiente a la clave GeoTIFF {0} en el fichero {1} (valor esperado {3})
diff --git a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_fr.utf8 b/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_fr.utf8
deleted file mode 100644
index 7b7fea5a1f2d61086c2e1275ab6637874ad29031..0000000000000000000000000000000000000000
--- a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_fr.utf8
+++ /dev/null
@@ -1,23 +0,0 @@
-# no Digital Elevation Model data for point {0}, {1} (should be in file {2})
-NO_DEM_DATA_FOR_POINT = pas de données de Modèle Numérique de Terrain pour le point {0}, {1} (elles devraient être dans le fichier {2})
-
-# error parsing file {0}: {1}
-ERROR_PARSING_FILE = erreur lors de l''analyse du fichier {0} : {1}
-
-# missing pixel scale GeoTIFF tag in file {0}
-MISSING_PIXEL_SCALE = méta-donnée « pixel scale » GeoTIFF manquante dans le fichier {0}
-
-# missing tie point GeoTIFF tag in file {0}
-MISSING_TIE_POINT = méta-donnée « tie point » GeoTIFF manquante dans le fichier {0}
-
-# unsupported GeoTIFF version {0}/{1}.{2} in file {3} (expected {4}/{5}.{6})
-UNSUPPORTED_GEOTIFF_VERSION = version GeoTIFF {0}/{1}.{2} du fichier {3} non prise en compte (version attendue : {4}/{5}.{6})
-
-# unable to retrieve value for key {0} in file {1}
-UNABLE_TO_RETRIEVE_VALUE_FOR_KEY = impossible de récupérer la valeur pour le clef {0} dans le fichier {1}
-
-# unexpected GeoTIFF key {0} in file {1}
-UNEXPECTED_GEOKEY = clef GeoTIFF {0} inattendue dans le fichier {1}
-
-# GeoTIFF key {0} in file {1} has unexpected value {2} (expected {3})
-UNEXPECTED_GEOKEY_VALUE = la clef GeoTIFF {0} du fichier {1} a la valeur inattendue {2} (valeur attendue : {3})
diff --git a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_gl.utf8 b/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_gl.utf8
deleted file mode 100644
index 26b1ec7a3a6724b067ce7e764d2481b9cda8b3fc..0000000000000000000000000000000000000000
--- a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_gl.utf8
+++ /dev/null
@@ -1,23 +0,0 @@
-# no Digital Elevation Model data for point {0}, {1} (should be in file {2})
-NO_DEM_DATA_FOR_POINT = non existen datos de Modelo Digital do Terreo para os puntos {0}, {1} (deberÃan estar no ficheiro {2})
-
-# error parsing file {0}: {1}
-ERROR_PARSING_FILE = erro de lectura do ficheiro {0}: {1}
-
-# missing pixel scale GeoTIFF tag in file {0}
-MISSING_PIXEL_SCALE = falla a etiqueta GeoTIFF « pixel scale » no ficheiro {0}
-
-# missing tie point GeoTIFF tag in file {0}
-MISSING_TIE_POINT = falla a etiqueta GeoTIFF « tie point » no ficheiro {0}
-
-# unsupported GeoTIFF version {0}/{1}.{2} in file {3} (expected {4}/{5}.{6})
-UNSUPPORTED_GEOTIFF_VERSION = versión GeoTIFF {0}/{1}.{2} no ficheiro {3} non recoñecida (versión agardada {4}/{5}.{6})
-
-# unable to retrieve value for key {0} in file {1}
-UNABLE_TO_RETRIEVE_VALUE_FOR_KEY = non se pode recupera-lo valor que corresponde á clave {0} no ficheiro {1}
-
-# unexpected GeoTIFF key {0} in file {1}
-UNEXPECTED_GEOKEY = non se recoñece a clave GeoTIFF {0} no ficheiro {1}
-
-# GeoTIFF key {0} in file {1} has unexpected value {2} (expected {3})
-UNEXPECTED_GEOKEY_VALUE = non se recoñece o valor {2} correspondente á clave GeoTIFF {0} no ficheiro {1} (valor agardado {3})
diff --git a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_it.utf8 b/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_it.utf8
deleted file mode 100644
index 2f9e1703ad80bc3cdac406bede4113cb3c66220e..0000000000000000000000000000000000000000
--- a/aster/src/main/resources/assets/org/orekit/rugged/AsterMessages_it.utf8
+++ /dev/null
@@ -1,23 +0,0 @@
-# no Digital Elevation Model data for point {0}, {1} (should be in file {2})
-NO_DEM_DATA_FOR_POINT = nessun dato di Modello Digitale di Suolo per il punto {0}, {1} (i dati dovrebbero trovarsi ne file {2})
-
-# error parsing file {0}: {1}
-ERROR_PARSING_FILE = errore durante l''analisi del file {0} : {1}
-
-# missing pixel scale GeoTIFF tag in file {0}
-MISSING_PIXEL_SCALE = meta-dato « pixel scale » GeoTIFF mancante nel file {0}
-
-# missing tie point GeoTIFF tag in file {0}
-MISSING_TIE_POINT = meta-dato « tie point » GeoTIFF mancante nel file {0}
-
-# unsupported GeoTIFF version {0}/{1}.{2} in file {3} (expected {4}/{5}.{6})
-UNSUPPORTED_GEOTIFF_VERSION = versione GeoTIFF {0}/{1}.{2} del file {3} non supportata (versione attesa : {4}/{5}.{6})
-
-# unable to retrieve value for key {0} in file {1}
-UNABLE_TO_RETRIEVE_VALUE_FOR_KEY = impossibile recuperare il valore della chiave {0} nel file {1}
-
-# unexpected GeoTIFF key {0} in file {1}
-UNEXPECTED_GEOKEY = chiave GeoTIFF {0} inattesa nel file {1}
-
-# GeoTIFF key {0} in file {1} has unexpected value {2} (expected {3})
-UNEXPECTED_GEOKEY_VALUE = la chiave GeoTIFF {0} del file {1} ha il valore inatteso {2} (valore attesa : {3})
diff --git a/aster/src/test/java/org/orekit/rugged/aster/AsterMessagesTest.java b/aster/src/test/java/org/orekit/rugged/aster/AsterMessagesTest.java
deleted file mode 100644
index ec40a872449e4c044deb772bd9ddab6ba600c1b3..0000000000000000000000000000000000000000
--- a/aster/src/test/java/org/orekit/rugged/aster/AsterMessagesTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2002-2014 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * CS licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.orekit.rugged.aster;
-
-
-import java.text.MessageFormat;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class AsterMessagesTest {
-
- @Test
- public void testMessageNumber() {
- Assert.assertEquals(8, AsterMessages.values().length);
- }
-
- @Test
- public void testAllKeysPresentInPropertiesFiles() {
- for (final String language : new String[] { "de", "en", "es", "fr", "gl", "it" } ) {
- ResourceBundle bundle =
- ResourceBundle.getBundle("assets/org/orekit/rugged/AsterMessages",
- new Locale(language), new AsterMessages.UTF8Control());
- for (AsterMessages message : AsterMessages.values()) {
- final String messageKey = message.toString();
- boolean keyPresent = false;
- for (final Enumeration<String> keys = bundle.getKeys(); keys.hasMoreElements();) {
- keyPresent |= messageKey.equals(keys.nextElement());
- }
- Assert.assertTrue("missing key \"" + message.name() + "\" for language " + language,
- keyPresent);
- }
- Assert.assertEquals(language, bundle.getLocale().getLanguage());
- }
-
- }
-
- @Test
- public void testAllPropertiesCorrespondToKeys() {
- for (final String language : new String[] { "de", "en", "es", "fr", "gl", "it" } ) {
- ResourceBundle bundle =
- ResourceBundle.getBundle("assets/org/orekit/rugged/AsterMessages",
- new Locale(language), new AsterMessages.UTF8Control());
- for (final Enumeration<String> keys = bundle.getKeys(); keys.hasMoreElements();) {
- final String propertyKey = keys.nextElement();
- try {
- Assert.assertNotNull(AsterMessages.valueOf(propertyKey));
- } catch (IllegalArgumentException iae) {
- Assert.fail("unknown key \"" + propertyKey + "\" in language " + language);
- }
- }
- Assert.assertEquals(language, bundle.getLocale().getLanguage());
- }
-
- }
-
- @Test
- public void testNoMissingFrenchTranslation() {
- for (AsterMessages message : AsterMessages.values()) {
- String translated = message.getLocalizedString(Locale.FRENCH);
- Assert.assertFalse(message.name(), translated.toLowerCase().contains("missing translation"));
- }
- }
-
- @Test
- public void testNoOpEnglishTranslation() {
- for (AsterMessages message : AsterMessages.values()) {
- String translated = message.getLocalizedString(Locale.ENGLISH);
- Assert.assertEquals(message.getSourceString(), translated);
- }
- }
-
- @Test
- public void testVariablePartsConsistency() {
- for (final String language : new String[] { "de", "en", "es", "fr", "gl", "it" } ) {
- Locale locale = new Locale(language);
- for (AsterMessages message : AsterMessages.values()) {
- MessageFormat source = new MessageFormat(message.getSourceString());
- MessageFormat translated = new MessageFormat(message.getLocalizedString(locale));
- Assert.assertEquals(message.name() + " (" + language + ")",
- source.getFormatsByArgumentIndex().length,
- translated.getFormatsByArgumentIndex().length);
- }
- }
- }
-
-}
diff --git a/aster/src/test/java/org/orekit/rugged/aster/AsterTileUpdaterTest.java b/aster/src/test/java/org/orekit/rugged/aster/AsterTileUpdaterTest.java
deleted file mode 100644
index 18c6589cc71a51ca0e0b5e81c119d8c6925e4c41..0000000000000000000000000000000000000000
--- a/aster/src/test/java/org/orekit/rugged/aster/AsterTileUpdaterTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Copyright 2013-2014 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * CS licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.orekit.rugged.aster;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.math3.util.FastMath;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.raster.SimpleTile;
-import org.orekit.rugged.raster.SimpleTileFactory;
-import org.orekit.rugged.raster.TileFactory;
-
-
-public class AsterTileUpdaterTest {
-
- @Test
- public void testAster() throws RuggedException {
-
- File folder = warningFile.getParentFile();
- List<int[]> corners = getCorners(folder);
- if (corners.isEmpty()) {
- // no ASTER data available in the test resources
- // warn user, but don't allow the test to fail
- displayWarning();
- } else {
-
- TileFactory<SimpleTile> factory = new SimpleTileFactory();
- AsterTileUpdater updater = new AsterTileUpdater(folder);
- for (int[] corner : corners) {
-
- SimpleTile tile = factory.createTile();
- updater.updateTile(FastMath.toRadians(corner[0] + 0.2),
- FastMath.toRadians(corner[1] + 0.7),
- tile);
- tile.tileUpdateCompleted();
-
- Assert.assertEquals(corner[0] + 1.0 / 7200.0, FastMath.toDegrees(tile.getMinimumLatitude()), 1.0e-10);
- Assert.assertEquals(corner[1] - 1.0 / 7200.0, FastMath.toDegrees(tile.getMinimumLongitude()), 1.0e-10);
- Assert.assertEquals(1.0 / 3600.0, FastMath.toDegrees(tile.getLatitudeStep()), 1.0e-10);
- Assert.assertEquals(1.0 / 3600.0, FastMath.toDegrees(tile.getLongitudeStep()), 1.0e-10);
- Assert.assertTrue(tile.getMinElevation() < 9000.0);
- Assert.assertTrue(tile.getMaxElevation() > -1000.0);
-
- }
-
- }
-
- }
-
- @Before
- public void setUp() {
- try {
- String warningResource = "org/orekit/rugged/geotiff/ASTER-files-warning.txt";
- URL url = AsterTileUpdaterTest.class.getClassLoader().getResource(warningResource);
- File compiledWarningFile = new File(url.toURI().getPath());
-
- // the resource found above is in the "compiled" area of the build system,
- // however, we want to notify users they may put ASTER files in the "source" area
- // so we need to roll back the folders and find the sources.
- // under eclipse, the compiled area is typically in a "bin" folder below project
- // under maven, the compiled area of a multi-module component is in [component-name]/target/test-classes
- // so we need to perform the following transform on the compiled path:
- // replace /some/deep/path/to/project/[**]/org/orekit/rugged/geotiff/ASTER-files-warning.txt
- // with /some/deep/path/to/project/[aster/src/test/resources]/org/orekit/rugged/geotiff/ASTER-files-warning.txt
- File walking = compiledWarningFile;
- List<String> subs = new ArrayList<String>();
- for (int i = 0; i < 6; ++i) {
- subs.add(0, walking.getName());
- walking = walking.getParentFile();
- }
- subs.set(0, "resources");
- subs.add(0, "test");
- subs.add(0, "src");
- subs.add(0, "aster");
-
- while (walking.exists()) {
- File sourceWarningFile = walking;
- for (String sub : subs) {
- if (sourceWarningFile.exists()) {
- sourceWarningFile = new File(sourceWarningFile, sub);
- }
- }
- if (sourceWarningFile.exists()) {
- warningFile = sourceWarningFile;
- return;
- } else {
- walking = walking.getParentFile();
- }
- }
-
- // we didn't find the source file, use the "compiled" one
- warningFile = compiledWarningFile;
-
- } catch (URISyntaxException urise) {
- Assert.fail(urise.getLocalizedMessage());
- }
- }
-
- private List<int[]> getCorners(File folder) {
- Pattern patter = Pattern.compile("ASTGTM2_([NS]\\d\\d)([EW]\\d\\d\\d)\\.zip$");
- List<int[]> asterCorners = new ArrayList<int[]>();
- for (final File file : folder.listFiles()) {
- Matcher matcher = patter.matcher(file.getName());
- if (matcher.matches()) {
- int latCode = (matcher.group(1).startsWith("N") ? 1 : -1) * Integer.parseInt(matcher.group(1).substring(1));
- int lonCode = (matcher.group(2).startsWith("E") ? 1 : -1) * Integer.parseInt(matcher.group(2).substring(1));
- asterCorners.add(new int[] { latCode, lonCode });
- }
- }
- return asterCorners;
- }
-
- private void displayWarning() {
- try {
- System.err.println("###### " + warningFile.getAbsolutePath() + " ######");
- BufferedReader reader = new BufferedReader(new FileReader(warningFile));
- for (String line = reader.readLine(); line != null; line = reader.readLine()) {
- System.err.println(line);
- }
- reader.close();
- System.err.println("###### " + warningFile.getAbsolutePath() + " ######");
- } catch (IOException ioe) {
- Assert.fail(ioe.getLocalizedMessage());
- }
- }
-
- private File warningFile;
-
-}
diff --git a/aster/src/test/resources/org/orekit/rugged/geotiff/ASTER-files-warning.txt b/aster/src/test/resources/org/orekit/rugged/geotiff/ASTER-files-warning.txt
deleted file mode 100644
index f8081b050e0437785435fc83ccf760f2f9bfa038..0000000000000000000000000000000000000000
--- a/aster/src/test/resources/org/orekit/rugged/geotiff/ASTER-files-warning.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-For test purposes, some ASTER files should be put in the same folder as this file.
-
-ASTER stands for Advanced Spaceborne Thermal Emission and Reflection Radiometer
-and is a joint effort of the Ministry of Economy, Trade, and Industry (METI) of
-Japan and the United States National Aeronautics and Space Administration (NASA).
-More information on how to get the files is available here:
-
- http://asterweb.jpl.nasa.gov/gdem.asp
-
-The Rugged library cannot distribute such test files, so the distributed folder
-contains only this warning text file and no real ASTER files. If the folder still does
-not contain any ASTER files at tests run time, the content of this file is displayed
-as a warning but the tests won't fail.
-
-If users want to really perform tests, they have to retrieve ASTER files by themselves
-and copy them in the folder. Then the files will automatically been picked up and used
-for the tests. The files must have a name of the form ASTGTM2_v##h###.zip, where v
-stands for either N or S, h stands for either E or W and # stands for digits. The zip
-files themselves are used for the tests, users should not extract the _dem.tif files.
diff --git a/core/pom.xml b/core/pom.xml
deleted file mode 100644
index 0ba691d9c9fa2252b01e5b86bea2bcb6d0117758..0000000000000000000000000000000000000000
--- a/core/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.orekit</groupId>
- <artifactId>rugged-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>rugged-core</artifactId>
- <packaging>bundle</packaging>
- <name>Rugged Core Engine</name>
-
- <inceptionYear>2014</inceptionYear>
- <description>
- This module is the core engine for Rugged,
- an Orekit add-on handling Digital Elevation Models
- contribution to line of sight computation
- </description>
-
- <developers>
- <developer>
- <name>Luc Maisonobe</name>
- <id>luc</id>
- <roles>
- <role>architect</role>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Aude Espesset</name>
- </contributor>
- </contributors>
-
- <organization>
- <name>CS Systèmes d'Information</name>
- <url>http://www.c-s.fr/</url>
- </organization>
-
- <dependencies>
- <dependency>
- <groupId>org.orekit</groupId>
- <artifactId>orekit</artifactId>
- <version>7.0-SNAPSHOT</version>
- <type>jar</type>
- <optional>false</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <version>3.3</version>
- <type>jar</type>
- <optional>false</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <type>jar</type>
- <scope>test</scope>
- <optional>false</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${rugged.maven-bundle-plugin.version}</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.orekit.rugged.api.*;version=${project.version};-noimport:=true</Export-Package>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 276c69a1f1f636f6193018a5c61b0f2aa6fd18da..e8bc66d2fe711b60c52ff4cc86d70fe562f8dc06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.orekit</groupId>
- <artifactId>rugged-parent</artifactId>
+ <artifactId>rugged</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Rugged Parent</name>
+ <packaging>bundle</packaging>
+ <name>Rugged</name>
<inceptionYear>2014</inceptionYear>
<description>
@@ -21,7 +21,7 @@
<maven.compiler.target>1.6</maven.compiler.target>
<rugged.maven-compiler-plugin.version>3.2</rugged.maven-compiler-plugin.version>
<rugged.maven-jar-plugin.version>2.5</rugged.maven-jar-plugin.version>
- <rugged.maven-assembly-plugin.version>2.5.1</rugged.maven-assembly-plugin.version>
+ <rugged.maven-assembly-plugin.version>2.5.2</rugged.maven-assembly-plugin.version>
<rugged.maven-bundle-plugin.version>2.5.3</rugged.maven-bundle-plugin.version>
<rugged.maven-resources-plugin.version>2.7</rugged.maven-resources-plugin.version>
<rugged.maven-clean-plugin.version>2.6.1</rugged.maven-clean-plugin.version>
@@ -115,11 +115,6 @@
</mailingList>
</mailingLists>
- <modules>
- <module>core</module>
- <module>aster</module>
- </modules>
-
<distributionManagement>
<site>
<id>rugged.website</id>
@@ -128,8 +123,32 @@
</site>
</distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.orekit</groupId>
+ <artifactId>orekit</artifactId>
+ <version>7.0-SNAPSHOT</version>
+ <type>jar</type>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.3</version>
+ <type>jar</type>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <type>jar</type>
+ <scope>test</scope>
+ <optional>false</optional>
+ </dependency>
+ </dependencies>
+
<build>
- <pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -155,8 +174,8 @@
<version>${rugged.maven-assembly-plugin.version}</version>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/source-assembly.xml</descriptor>
- <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
+ <descriptor>src/assembly/source-assembly.xml</descriptor>
+ <descriptor>src/assembly/binary-assembly.xml</descriptor>
</descriptors>
</configuration>
<executions>
@@ -184,9 +203,6 @@
<artifactId>maven-site-plugin</artifactId>
<version>${rugged.maven-site-plugin.version}</version>
</plugin>
- </plugins>
- </pluginManagement>
- <plugins>
<plugin>
<groupId>com.github.jeluard</groupId>
<artifactId>maven-plantuml-plugin</artifactId>
@@ -220,6 +236,27 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${rugged.maven-bundle-plugin.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.orekit.rugged.api.*;version=${project.version};-noimport:=true</Export-Package>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -242,7 +279,7 @@
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
- <excludeFilterFile>${project.parent.basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
+ <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin>
@@ -263,9 +300,9 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${rugged.maven-checkstyle-plugin.version}</version>
<configuration>
- <configLocation>${project.parent.basedir}/checkstyle.xml</configLocation>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
- <headerLocation>${project.parent.basedir}/license-header.txt</headerLocation>
+ <headerLocation>${basedir}/license-header.txt</headerLocation>
</configuration>
<reportSets>
<reportSet>
diff --git a/src/main/assembly/binary-assembly.xml b/src/assembly/binary-assembly.xml
similarity index 53%
rename from src/main/assembly/binary-assembly.xml
rename to src/assembly/binary-assembly.xml
index 64f01be1c54a9327877d050c61aba6f8b3c2699f..63fddd2fb5e6a617a41dccff83dee0ae6f3acecd 100644
--- a/src/main/assembly/binary-assembly.xml
+++ b/src/assembly/binary-assembly.xml
@@ -6,15 +6,7 @@
<format>zip</format>
</formats>
<componentDescriptors>
- <componentDescriptor>src/main/assembly/misc-files.xml</componentDescriptor>
- <componentDescriptor>src/main/assembly/jar-files.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/misc-files.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/jar-files.xml</componentDescriptor>
</componentDescriptors>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.orekit:rugged-aster</include>
- <include>org.orekit:rugged-core</include>
- </includes>
- </moduleSet>
- </moduleSets>
</assembly>
\ No newline at end of file
diff --git a/src/main/assembly/building-files.xml b/src/assembly/building-files.xml
similarity index 100%
rename from src/main/assembly/building-files.xml
rename to src/assembly/building-files.xml
diff --git a/src/main/assembly/jar-files.xml b/src/assembly/jar-files.xml
similarity index 100%
rename from src/main/assembly/jar-files.xml
rename to src/assembly/jar-files.xml
diff --git a/src/main/assembly/misc-files.xml b/src/assembly/misc-files.xml
similarity index 100%
rename from src/main/assembly/misc-files.xml
rename to src/assembly/misc-files.xml
diff --git a/src/main/assembly/source-assembly.xml b/src/assembly/source-assembly.xml
similarity index 53%
rename from src/main/assembly/source-assembly.xml
rename to src/assembly/source-assembly.xml
index bb6574c4900865452ead604d2dadc99261e4420a..d9dc87506055635b9e719196dbf7780004749139 100644
--- a/src/main/assembly/source-assembly.xml
+++ b/src/assembly/source-assembly.xml
@@ -6,15 +6,7 @@
<format>zip</format>
</formats>
<componentDescriptors>
- <componentDescriptor>src/main/assembly/misc-files.xml</componentDescriptor>
- <componentDescriptor>src/main/assembly/building-files.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/misc-files.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/building-files.xml</componentDescriptor>
</componentDescriptors>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.orekit:rugged-aster</include>
- <include>org.orekit:rugged-core</include>
- </includes>
- </moduleSet>
- </moduleSets>
</assembly>
\ No newline at end of file
diff --git a/core/src/main/java/org/orekit/rugged/api/AlgorithmId.java b/src/main/java/org/orekit/rugged/api/AlgorithmId.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/AlgorithmId.java
rename to src/main/java/org/orekit/rugged/api/AlgorithmId.java
diff --git a/core/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java b/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java
rename to src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java
diff --git a/core/src/main/java/org/orekit/rugged/api/EllipsoidId.java b/src/main/java/org/orekit/rugged/api/EllipsoidId.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/EllipsoidId.java
rename to src/main/java/org/orekit/rugged/api/EllipsoidId.java
diff --git a/core/src/main/java/org/orekit/rugged/api/FixedLOS.java b/src/main/java/org/orekit/rugged/api/FixedLOS.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/FixedLOS.java
rename to src/main/java/org/orekit/rugged/api/FixedLOS.java
diff --git a/core/src/main/java/org/orekit/rugged/api/InertialFrameId.java b/src/main/java/org/orekit/rugged/api/InertialFrameId.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/InertialFrameId.java
rename to src/main/java/org/orekit/rugged/api/InertialFrameId.java
diff --git a/core/src/main/java/org/orekit/rugged/api/LineDatation.java b/src/main/java/org/orekit/rugged/api/LineDatation.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/LineDatation.java
rename to src/main/java/org/orekit/rugged/api/LineDatation.java
diff --git a/core/src/main/java/org/orekit/rugged/api/LineSensor.java b/src/main/java/org/orekit/rugged/api/LineSensor.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/LineSensor.java
rename to src/main/java/org/orekit/rugged/api/LineSensor.java
diff --git a/core/src/main/java/org/orekit/rugged/api/LinearLineDatation.java b/src/main/java/org/orekit/rugged/api/LinearLineDatation.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/LinearLineDatation.java
rename to src/main/java/org/orekit/rugged/api/LinearLineDatation.java
diff --git a/core/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/Rugged.java
rename to src/main/java/org/orekit/rugged/api/Rugged.java
diff --git a/core/src/main/java/org/orekit/rugged/api/RuggedException.java b/src/main/java/org/orekit/rugged/api/RuggedException.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/RuggedException.java
rename to src/main/java/org/orekit/rugged/api/RuggedException.java
diff --git a/core/src/main/java/org/orekit/rugged/api/RuggedMessages.java b/src/main/java/org/orekit/rugged/api/RuggedMessages.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/RuggedMessages.java
rename to src/main/java/org/orekit/rugged/api/RuggedMessages.java
diff --git a/core/src/main/java/org/orekit/rugged/api/SensorMeanPlaneCrossing.java b/src/main/java/org/orekit/rugged/api/SensorMeanPlaneCrossing.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/SensorMeanPlaneCrossing.java
rename to src/main/java/org/orekit/rugged/api/SensorMeanPlaneCrossing.java
diff --git a/core/src/main/java/org/orekit/rugged/api/SensorPixel.java b/src/main/java/org/orekit/rugged/api/SensorPixel.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/SensorPixel.java
rename to src/main/java/org/orekit/rugged/api/SensorPixel.java
diff --git a/core/src/main/java/org/orekit/rugged/api/SensorPixelCrossing.java b/src/main/java/org/orekit/rugged/api/SensorPixelCrossing.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/SensorPixelCrossing.java
rename to src/main/java/org/orekit/rugged/api/SensorPixelCrossing.java
diff --git a/core/src/main/java/org/orekit/rugged/api/TimeDependentLOS.java b/src/main/java/org/orekit/rugged/api/TimeDependentLOS.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/api/TimeDependentLOS.java
rename to src/main/java/org/orekit/rugged/api/TimeDependentLOS.java
diff --git a/core/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
rename to src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
diff --git a/core/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
rename to src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
diff --git a/core/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
rename to src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
diff --git a/core/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
rename to src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
diff --git a/core/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
rename to src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
diff --git a/core/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
rename to src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
diff --git a/core/src/main/java/org/orekit/rugged/raster/SimpleTile.java b/src/main/java/org/orekit/rugged/raster/SimpleTile.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/raster/SimpleTile.java
rename to src/main/java/org/orekit/rugged/raster/SimpleTile.java
diff --git a/core/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java b/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
rename to src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
diff --git a/core/src/main/java/org/orekit/rugged/raster/Tile.java b/src/main/java/org/orekit/rugged/raster/Tile.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/raster/Tile.java
rename to src/main/java/org/orekit/rugged/raster/Tile.java
diff --git a/core/src/main/java/org/orekit/rugged/raster/TileFactory.java b/src/main/java/org/orekit/rugged/raster/TileFactory.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/raster/TileFactory.java
rename to src/main/java/org/orekit/rugged/raster/TileFactory.java
diff --git a/core/src/main/java/org/orekit/rugged/raster/TileUpdater.java b/src/main/java/org/orekit/rugged/raster/TileUpdater.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/raster/TileUpdater.java
rename to src/main/java/org/orekit/rugged/raster/TileUpdater.java
diff --git a/core/src/main/java/org/orekit/rugged/raster/TilesCache.java b/src/main/java/org/orekit/rugged/raster/TilesCache.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/raster/TilesCache.java
rename to src/main/java/org/orekit/rugged/raster/TilesCache.java
diff --git a/core/src/main/java/org/orekit/rugged/raster/UpdatableTile.java b/src/main/java/org/orekit/rugged/raster/UpdatableTile.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/raster/UpdatableTile.java
rename to src/main/java/org/orekit/rugged/raster/UpdatableTile.java
diff --git a/core/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java b/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
rename to src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
diff --git a/core/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java b/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java
rename to src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java
diff --git a/core/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java b/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
similarity index 100%
rename from core/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
rename to src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
diff --git a/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8
similarity index 100%
rename from core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8
rename to src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8
diff --git a/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
similarity index 100%
rename from core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
rename to src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
diff --git a/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8
similarity index 100%
rename from core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8
rename to src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8
diff --git a/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
similarity index 100%
rename from core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
rename to src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
diff --git a/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8
similarity index 100%
rename from core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8
rename to src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8
diff --git a/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8
similarity index 100%
rename from core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8
rename to src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8
diff --git a/src/site/markdown/building.md b/src/site/markdown/building.md
index 596e746b77058f45d6c69546348dd5e732b382f3..7374d36231c41c7c38c8fbbcb0082861e53f8594 100644
--- a/src/site/markdown/building.md
+++ b/src/site/markdown/building.md
@@ -38,12 +38,13 @@ installation procedure.
As with all maven enabled projects, building Rugged is straightforward, simply
run:
- mvn assembly:single
+ mvn package
The preceding command will perform all dependencies retrieval, compilation,
-tests and packaging for you. At the end, it will create several files named
-{module}/target/rugged-{module}-x.y.jar where {module} is the module name (aster,
-core, ...) and x.y is the version number.
+tests and packaging for you. At the end, it will create several files in
+the target directory, including one file named rugged-x.y.jar where x.y is
+the version number. This is the jar file you can use in your project using
+Rugged.
If you need to configure a proxy server for dependencies retrieval, see
the [Guide to using proxies](http://maven.apache.org/guides/mini/guide-proxies.html)
@@ -78,14 +79,10 @@ The simplest way to use Rugged with Eclipse is to follow these steps:
directory where you unpacked Rugged
* set the source folders to
- * core/src/main/java
- * aster/src/main/java
- * core/src/test/java
- * aster/src/test/java
- * core/src/main/resources
- * aster/src/main/resources
- * core/src/test/resources
- * aster/src/test/resources
+ * src/main/java
+ * src/test/java
+ * src/main/resources
+ * src/test/resources
in the source tab of the Configure Build Path dialog
diff --git a/src/site/markdown/downloads.md b/src/site/markdown/downloads.md
index d77d70776a949decee6201616d8928ff925b4b79..3526b4650456afacc82616c9ce5328be6fd2f07a 100644
--- a/src/site/markdown/downloads.md
+++ b/src/site/markdown/downloads.md
@@ -40,6 +40,6 @@ ones since the other packages (binary jars, javadoc jars and even the bulk
of this site) are created from these sources.
Rugged is also available in maven central repository,
-with groupID org.orekit and artifactId rugged-core, rugged-aster, ... so maven
+with groupID org.orekit and artifactId rugged so maven
internal mechanism will download automatically all artifacts and dependencies
as required.
diff --git a/core/src/test/java/org/orekit/rugged/api/RuggedMessagesTest.java b/src/test/java/org/orekit/rugged/api/RuggedMessagesTest.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/api/RuggedMessagesTest.java
rename to src/test/java/org/orekit/rugged/api/RuggedMessagesTest.java
diff --git a/core/src/test/java/org/orekit/rugged/api/RuggedTest.java b/src/test/java/org/orekit/rugged/api/RuggedTest.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/api/RuggedTest.java
rename to src/test/java/org/orekit/rugged/api/RuggedTest.java
diff --git a/core/src/test/java/org/orekit/rugged/api/SensorMeanPlaneCrossingTest.java b/src/test/java/org/orekit/rugged/api/SensorMeanPlaneCrossingTest.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/api/SensorMeanPlaneCrossingTest.java
rename to src/test/java/org/orekit/rugged/api/SensorMeanPlaneCrossingTest.java
diff --git a/core/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
rename to src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
diff --git a/core/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
rename to src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
diff --git a/core/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
rename to src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
diff --git a/core/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java b/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
rename to src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
diff --git a/core/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
rename to src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
diff --git a/core/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
rename to src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
diff --git a/core/src/test/java/org/orekit/rugged/raster/CountingFactory.java b/src/test/java/org/orekit/rugged/raster/CountingFactory.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/raster/CountingFactory.java
rename to src/test/java/org/orekit/rugged/raster/CountingFactory.java
diff --git a/core/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java b/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
rename to src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
diff --git a/core/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java b/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
rename to src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
diff --git a/core/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java b/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
rename to src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
diff --git a/core/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
rename to src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
diff --git a/core/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java b/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
similarity index 100%
rename from core/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
rename to src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
diff --git a/core/src/test/resources/orekit-data/UTC-TAI.history b/src/test/resources/orekit-data/UTC-TAI.history
similarity index 100%
rename from core/src/test/resources/orekit-data/UTC-TAI.history
rename to src/test/resources/orekit-data/UTC-TAI.history
diff --git a/core/src/test/resources/orekit-data/eigen-6s-truncated.gfc b/src/test/resources/orekit-data/eigen-6s-truncated.gfc
similarity index 100%
rename from core/src/test/resources/orekit-data/eigen-6s-truncated.gfc
rename to src/test/resources/orekit-data/eigen-6s-truncated.gfc
diff --git a/core/src/test/resources/orekit-data/eopc04_08.12 b/src/test/resources/orekit-data/eopc04_08.12
similarity index 100%
rename from core/src/test/resources/orekit-data/eopc04_08.12
rename to src/test/resources/orekit-data/eopc04_08.12
diff --git a/core/src/test/resources/orekit-data/eopc04_08_IAU2000.12 b/src/test/resources/orekit-data/eopc04_08_IAU2000.12
similarity index 100%
rename from core/src/test/resources/orekit-data/eopc04_08_IAU2000.12
rename to src/test/resources/orekit-data/eopc04_08_IAU2000.12
diff --git a/core/src/test/resources/orekit-data/unxp2012.406 b/src/test/resources/orekit-data/unxp2012.406
similarity index 100%
rename from core/src/test/resources/orekit-data/unxp2012.406
rename to src/test/resources/orekit-data/unxp2012.406