diff --git a/.CI/README b/.CI/README
new file mode 100644
index 0000000000000000000000000000000000000000..457c6ee3ebf080e149a211a73db41acbc55f2af4
--- /dev/null
+++ b/.CI/README
@@ -0,0 +1 @@
+A directory for Continuous Integration tooling.
\ No newline at end of file
diff --git a/.CI/maven-settings.xml b/.CI/maven-settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..09b19e135b63526013b65a2cb697ace4d5033c93
--- /dev/null
+++ b/.CI/maven-settings.xml
@@ -0,0 +1,63 @@
+<settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xsi:schemalocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <mirrors>
+ <!-- mirror
+ | Specifies a repository mirror site to use instead of a given repository. The repository that
+ | this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
+ | for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
+ |
+ <mirror>
+ <id>mirrorId</id>
+ <mirrorOf>repositoryId</mirrorOf>
+ <name>Human Readable Name for this Mirror.</name>
+ <url>http://my.repository.com/repo/path</url>
+ </mirror>
+ -->
+ <mirror>
+ <id>Nexus-Rugged</id>
+ <name>Maven Repository Manager</name>
+ <!-- Share the same Nexus repository as Orekit -->
+ <url>https://packages.orekit.org/repository/maven-public/</url>
+ <mirrorOf>*</mirrorOf>
+ </mirror>
+ </mirrors>
+ <servers>
+ <server>
+ <id>ci-releases</id>
+ <username>${env.NEXUS_USERNAME}</username>
+ <password>${env.NEXUS_PASSWORD}</password>
+ </server>
+ <server>
+ <id>ci-snapshots</id>
+ <username>${env.NEXUS_USERNAME}</username>
+ <password>${env.NEXUS_PASSWORD}</password>
+ </server>
+ <server>
+ <id>website</id>
+ <privateKey>${user.home}/.ssh/id_website</privateKey>
+ </server>
+ </servers>
+ <profiles>
+ <profile>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>Nexus-Rugged</id>
+ <name>Nexus Public Repository</name>
+ <!-- Share the same Nexus repository as Orekit -->
+ <url>https://packages.orekit.org/repository/maven-public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+</settings>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c7c79b498e2e7812da283ad2976ae3201f95c75f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,78 @@
+stages:
+- verify
+- deploy
+
+default:
+ # Default image
+ image: registry.orekit.org/orekit/ci-utils/maven:3.3.9-jdk-8
+ # Cache downloaded dependencies and plugins between builds.
+ # To keep cache across branches add 'key: "$CI_JOB_REF_NAME"'
+ cache:
+ paths:
+ - .m2/repository
+
+variables:
+ # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
+ # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
+ MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+ # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
+ # when running from the command line.
+ # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
+ MAVEN_CLI_OPTS: "-s .CI/maven-settings.xml --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
+
+verify:
+ stage: verify
+ script:
+ - mvn $MAVEN_CLI_OPTS verify site
+ - mvn $MAVEN_CLI_OPTS sonar:sonar -Dsonar.login=${SONAR_TOKEN} -Dsonar.branch.name=${CI_COMMIT_REF_NAME}
+ artifacts:
+ paths:
+ - target/*.jar
+ - target/site
+ reports:
+ junit:
+ - target/surefire-reports/*.xml
+
+# On main branches (develop, release-*, master)
+# the produced artifacts are deployed on the Nexus of the project
+# (https://packages.orekit.org/)
+deploy:artifacts:
+ stage: deploy
+ script:
+ - mvn $MAVEN_CLI_OPTS javadoc:jar source:jar deploy -DskipTests=true -Pci-deploy
+ artifacts:
+ paths:
+ - target/*.jar
+ only:
+ - develop@orekit/rugged
+ - /^release-[.0-9]+$/@orekit/rugged
+ - master@orekit/rugged
+
+
+deploy:site:
+ stage: deploy
+ before_script:
+ ##
+ ## Create the SSH directory and give it the right permissions
+ ##
+ - mkdir -p ~/.ssh
+ - chmod 700 ~/.ssh
+
+ ##
+ ## We're using tr to fix line endings which makes ed25519 keys work
+ ## without extra base64 encoding.
+ ## https://gitlab.com/gitlab-examples/ssh-private-key/issues/1#note_48526556
+ ##
+ - echo "$SSH_SECRET_KEY" > ~/.ssh/id_website
+ - chmod 700 ~/.ssh/id_website
+
+ ##
+ ## Add known hosts
+ ##
+ - cp $SSH_KNOWN_HOSTS ~/.ssh/known_hosts
+ script:
+ - mvn $MAVEN_CLI_OPTS site:deploy
+ only:
+ - master@orekit/rugged
+ - /^release-[.0-9]+$/@orekit/rugged
+ - develop@orekit/rugged
diff --git a/BUILDING.txt b/BUILDING.txt
deleted file mode 100644
index cfd8dbbc2df1c1974aedefbcf96cc27bc9b15115..0000000000000000000000000000000000000000
--- a/BUILDING.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Rugged can be built from source either using maven 3 or eclipse.
-
-Building with Maven 3:
- - Maven 3 can be downloaded here:
- http://maven.apache.org/download.html
- - If you are behind a proxy (which is a traditional
- setting in a corporate environment), then you need
- to configure maven to use it. This is explained
- in the maven documentation here:
- http://maven.apache.org/guides/mini/guide-proxies.html
- - run "mvn package" to automatically download all
- the required dependencies listed in the pom.xml file
- and create a file named target/rugged-x.y.jar where
- x.y is the version number
-
-Building with Eclipse:
- - Eclipse can be downloaded here:
- http://www.eclipse.org/downloads/
- - using your operating system tools, unpack the source distribution directly
- inside your Eclipse workspace
- - using Eclipse, import the project by selecting in the top level "File" menu
- the entry "Import..."
- - in the wizard that should appear, select "Maven -> Existing Maven Projects"
- - select the folder you just created in your workspace by unpacking the
- source distribution. The "pom.xml" file describing the project will be
- automatically selected. Click finish
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 9f68828414b5c24d339f76984d255219eb84a274..0000000000000000000000000000000000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,48 +0,0 @@
-pipeline {
-
- agent any
- tools {
- maven 'mvn-default'
- jdk 'openjdk-8'
- }
-
- options {
- timeout(time: 60, unit: 'MINUTES')
- }
-
- stages {
-
- stage('Cleaning') {
- steps {
- sh 'git clean -fdx'
- }
- }
-
- stage('Build') {
- steps {
- script {
- if ( env.BRANCH_NAME ==~ /^release-[.0-9]+$/ ) {
- sh 'mvn verify assembly:single'
- }
- else {
- sh 'mvn verify site'
- }
- }
- }
- }
- }
-
- post {
- always {
- archiveArtifacts artifacts: 'target/*.jar', fingerprint: true
- script {
- if ( env.BRANCH_NAME ==~ /^release-[.0-9]+$/ ) {
- archiveArtifacts artifacts: 'target/*.zip', fingerprint: true
- }
- }
- checkstyle pattern: 'target/checkstyle-result.xml'
- junit 'target/surefire-reports/*.xml'
- jacoco execPattern:'target/**.exec', classPattern: '**/classes', sourcePattern: '**/src/main/java'
- }
- }
-}
diff --git a/NOTICE.txt b/NOTICE.txt
index 3ab722542a0cd55c15513e6214857f13aa43a63d..53b85ab7c8f25160bdfb01a716e6cbf786ba2395 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,11 +1,11 @@
RUGGED
-Copyright 2013-2019 CS Systèmes d'Information
+Copyright 2013-2022 CS GROUP
This product includes software developed by
-CS Systèmes d'Information (http://www.c-s.fr/)
+CS GROUP (https://www.csgroup.eu/)
This product depends on software developed by
The Apache Software Foundation (http://www.apache.org/)
This product depends on software developed by
-The Hipparchus project (https://hipparchus.org/)
\ No newline at end of file
+The Hipparchus project (https://hipparchus.org/)
diff --git a/README.txt b/README.txt
deleted file mode 100644
index ee17ceee9840f70799c9ed3c038bb052543b02c2..0000000000000000000000000000000000000000
--- a/README.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Rugged, a sensor-to-terrain mapping tool, is a free java library
-for geolocation and used for satellite imagery.
-
-It is licensed by CS Systèmes d'Information under the
-Apache License Version 2.0. A copy of this license is
-provided in the LICENSE.txt file.
-
-The BUILDING.txt file explains how the library can be built from sources.
-
-The src/main/java directory contains the library sources.
-The src/main/resources directory contains the library data.
-The src/test/java directory contains the tests sources.
-The src/test/resources directory contains the tests data.
-The src/tutorials/java directory contains sources for example use of the library.
-The src/design directory contains pieces for a UML model of the library.
-
-Rugged relies on the following free software, all released under
-business friendly free licenses.
-
-compile-time/run-time dependency:
-
- - Orekit from CS Systèmes d'Information
- https://www.orekit.org/
- released under the Apache Software License, version 2
-
- - Hipparchus from the Hipparchus project
- https://hipparchus.org/
- released under the Apache Software License, version 2
-
-test-time dependency:
-
- - JUnit 4 from Erich Gamma and Kent Beck
- http://www.junit.org/
- released under the Common Public License Version 1.0
diff --git a/Readme.md b/Readme.md
index 1b2d046f39ba3f5c671abc6d42edd15d020d1b14..d6a21bcc2ea2c7a2e28bd67cf6992be633ba7611 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,29 +1,12 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
- Licensed 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.
--->
-
-<h1 style="color:blue;" align="center">
- Rugged
-</h1>
-<h1>
- <img src="src/site/resources/images/rugged-logo.png" alt="Rugged"/>
- A sensor-to-terrain mapping tool
-</h1>
-
-<h4 align="center">Rugged is a free java library for geolocation and used for satellite imagery.</h4>
-
-Rugged is an add-on for [Orekit](https://www.orekit.org/ "Orekit homepage") handling Digital Elevation Models contribution to
-line of sight computation. It is a free software intermediate-level library written in Java.
+
+
+# Rugged
+
+> A sensor-to-terrain mapping tool
+
+[Rugged](https://www.orekit.org/rugged/ "Rugged homepage") is a free java library for geolocation and used for satellite imagery.
+
+Rugged is an add-on for [Orekit](https://www.orekit.org/ "Orekit homepage") handling Digital Elevation Models contribution to line of sight computation. It is a free software intermediate-level library written in Java.
It mainly provides direct and inverse location, i.e. it allows to compute accurately
which ground point is looked at from a specific pixel in a spacecraft instrument,
@@ -38,4 +21,79 @@ ground and sensor is computed with a viewing model taking into account:
Direct and inverse location can be used to perform full ortho-rectification of
images and correlation between sensors observing the same area.
-Homepage: [www.orekit.org/rugged/](https://www.orekit.org/rugged/ "Rugged homepage")
+
+[](http://www.apache.org/licenses/LICENSE-2.0.html)
+[](https://sonar.orekit.org/dashboard?id=org.orekit%3Arugged)
+[](https://sonar.orekit.org/component_measures?id=org.orekit%3Arugged&metric=coverage&view=treemap)
+
+## Download
+
+### Official releases
+
+[Official Rugged releases](https://gitlab.orekit.org/orekit/rugged/-/releases)
+are available on our [Gitlab instance](https://gitlab.orekit.org/orekit/rugged). They are
+also available in the
+[Maven repository](https://mvnrepository.com/artifact/org.orekit/rugged).
+
+### Development version
+
+To get the latest development version, please clone our official repository
+and checkout the `develop` branch:
+
+```bash
+git clone -b develop https://gitlab.orekit.org/orekit/rugged.git
+```
+__Note:__ Our official repository is
+[mirrored on Github](https://github.com/CS-SI/Rugged).
+
+## Documentation
+
+Project overview, architecture and development, detailed features list,
+Javadoc and a lot of other information is available on the
+[Maven site](https://www.orekit.org/site-rugged-development/).
+
+## Getting help
+
+The main communication channel is our [forum](https://forum.orekit.org/). You
+can report bugs and suggest new features in our
+[issues tracking system](https://gitlab.orekit.org/orekit/rugged/-/issues). When
+reporting security issues check the "This issue is confidential" box.
+
+## Contributing
+
+Please take a look at our
+[contributing guidelines](https://www.orekit.org/site-rugged-latest/contributing.html) if you're
+interested in helping!
+
+## Building
+
+Detailed information on how to build Rugged from source either using Maven or
+Eclipse is provided in [building](https://www.orekit.org/site-rugged-latest/building.html) explanations.
+
+## Dependencies
+
+Rugged relies on the following
+[FOSS](https://en.wikipedia.org/wiki/Free_and_open-source_software) libraries,
+all released under business friendly FOSS licenses.
+
+### Compile-time/run-time dependencies
+
+* [Orekit](https://www.orekit.org/), a low level space dynamics library released under
+ the Apache License, version 2.0.
+
+* [Hipparchus](https://hipparchus.org/), a mathematics library released under
+ the Apache License, version 2.0.
+
+### Test-time dependencies
+
+* [JUnit 4](http://www.junit.org/), a widely used unit test framework released
+ under the Eclipse Public License, version 1.0.
+
+More detailed information is available in the
+[Maven site](https://www.orekit.org/site-rugged-development/dependencies.html).
+
+## License
+
+Rugged is licensed by [CS GROUP](https://www.csgroup.eu/) under
+the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
+A copy of this license is provided in the [LICENSE.txt](LICENSE.txt) file.
diff --git a/checkstyle.xml b/checkstyle.xml
index 7fc65ee528ab744db95b38dbad022ac812bc301b..b39d4a9c1f828ade0fc4a4b95be45f03939cd29f 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC
+ "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+ "https://checkstyle.org/dtds/configuration_1_3.dtd">
<module name="Checker">
<module name="TreeWalker">
@@ -34,8 +35,6 @@
<property name="caseIndent" value="4"/>
</module>
<module name="JavadocMethod">
- <property name="allowUndeclaredRTE" value="true"/>
- <property name="allowMissingPropertyJavadoc" value="true"/>
<property name="validateThrows" value="false"/>
</module>
<module name="JavadocStyle"/>
@@ -43,10 +42,14 @@
<module name="MissingSwitchDefault"/>
<module name="ModifierOrder"/>
<module name="MultipleStringLiterals">
- <property name="ignoreStringsRegexp" value='^(("")|("."))$'/>
+ <property name="ignoreStringsRegexp" value='^(("")|(".")|("\\\\"))$'/>
</module>
<module name="MultipleVariableDeclarations"/>
- <module name="NoWhitespaceAfter"/>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens"
+ value="AT, INC, DEC, UNARY_MINUS, UNARY_PLUS, BNOT, LNOT, DOT,
+ ARRAY_DECLARATOR, INDEX_OP"/>
+ </module>
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap">
<property name="option" value="eol"/>
@@ -57,12 +60,13 @@
<property name="severity" value="warning"/>
</module>
<module name="UnnecessaryParentheses"/>
+ <module name="NeedBraces"/>
<module name="UnusedImports"/>
<module name="VisibilityModifier"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround">
<property name="tokens"
- value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN,
+ value="ASSIGN, ARRAY_INIT, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN,
BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT,
LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
@@ -96,15 +100,13 @@
<property name="onCommentFormat" value="CHECKSTYLE\: resume MultipleStringLiterals check"/>
<property name="checkFormat" value="MultipleStringLiteralsCheck"/>
</module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE\: stop UnnecessaryParentheses check"/>
- <property name="onCommentFormat" value="CHECKSTYLE\: resume UnnecessaryParentheses check"/>
- <property name="checkFormat" value="UnnecessaryParentheses"/>
- </module>
</module>
<module name="RegexpHeader">
<property name="headerFile" value="${checkstyle.header.file}" />
+ <property name="fileExtensions" value="java" />
</module>
<module name="FileTabCharacter"/>
- <module name="NewlineAtEndOfFile"/>
+ <module name="NewlineAtEndOfFile">
+ <property name="lineSeparator" value="LF_CR_CRLF"/>
+ </module>
</module>
diff --git a/pom.xml b/pom.xml
index 3c2cb5c37314d091324b859a65a14d44bfba6f5f..86218cea3464617fff6c46ed1eab6dff503b5b18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.orekit</groupId>
<artifactId>rugged</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Rugged</name>
<url>https://www.orekit.org/rugged</url>
@@ -19,42 +19,45 @@
<!-- COTS version -->
- <rugged.orekit.version>9.3</rugged.orekit.version>
- <rugged.hipparchus.version>1.4</rugged.hipparchus.version>
- <rugged.junit.version>4.12</rugged.junit.version>
+ <rugged.orekit.version>11.3.2</rugged.orekit.version>
+ <rugged.junit.version>4.13.2</rugged.junit.version>
<!-- Compilers and Tools version -->
<rugged.compiler.source>1.8</rugged.compiler.source>
<rugged.compiler.target>1.8</rugged.compiler.target>
<rugged.implementation.build>${git.revision}; ${maven.build.timestamp}</rugged.implementation.build>
+ <!-- sonar related properties -->
+ <sonar.host.url>https://sonar.orekit.org/</sonar.host.url>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <rugged.spotbugs-maven-plugin.version>3.1.7</rugged.spotbugs-maven-plugin.version>
- <rugged.jacoco-maven-plugin.version>0.8.2</rugged.jacoco-maven-plugin.version>
- <rugged.maven-assembly-plugin.version>3.1.0</rugged.maven-assembly-plugin.version>
- <rugged.maven-bundle-plugin.version>4.1.0</rugged.maven-bundle-plugin.version>
+ <rugged.spotbugs-maven-plugin.version>4.5.3.0</rugged.spotbugs-maven-plugin.version>
+ <rugged.jacoco-maven-plugin.version>0.8.8</rugged.jacoco-maven-plugin.version>
+ <rugged.maven-bundle-plugin.version>5.1.8</rugged.maven-bundle-plugin.version>
<rugged.maven-changes-plugin.version>2.12.1</rugged.maven-changes-plugin.version>
- <rugged.maven-checkstyle-plugin.version>3.0.0</rugged.maven-checkstyle-plugin.version>
- <rugged.checkstyle.version>8.14</rugged.checkstyle.version>
- <rugged.maven-clean-plugin.version>3.1.0</rugged.maven-clean-plugin.version>
- <rugged.maven-compiler-plugin.version>3.8.0</rugged.maven-compiler-plugin.version>
- <rugged.maven-javadoc-plugin.version>3.0.1</rugged.maven-javadoc-plugin.version>
- <rugged.maven-jar-plugin.version>3.1.0</rugged.maven-jar-plugin.version>
- <rugged.maven-jxr-plugin.version>3.0.0</rugged.maven-jxr-plugin.version>
+ <rugged.maven-checkstyle-plugin.version>3.2.0</rugged.maven-checkstyle-plugin.version>
+ <rugged.checkstyle.version>9.3</rugged.checkstyle.version>
+ <rugged.maven-clean-plugin.version>3.2.0</rugged.maven-clean-plugin.version>
+ <rugged.maven-compiler-plugin.version>3.10.1</rugged.maven-compiler-plugin.version>
+ <rugged.maven-javadoc-plugin.version>3.4.1</rugged.maven-javadoc-plugin.version>
+ <rugged.maven-jar-plugin.version>3.3.0</rugged.maven-jar-plugin.version>
+ <rugged.maven-jxr-plugin.version>3.3.0</rugged.maven-jxr-plugin.version>
<rugged.plantuml-maven-plugin.version>1.2</rugged.plantuml-maven-plugin.version>
- <rugged.plantuml.version>1.2018.12</rugged.plantuml.version>
- <rugged.maven-project-info-reports-plugin.version>3.0.0</rugged.maven-project-info-reports-plugin.version>
- <rugged.maven-resources-plugin.version>3.1.0</rugged.maven-resources-plugin.version>
- <rugged.maven-site-plugin.version>3.7.1</rugged.maven-site-plugin.version>
- <rugged.maven-source-plugin.version>3.0.1</rugged.maven-source-plugin.version>
- <rugged.maven-surefire-plugin.version>2.22.1</rugged.maven-surefire-plugin.version>
- <rugged.maven-surefire-report-plugin.version>2.22.1</rugged.maven-surefire-report-plugin.version>
- <rugged.jgit.buildnumber.version>1.2.10</rugged.jgit.buildnumber.version>
- <rugged.build-helper-maven-plugin.version>3.0.0</rugged.build-helper-maven-plugin.version>
- <rugged.nexus-staging-maven-plugin.version>1.6.8</rugged.nexus-staging-maven-plugin.version>
- <rugged.maven-gpg-plugin.version>1.6</rugged.maven-gpg-plugin.version>
- <rugged.maven-install-plugin.version>3.0.0-M1</rugged.maven-install-plugin.version>
+ <rugged.plantuml.version>1.2022.8</rugged.plantuml.version>
+ <rugged.maven-project-info-reports-plugin.version>3.4.1</rugged.maven-project-info-reports-plugin.version>
+ <rugged.maven-resources-plugin.version>3.3.0</rugged.maven-resources-plugin.version>
+ <rugged.maven-site-plugin.version>3.12.1</rugged.maven-site-plugin.version>
+ <rugged.maven-source-plugin.version>3.2.1</rugged.maven-source-plugin.version>
+ <!-- Surefire 2.22.2 is the last to support CentOS/RedHat 7 due to
+ https://issues.apache.org/jira/browse/SUREFIRE-1628 -->
+ <rugged.maven-surefire-plugin.version>2.22.2</rugged.maven-surefire-plugin.version>
+ <rugged.maven-surefire-report-plugin.version>3.0.0-M6</rugged.maven-surefire-report-plugin.version>
+ <rugged.jgit.buildnumber.version>1.2.12</rugged.jgit.buildnumber.version>
+ <rugged.build-helper-maven-plugin.version>3.3.0</rugged.build-helper-maven-plugin.version>
+ <rugged.nexus-staging-maven-plugin.version>1.6.13</rugged.nexus-staging-maven-plugin.version>
+ <rugged.maven-gpg-plugin.version>3.0.1</rugged.maven-gpg-plugin.version>
+ <rugged.maven-install-plugin.version>3.0.1</rugged.maven-install-plugin.version>
</properties>
@@ -118,14 +121,14 @@
</contributors>
<organization>
- <name>CS Systèmes d'Information</name>
- <url>http://www.c-s.fr/</url>
+ <name>CS GROUP</name>
+ <url>https://www.csgroup.eu/</url>
</organization>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
@@ -142,9 +145,9 @@
<distributionManagement>
<site>
- <id>rugged.website</id>
+ <id>website</id>
<name>Rugged Website</name>
- <url>https://www.orekit.org/rugged/</url>
+ <url>scp://cochise@spoutnik.orekit.org/var/www/mvn-sites/site-rugged-${project.version}</url>
</site>
</distributionManagement>
@@ -156,28 +159,6 @@
<type>jar</type>
<optional>false</optional>
</dependency>
- <dependency>
- <groupId>org.hipparchus</groupId>
- <artifactId>hipparchus-core</artifactId>
- <version>${rugged.hipparchus.version}</version>
- <type>jar</type>
- <optional>false</optional>
- </dependency>
- <dependency>
- <groupId>org.hipparchus</groupId>
- <artifactId>hipparchus-geometry</artifactId>
- <version>${rugged.hipparchus.version}</version>
- <type>jar</type>
- <optional>false</optional>
- </dependency>
- <dependency>
- <groupId>org.hipparchus</groupId>
- <artifactId>hipparchus-stat</artifactId>
- <version>${rugged.hipparchus.version}</version>
- <type>jar</type>
- <optional>false</optional>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -214,17 +195,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${rugged.maven-assembly-plugin.version}</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/source-distribution-assembly.xml</descriptor>
- <descriptor>src/main/assembly/source-jar-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -339,6 +309,23 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${rugged.maven-site-plugin.version}</version>
+ <dependencies>
+ <dependency><!-- add support for ssh/scp -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>3.3.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${rugged.maven-project-info-reports-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>${rugged.maven-changes-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.github.jeluard</groupId>
@@ -385,7 +372,7 @@
</archive>
<manifestLocation>${project.build.directory}/osgi</manifestLocation>
<instructions>
- <Export-Package>org.orekit.rugged.api.*;version=${project.version};-noimport:=true</Export-Package>
+ <Export-Package>org.orekit.rugged.*;version=${project.version};-noimport:=true</Export-Package>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
</instructions>
</configuration>
@@ -438,6 +425,7 @@
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
+ <onlyAnalyze>org.orekit.rugged.*</onlyAnalyze>
<excludeFilterFile>${basedir}/spotbugs-exclude-filter.xml</excludeFilterFile>
</configuration>
</plugin>
@@ -472,8 +460,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>${rugged.maven-changes-plugin.version}</version>
- <configuration>
- <xmlPath>${basedir}/src/site/xdoc/changes.xml</xmlPath>
+ <configuration>
+ <teamlist>team.html</teamlist>
</configuration>
<reportSets>
<reportSet>
@@ -489,7 +477,7 @@
<version>${rugged.maven-jxr-plugin.version}</version>
<configuration>
<linkJavadoc>false</linkJavadoc>
- <bottom><![CDATA[Copyright © ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Systèmes d'information</a>. All rights reserved.]]></bottom>
+ <bottom><![CDATA[Copyright © ${project.inceptionYear}-{currentYear} <a href="https://www.csgroup.eu/">CS GROUP</a>. All rights reserved.]]></bottom>
</configuration>
</plugin>
<plugin>
@@ -497,12 +485,14 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${rugged.maven-javadoc-plugin.version}</version>
<configuration>
- <bottom><![CDATA[Copyright © ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Systèmes d'information</a>. All rights reserved.]]></bottom>
+ <bottom><![CDATA[Copyright © ${project.inceptionYear}-{currentYear} <a href="https://www.csgroup.eu/">CS GROUP</a>. All rights reserved.]]></bottom>
<links>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
<link>https://www.hipparchus.org/apidocs/</link>
- <link>http://www.orekit.org/site-rugged-${rugged.orekit.version}/apidocs/</link>
+ <link>https://www.orekit.org/site-orekit-${rugged.orekit.version}/apidocs/</link>
</links>
+ <source>${rugged.compiler.source}</source>
+ <doclint>none</doclint>
</configuration>
<reportSets>
<reportSet>
@@ -531,7 +521,7 @@
<build>
<plugins>
<plugin>
- <groupId>ru.concerteza.buildnumber</groupId>
+ <groupId>org.bidib.buildnumber</groupId>
<artifactId>maven-jgit-buildnumber-plugin</artifactId>
<version>${rugged.jgit.buildnumber.version}</version>
<executions>
@@ -556,6 +546,7 @@
<Implementation-Build>${rugged.implementation.build}</Implementation-Build>
<X-Compile-Source-JDK>${rugged.compiler.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${rugged.compiler.target}</X-Compile-Target-JDK>
+ <Automatic-Module-Name>org.orekit.rugged</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
@@ -565,6 +556,16 @@
</profile>
<profile>
<id>release</id>
+ <!-- distributionManagement>
+ <repository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement-->
<build>
<plugins>
<plugin>
@@ -634,6 +635,7 @@
<gpgArguments>
<arg>--digest-algo=SHA512</arg>
</gpgArguments>
+ <!-- keyname>0802AB8C87B0B1AEC1C1C5871550FDBD6375C33B</keyname-->
</configuration>
<executions>
<execution>
@@ -656,6 +658,20 @@
</plugins>
</build>
</profile>
+ <profile>
+ <!-- A profile to configure staging deployment (for continuous integration process) -->
+ <id>ci-deploy</id>
+ <distributionManagement>
+ <repository>
+ <id>ci-releases</id>
+ <url>https://packages.orekit.org/repository/maven-releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>ci-snapshots</id>
+ <url>https://packages.orekit.org/repository/maven-snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+ </profile>
<profile>
<id>eclipse</id>
<activation>
diff --git a/spotbugs-exclude-filter.xml b/spotbugs-exclude-filter.xml
index f06c28a6db3204c09a1c41ab9da95459eee03108..965bc1e5e94194674498eb47a2765b2c4d1a5e8e 100644
--- a/spotbugs-exclude-filter.xml
+++ b/spotbugs-exclude-filter.xml
@@ -6,4 +6,238 @@
-->
<FindBugsFilter>
+ <!-- The following internal representation exposure are intentional,
+ They are used to pass data back and forth between classes
+ -->
+ <Match>
+ <Class name="org.orekit.rugged.adjustment.AdjustmentContext"/>
+ <Method name="<init>"
+ params="java.util.Collection,
+ org.orekit.rugged.adjustment.measurements.Observables"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.adjustment.GroundOptimizationProblemBuilder"/>
+ <Method name="<init>"
+ params="java.util.List,org.orekit.rugged.adjustment.measurements.Observables,
+ org.orekit.rugged.api.Rugged"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.adjustment.measurements.SensorToSensorMapping"/>
+ <Or>
+ <Method name="getBodyDistances"
+ params=""
+ returns="java.util.List" />
+ <Method name="getLosDistances"
+ params=""
+ returns="java.util.List" />
+ </Or>
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.api.Rugged"/>
+ <Or>
+ <Method name="getEllipsoid"
+ params=""
+ returns="org.orekit.rugged.utils.ExtendedEllipsoid" />
+ <Method name="getRefractionCorrection"
+ params=""
+ returns="org.orekit.rugged.refraction.AtmosphericRefraction" />
+ </Or>
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.api.RuggedBuilder"/>
+ <Or>
+ <Method name="getEllipsoid"
+ params=""
+ returns="org.orekit.rugged.utils.ExtendedEllipsoid" />
+ <Method name="getPositionsVelocities"
+ params=""
+ returns="java.util.List" />
+ <Method name="getQuaternions"
+ params=""
+ returns="java.util.List" />
+ <Method name="getRefractionCorrection"
+ params=""
+ returns="org.orekit.rugged.refraction.AtmosphericRefraction" />
+ </Or>
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.api.RuggedBuilder"/>
+ <Or>
+ <Method name="setRefractionCorrection"
+ params="org.orekit.rugged.refraction.AtmosphericRefraction"
+ returns="org.orekit.rugged.api.RuggedBuilder" />
+ <Method name="setTrajectory"
+ params="double,
+ int,
+ org.orekit.utils.CartesianDerivativesFilter,
+ org.orekit.utils.AngularDerivativesFilter,
+ org.orekit.propagation.Propagator"
+ returns="org.orekit.rugged.api.RuggedBuilder" />
+ <Method name="setTrajectory"
+ params="org.orekit.frames.Frame,
+ java.util.List,
+ int,
+ org.orekit.utils.CartesianDerivativesFilter,
+ java.util.List,
+ int,
+ org.orekit.utils.AngularDerivativesFilter"
+ returns="org.orekit.rugged.api.RuggedBuilder" />
+ </Or>
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.errors.RuggedExceptionWrapper"/>
+ <Method name="getException"
+ params=""
+ returns="org.orekit.rugged.errors.RuggedException" />
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.errors.RuggedExceptionWrapper"/>
+ <Method name="<init>"
+ params="org.orekit.rugged.errors.RuggedException"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.linesensor.LineSensor"/>
+ <Method name="getPosition"
+ params=""
+ returns="org.hipparchus.geometry.euclidean.threed.Vector3D" />
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.linesensor.LineSensor"/>
+ <Method name="<init>"
+ params="java.lang.String,
+ org.orekit.rugged.linesensor.LineDatation,
+ org.hipparchus.geometry.euclidean.threed.Vector3D,
+ org.orekit.rugged.los.TimeDependentLOS"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.linesensor.SensorMeanPlaneCrossing"/>
+ <Method name="getMeanPlaneNormal"
+ params=""
+ returns="org.hipparchus.geometry.euclidean.threed.Vector3D" />
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.linesensor.SensorMeanPlaneCrossing"/>
+ <Method name="<init>"
+ params="org.orekit.rugged.linesensor.LineSensor,
+ org.orekit.rugged.utils.SpacecraftToObservedBody,
+ int,
+ int,
+ boolean,
+ boolean,
+ int,
+ double,
+ org.hipparchus.geometry.euclidean.threed.Vector3D,
+ java.util.stream.Stream"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.linesensor.SensorMeanPlaneCrossing$CrossingResult"/>
+ <Or>
+ <Method name="getTarget"
+ params=""
+ returns="org.hipparchus.geometry.euclidean.threed.Vector3D" />
+ <Method name="getTargetDirection"
+ params=""
+ returns="org.hipparchus.geometry.euclidean.threed.Vector3D" />
+ <Method name="getTargetDirectionDerivative"
+ params=""
+ returns="org.hipparchus.geometry.euclidean.threed.Vector3D" />
+ </Or>
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.linesensor.SensorMeanPlaneCrossing$CrossingResult"/>
+ <Method name="<init>"
+ params="org.orekit.time.AbsoluteDate,
+ double,
+ org.hipparchus.geometry.euclidean.threed.Vector3D,
+ org.hipparchus.geometry.euclidean.threed.Vector3D,
+ org.hipparchus.geometry.euclidean.threed.Vector3D"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.los.FixedRotation"/>
+ <Method name="<init>"
+ params="java.lang.String,
+ org.hipparchus.geometry.euclidean.threed.Vector3D,double"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.los.LOSBuilder"/>
+ <Method name="<init>"
+ params="java.util.List"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.los.PolynomialRotation"/>
+ <Method name="<init>"
+ params="java.lang.String,
+ org.hipparchus.geometry.euclidean.threed.Vector3D,
+ org.orekit.time.AbsoluteDate,
+ double[]"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.refraction.AtmosphericRefraction"/>
+ <Method name="getComputationParameters"
+ params=""
+ returns="org.orekit.rugged.refraction.AtmosphericComputationParameters" />
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.refraction.MultiLayerModel"/>
+ <Or>
+ <Method name="<init>"
+ params="org.orekit.rugged.utils.ExtendedEllipsoid"
+ returns="void" />
+ <Method name="<init>"
+ params="org.orekit.rugged.utils.ExtendedEllipsoid,
+ java.util.List"
+ returns="void" />
+ </Or>
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.utils.RoughVisibilityEstimator"/>
+ <Method name="<init>"
+ params="org.orekit.bodies.OneAxisEllipsoid,
+ org.orekit.frames.Frame,java.util.List"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Class name="org.orekit.rugged.utils.SpacecraftToObservedBody"/>
+ <Method name="<init>"
+ params="org.orekit.frames.Frame,
+ org.orekit.frames.Frame,
+ org.orekit.time.AbsoluteDate,
+ org.orekit.time.AbsoluteDate,
+ double,
+ double,
+ java.util.List,
+ java.util.List"
+ returns="void" />
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+
</FindBugsFilter>
diff --git a/src/site/xdoc/changes.xml b/src/changes/changes.xml
similarity index 85%
rename from src/site/xdoc/changes.xml
rename to src/changes/changes.xml
index ebaae5404b2035d939bafc856e918db86918c34a..26de291cf99c5481d0abd04d7463ecd7107c6679 100644
--- a/src/site/xdoc/changes.xml
+++ b/src/changes/changes.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Copyright 2013-2019 CS Systèmes d'Information
- Licensed to CS Systèmes d'Information (CS) under one or more
+<!-- Copyright 2013-2022 CS GROUP
+ Licensed to CS GROUP (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
@@ -20,11 +20,92 @@
<title>Rugged Changes</title>
</properties>
<body>
- <release version="2.1-SNAPSHOT" date="TBD" description="TTBD">
+ <release version="4.0" date="TBD" description="TBD">
+ <action dev="guylaine" type="update" issue="375">
+ Made Rugged able to deal with seamless DEM tiles (no overlapping constraints).
+ </action>
+ <action dev="guylaine" type="update" issue="392">
+ Fixed light time correction in atmospheric refraction computation.
+ </action>
+ <action dev="guylaine" type="update" issue="393">
+ Created a tutorial about how to initialize a tile updater with a real DEM.
+ </action>
+ <action dev="guylaine" type="update">
+ Updated dependencies to Orekit 11.3 (and Hipparchus 2.3).
+ </action>
+ </release>
+ <release version="3.0" date="2022-07-05" description="This is a major release.
+ It fixes a few bugs.
+ This version depends on Orekit 11.2 and Hipparchus 2.1.">
+ <action dev="luc" type="update" issue="388">
+ Fixed longitude normalization issue with tiles.
+ </action>
+ <action dev="guylaine" type="update" issue="391">
+ Fixed inverse location issue with atmospheric refraction.
+ </action>
+ <action dev="luc" type="update" issue="387">
+ Updated dependencies to Orekit 11.2 (and Hipparchus 2.1 ).
+ </action>
+ <action dev="guylaine" type="update" issue="390">
+ Changed CS Group website URL.
+ </action>
<action dev="guylaine" type="update">
- Updated dependencies to Orekit 9.3 and Hipparchus 1.4.
+ Updated link to Sergeï Tanygin's paper about attitude interpolation in documentation.
+ </action>
+ </release>
+ <release version="2.2" date="2020-07-31" description="This is a minor release.
+ It adds access to algorithm identifier,
+ corrects an Earth constant for model IERS96,
+ improves documentation and fixes a few bugs.
+ Automatic building, release and code analysis are available with Gitlab CI.
+ This version depends on Orekit 10.2 and Hipparchus 1.7.">
+ <action dev="guylaine" type="update" issue="383">
+ Updated dependencies to Orekit 10.2 (and Hipparchus 1.7).
+ </action>
+ <action dev="guylaine" type="fix" issue="384">
+ Add connection with Gitlab CI to allow automatic building and release,
+ as well as automatic code analysis (https://sonar.orekit.org/dashboard?id=org.orekit%3Arugged).
+ </action>
+ <action dev="luc" type="fix" issue="386">
+ Fix a unit test due to CI specificity.
+ </action>
+ <action dev="guylaine" type="update" issue="381">
+ Give access to algorithm identifier (DUVENHAGE,
+ CONSTANT_ELEVATION_OVER_ELLIPSOID, ...) with the new method getAlgorithmId().
+ </action>
+ <action dev="guylaine" type="update" issue="385">
+ Use the new Derivative<T> interface from Hipparchus.
+ </action>
+ <action dev="guylaine" type="fix" issue="379">
+ Correct erroneous Earth flattening for model IERS96 in RuggedBuilder.
</action>
- <action dev="guylaine" type="fix" issue="376">
+ <action dev="guylaine" type="update" issue="378">
+ Replace in RuggedBuilder hard-coded constants by Orekit Earth constants.
+ </action>
+ <action dev="guylaine" type="update">
+ Update building explanations in static site and remove redundant BUILDING.txt.
+ </action>
+ <action dev="guylaine" type="add">
+ Create a release guide in static site.
+ </action>
+ <action dev="guylaine" type="update">
+ Update deprecated method of Orekit DataProvidersManager class.
+ </action>
+ <action dev="guylaine" type="update" issue="382">
+ Remove explicit dependency to Hipparchus library.
+ </action>
+ <action dev="guylaine" type="add">
+ Add package-info documentation.
+ </action>
+ </release>
+
+ <release version="2.1" date="2019-03-14" description="This is a minor release.
+ It adds refraction in inverse location and fixes a few bugs. This version depends
+ on Orekit 9.3.1 and Hipparchus 1.4.">
+ <action dev="guylaine" type="update">
+ Updated dependencies to Orekit 9.3.1 and Hipparchus 1.4.
+ </action>
+ <action dev="luc" type="fix" issue="376">
Direct location may result to a null result in some very rugged region.
In Duvenhage algorithm, in the refineIntersection method for the DEM,
some rare cases led to no intersection (as a result from SimpleTile.cellIntersection)
@@ -32,14 +113,21 @@
along the LOS direction, with an iterative process, we are able to find the intersection.
</action>
<action dev="guylaine" type="fix" issue="377">
- Add the possibilty to suspend and resume the dump.
+ Add the possibility to suspend and resume the dump.
When performing a dump, in some cases, some extra informations are dumped
but are not relevant.
For instance when updating a tile for a SRTM tile, we need to add the geoid
value of the current point. In the dump file, the geoid tile is also dumped
- and it leds to bad results when performing the DumpReplayer, as the geoid
+ and it leads to bad results when performing the DumpReplayer, as the geoid
elevations are read instead of the real elevations.
</action>
+ <action dev="guylaine" type="update">
+ Enable null in dump of direct or inverse location results.
+ If direct or inverse location gave "null" as a result, it was not dumped.
+ </action>
+ <action dev="guylaine" type="update">
+ Improve test coverage of classes related to dump (org.orekit.rugged.errors).
+ </action>
<action dev="guylaine" type="fix" issue="373">
Changed RuggedException from checked to unchecked exception.
Most functions do throw such exceptions. As they are unchecked, they are
@@ -63,7 +151,8 @@
adjustment.measurements.SensorToGroundMapping due to a parameters reversal error.
</action>
<action dev="guylaine" type="fix" issue="256">
- Bad check of maxDate validity in utils.SpacecraftToObservedBody.SpacecraftToObservedBody method.
+ Bad check of maxDate validity in utils.SpacecraftToObservedBody.SpacecraftToObservedBody
+ method.
</action>
<action dev="luc" type="add" due-to="Lars Næsbye Christensen">
@@ -90,9 +179,8 @@
<action dev="guylaine" type="add" due-to="Jonathan Guinet, Lucie Labat-Allée">
Added refinement feature, to adjust viewing model parameters
</action>
- <action dev="luc" type="add" due-to="Lars Næsbye Christensen">
+ <action dev="luc" type="add" due-to="Lars Næsbye Christensen" issue="343">
Added Danish translations.
- Fixes issue #343.
</action>
<action dev="luc" type="update">
Updated dependency to Hipparchus 1.1, released on 2017, March 16th.
diff --git a/src/design/dem-loading-class-diagram.puml b/src/design/dem-loading-class-diagram.puml
index 360ba2320e6d3f90d52bd462c3c6f17bb658a07c..d8b5059d228e28ebbbb3dc14e3fc6d5a2cfe141f 100644
--- a/src/design/dem-loading-class-diagram.puml
+++ b/src/design/dem-loading-class-diagram.puml
@@ -1,5 +1,5 @@
-' Copyright 2013-2019 CS Systèmes d'Information
-' Licensed to CS Systèmes d'Information (CS) under one or more
+' Copyright 2013-2022 CS GROUP
+' Licensed to CS GROUP (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
diff --git a/src/design/direct-location-class-diagram.puml b/src/design/direct-location-class-diagram.puml
index 345691fba32960f492ad90e3e9f6c5f5c2da42f8..5ef90fba59cacaee330d5d327594bee96f12653e 100644
--- a/src/design/direct-location-class-diagram.puml
+++ b/src/design/direct-location-class-diagram.puml
@@ -1,5 +1,5 @@
-' Copyright 2013-2019 CS Systèmes d'Information
-' Licensed to CS Systèmes d'Information (CS) under one or more
+' Copyright 2013-2022 CS GROUP
+' Licensed to CS GROUP (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
diff --git a/src/design/direct-location-sequence-diagram.puml b/src/design/direct-location-sequence-diagram.puml
index dd2e5f18ad3fb046e99a7995e236659b853ced66..f1a9fa4ab19427d1790f319dd761e20ab1f1b71c 100644
--- a/src/design/direct-location-sequence-diagram.puml
+++ b/src/design/direct-location-sequence-diagram.puml
@@ -1,5 +1,5 @@
-' Copyright 2013-2019 CS Systèmes d'Information
-' Licensed to CS Systèmes d'Information (CS) under one or more
+' Copyright 2013-2022 CS GROUP
+' Licensed to CS GROUP (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
diff --git a/src/design/duvenhage-inner-recursion-activity-diagram.puml b/src/design/duvenhage-inner-recursion-activity-diagram.puml
index d7ea4581f16daf14edf257a205ab4caf81ac02e4..cdac26eb03f950a5bef8276c789c3001a5b6f0eb 100644
--- a/src/design/duvenhage-inner-recursion-activity-diagram.puml
+++ b/src/design/duvenhage-inner-recursion-activity-diagram.puml
@@ -1,5 +1,5 @@
-' Copyright 2013-2019 CS Systèmes d'Information
-' Licensed to CS Systèmes d'Information (CS) under one or more
+' Copyright 2013-2022 CS GROUP
+' Licensed to CS GROUP (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
diff --git a/src/design/duvenhage-top-loop-activity-diagram.puml b/src/design/duvenhage-top-loop-activity-diagram.puml
index 25772bb1788aac3261ab90d17fce375a84053365..9b46a7392c6c654c121912525fcfcee038066fd3 100644
--- a/src/design/duvenhage-top-loop-activity-diagram.puml
+++ b/src/design/duvenhage-top-loop-activity-diagram.puml
@@ -1,5 +1,5 @@
-' Copyright 2013-2019 CS Systèmes d'Information
-' Licensed to CS Systèmes d'Information (CS) under one or more
+' Copyright 2013-2022 CS GROUP
+' Licensed to CS GROUP (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
diff --git a/src/design/initialization-class-diagram.puml b/src/design/initialization-class-diagram.puml
index f13e184c759a0af9ec66cd3da0e1530f5cb2a3d7..26081cd5e85f3e06e731229526d686b898ee1737 100644
--- a/src/design/initialization-class-diagram.puml
+++ b/src/design/initialization-class-diagram.puml
@@ -1,5 +1,5 @@
-' Copyright 2013-2019 CS Systèmes d'Information
-' Licensed to CS Systèmes d'Information (CS) under one or more
+' Copyright 2013-2022 CS GROUP
+' Licensed to CS GROUP (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
diff --git a/src/design/initialization-sequence-diagram.puml b/src/design/initialization-sequence-diagram.puml
index d9259e5ea383fce6fbd952df92362e2b1ae96c1a..2bab83d0d5e21dfd8c9f3c5c43f29ce359f02b1d 100644
--- a/src/design/initialization-sequence-diagram.puml
+++ b/src/design/initialization-sequence-diagram.puml
@@ -1,5 +1,5 @@
-' Copyright 2013-2019 CS Systèmes d'Information
-' Licensed to CS Systèmes d'Information (CS) under one or more
+' Copyright 2013-2022 CS GROUP
+' Licensed to CS GROUP (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
diff --git a/src/design/inverse-location-sequence-diagram.puml b/src/design/inverse-location-sequence-diagram.puml
index 8f7eb05cbd0ef2ddf672fdd8292b810184e968c8..61840940a7ed60348e66059f1ca7d28c7e99c05a 100644
--- a/src/design/inverse-location-sequence-diagram.puml
+++ b/src/design/inverse-location-sequence-diagram.puml
@@ -1,5 +1,5 @@
-' Copyright 2013-2019 CS Systèmes d'Information
-' Licensed to CS Systèmes d'Information (CS) under one or more
+' Copyright 2013-2022 CS GROUP
+' Licensed to CS GROUP (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
diff --git a/src/design/parametric-los-class-diagram.puml b/src/design/parametric-los-class-diagram.puml
index f75085512a2fbaa603bedf14e275f9515fbf1916..ba4d0e49b516523789774217be02d918d5597020 100644
--- a/src/design/parametric-los-class-diagram.puml
+++ b/src/design/parametric-los-class-diagram.puml
@@ -1,5 +1,5 @@
-' Copyright 2013-2019 CS Systèmes d'Information
-' Licensed to CS Systèmes d'Information (CS) under one or more
+' Copyright 2013-2022 CS GROUP
+' Licensed to CS GROUP (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
diff --git a/src/main/assembly/source-distribution-assembly.xml b/src/main/assembly/source-distribution-assembly.xml
deleted file mode 100644
index c7f81d8b88bc8dfa23c5c9b0e9ab14ef1d51de83..0000000000000000000000000000000000000000
--- a/src/main/assembly/source-distribution-assembly.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<assembly>
- <id>sources</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <includes>
- <include>README.txt</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>BUILDING.txt</include>
- <include>pom.xml</include>
- <include>checkstyle.xml</include>
- <include>spotbugs-exclude-filter.xml</include>
- <include>license-header.txt</include>
- </includes>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- <fileSet>
- <directory>src</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/src/main/assembly/source-jar-assembly.xml b/src/main/assembly/source-jar-assembly.xml
deleted file mode 100644
index b79e54ba06f83954e5ad14b26095f2f6f844347d..0000000000000000000000000000000000000000
--- a/src/main/assembly/source-jar-assembly.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<assembly>
- <id>sources</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- <outputDirectory>META-INF</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/main/java</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>**/*.java</include>
- </includes>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java b/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java
index bddfcd96406a0580f383b4aebda1bd14bd1fe255..e21b4624ad1a55487d9d837389b2264954d49561 100644
--- a/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java
+++ b/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -119,8 +119,8 @@ public class AdjustmentContext {
public Optimum estimateFreeParameters(final Collection<String> ruggedNameList, final int maxEvaluations,
final double parametersConvergenceThreshold) {
- final List<Rugged> ruggedList = new ArrayList<Rugged>();
- final List<LineSensor> selectedSensors = new ArrayList<LineSensor>();
+ final List<Rugged> ruggedList = new ArrayList<>();
+ final List<LineSensor> selectedSensors = new ArrayList<>();
for (String ruggedName : ruggedNameList) {
final Rugged rugged = this.viewingModel.get(ruggedName);
if (rugged == null) {
diff --git a/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java b/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java
index 51d3f62d5b1381fd25adb36fe894d84afe11c17f..28335b2a7c9458d39e3f5ec82f378cef28a97157 100644
--- a/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java
+++ b/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.analysis.differentiation.Gradient;
import org.hipparchus.linear.Array2DRowRealMatrix;
import org.hipparchus.linear.ArrayRealVector;
import org.hipparchus.linear.RealMatrix;
@@ -93,7 +93,7 @@ public class GroundOptimizationProblemBuilder extends OptimizationProblemBuilder
protected void initMapping() {
final String ruggedName = rugged.getName();
- this.sensorToGroundMappings = new ArrayList<SensorToGroundMapping>();
+ this.sensorToGroundMappings = new ArrayList<>();
for (final LineSensor lineSensor : this.getSensors()) {
final SensorToGroundMapping mapping = this.getMeasurements().getGroundMapping(ruggedName, lineSensor.getName());
if (mapping != null) {
@@ -162,7 +162,7 @@ public class GroundOptimizationProblemBuilder extends OptimizationProblemBuilder
for (final SensorToGroundMapping reference : this.sensorToGroundMappings) {
for (final Map.Entry<SensorPixel, GeodeticPoint> mapping : reference.getMapping()) {
final GeodeticPoint gp = mapping.getValue();
- final DerivativeStructure[] ilResult = this.rugged.inverseLocationDerivatives(reference.getSensorName(), gp, minLine, maxLine, this.getGenerator());
+ final Gradient[] ilResult = this.rugged.inverseLocationDerivatives(reference.getSensorName(), gp, minLine, maxLine, this.getGenerator());
if (ilResult == null) {
value.setEntry(l, minLine - 100.0); // arbitrary
diff --git a/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java b/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java
index 7083a59b2fc1d2353ef7fb45e3654148e853ca58..c5d5d793c627e4402cc0a047179b91ccff2e9564 100644
--- a/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java
+++ b/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -24,7 +24,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.analysis.differentiation.Gradient;
import org.hipparchus.linear.Array2DRowRealMatrix;
import org.hipparchus.linear.ArrayRealVector;
import org.hipparchus.linear.RealMatrix;
@@ -90,7 +90,7 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
@Override
protected void initMapping() {
- this.sensorToSensorMappings = new ArrayList<SensorToSensorMapping>();
+ this.sensorToSensorMappings = new ArrayList<>();
for (final String ruggedNameA : this.ruggedMap.keySet()) {
for (final String ruggedNameB : this.ruggedMap.keySet()) {
@@ -137,7 +137,9 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
int i = 0;
for (Iterator<Map.Entry<SensorPixel, SensorPixel>> gtIt = reference.getMapping().iterator(); gtIt.hasNext(); i++) {
- if (i == reference.getMapping().size()) break;
+ if (i == reference.getMapping().size()) {
+ break;
+ }
// Get LOS distance
final Double losDistance = reference.getLosDistance(i);
@@ -207,7 +209,7 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
final SpacecraftToObservedBody scToBodyA = ruggedA.getScToBody();
- final DerivativeStructure[] ilResult =
+ final Gradient[] ilResult =
ruggedB.distanceBetweenLOSderivatives(lineSensorA, dateA, pixelA, scToBodyA,
lineSensorB, dateB, pixelB, this.getGenerator());
diff --git a/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java b/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java
index 02fe4ce2221e14de0c64a51545fe3942830ca1f2..e744c1ff03159e3d0274040ebd8feeb40787ac16 100644
--- a/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java
+++ b/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -24,7 +24,7 @@ import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresOptimizer;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresOptimizer.Optimum;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresProblem;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LevenbergMarquardtOptimizer;
-import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedInternalError;
/** LeastSquareAdjuster
* Class for setting least square algorithm chosen for solving optimization problem.
@@ -84,7 +84,7 @@ public class LeastSquareAdjuster {
default :
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
}
}
diff --git a/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java b/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
index 15891ca950a6715373b5fec67cdb9f43fdcf341b..0bd12a0a51fe37a9c1e64189b3f7ff2ecf1c69a2 100644
--- a/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
+++ b/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -24,8 +24,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.hipparchus.analysis.differentiation.DSFactory;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.Field;
+import org.hipparchus.analysis.differentiation.Gradient;
+import org.hipparchus.analysis.differentiation.GradientField;
import org.hipparchus.optim.ConvergenceChecker;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresProblem;
import org.hipparchus.optim.nonlinear.vector.leastsquares.MultivariateJacobianFunction;
@@ -34,7 +35,7 @@ import org.orekit.rugged.adjustment.measurements.Observables;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.utils.ParameterDriver;
/**
@@ -51,8 +52,8 @@ abstract class OptimizationProblemBuilder {
/** Margin used in parameters estimation for the inverse location lines range. */
protected static final int ESTIMATION_LINE_RANGE_MARGIN = 100;
- /** Derivative structure generator.*/
- private final DSGenerator generator;
+ /** Gradient generator.*/
+ private final DerivativeGenerator<Gradient> generator;
/** Parameter drivers list. */
private final List<ParameterDriver> drivers;
@@ -151,11 +152,11 @@ abstract class OptimizationProblemBuilder {
return validator;
}
- /** Create the generator for {@link DerivativeStructure} instances.
+ /** Create the generator for {@link Gradient} instances.
* @param selectedSensors list of sensors referencing the parameters drivers
* @return a new generator
*/
- private DSGenerator createGenerator(final List<LineSensor> selectedSensors) {
+ private DerivativeGenerator<Gradient> createGenerator(final List<LineSensor> selectedSensors) {
// Initialize set of drivers name
final Set<String> names = new HashSet<>();
@@ -188,10 +189,9 @@ abstract class OptimizationProblemBuilder {
});
}
- final DSFactory factory = new DSFactory(map.size(), 1);
-
- // Derivative Structure Generator
- return new DSGenerator() {
+ // gradient Generator
+ final GradientField field = GradientField.getField(map.size());
+ return new DerivativeGenerator<Gradient>() {
/** {@inheritDoc} */
@Override
@@ -201,21 +201,27 @@ abstract class OptimizationProblemBuilder {
/** {@inheritDoc} */
@Override
- public DerivativeStructure constant(final double value) {
- return factory.constant(value);
+ public Gradient constant(final double value) {
+ return Gradient.constant(map.size(), value);
}
/** {@inheritDoc} */
@Override
- public DerivativeStructure variable(final ParameterDriver driver) {
-
+ public Gradient variable(final ParameterDriver driver) {
final Integer index = map.get(driver.getName());
if (index == null) {
return constant(driver.getValue());
} else {
- return factory.variable(index.intValue(), driver.getValue());
+ return Gradient.variable(map.size(), index.intValue(), driver.getValue());
}
}
+
+ /** {@inheritDoc} */
+ @Override
+ public Field<Gradient> getField() {
+ return field;
+ }
+
};
}
@@ -245,7 +251,7 @@ abstract class OptimizationProblemBuilder {
* Get the derivative structure generator.
* @return the derivative structure generator.
*/
- protected final DSGenerator getGenerator() {
+ protected final DerivativeGenerator<Gradient> getGenerator() {
return this.generator;
}
diff --git a/src/main/java/org/orekit/rugged/adjustment/OptimizerId.java b/src/main/java/org/orekit/rugged/adjustment/OptimizerId.java
index 30ad99bda7d8813e28bf92980a0d540751fdc64e..ba62a68a0ef60aada875ca84dc20f4fe9d91230f 100644
--- a/src/main/java/org/orekit/rugged/adjustment/OptimizerId.java
+++ b/src/main/java/org/orekit/rugged/adjustment/OptimizerId.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java b/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
index 09ed8dfed9cb574b8737ff1f6c5f7933ca289881..94d77b0f3a64c6c784abc5b56e8d9c634a7f29ab 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java
index cc9719a3f1b21042ef64943a727ade2f2d7e7865..22b9ebc2adc5bf51716c7688aa7c90269268c760 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java
index 6a2aa0a410e7bb853d0c9c2fd4bb6cd7daa8b60a..623befb6ddcffebf8061acaf685b193469a55f7a 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -56,7 +56,7 @@ public class SensorToGroundMapping {
public SensorToGroundMapping(final String ruggedName, final String sensorName) {
this.sensorName = sensorName;
- this.groundMapping = new SensorMapping<GeodeticPoint>(sensorName, ruggedName);
+ this.groundMapping = new SensorMapping<>(sensorName, ruggedName);
}
/** Get the name of the sensor to which mapping applies.
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java
index 3c360c52aecb3a7146ac8c5b0597dbfda24a70d0..bef0ceda2a9aac4261f827a977998227fb5f2ac5 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -82,11 +82,11 @@ public class SensorToSensorMapping {
final String sensorNameB, final String ruggedNameB,
final double bodyConstraintWeight) {
- this.interMapping = new SensorMapping<SensorPixel>(sensorNameA, ruggedNameA);
+ this.interMapping = new SensorMapping<>(sensorNameA, ruggedNameA);
this.sensorNameB = sensorNameB;
this.ruggedNameB = ruggedNameB;
- this.losDistances = new ArrayList<Double>();
- this.bodyDistances = new ArrayList<Double>();
+ this.losDistances = new ArrayList<>();
+ this.bodyDistances = new ArrayList<>();
this.bodyConstraintWeight = bodyConstraintWeight;
}
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/package-info.java b/src/main/java/org/orekit/rugged/adjustment/measurements/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..5814fbf3c989462e7d4a14e21cee155a5a4041f6
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/package-info.java
@@ -0,0 +1,27 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides tools for measurements generation.
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ * @author Jonathan Guinet
+ * @author Lucie Labat-Allee
+ *
+ */
+package org.orekit.rugged.adjustment.measurements;
diff --git a/src/main/java/org/orekit/rugged/adjustment/package-info.java b/src/main/java/org/orekit/rugged/adjustment/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..6adb28ed99631dd3228e397f8ef9356317460125
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/adjustment/package-info.java
@@ -0,0 +1,26 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides tools to deal with viewing model refining.
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ * @author Jonathan Guinet
+ *
+ */
+package org.orekit.rugged.adjustment;
diff --git a/src/main/java/org/orekit/rugged/api/AlgorithmId.java b/src/main/java/org/orekit/rugged/api/AlgorithmId.java
index e5128966944e4ffee5fac2063b50b536242587c1..4353c18937e95b7198b86913cee488e6488a6780 100644
--- a/src/main/java/org/orekit/rugged/api/AlgorithmId.java
+++ b/src/main/java/org/orekit/rugged/api/AlgorithmId.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -25,7 +25,7 @@ public enum AlgorithmId {
/** Fast algorithm due to Bernardt Duvenhage.
* <p>
* The algorithm is described in the 2009 paper:
- * <a href="http://researchspace.csir.co.za/dspace/bitstream/10204/3041/1/Duvenhage_2009.pdf">Using
+ * <a href="https://researchspace.csir.co.za/dspace/bitstream/10204/3041/1/Duvenhage_2009.pdf">Using
* An Implicit Min/Max KD-Tree for Doing Efficient Terrain Line of Sight Calculations</a>.
* </p>
*/
@@ -34,7 +34,7 @@ public enum AlgorithmId {
/** Fast algorithm due to Bernardt Duvenhage.
* <p>
* The algorithm is described in the 2009 paper:
- * <a href="http://researchspace.csir.co.za/dspace/bitstream/10204/3041/1/Duvenhage_2009.pdf">Using
+ * <a href="https://researchspace.csir.co.za/dspace/bitstream/10204/3041/1/Duvenhage_2009.pdf">Using
* An Implicit Min/Max KD-Tree for Doing Efficient Terrain Line of Sight Calculations</a>.
* </p>
* <p>
diff --git a/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java b/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java
index fc6b0954908f2a77e0865457c85200c854d4f64c..67aa214d3176b7ef03bfe7782b53e283ebafcc73 100644
--- a/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java
+++ b/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/api/EllipsoidId.java b/src/main/java/org/orekit/rugged/api/EllipsoidId.java
index 56976ceec6af8b491b6b0687e42c772be1b12596..b8f0e1b9918086011b87678855d03ca471fb42db 100644
--- a/src/main/java/org/orekit/rugged/api/EllipsoidId.java
+++ b/src/main/java/org/orekit/rugged/api/EllipsoidId.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/api/InertialFrameId.java b/src/main/java/org/orekit/rugged/api/InertialFrameId.java
index e5ca74d969a36da58818cc5ee3d8a07a5b38803a..295405155b30b80a9fc2a18d17a7f3dd0c694c82 100644
--- a/src/main/java/org/orekit/rugged/api/InertialFrameId.java
+++ b/src/main/java/org/orekit/rugged/api/InertialFrameId.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index 4fd3cedddfd1e187a431313c5242a831b7306fc3..6a89830acbc5d91621b9351e8bc3d913fa2a5e4b 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -20,14 +20,17 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import org.hipparchus.analysis.differentiation.Derivative;
import org.hipparchus.analysis.differentiation.DerivativeStructure;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
+import org.hipparchus.util.MathArrays;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.frames.Transform;
import org.orekit.rugged.errors.DumpManager;
import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedInternalError;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.linesensor.LineSensor;
@@ -35,7 +38,7 @@ import org.orekit.rugged.linesensor.SensorMeanPlaneCrossing;
import org.orekit.rugged.linesensor.SensorPixel;
import org.orekit.rugged.linesensor.SensorPixelCrossing;
import org.orekit.rugged.refraction.AtmosphericRefraction;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
@@ -63,9 +66,6 @@ public class Rugged {
/** Maximum number of evaluations for crossing algorithms. */
private static final int MAX_EVAL = 50;
- /** Margin for computation of inverse location with atmospheric refraction correction. */
- private static final double INVLOC_MARGIN = 0.8;
-
/** Threshold for pixel convergence in fixed point method
* (for inverse location with atmospheric refraction correction). */
private static final double PIXEL_CV_THRESHOLD = 1.e-4;
@@ -165,6 +165,14 @@ public class Rugged {
return algorithm;
}
+ /** Get the DEM intersection algorithm identifier.
+ * @return DEM intersection algorithm Id
+ * @since 2.2
+ */
+ public AlgorithmId getAlgorithmId() {
+ return algorithm.getAlgorithmId();
+ }
+
/** Get flag for light time correction.
* @return true if the light time between ground and spacecraft is
* compensated for more accurate location
@@ -292,10 +300,35 @@ public class Rugged {
// compute with atmospheric refraction correction if necessary
if (atmosphericRefraction != null && atmosphericRefraction.mustBeComputed()) {
+ final Vector3D pBody;
+ final Vector3D lBody;
+
+ // Take into account the light time correction
+ // @since 3.1
+ if (lightTimeCorrection) {
+ // Transform sensor position in inertial frame to observed body
+ final Vector3D sP = inertToBody.transformPosition(pInert);
+ // Convert ground location of the pixel in cartesian coordinates
+ final Vector3D eP = ellipsoid.transform(gp[i]);
+ // Compute the light time correction (s)
+ final double deltaT = eP.distance(sP) / Constants.SPEED_OF_LIGHT;
+
+ // Apply shift due to light time correction
+ final Transform shiftedInertToBody = inertToBody.shiftedBy(-deltaT);
+
+ pBody = shiftedInertToBody.transformPosition(pInert);
+ lBody = shiftedInertToBody.transformVector(lInert);
+
+ } else { // Light time correction NOT to be taken into account
+
+ pBody = inertToBody.transformPosition(pInert);
+ lBody = inertToBody.transformVector(lInert);
+
+ } // end test on lightTimeCorrection
+
// apply atmospheric refraction correction
- final Vector3D pBody = inertToBody.transformPosition(pInert);
- final Vector3D lBody = inertToBody.transformVector(lInert);
gp[i] = atmosphericRefraction.applyCorrection(pBody, lBody, (NormalizedGeodeticPoint) gp[i], algorithm);
+
}
DumpManager.dumpDirectLocationResult(gp[i]);
}
@@ -338,7 +371,7 @@ public class Rugged {
lInert = obsLInert;
}
- // Compute ground location of specified pixel
+ // Compute ground location of specified pixel according to light time correction flag
final NormalizedGeodeticPoint gp;
if (lightTimeCorrection) {
@@ -354,14 +387,39 @@ public class Rugged {
algorithm.intersection(ellipsoid, pBody, lBody));
}
+ // Compute ground location of specified pixel according to atmospheric refraction correction flag
NormalizedGeodeticPoint result = gp;
// compute the ground location with atmospheric correction if asked for
if (atmosphericRefraction != null && atmosphericRefraction.mustBeComputed()) {
+ final Vector3D pBody;
+ final Vector3D lBody;
+
+ // Take into account the light time correction
+ // @since 3.1
+ if (lightTimeCorrection) {
+ // Transform sensor position in inertial frame to observed body
+ final Vector3D sP = inertToBody.transformPosition(pInert);
+ // Convert ground location of the pixel in cartesian coordinates
+ final Vector3D eP = ellipsoid.transform(gp);
+ // Compute the light time correction (s)
+ final double deltaT = eP.distance(sP) / Constants.SPEED_OF_LIGHT;
+
+ // Apply shift due to light time correction
+ final Transform shiftedInertToBody = inertToBody.shiftedBy(-deltaT);
+
+ pBody = shiftedInertToBody.transformPosition(pInert);
+ lBody = shiftedInertToBody.transformVector(lInert);
+
+ } else { // Light time correction NOT to be taken into account
+
+ pBody = inertToBody.transformPosition(pInert);
+ lBody = inertToBody.transformVector(lInert);
+
+ } // end test on lightTimeCorrection
+
// apply atmospheric refraction correction
- final Vector3D pBody = inertToBody.transformPosition(pInert);
- final Vector3D lBody = inertToBody.transformVector(lInert);
result = atmosphericRefraction.applyCorrection(pBody, lBody, gp, algorithm);
} // end test on atmosphericRefraction != null
@@ -514,7 +572,7 @@ public class Rugged {
final int minLine, final int maxLine) {
final LineSensor sensor = getLineSensor(sensorName);
- DumpManager.dumpInverseLocation(sensor, point, minLine, maxLine, lightTimeCorrection,
+ DumpManager.dumpInverseLocation(sensor, point, ellipsoid, minLine, maxLine, lightTimeCorrection,
aberrationOfLightCorrection, atmosphericRefraction != null);
final SensorMeanPlaneCrossing planeCrossing = getPlaneCrossing(sensorName, minLine, maxLine);
@@ -561,7 +619,7 @@ public class Rugged {
* @param scToInert transform for the date from spacecraft to inertial
* @param inertToBody transform for the date from inertial to body
* @param pInert sensor position in inertial frame
- * @param lInert line of sight in inertial frame
+ * @param lInert line of sight in inertial frame (with light time correction if asked for)
* @return geodetic point with light time correction
*/
private NormalizedGeodeticPoint computeWithLightTimeCorrection(final AbsoluteDate date,
@@ -569,26 +627,41 @@ public class Rugged {
final Transform scToInert, final Transform inertToBody,
final Vector3D pInert, final Vector3D lInert) {
- // compute the approximate transform between spacecraft and observed body
+ // Compute the transform between spacecraft and observed body
final Transform approximate = new Transform(date, scToInert, inertToBody);
+ // Transform LOS in spacecraft frame to observed body
final Vector3D sL = approximate.transformVector(los);
+ // Transform sensor position in spacecraft frame to observed body
final Vector3D sP = approximate.transformPosition(sensorPosition);
+ // Compute point intersecting ground (= the ellipsoid) along the pixel LOS
final Vector3D eP1 = ellipsoid.transform(ellipsoid.pointOnGround(sP, sL, 0.0));
+
+ // Compute light time time correction (vs the ellipsoid) (s)
final double deltaT1 = eP1.distance(sP) / Constants.SPEED_OF_LIGHT;
+
+ // Apply shift due to light time correction (vs the ellipsoid)
final Transform shifted1 = inertToBody.shiftedBy(-deltaT1);
+
+ // Search the intersection of LOS (taking into account the light time correction if asked for) with DEM
final NormalizedGeodeticPoint gp1 = algorithm.intersection(ellipsoid,
shifted1.transformPosition(pInert),
shifted1.transformVector(lInert));
+ // Convert the geodetic point (intersection of LOS with DEM) in cartesian coordinates
final Vector3D eP2 = ellipsoid.transform(gp1);
+
+ // Compute the light time correction (vs DEM) (s)
final double deltaT2 = eP2.distance(sP) / Constants.SPEED_OF_LIGHT;
+
+ // Apply shift due to light time correction (vs DEM)
final Transform shifted2 = inertToBody.shiftedBy(-deltaT2);
+
return algorithm.refineIntersection(ellipsoid,
- shifted2.transformPosition(pInert),
- shifted2.transformVector(lInert),
- gp1);
+ shifted2.transformPosition(pInert),
+ shifted2.transformVector(lInert),
+ gp1);
}
/**
@@ -675,7 +748,7 @@ public class Rugged {
// ===========================================
// Need to be computed only once for a given sensor (with the same minLine and maxLine)
if (atmosphericRefraction.getBifPixel() == null || atmosphericRefraction.getBifLine() == null || // lazy evaluation
- (!atmosphericRefraction.isSameContext(sensorName, minLine, maxLine))) { // Must be recomputed if the context changed
+ !atmosphericRefraction.isSameContext(sensorName, minLine, maxLine)) { // Must be recomputed if the context changed
// Definition of a regular grid (at sensor level)
atmosphericRefraction.configureCorrectionGrid(sensor, minLine, maxLine);
@@ -706,19 +779,29 @@ public class Rugged {
// ==================
// Initialization
// --------------
+ // Deactivate the dump because no need to keep intermediate computations of inverse loc (can be regenerate)
+ final Boolean wasSuspended = DumpManager.suspend();
+
// compute the sensor pixel on the desired ground point WITHOUT atmosphere
atmosphericRefraction.deactivateComputation();
final SensorPixel sp0 = inverseLocation(sensorName, point, minLine, maxLine);
atmosphericRefraction.reactivateComputation();
+ // Reactivate the dump
+ DumpManager.resume(wasSuspended);
if (sp0 == null) {
- // Impossible to find the point in the given min line and max line (without atmosphere)
- throw new RuggedException(RuggedMessages.INVALID_RANGE_FOR_LINES, minLine, maxLine, "");
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
+
+ // Impossible to find the sensor pixel in the given range lines (without atmosphere)
+ throw new RuggedException(RuggedMessages.SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES, minLine, maxLine);
}
// set up the starting point of the fixed point method
final double pixel0 = sp0.getPixelNumber();
final double line0 = sp0.getLineNumber();
+ // Needed data for the dump
+ sensor.dumpRate(line0);
// Apply fixed point method until convergence in pixel and line
// ------------------------------------------------------------
@@ -746,6 +829,8 @@ public class Rugged {
}
// The sensor pixel is found !
final SensorPixel sensorPixelWithAtmosphere = new SensorPixel(corrLinePrevious, corrPixelPrevious);
+
+ // Dump the found sensorPixel
DumpManager.dumpInverseLocationResult(sensorPixelWithAtmosphere);
return sensorPixelWithAtmosphere;
@@ -766,6 +851,9 @@ public class Rugged {
final int nbPixelGrid, final int nbLineGrid,
final LineSensor sensor, final int minLine, final int maxLine) {
+ // Deactivate the dump because no need to keep intermediate computations of inverse loc (can be regenerate)
+ final Boolean wasSuspended = DumpManager.suspend();
+
final SensorPixel[][] sensorPixelGrid = new SensorPixel[nbPixelGrid][nbLineGrid];
final String sensorName = sensor.getName();
@@ -783,17 +871,26 @@ public class Rugged {
sensorPixelGrid[uIndex][vIndex] = inverseLocation(sensorName, currentLat, currentLon, minLine, maxLine);
} catch (RuggedException re) { // This should never happen
- throw RuggedException.createInternalError(re);
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
+ throw new RuggedInternalError(re);
}
// Check if the pixel is inside the sensor (with a margin) OR if the inverse location was impossible (null result)
- if ((sensorPixelGrid[uIndex][vIndex] != null &&
- (sensorPixelGrid[uIndex][vIndex].getPixelNumber() < (-INVLOC_MARGIN) ||
- sensorPixelGrid[uIndex][vIndex].getPixelNumber() > (INVLOC_MARGIN + sensor.getNbPixels() - 1))) ||
- (sensorPixelGrid[uIndex][vIndex] == null) ) {
-
- // Impossible to find the point in the given min line
- throw new RuggedException(RuggedMessages.INVALID_RANGE_FOR_LINES, minLine, maxLine, "");
+ if (!pixelIsInside(sensorPixelGrid[uIndex][vIndex], sensor)) {
+
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
+
+ if (sensorPixelGrid[uIndex][vIndex] == null) {
+ // Impossible to find the sensor pixel in the given range lines
+ throw new RuggedException(RuggedMessages.SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES, minLine, maxLine);
+ } else {
+ // Impossible to find the sensor pixel
+ final double invLocationMargin = atmosphericRefraction.getComputationParameters().getInverseLocMargin();
+ throw new RuggedException(RuggedMessages.SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE, sensorPixelGrid[uIndex][vIndex].getPixelNumber(),
+ -invLocationMargin, invLocationMargin + sensor.getNbPixels() - 1, invLocationMargin);
+ }
}
} else { // groundGrid[uIndex][vIndex] == null: impossible to compute inverse loc because ground point not defined
@@ -804,10 +901,25 @@ public class Rugged {
} // end loop vIndex
} // end loop uIndex
+ // Reactivate the dump
+ DumpManager.resume(wasSuspended);
+
// The sensor grid computed WITHOUT atmospheric refraction correction
return sensorPixelGrid;
}
+ /** Check if pixel is inside the sensor with a margin.
+ * @param pixel pixel to check (may be null if not found)
+ * @param sensor the line sensor
+ * @return true if the pixel is inside the sensor
+ */
+ private boolean pixelIsInside(final SensorPixel pixel, final LineSensor sensor) {
+ // Get the inverse location margin
+ final double invLocationMargin = atmosphericRefraction.getComputationParameters().getInverseLocMargin();
+
+ return pixel != null && pixel.getPixelNumber() >= -invLocationMargin && pixel.getPixelNumber() < invLocationMargin + sensor.getNbPixels() - 1;
+ }
+
/** Computation, for the sensor pixels grid, of the direct location WITH atmospheric refraction.
* (full computation)
* @param pixelGrid the pixel grid
@@ -819,6 +931,9 @@ public class Rugged {
private GeodeticPoint[][] computeDirectLocOnGridWithAtmosphere(final double[] pixelGrid, final double[] lineGrid,
final LineSensor sensor) {
+ // Deactivate the dump because no need to keep intermediate computations of direct loc (can be regenerate)
+ final Boolean wasSuspended = DumpManager.suspend();
+
final int nbPixelGrid = pixelGrid.length;
final int nbLineGrid = lineGrid.length;
final GeodeticPoint[][] groundGridWithAtmosphere = new GeodeticPoint[nbPixelGrid][nbLineGrid];
@@ -835,11 +950,16 @@ public class Rugged {
groundGridWithAtmosphere[uIndex][vIndex] = directLocation(date, sensorPosition, los);
} catch (RuggedException re) { // This should never happen
- throw RuggedException.createInternalError(re);
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
+ throw new RuggedInternalError(re);
}
} // end loop vIndex
} // end loop uIndex
+ // Reactivate the dump
+ DumpManager.resume(wasSuspended);
+
// The ground grid computed WITH atmospheric refraction correction
return groundGridWithAtmosphere;
}
@@ -915,6 +1035,7 @@ public class Rugged {
}
/** Compute distances between two line sensors with derivatives.
+ * @param <T> derivative type
* @param sensorA line sensor A
* @param dateA current date for sensor A
* @param pixelA pixel index for sensor A
@@ -926,11 +1047,11 @@ public class Rugged {
* @return distances computed, with derivatives, between LOS and to the ground
* @see #distanceBetweenLOS(LineSensor, AbsoluteDate, double, SpacecraftToObservedBody, LineSensor, AbsoluteDate, double)
*/
- public DerivativeStructure[] distanceBetweenLOSderivatives(
+ public <T extends Derivative<T>> T[] distanceBetweenLOSderivatives(
final LineSensor sensorA, final AbsoluteDate dateA, final double pixelA,
final SpacecraftToObservedBody scToBodyA,
final LineSensor sensorB, final AbsoluteDate dateB, final double pixelB,
- final DSGenerator generator) {
+ final DerivativeGenerator<T> generator) {
// Compute the approximate transforms between spacecraft and observed body
// from Rugged instance A
@@ -944,59 +1065,63 @@ public class Rugged {
final Transform transformScToBodyB = new Transform(dateB, scToInertB, inertToBodyB);
// Get sensors LOS into local frame
- final FieldVector3D<DerivativeStructure> vALocal = sensorA.getLOSDerivatives(dateA, pixelA, generator);
- final FieldVector3D<DerivativeStructure> vBLocal = sensorB.getLOSDerivatives(dateB, pixelB, generator);
+ final FieldVector3D<T> vALocal = sensorA.getLOSDerivatives(dateA, pixelA, generator);
+ final FieldVector3D<T> vBLocal = sensorB.getLOSDerivatives(dateB, pixelB, generator);
// Get sensors LOS into body frame
- final FieldVector3D<DerivativeStructure> vA = transformScToBodyA.transformVector(vALocal); // V_a : line of sight's vectorA
- final FieldVector3D<DerivativeStructure> vB = transformScToBodyB.transformVector(vBLocal); // V_b : line of sight's vectorB
+ final FieldVector3D<T> vA = transformScToBodyA.transformVector(vALocal); // V_a : line of sight's vectorA
+ final FieldVector3D<T> vB = transformScToBodyB.transformVector(vBLocal); // V_b : line of sight's vectorB
// Position of sensors into local frame
final Vector3D sAtmp = sensorA.getPosition();
final Vector3D sBtmp = sensorB.getPosition();
- final DerivativeStructure scaleFactor = FieldVector3D.dotProduct(vA.normalize(), vA.normalize()); // V_a.V_a=1
+ final T scaleFactor = FieldVector3D.dotProduct(vA.normalize(), vA.normalize()); // V_a.V_a=1
// Build a vector from the position and a scale factor (equals to 1).
// The vector built will be scaleFactor * sAtmp for example.
- final FieldVector3D<DerivativeStructure> sALocal = new FieldVector3D<DerivativeStructure>(scaleFactor, sAtmp);
- final FieldVector3D<DerivativeStructure> sBLocal = new FieldVector3D<DerivativeStructure>(scaleFactor, sBtmp);
+ final FieldVector3D<T> sALocal = new FieldVector3D<>(scaleFactor, sAtmp);
+ final FieldVector3D<T> sBLocal = new FieldVector3D<>(scaleFactor, sBtmp);
// Get sensors position into body frame
- final FieldVector3D<DerivativeStructure> sA = transformScToBodyA.transformPosition(sALocal); // S_a : sensorA 's position
- final FieldVector3D<DerivativeStructure> sB = transformScToBodyB.transformPosition(sBLocal); // S_b : sensorB 's position
+ final FieldVector3D<T> sA = transformScToBodyA.transformPosition(sALocal); // S_a : sensorA 's position
+ final FieldVector3D<T> sB = transformScToBodyB.transformPosition(sBLocal); // S_b : sensorB 's position
// Compute distance
- final FieldVector3D<DerivativeStructure> vBase = sB.subtract(sA); // S_b - S_a
- final DerivativeStructure svA = FieldVector3D.dotProduct(vBase, vA); // SV_a = (S_b - S_a).V_a
- final DerivativeStructure svB = FieldVector3D.dotProduct(vBase, vB); // SV_b = (S_b - S_a).V_b
+ final FieldVector3D<T> vBase = sB.subtract(sA); // S_b - S_a
+ final T svA = FieldVector3D.dotProduct(vBase, vA); // SV_a = (S_b - S_a).V_a
+ final T svB = FieldVector3D.dotProduct(vBase, vB); // SV_b = (S_b - S_a).V_b
- final DerivativeStructure vAvB = FieldVector3D.dotProduct(vA, vB); // V_a.V_b
+ final T vAvB = FieldVector3D.dotProduct(vA, vB); // V_a.V_b
// Compute lambda_b = (SV_a * V_a.V_b - SV_b) / (1 - (V_a.V_b)²)
- final DerivativeStructure lambdaB = (svA.multiply(vAvB).subtract(svB)).divide(vAvB.multiply(vAvB).subtract(1).negate());
+ final T lambdaB = (svA.multiply(vAvB).subtract(svB)).divide(vAvB.multiply(vAvB).subtract(1).negate());
// Compute lambda_a = SV_a + lambdaB * V_a.V_b
- final DerivativeStructure lambdaA = vAvB.multiply(lambdaB).add(svA);
+ final T lambdaA = vAvB.multiply(lambdaB).add(svA);
// Compute vector M_a:
- final FieldVector3D<DerivativeStructure> mA = sA.add(vA.scalarMultiply(lambdaA)); // M_a = S_a + lambda_a * V_a
+ final FieldVector3D<T> mA = sA.add(vA.scalarMultiply(lambdaA)); // M_a = S_a + lambda_a * V_a
// Compute vector M_b
- final FieldVector3D<DerivativeStructure> mB = sB.add(vB.scalarMultiply(lambdaB)); // M_b = S_b + lambda_b * V_b
+ final FieldVector3D<T> mB = sB.add(vB.scalarMultiply(lambdaB)); // M_b = S_b + lambda_b * V_b
// Compute vector M_a -> M_B for which distance between LOS is minimum
- final FieldVector3D<DerivativeStructure> vDistanceMin = mB.subtract(mA); // M_b - M_a
+ final FieldVector3D<T> vDistanceMin = mB.subtract(mA); // M_b - M_a
// Compute vector from mid point of vector M_a -> M_B to the ground (corresponds to minimum elevation)
- final FieldVector3D<DerivativeStructure> midPoint = (mB.add(mA)).scalarMultiply(0.5);
+ final FieldVector3D<T> midPoint = (mB.add(mA)).scalarMultiply(0.5);
// Get the euclidean norms to compute the minimum distances:
// between LOS
- final DerivativeStructure dMin = vDistanceMin.getNorm();
+ final T dMin = vDistanceMin.getNorm();
// to the ground
- final DerivativeStructure dCentralBody = midPoint.getNorm();
+ final T dCentralBody = midPoint.getNorm();
+
+ final T[] ret = MathArrays.buildArray(dMin.getField(), 2);
+ ret[0] = dMin;
+ ret[1] = dCentralBody;
+ return ret;
- return new DerivativeStructure[] {dMin, dCentralBody};
}
@@ -1037,22 +1162,22 @@ public class Rugged {
}
/** Inverse location of a point with derivatives.
+ * @param <T> derivative type
* @param sensorName name of the line sensor
* @param point point to localize
* @param minLine minimum line number
* @param maxLine maximum line number
- * @param generator generator to use for building {@link DerivativeStructure} instances
+ * @param generator generator to use for building {@link Derivative} instances
* @return sensor pixel seeing point with derivatives, or null if point cannot be seen between the
* prescribed line numbers
* @see #inverseLocation(String, GeodeticPoint, int, int)
* @since 2.0
*/
-
- public DerivativeStructure[] inverseLocationDerivatives(final String sensorName,
- final GeodeticPoint point,
- final int minLine,
- final int maxLine,
- final DSGenerator generator) {
+ public <T extends Derivative<T>> T[] inverseLocationDerivatives(final String sensorName,
+ final GeodeticPoint point,
+ final int minLine,
+ final int maxLine,
+ final DerivativeGenerator<T> generator) {
final LineSensor sensor = getLineSensor(sensorName);
@@ -1080,37 +1205,39 @@ public class Rugged {
// fix line by considering the closest pixel exact position and line-of-sight
// (this pixel might point towards a direction slightly above or below the mean sensor plane)
final int lowIndex = FastMath.max(0, FastMath.min(sensor.getNbPixels() - 2, (int) FastMath.floor(coarsePixel)));
- final FieldVector3D<DerivativeStructure> lowLOS =
+ final FieldVector3D<T> lowLOS =
sensor.getLOSDerivatives(crossingResult.getDate(), lowIndex, generator);
- final FieldVector3D<DerivativeStructure> highLOS = sensor.getLOSDerivatives(crossingResult.getDate(), lowIndex + 1, generator);
- final FieldVector3D<DerivativeStructure> localZ = FieldVector3D.crossProduct(lowLOS, highLOS).normalize();
- final DerivativeStructure beta = FieldVector3D.dotProduct(crossingResult.getTargetDirection(), localZ).acos();
- final DerivativeStructure s = FieldVector3D.dotProduct(crossingResult.getTargetDirectionDerivative(), localZ);
- final DerivativeStructure minusBetaDer = s.divide(s.multiply(s).subtract(1).negate().sqrt());
- final DerivativeStructure deltaL = beta.subtract(0.5 * FastMath.PI) .divide(minusBetaDer);
- final DerivativeStructure fixedLine = deltaL.add(crossingResult.getLine());
- final FieldVector3D<DerivativeStructure> fixedDirection =
- new FieldVector3D<DerivativeStructure>(deltaL.getField().getOne(), crossingResult.getTargetDirection(),
- deltaL, crossingResult.getTargetDirectionDerivative()).normalize();
+ final FieldVector3D<T> highLOS = sensor.getLOSDerivatives(crossingResult.getDate(), lowIndex + 1, generator);
+ final FieldVector3D<T> localZ = FieldVector3D.crossProduct(lowLOS, highLOS).normalize();
+ final T beta = FieldVector3D.dotProduct(crossingResult.getTargetDirection(), localZ).acos();
+ final T s = FieldVector3D.dotProduct(crossingResult.getTargetDirectionDerivative(), localZ);
+ final T minusBetaDer = s.divide(s.multiply(s).subtract(1).negate().sqrt());
+ final T deltaL = beta.subtract(0.5 * FastMath.PI) .divide(minusBetaDer);
+ final T fixedLine = deltaL.add(crossingResult.getLine());
+ final FieldVector3D<T> fixedDirection =
+ new FieldVector3D<>(deltaL.getField().getOne(), crossingResult.getTargetDirection(),
+ deltaL, crossingResult.getTargetDirectionDerivative()).normalize();
// fix neighbouring pixels
final AbsoluteDate fixedDate = sensor.getDate(fixedLine.getValue());
- final FieldVector3D<DerivativeStructure> fixedX = sensor.getLOSDerivatives(fixedDate, lowIndex, generator);
- final FieldVector3D<DerivativeStructure> fixedZ = FieldVector3D.crossProduct(fixedX, sensor.getLOSDerivatives(fixedDate, lowIndex + 1, generator));
- final FieldVector3D<DerivativeStructure> fixedY = FieldVector3D.crossProduct(fixedZ, fixedX);
+ final FieldVector3D<T> fixedX = sensor.getLOSDerivatives(fixedDate, lowIndex, generator);
+ final FieldVector3D<T> fixedZ = FieldVector3D.crossProduct(fixedX, sensor.getLOSDerivatives(fixedDate, lowIndex + 1, generator));
+ final FieldVector3D<T> fixedY = FieldVector3D.crossProduct(fixedZ, fixedX);
// fix pixel
- final DerivativeStructure hY = FieldVector3D.dotProduct(highLOS, fixedY);
- final DerivativeStructure hX = FieldVector3D.dotProduct(highLOS, fixedX);
- final DerivativeStructure pixelWidth = hY.atan2(hX);
- final DerivativeStructure fY = FieldVector3D.dotProduct(fixedDirection, fixedY);
- final DerivativeStructure fX = FieldVector3D.dotProduct(fixedDirection, fixedX);
- final DerivativeStructure alpha = fY.atan2(fX);
- final DerivativeStructure fixedPixel = alpha.divide(pixelWidth).add(lowIndex);
-
- return new DerivativeStructure[] {
- fixedLine, fixedPixel
- };
+ final T hY = FieldVector3D.dotProduct(highLOS, fixedY);
+ final T hX = FieldVector3D.dotProduct(highLOS, fixedX);
+ final T pixelWidth = hY.atan2(hX);
+ final T fY = FieldVector3D.dotProduct(fixedDirection, fixedY);
+ final T fX = FieldVector3D.dotProduct(fixedDirection, fixedX);
+ final T alpha = fY.atan2(fX);
+ final T fixedPixel = alpha.divide(pixelWidth).add(lowIndex);
+
+ final T[] ret = MathArrays.buildArray(fixedPixel.getField(), 2);
+ ret[0] = fixedLine;
+ ret[1] = fixedPixel;
+ return ret;
+
}
/** Get transform from spacecraft to inertial frame.
diff --git a/src/main/java/org/orekit/rugged/api/RuggedBuilder.java b/src/main/java/org/orekit/rugged/api/RuggedBuilder.java
index 3a604d61038385ddc426fd0f14e83c9fb6c845af..02be375a6c10ff04a17324dde9cc710cd9645324 100644
--- a/src/main/java/org/orekit/rugged/api/RuggedBuilder.java
+++ b/src/main/java/org/orekit/rugged/api/RuggedBuilder.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -32,9 +32,8 @@ import org.orekit.bodies.OneAxisEllipsoid;
import org.orekit.frames.Frame;
import org.orekit.frames.FramesFactory;
import org.orekit.propagation.Propagator;
-import org.orekit.propagation.SpacecraftState;
-import org.orekit.propagation.sampling.OrekitFixedStepHandler;
import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedInternalError;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.BasicScanAlgorithm;
import org.orekit.rugged.intersection.ConstantElevationAlgorithm;
@@ -97,6 +96,10 @@ public class RuggedBuilder {
/** Updater used to load Digital Elevation Model tiles. */
private TileUpdater tileUpdater;
+ /** Flag to tell if the Digital Elevation Model tiles are overlapping.
+ * @since 4.0 */
+ private boolean isOverlappingTiles = true;
+
/** Constant elevation over ellipsoid (m).
* used only with {@link AlgorithmId#CONSTANT_ELEVATION_OVER_ELLIPSOID. */
private double constantElevation;
@@ -172,7 +175,7 @@ public class RuggedBuilder {
* </p>
*/
public RuggedBuilder() {
- sensors = new ArrayList<LineSensor>();
+ sensors = new ArrayList<>();
constantElevation = Double.NaN;
lightTimeCorrection = true;
aberrationOfLightCorrection = true;
@@ -238,7 +241,8 @@ public class RuggedBuilder {
* {@link AlgorithmId#DUVENHAGE_FLAT_BODY DUVENHAGE_FLAT_BODY}
* and {@link AlgorithmId#BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY
* BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY} all
- * require {@link #setDigitalElevationModel(TileUpdater, int) setDigitalElevationModel}
+ * require {@link #setDigitalElevationModel(TileUpdater, int, boolean) setDigitalElevationModel}
+ * or {@link #setDigitalElevationModel(TileUpdater, int) setDigitalElevationModel}
* to be called,</li>
* <li>{@link AlgorithmId#CONSTANT_ELEVATION_OVER_ELLIPSOID
* CONSTANT_ELEVATION_OVER_ELLIPSOID} requires
@@ -250,6 +254,7 @@ public class RuggedBuilder {
*
* @param newAlgorithmId identifier of algorithm to use for Digital Elevation Model intersection
* @return the builder instance
+ * @see #setDigitalElevationModel(TileUpdater, int, boolean)
* @see #setDigitalElevationModel(TileUpdater, int)
* @see #getAlgorithm()
*/
@@ -267,6 +272,10 @@ public class RuggedBuilder {
}
/** Set the user-provided {@link TileUpdater tile updater}.
+ * <p>
+ * The DEM tiles must be overlapping, otherwise use {@link #setDigitalElevationModel(TileUpdater, int, boolean)}
+ * with flag set to false.
+ * </p>
* <p>
* Note that when the algorithm specified in {@link #setAlgorithm(AlgorithmId)}
* is either {@link AlgorithmId#CONSTANT_ELEVATION_OVER_ELLIPSOID
@@ -279,18 +288,48 @@ public class RuggedBuilder {
* @param newTileUpdater updater used to load Digital Elevation Model tiles
* @param newMaxCachedTiles maximum number of tiles stored in the cache
* @return the builder instance
+ * @see #setDigitalElevationModel(TileUpdater, int, boolean)
* @see #setAlgorithm(AlgorithmId)
* @see #getTileUpdater()
* @see #getMaxCachedTiles()
*/
public RuggedBuilder setDigitalElevationModel(final TileUpdater newTileUpdater, final int newMaxCachedTiles) {
+ return setDigitalElevationModel(newTileUpdater, newMaxCachedTiles, true);
+ }
+
+ /** Set the user-provided {@link TileUpdater tile updater}.
+ * <p>
+ * Note that when the algorithm specified in {@link #setAlgorithm(AlgorithmId)}
+ * is either {@link AlgorithmId#CONSTANT_ELEVATION_OVER_ELLIPSOID
+ * CONSTANT_ELEVATION_OVER_ELLIPSOID} or {@link
+ * AlgorithmId#IGNORE_DEM_USE_ELLIPSOID IGNORE_DEM_USE_ELLIPSOID},
+ * then this method becomes irrelevant and can either be not called at all,
+ * or it can be called with an updater set to {@code null}. For all other
+ * algorithms, the updater must be properly configured.
+ * </p>
+ * @param newTileUpdater updater used to load Digital Elevation Model tiles
+ * @param newMaxCachedTiles maximum number of tiles stored in the cache
+ * @param newIsOverlappingTiles flag to tell if the DEM tiles are overlapping:
+ * true if overlapping; false otherwise.
+ * @return the builder instance
+ * @see #setDigitalElevationModel(TileUpdater, int)
+ * @see #setAlgorithm(AlgorithmId)
+ * @see #getTileUpdater()
+ * @see #getMaxCachedTiles()
+ * @see #isOverlappingTiles()
+ * @since 4.0
+ */
+ public RuggedBuilder setDigitalElevationModel(final TileUpdater newTileUpdater, final int newMaxCachedTiles,
+ final boolean newIsOverlappingTiles) {
this.tileUpdater = newTileUpdater;
this.maxCachedTiles = newMaxCachedTiles;
+ this.isOverlappingTiles = newIsOverlappingTiles;
return this;
}
/** Get the updater used to load Digital Elevation Model tiles.
* @return updater used to load Digital Elevation Model tiles
+ * @see #setDigitalElevationModel(TileUpdater, int, boolean)
* @see #setDigitalElevationModel(TileUpdater, int)
* @see #getMaxCachedTiles()
*/
@@ -298,6 +337,26 @@ public class RuggedBuilder {
return tileUpdater;
}
+ /**
+ * Get the flag telling if the DEM tiles are overlapping.
+ * @return true if the Digital Elevation Model tiles are overlapping;
+ * false otherwise. Default = true.
+ * @since 4.0
+ */
+ public boolean isOverlappingTiles() {
+ return isOverlappingTiles;
+ }
+
+ /**
+ * Set the DEM overlapping tiles flag.
+ * @param newIsOverlappingTiles flag to tell if the Digital Elevation Model tiles are overlapping:
+ * true if overlapping; false otherwise
+ * @since 4.0
+ */
+ public void setOverlappingTiles(final boolean newIsOverlappingTiles) {
+ this.isOverlappingTiles = newIsOverlappingTiles;
+ }
+
/** Set the user-provided constant elevation model.
* <p>
* Note that this method is relevant <em>only</em> if the algorithm specified
@@ -325,6 +384,7 @@ public class RuggedBuilder {
/** Get the maximum number of tiles stored in the cache.
* @return maximum number of tiles stored in the cache
+ * @see #setDigitalElevationModel(TileUpdater, int, boolean)
* @see #setDigitalElevationModel(TileUpdater, int)
* @see #getTileUpdater()
*/
@@ -729,22 +789,17 @@ public class RuggedBuilder {
// extract position/attitude samples from propagator
final List<TimeStampedPVCoordinates> positionsVelocities =
- new ArrayList<TimeStampedPVCoordinates>();
+ new ArrayList<>();
final List<TimeStampedAngularCoordinates> quaternions =
- new ArrayList<TimeStampedAngularCoordinates>();
- propagator.setMasterMode(interpolationStep, new OrekitFixedStepHandler() {
-
- /** {@inheritDoc} */
- @Override
- public void handleStep(final SpacecraftState currentState, final boolean isLast) {
+ new ArrayList<>();
+ propagator.getMultiplexer().add(interpolationStep,
+ currentState -> {
final AbsoluteDate date = currentState.getDate();
final PVCoordinates pv = currentState.getPVCoordinates(inertialFrame);
final Rotation q = currentState.getAttitude().getRotation();
positionsVelocities.add(new TimeStampedPVCoordinates(date, pv.getPosition(), pv.getVelocity(), Vector3D.ZERO));
quaternions.add(new TimeStampedAngularCoordinates(date, q, Vector3D.ZERO, Vector3D.ZERO));
- }
-
- });
+ });
propagator.propagate(minDate.shiftedBy(-interpolationStep), maxDate.shiftedBy(interpolationStep));
// orbit/attitude to body converter
@@ -883,7 +938,7 @@ public class RuggedBuilder {
return FramesFactory.getVeis1950();
default :
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
}
@@ -903,7 +958,7 @@ public class RuggedBuilder {
return FramesFactory.getGTOD(IERSConventions.IERS_1996, true);
default :
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
}
@@ -917,18 +972,24 @@ public class RuggedBuilder {
// set up the ellipsoid
switch (ellipsoidID) {
case GRS80 :
- return new OneAxisEllipsoid(6378137.0, 1.0 / 298.257222101, bodyFrame);
+ return new OneAxisEllipsoid(Constants.GRS80_EARTH_EQUATORIAL_RADIUS,
+ Constants.GRS80_EARTH_FLATTENING,
+ bodyFrame);
case WGS84 :
return new OneAxisEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
Constants.WGS84_EARTH_FLATTENING,
bodyFrame);
case IERS96 :
- return new OneAxisEllipsoid(6378136.49, 1.0 / 298.25645, bodyFrame);
+ return new OneAxisEllipsoid(Constants.IERS96_EARTH_EQUATORIAL_RADIUS,
+ Constants.IERS96_EARTH_FLATTENING,
+ bodyFrame);
case IERS2003 :
- return new OneAxisEllipsoid(6378136.6, 1.0 / 298.25642, bodyFrame);
+ return new OneAxisEllipsoid(Constants.IERS2003_EARTH_EQUATORIAL_RADIUS,
+ Constants.IERS2003_EARTH_FLATTENING,
+ bodyFrame);
default :
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
}
@@ -938,27 +999,28 @@ public class RuggedBuilder {
* @param updater updater used to load Digital Elevation Model tiles
* @param maxCachedTiles maximum number of tiles stored in the cache
* @param constantElevation constant elevation over ellipsoid
+ * @param isOverlappingTiles flag to tell if the DEM tiles are overlapping:
+ * true if overlapping; false otherwise.
* @return selected algorithm
*/
private static IntersectionAlgorithm createAlgorithm(final AlgorithmId algorithmID,
final TileUpdater updater, final int maxCachedTiles,
- final double constantElevation) {
-
+ final double constantElevation, final boolean isOverlappingTiles) {
// set up the algorithm
switch (algorithmID) {
case DUVENHAGE :
- return new DuvenhageAlgorithm(updater, maxCachedTiles, false);
+ return new DuvenhageAlgorithm(updater, maxCachedTiles, false, isOverlappingTiles);
case DUVENHAGE_FLAT_BODY :
- return new DuvenhageAlgorithm(updater, maxCachedTiles, true);
+ return new DuvenhageAlgorithm(updater, maxCachedTiles, true, isOverlappingTiles);
case BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY :
- return new BasicScanAlgorithm(updater, maxCachedTiles);
+ return new BasicScanAlgorithm(updater, maxCachedTiles, isOverlappingTiles);
case CONSTANT_ELEVATION_OVER_ELLIPSOID :
return new ConstantElevationAlgorithm(constantElevation);
case IGNORE_DEM_USE_ELLIPSOID :
return new IgnoreDEMAlgorithm();
default :
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
}
@@ -980,7 +1042,7 @@ public class RuggedBuilder {
}
}
createInterpolatorIfNeeded();
- return new Rugged(createAlgorithm(algorithmID, tileUpdater, maxCachedTiles, constantElevation), ellipsoid,
+ return new Rugged(createAlgorithm(algorithmID, tileUpdater, maxCachedTiles, constantElevation, isOverlappingTiles), ellipsoid,
lightTimeCorrection, aberrationOfLightCorrection, atmosphericRefraction, scToBody, sensors, name);
}
}
diff --git a/src/main/java/org/orekit/rugged/api/package-info.java b/src/main/java/org/orekit/rugged/api/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..d862d25328c618ee97a78a9a007ac3407fd1ac1c
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/api/package-info.java
@@ -0,0 +1,26 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides the principal class of Rugged library API, as well as
+ * the builder for Rugged instances.
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ *
+ */
+package org.orekit.rugged.api;
diff --git a/src/main/java/org/orekit/rugged/errors/Dump.java b/src/main/java/org/orekit/rugged/errors/Dump.java
index 6cf19d3419148bb7c6676db04f0716052f01db61..23de046a43df8ef4e44870b1c61d81e5407f734f 100644
--- a/src/main/java/org/orekit/rugged/errors/Dump.java
+++ b/src/main/java/org/orekit/rugged/errors/Dump.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -75,8 +75,8 @@ class Dump {
*/
Dump(final PrintWriter writer) {
this.writer = writer;
- this.tiles = new ArrayList<DumpedTileData>();
- this.sensors = new ArrayList<DumpedSensorData>();
+ this.tiles = new ArrayList<>();
+ this.sensors = new ArrayList<>();
this.algorithmDumped = false;
this.ellipsoidDumped = false;
this.tranformsDumped = null;
@@ -170,6 +170,8 @@ class Dump {
writer.format(Locale.US,
"direct location result: latitude %22.15e longitude %22.15e elevation %22.15e%n",
gp.getLatitude(), gp.getLongitude(), gp.getAltitude());
+ } else {
+ writer.format(Locale.US, "direct location result: NULL");
}
}
@@ -203,6 +205,8 @@ class Dump {
writer.format(Locale.US,
"inverse location result: lineNumber %22.15e pixelNumber %22.15e%n",
pixel.getLineNumber(), pixel.getPixelNumber());
+ } else {
+ writer.format(Locale.US, "inverse location result: NULL");
}
}
@@ -508,7 +512,7 @@ class Dump {
result.getTargetDirectionDerivative().getY(),
result.getTargetDirectionDerivative().getZ());
} catch (RuggedException re) {
- throw RuggedException.createInternalError(re);
+ throw new RuggedInternalError(re);
}
});
writer.format(Locale.US, "%n");
diff --git a/src/main/java/org/orekit/rugged/errors/DumpManager.java b/src/main/java/org/orekit/rugged/errors/DumpManager.java
index 189aea8a522c1ff3255edb357e6f73db9d7a2daf..8b576bb22ed5b70619b20d8105065a4f451a0780 100644
--- a/src/main/java/org/orekit/rugged/errors/DumpManager.java
+++ b/src/main/java/org/orekit/rugged/errors/DumpManager.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -47,7 +47,7 @@ import org.orekit.time.AbsoluteDate;
public class DumpManager {
/** Dump file (default initial value is null, i.e. nothing is dumped). */
- private static final ThreadLocal<Dump> DUMP = new ThreadLocal<Dump>();
+ private static final ThreadLocal<Dump> DUMP = new ThreadLocal<>();
/** Boolean to check if the dump is suspended. */
private static boolean isSuspended = false;
@@ -86,15 +86,38 @@ public class DumpManager {
}
/** Suspend the dump.
+ * In case the dump is already suspended, keep the previous status in order to
+ * correctly deal the resume stage.
+ * @return a flag to tell if the dump is already suspended (true; false otherwise)
*/
- public static void suspend() {
- isSuspended = true;
+ public static Boolean suspend() {
+ // Check if the dump is already suspended
+ if (isSuspended) {
+ return isSuspended;
+ } else {
+ isSuspended = true;
+ return false;
+ }
+ }
+
+ /** Resume the dump, only if it was not already suspended.
+ * @param wasSuspended flag to tell if the dump was already suspended (true; false otherwise)
+ */
+ public static void resume(final Boolean wasSuspended) {
+ if (!wasSuspended) {
+ isSuspended = false;
+ }
}
- /** Resume the dump.
+ /** In case dump is suspended and an exception is thrown,
+ * allows the dump to end nicely.
*/
- public static void resume() {
+ public static void endNicely() {
isSuspended = false;
+ if (isActive()) {
+ deactivate();
+ }
+
}
/** Check if dump is active for this thread.
@@ -175,6 +198,7 @@ public class DumpManager {
/** Dump an inverse location computation.
* @param sensor sensor
* @param point point to localize
+ * @param ellipsoid the used ellipsoid
* @param minLine minimum line number
* @param maxLine maximum line number
* @param lightTimeCorrection flag for light time correction
@@ -182,12 +206,14 @@ public class DumpManager {
* @param refractionCorrection flag for refraction correction
*/
public static void dumpInverseLocation(final LineSensor sensor, final GeodeticPoint point,
+ final ExtendedEllipsoid ellipsoid,
final int minLine, final int maxLine,
final boolean lightTimeCorrection, final boolean aberrationOfLightCorrection,
final boolean refractionCorrection) {
if (isActive()) {
DUMP.get().dumpInverseLocation(sensor, point, minLine, maxLine,
lightTimeCorrection, aberrationOfLightCorrection, refractionCorrection);
+ DUMP.get().dumpEllipsoid(ellipsoid);
}
}
diff --git a/src/main/java/org/orekit/rugged/errors/DumpReplayer.java b/src/main/java/org/orekit/rugged/errors/DumpReplayer.java
index 12f3713b06fa20f3f11537821784863db65c726b..07a97316b051859d446ca39329dfda928329b907 100644
--- a/src/main/java/org/orekit/rugged/errors/DumpReplayer.java
+++ b/src/main/java/org/orekit/rugged/errors/DumpReplayer.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -33,9 +33,10 @@ import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
import java.util.TreeMap;
+import java.util.regex.Pattern;
import java.util.stream.Stream;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.analysis.differentiation.Derivative;
import org.hipparchus.exception.LocalizedCoreFormats;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Rotation;
@@ -62,7 +63,7 @@ import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.raster.UpdatableTile;
import org.orekit.rugged.refraction.AtmosphericRefraction;
import org.orekit.rugged.refraction.MultiLayerModel;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
@@ -221,6 +222,15 @@ public class DumpReplayer {
/** Keyword for target direction. */
private static final String TARGET_DIRECTION = "targetDirection";
+ /** Keyword for null result. */
+ private static final String NULL_RESULT = "NULL";
+
+ /** Pattern for delimiting regular expressions. */
+ private static final Pattern SEPARATOR = Pattern.compile("\\s+");
+
+ /** Empty pattern. */
+ private static final Pattern PATTERN = Pattern.compile(" ");
+
/** Constant elevation for constant elevation algorithm. */
private double constantElevation;
@@ -269,12 +279,13 @@ public class DumpReplayer {
/** Dumped calls. */
private final List<DumpedCall> calls;
+
/** Simple constructor.
*/
public DumpReplayer() {
- tiles = new ArrayList<ParsedTile>();
- sensors = new ArrayList<ParsedSensor>();
- calls = new ArrayList<DumpedCall>();
+ tiles = new ArrayList<>();
+ sensors = new ArrayList<>();
+ calls = new ArrayList<>();
}
/** Parse a dump file.
@@ -308,6 +319,9 @@ public class DumpReplayer {
if (algorithmId == AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID) {
builder.setConstantElevation(constantElevation);
} else if (algorithmId != AlgorithmId.IGNORE_DEM_USE_ELLIPSOID) {
+ // In the case of user used a non overlapping DEM: no need here to take it into account
+ // as Rugged during the run created if necessary zipper tiles.
+ // At this stage, the read DEM in the dump behave like an overlapping DEM.
builder.setDigitalElevationModel(new TileUpdater() {
/** {@inheritDoc} */
@@ -339,8 +353,8 @@ public class DumpReplayer {
// build missing transforms by extrapolating the parsed ones
final int n = (int) FastMath.ceil(maxDate.durationFrom(minDate) / tStep);
- final List<Transform> b2iList = new ArrayList<Transform>(n);
- final List<Transform> s2iList = new ArrayList<Transform>(n);
+ final List<Transform> b2iList = new ArrayList<>(n);
+ final List<Transform> s2iList = new ArrayList<>(n);
for (int i = 0; i < n; ++i) {
if (bodyToInertial.containsKey(i)) {
// the i-th transform was dumped
@@ -374,7 +388,7 @@ public class DumpReplayer {
final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
builder.setTrajectoryAndTimeSpan(bis);
- final List<SensorMeanPlaneCrossing> planeCrossings = new ArrayList<SensorMeanPlaneCrossing>();
+ final List<SensorMeanPlaneCrossing> planeCrossings = new ArrayList<>();
for (final ParsedSensor parsedSensor : sensors) {
final LineSensor sensor = new LineSensor(parsedSensor.name,
parsedSensor,
@@ -404,23 +418,9 @@ public class DumpReplayer {
return rugged;
- } catch (IOException ioe) {
- throw new RuggedException(ioe, LocalizedCoreFormats.SIMPLE_MESSAGE, ioe.getLocalizedMessage());
- } catch (SecurityException e) {
- // this should never happen
- throw RuggedException.createInternalError(e);
- } catch (NoSuchMethodException e) {
- // this should never happen
- throw RuggedException.createInternalError(e);
- } catch (IllegalArgumentException e) {
- // this should never happen
- throw RuggedException.createInternalError(e);
- } catch (IllegalAccessException e) {
+ } catch (IOException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
// this should never happen
- throw RuggedException.createInternalError(e);
- } catch (InvocationTargetException e) {
- // this should never happen
- throw RuggedException.createInternalError(e);
+ throw new RuggedInternalError(e);
}
}
@@ -595,15 +595,24 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
- if (fields.length < 6 || !fields[0].equals(LATITUDE) ||
- !fields[2].equals(LONGITUDE) || !fields[4].equals(ELEVATION)) {
+ if (fields.length == 1) {
+ if (fields[0].equals(NULL_RESULT)) {
+ final GeodeticPoint gp = null;
+ final DumpedCall last = global.calls.get(global.calls.size() - 1);
+ last.expected = gp;
+ } else {
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ }
+ } else if (fields.length < 6 || !fields[0].equals(LATITUDE) ||
+ !fields[2].equals(LONGITUDE) || !fields[4].equals(ELEVATION)) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ } else {
+ final GeodeticPoint gp = new GeodeticPoint(Double.parseDouble(fields[1]),
+ Double.parseDouble(fields[3]),
+ Double.parseDouble(fields[5]));
+ final DumpedCall last = global.calls.get(global.calls.size() - 1);
+ last.expected = gp;
}
- final GeodeticPoint gp = new GeodeticPoint(Double.parseDouble(fields[1]),
- Double.parseDouble(fields[3]),
- Double.parseDouble(fields[5]));
- final DumpedCall last = global.calls.get(global.calls.size() - 1);
- last.expected = gp;
}
},
@@ -806,13 +815,22 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
- if (fields.length < 4 || !fields[0].equals(LINE_NUMBER) || !fields[2].equals(PIXEL_NUMBER)) {
+ if (fields.length == 1) {
+ if (fields[0].equals(NULL_RESULT)) {
+ final SensorPixel sp = null;
+ final DumpedCall last = global.calls.get(global.calls.size() - 1);
+ last.expected = sp;
+ } else {
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ }
+ } else if (fields.length < 4 || !fields[0].equals(LINE_NUMBER) || !fields[2].equals(PIXEL_NUMBER)) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ } else {
+ final SensorPixel sp = new SensorPixel(Double.parseDouble(fields[1]),
+ Double.parseDouble(fields[3]));
+ final DumpedCall last = global.calls.get(global.calls.size() - 1);
+ last.expected = sp;
}
- final SensorPixel sp = new SensorPixel(Double.parseDouble(fields[1]),
- Double.parseDouble(fields[3]));
- final DumpedCall last = global.calls.get(global.calls.size() - 1);
- last.expected = sp;
}
},
@@ -955,14 +973,14 @@ public class DumpReplayer {
final int colon = line.indexOf(':');
if (colon > 0) {
- final String parsedKey = line.substring(0, colon).trim().replaceAll(" ", "_").toUpperCase();
+ final String parsedKey = PATTERN.matcher(line.substring(0, colon).trim()).replaceAll("_").toUpperCase();
try {
final LineParser parser = LineParser.valueOf(parsedKey);
final String[] fields;
if (colon + 1 >= line.length()) {
fields = new String[0];
} else {
- fields = line.substring(colon + 1).trim().split("\\s+");
+ fields = SEPARATOR.split(line.substring(colon + 1).trim());
}
parser.parse(l, file, line, fields, global);
} catch (IllegalArgumentException iae) {
@@ -1043,8 +1061,8 @@ public class DumpReplayer {
public boolean isInterpolable(final double latitude, final double longitude) {
final int latitudeIndex = (int) FastMath.floor((latitude - minLatitude) / latitudeStep);
final int longitudeIndex = (int) FastMath.floor((longitude - minLongitude) / longitudeStep);
- return (latitudeIndex >= 0) && (latitudeIndex <= latitudeRows - 2) &&
- (longitudeIndex >= 0) && (longitudeIndex <= longitudeColumns - 2);
+ return latitudeIndex >= 0 && latitudeIndex <= latitudeRows - 2 &&
+ longitudeIndex >= 0 && longitudeIndex <= longitudeColumns - 2;
}
/** Update the tile according to the Digital Elevation Model.
@@ -1158,7 +1176,7 @@ public class DumpReplayer {
public Vector3D getLOS(final int index, final AbsoluteDate date) {
final List<Pair<AbsoluteDate, Vector3D>> list = losMap.get(index);
if (list == null) {
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
if (list.size() < 2) {
@@ -1186,12 +1204,12 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public FieldVector3D<DerivativeStructure> getLOSDerivatives(final int index, final AbsoluteDate date,
- final DSGenerator generator) {
+ public <T extends Derivative<T>> FieldVector3D<T> getLOSDerivatives(final int index, final AbsoluteDate date,
+ final DerivativeGenerator<T> generator) {
final Vector3D los = getLOS(index, date);
- return new FieldVector3D<DerivativeStructure>(generator.constant(los.getX()),
- generator.constant(los.getY()),
- generator.constant(los.getZ()));
+ return new FieldVector3D<>(generator.constant(los.getX()),
+ generator.constant(los.getY()),
+ generator.constant(los.getZ()));
}
/** Set a datation pair.
diff --git a/src/main/java/org/orekit/rugged/errors/RuggedException.java b/src/main/java/org/orekit/rugged/errors/RuggedException.java
index 7bd83e81837c8c62b51a928f7bf9646d57648b8f..ddd461260e9159859bd18b23af6b9f07443f3354 100644
--- a/src/main/java/org/orekit/rugged/errors/RuggedException.java
+++ b/src/main/java/org/orekit/rugged/errors/RuggedException.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -27,7 +27,7 @@ import org.hipparchus.exception.LocalizedException;
* the rugged library classes.
* <p>
- * This class is heavily based on Orekit {@link org.orekit.errors.OrekitException},
+ * This class is heavily based on {@code OrekitException},
* which is distributed under the terms of the Apache License V2.
* </p>
*
@@ -113,37 +113,4 @@ public class RuggedException extends RuntimeException implements LocalizedExcept
return (specifier == null) ? "" : new MessageFormat(specifier.getLocalizedString(locale), locale).format(parts);
}
- /** Create an {@link java.lang.RuntimeException} for an internal error.
- * @param cause underlying cause
- * @return an {@link java.lang.RuntimeException} for an internal error
- */
- public static RuntimeException createInternalError(final Throwable cause) {
-
- /** Format specifier (to be translated). */
- final Localizable specifier = RuggedMessages.INTERNAL_ERROR;
-
- /** Parts to insert in the format (no translation). */
- final String parts = "https://gitlab.orekit.org/orekit/rugged/issues";
-
- return new RuntimeException() {
-
- /** Serializable UID. */
- private static final long serialVersionUID = 20140309L;
-
- /** {@inheritDoc} */
- @Override
- public String getMessage() {
- return buildMessage(Locale.US, specifier, parts);
- }
-
- /** {@inheritDoc} */
- @Override
- public String getLocalizedMessage() {
- return buildMessage(Locale.getDefault(), specifier, parts);
- }
-
- };
-
- }
-
}
diff --git a/src/main/java/org/orekit/rugged/errors/RuggedExceptionWrapper.java b/src/main/java/org/orekit/rugged/errors/RuggedExceptionWrapper.java
index cacf1614474b5ef43a8ad76c6a938ead34191ae4..4b57665bafde7cba72943c1361e092cc52f89ebe 100644
--- a/src/main/java/org/orekit/rugged/errors/RuggedExceptionWrapper.java
+++ b/src/main/java/org/orekit/rugged/errors/RuggedExceptionWrapper.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -22,7 +22,7 @@ package org.orekit.rugged.errors;
* this exception. Typical examples are propagation methods that are used inside Hipparchus
* optimizers, integrators or solvers.</p>
* <p>
- * This class is heavily based on Orekit {@link org.orekit.errors.OrekitException},
+ * This class is heavily based on {@code OrekitException},
* which is distributed under the terms of the Apache License V2.
* </p>
* @author Luc Maisonobe
diff --git a/src/main/java/org/orekit/rugged/errors/RuggedInternalError.java b/src/main/java/org/orekit/rugged/errors/RuggedInternalError.java
new file mode 100644
index 0000000000000000000000000000000000000000..1c91afdb6f124e37eb33fac333cc1bf920d62ec9
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/errors/RuggedInternalError.java
@@ -0,0 +1,88 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.errors;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+
+import org.hipparchus.exception.Localizable;
+import org.hipparchus.exception.LocalizedException;
+
+
+/** Extension of {@link java.lang.Runtime} with localized message for internal errors only.
+ * @since 2.1
+ */
+public class RuggedInternalError extends RuntimeException implements LocalizedException {
+
+ /** Serializable UID. */
+ private static final long serialVersionUID = 20190305L;
+
+ /** Format specifier (to be translated). */
+ private final Localizable specifier = RuggedMessages.INTERNAL_ERROR;
+
+ /** Parts to insert in the format (no translation). */
+ private final String[] parts = new String[] {
+ "https://gitlab.orekit.org/orekit/rugged/issues"
+ };
+
+ /** Create an exception with localized message.
+ * @param cause underlying cause
+ */
+ public RuggedInternalError(final Throwable cause) {
+ super(cause);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public String getMessage(final Locale locale) {
+ return buildMessage(locale);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public String getMessage() {
+ return buildMessage(Locale.US);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public String getLocalizedMessage() {
+ return buildMessage(Locale.getDefault());
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Localizable getSpecifier() {
+ return specifier;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Object[] getParts() {
+ return parts.clone();
+ }
+
+ /**
+ * Builds a message string by from a pattern and its arguments.
+ * @param locale Locale in which the message should be translated
+ * @return a message string
+ */
+ private String buildMessage(final Locale locale) {
+ return new MessageFormat(specifier.getLocalizedString(locale), locale).format(parts);
+ }
+
+}
diff --git a/src/main/java/org/orekit/rugged/errors/RuggedMessages.java b/src/main/java/org/orekit/rugged/errors/RuggedMessages.java
index 6bd87218c3e3a2aeb571e40d937a52da43d07253..f6b6f3bc94c3b77b822fff77dc994f36dcfc9f23 100644
--- a/src/main/java/org/orekit/rugged/errors/RuggedMessages.java
+++ b/src/main/java/org/orekit/rugged/errors/RuggedMessages.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -21,6 +21,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.PropertyResourceBundle;
@@ -43,7 +44,7 @@ import org.hipparchus.exception.Localizable;
* translation is missing.
* </p>
* <p>
- * This class is heavily based on Orekit {@link org.orekit.errors.OrekitMessages},
+ * This class is heavily based on {@code OrekitMessages},
* which is distributed under the terms of the Apache License V2.
* </p>
*/
@@ -83,7 +84,10 @@ public enum RuggedMessages implements Localizable {
UNSUPPORTED_REFINING_CONTEXT("refining using {0} rugged instance is not handled"),
NO_LAYER_DATA("no atmospheric layer data at altitude {0} (lowest altitude: {1})"),
INVALID_STEP("step {0} is not valid : {1}"),
- INVALID_RANGE_FOR_LINES("range between min line {0} and max line {1} is invalid {2}");
+ INVALID_RANGE_FOR_LINES("range between min line {0} and max line {1} is invalid {2}"),
+ SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES("impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}"),
+ SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE("impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})");
+
// CHECKSTYLE: resume JavadocVariable check
@@ -115,9 +119,8 @@ public enum RuggedMessages implements Localizable {
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(locale).contains("missing translation"))) {
+ if (translated.length() > 0 &&
+ !translated.toLowerCase(locale).contains("missing translation")) {
// the value of the resource is the translated format
return translated;
}
@@ -164,11 +167,9 @@ public enum RuggedMessages implements Localizable {
stream = loader.getResourceAsStream(resourceName);
}
if (stream != null) {
- try {
+ try (InputStreamReader inputStreamReader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
// 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();
+ bundle = new PropertyResourceBundle(inputStreamReader);
}
}
return bundle;
diff --git a/src/main/java/org/orekit/rugged/errors/package-info.java b/src/main/java/org/orekit/rugged/errors/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..3d98390211703f2703e553cef32727568d846d91
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/errors/package-info.java
@@ -0,0 +1,25 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides classes to generate and handle exceptions.
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ *
+ */
+package org.orekit.rugged.errors;
diff --git a/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
index a02eccf5f4aa41550e52b5a04c35873b773507b4..c338bd9499499a113cc8fc49061953297f60eb47 100644
--- a/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -39,6 +39,7 @@ import org.orekit.rugged.utils.NormalizedGeodeticPoint;
* corner points. It is not designed for operational use.
* </p>
* @author Luc Maisonobe
+ * @author Guylaine Prat
*/
public class BasicScanAlgorithm implements IntersectionAlgorithm {
@@ -51,14 +52,21 @@ public class BasicScanAlgorithm implements IntersectionAlgorithm {
/** Maximum altitude encountered. */
private double hMax;
+ /** Algorithm Id.
+ * @since 2.2 */
+ private final AlgorithmId algorithmId;
+
/** Simple constructor.
* @param updater updater used to load Digital Elevation Model tiles
* @param maxCachedTiles maximum number of tiles stored in the cache
+ * @param isOverlappingTiles flag to tell if the DEM tiles are overlapping:
+ * true if overlapping; false otherwise.
*/
- public BasicScanAlgorithm(final TileUpdater updater, final int maxCachedTiles) {
- cache = new TilesCache<SimpleTile>(new SimpleTileFactory(), updater, maxCachedTiles);
- hMin = Double.POSITIVE_INFINITY;
- hMax = Double.NEGATIVE_INFINITY;
+ public BasicScanAlgorithm(final TileUpdater updater, final int maxCachedTiles, final boolean isOverlappingTiles) {
+ this.cache = new TilesCache<>(new SimpleTileFactory(), updater, maxCachedTiles, isOverlappingTiles);
+ this.hMin = Double.POSITIVE_INFINITY;
+ this.hMax = Double.NEGATIVE_INFINITY;
+ this.algorithmId = AlgorithmId.BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY;
}
/** {@inheritDoc} */
@@ -66,7 +74,7 @@ public class BasicScanAlgorithm implements IntersectionAlgorithm {
public NormalizedGeodeticPoint intersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los) {
- DumpManager.dumpAlgorithm(AlgorithmId.BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY);
+ DumpManager.dumpAlgorithm(this.algorithmId);
// find the tiles between the entry and exit point in the Digital Elevation Model
NormalizedGeodeticPoint entryPoint = null;
@@ -75,7 +83,7 @@ public class BasicScanAlgorithm implements IntersectionAlgorithm {
double maxLatitude = Double.NaN;
double minLongitude = Double.NaN;
double maxLongitude = Double.NaN;
- final List<SimpleTile> scannedTiles = new ArrayList<SimpleTile>();
+ final List<SimpleTile> scannedTiles = new ArrayList<>();
double centralLongitude = Double.NaN;
for (boolean changedMinMax = true; changedMinMax; changedMinMax = checkMinMax(scannedTiles)) {
@@ -162,7 +170,7 @@ public class BasicScanAlgorithm implements IntersectionAlgorithm {
public NormalizedGeodeticPoint refineIntersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
final NormalizedGeodeticPoint closeGuess) {
- DumpManager.dumpAlgorithm(AlgorithmId.BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY);
+ DumpManager.dumpAlgorithm(this.algorithmId);
final Vector3D delta = ellipsoid.transform(closeGuess).subtract(position);
final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
@@ -182,11 +190,17 @@ public class BasicScanAlgorithm implements IntersectionAlgorithm {
/** {@inheritDoc} */
@Override
public double getElevation(final double latitude, final double longitude) {
- DumpManager.dumpAlgorithm(AlgorithmId.BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY);
+ DumpManager.dumpAlgorithm(this.algorithmId);
final Tile tile = cache.getTile(latitude, longitude);
return tile.interpolateElevation(latitude, longitude);
}
+ /** {@inheritDoc} */
+ @Override
+ public AlgorithmId getAlgorithmId() {
+ return this.algorithmId;
+ }
+
/** Check the overall min and max altitudes.
* @param tiles tiles to check
* @return true if the tile changed either min or max altitude
@@ -252,5 +266,4 @@ public class BasicScanAlgorithm implements IntersectionAlgorithm {
final int rawIndex = tile.getFloorLongitudeIndex(longitude);
return FastMath.min(FastMath.max(0, rawIndex), tile.getLongitudeColumns());
}
-
}
diff --git a/src/main/java/org/orekit/rugged/intersection/ConstantElevationAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/ConstantElevationAlgorithm.java
index 185ab1f8053d3ce056b1b616a2e000b345db8152..f371b0a2cb8027bb9ef6ce91244b007b1d6a0cff 100644
--- a/src/main/java/org/orekit/rugged/intersection/ConstantElevationAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/ConstantElevationAlgorithm.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -25,27 +25,33 @@ import org.orekit.rugged.utils.NormalizedGeodeticPoint;
/** Intersection ignoring Digital Elevation Model.
* <p>
- * This dummy implementation simply uses the ellipsoid itself.
+ * This implementation uses a constant elevation over the ellipsoid.
* </p>
* @author Luc Maisonobe
+ * @author Guylaine Prat
*/
public class ConstantElevationAlgorithm implements IntersectionAlgorithm {
/** Constant elevation over ellipsoid. */
private final double constantElevation;
+ /** Algorithm Id.
+ * @since 2.2 */
+ private final AlgorithmId algorithmId;
+
/** Simple constructor.
* @param constantElevation constant elevation over ellipsoid
*/
public ConstantElevationAlgorithm(final double constantElevation) {
this.constantElevation = constantElevation;
+ this.algorithmId = AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID;
}
/** {@inheritDoc} */
@Override
public NormalizedGeodeticPoint intersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los) {
- DumpManager.dumpAlgorithm(AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID, constantElevation);
+ DumpManager.dumpAlgorithm(this.algorithmId, constantElevation);
final Vector3D p = ellipsoid.pointAtAltitude(position, los, constantElevation);
final GeodeticPoint gp = ellipsoid.transform(p, ellipsoid.getFrame(), null);
return new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), 0.0);
@@ -56,7 +62,7 @@ public class ConstantElevationAlgorithm implements IntersectionAlgorithm {
public NormalizedGeodeticPoint refineIntersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
final NormalizedGeodeticPoint closeGuess) {
- DumpManager.dumpAlgorithm(AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID, constantElevation);
+ DumpManager.dumpAlgorithm(this.algorithmId, constantElevation);
final Vector3D p = ellipsoid.pointAtAltitude(position, los, constantElevation);
final GeodeticPoint gp = ellipsoid.transform(p, ellipsoid.getFrame(), null);
return new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(),
@@ -71,8 +77,13 @@ public class ConstantElevationAlgorithm implements IntersectionAlgorithm {
*/
@Override
public double getElevation(final double latitude, final double longitude) {
- DumpManager.dumpAlgorithm(AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID, constantElevation);
+ DumpManager.dumpAlgorithm(this.algorithmId, constantElevation);
return constantElevation;
}
+ /** {@inheritDoc} */
+ @Override
+ public AlgorithmId getAlgorithmId() {
+ return this.algorithmId;
+ }
}
diff --git a/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
index 29f0421d8dd429a4e57ad82c9ca385a282285599..74a488dedca178abf5502702258ce2013a4ca516 100644
--- a/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -27,19 +27,25 @@ import org.orekit.rugged.utils.NormalizedGeodeticPoint;
* This dummy implementation simply uses the ellipsoid itself.
* </p>
* @author Luc Maisonobe
+ * @author Guylaine Prat
*/
public class IgnoreDEMAlgorithm implements IntersectionAlgorithm {
+ /** Algorithm Id.
+ * @since 2.2 */
+ private final AlgorithmId algorithmId;
+
/** Simple constructor.
*/
public IgnoreDEMAlgorithm() {
+ this.algorithmId = AlgorithmId.IGNORE_DEM_USE_ELLIPSOID;
}
/** {@inheritDoc} */
@Override
public NormalizedGeodeticPoint intersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los) {
- DumpManager.dumpAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
+ DumpManager.dumpAlgorithm(this.algorithmId);
return ellipsoid.pointOnGround(position, los, 0.0);
}
@@ -48,7 +54,7 @@ public class IgnoreDEMAlgorithm implements IntersectionAlgorithm {
public NormalizedGeodeticPoint refineIntersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
final NormalizedGeodeticPoint closeGuess) {
- DumpManager.dumpAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
+ DumpManager.dumpAlgorithm(this.algorithmId);
return intersection(ellipsoid, position, los);
}
@@ -60,8 +66,13 @@ public class IgnoreDEMAlgorithm implements IntersectionAlgorithm {
*/
@Override
public double getElevation(final double latitude, final double longitude) {
- DumpManager.dumpAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
+ DumpManager.dumpAlgorithm(this.algorithmId);
return 0.0;
}
+ /** {@inheritDoc} */
+ @Override
+ public AlgorithmId getAlgorithmId() {
+ return this.algorithmId;
+ }
}
diff --git a/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
index a003c9fc5eaf8425312cb9ba8f15bc02ed647364..71699e0d3574c6da25bbfb057ddcbf7e82578b26 100644
--- a/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -17,12 +17,13 @@
package org.orekit.rugged.intersection;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.orekit.bodies.GeodeticPoint;
+import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
/** Interface for Digital Elevation Model intersection algorithm.
* @author Luc Maisonobe
+ * @author Guylaine Prat
*/
public interface IntersectionAlgorithm {
@@ -38,7 +39,7 @@ public interface IntersectionAlgorithm {
* <p>
* This method is used to refine an intersection when a close guess is
* already known. The intersection is typically looked for by a direct
- * {@link org.orekit.rugged.raster.Tile#cellIntersection(GeodeticPoint,
+ * {@link org.orekit.rugged.raster.Tile#cellIntersection(NormalizedGeodeticPoint,
* Vector3D, int, int) cell intersection} in the tile which already
* contains the close guess, or any similar very fast algorithm.
* </p>
@@ -58,4 +59,9 @@ public interface IntersectionAlgorithm {
*/
double getElevation(double latitude, double longitude);
+ /** Get the algorithmId.
+ * @return the algorithmId
+ * @since 2.2
+ */
+ AlgorithmId getAlgorithmId();
}
diff --git a/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
index 7009645126a6b34d2af91dfe78766d5a837d6f5f..27af7edab014bc3a0a00eb33b71c31a70320e33d 100644
--- a/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -22,6 +22,7 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.errors.DumpManager;
import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedInternalError;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.raster.Tile;
@@ -33,7 +34,7 @@ import org.orekit.rugged.utils.NormalizedGeodeticPoint;
/** Digital Elevation Model intersection using Bernardt Duvenhage's algorithm.
* <p>
* The algorithm is described in the 2009 paper:
- * <a href="http://researchspace.csir.co.za/dspace/bitstream/10204/3041/1/Duvenhage_2009.pdf">Using
+ * <a href="https://researchspace.csir.co.za/dspace/bitstream/10204/3041/1/Duvenhage_2009.pdf">Using
* An Implicit Min/Max KD-Tree for Doing Efficient Terrain Line of Sight Calculations</a>.
* </p>
* @author Luc Maisonobe
@@ -44,9 +45,12 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
/** Step size when skipping from one tile to a neighbor one, in meters. */
private static final double STEP = 0.01;
- /** Nb time cell intersection (with DEM) performed for null intersection: means that infinite loop.
+ /** Maximum number of attempts to refine intersection.
+ * <p>
+ * This parameter is intended to prevent infinite loops.
+ * </p>
* @since 2.1 */
- private static final int NB_TIME_CELL_INTERSECTION = 100;
+ private static final int MAX_REFINING_ATTEMPTS = 100;
/** Cache for DEM tiles. */
private final TilesCache<MinMaxTreeTile> cache;
@@ -54,6 +58,10 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
/** Flag for flat-body hypothesis. */
private final boolean flatBody;
+ /** Algorithm Id.
+ * @since 2.2 */
+ private final AlgorithmId algorithmId;
+
/** Simple constructor.
* @param updater updater used to load Digital Elevation Model tiles
* @param maxCachedTiles maximum number of tiles stored in the cache
@@ -62,12 +70,16 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
* in geodetic coordinates. The sagitta resulting from real ellipsoid curvature
* is therefore <em>not</em> corrected in this case. As this computation is not
* costly (a few percents overhead), it is highly recommended to set this parameter
- * to {@code false}. This flag is mainly intended for comparison purposes with other systems.
+ * to {@code false}. This flag is mainly intended for comparison purposes with other systems
+ * @param isOverlappingTiles flag to tell if the DEM tiles are overlapping:
+ * true if overlapping; false otherwise.
*/
public DuvenhageAlgorithm(final TileUpdater updater, final int maxCachedTiles,
- final boolean flatBody) {
- this.cache = new TilesCache<MinMaxTreeTile>(new MinMaxTreeTileFactory(), updater, maxCachedTiles);
+ final boolean flatBody, final boolean isOverlappingTiles) {
+ this.cache = new TilesCache<MinMaxTreeTile>(new MinMaxTreeTileFactory(), updater,
+ maxCachedTiles, isOverlappingTiles);
this.flatBody = flatBody;
+ this.algorithmId = flatBody ? AlgorithmId.DUVENHAGE_FLAT_BODY : AlgorithmId.DUVENHAGE;
}
/** {@inheritDoc} */
@@ -75,7 +87,7 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
public NormalizedGeodeticPoint intersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los) {
- DumpManager.dumpAlgorithm(flatBody ? AlgorithmId.DUVENHAGE_FLAT_BODY : AlgorithmId.DUVENHAGE);
+ DumpManager.dumpAlgorithm(this.algorithmId);
// compute intersection with ellipsoid
final NormalizedGeodeticPoint gp0 = ellipsoid.pointOnGround(position, los, 0.0);
@@ -91,9 +103,31 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
final Vector3D entryP = ellipsoid.pointAtAltitude(position, los, hMax + STEP);
if (Vector3D.dotProduct(entryP.subtract(position), los) < 0) {
// the entry point is behind spacecraft!
- throw new RuggedException(RuggedMessages.DEM_ENTRY_POINT_IS_BEHIND_SPACECRAFT);
+
+ // let's see if at least we are above DEM
+ try {
+ final NormalizedGeodeticPoint positionGP =
+ ellipsoid.transform(position, ellipsoid.getBodyFrame(), null, tile.getMinimumLongitude());
+ final double elevationAtPosition = tile.interpolateElevation(positionGP.getLatitude(), positionGP.getLongitude());
+ if (positionGP.getAltitude() >= elevationAtPosition) {
+ // we can use the current position as the entry point
+ current = positionGP;
+ } else {
+ current = null;
+ }
+ } catch (RuggedException re) {
+ if (re.getSpecifier() == RuggedMessages.OUT_OF_TILE_ANGLES) {
+ current = null;
+ }
+ }
+
+ if (current == null) {
+ throw new RuggedException(RuggedMessages.DEM_ENTRY_POINT_IS_BEHIND_SPACECRAFT);
+ }
+
+ } else {
+ current = ellipsoid.transform(entryP, ellipsoid.getBodyFrame(), null, tile.getMinimumLongitude());
}
- current = ellipsoid.transform(entryP, ellipsoid.getBodyFrame(), null, tile.getMinimumLongitude());
if (tile.getLocation(current.getLatitude(), current.getLongitude()) != Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
// the entry point is in another tile
@@ -156,7 +190,7 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
if (intersection != null) {
return intersection;
} else {
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
}
}
@@ -168,42 +202,37 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
final Vector3D position, final Vector3D los,
final NormalizedGeodeticPoint closeGuess) {
- DumpManager.dumpAlgorithm(flatBody ? AlgorithmId.DUVENHAGE_FLAT_BODY : AlgorithmId.DUVENHAGE);
-
- NormalizedGeodeticPoint currentGuess = closeGuess;
- NormalizedGeodeticPoint foundIntersection = null;
+ DumpManager.dumpAlgorithm(this.algorithmId);
if (flatBody) {
// under the (bad) flat-body assumption, the reference point must remain
// at DEM entry and exit, even if we already have a much better close guess :-(
// this is in order to remain consistent with other systems
- final Tile tile = cache.getTile(currentGuess.getLatitude(), currentGuess.getLongitude());
+ final Tile tile = cache.getTile(closeGuess.getLatitude(), closeGuess.getLongitude());
final Vector3D exitP = ellipsoid.pointAtAltitude(position, los, tile.getMinElevation());
final Vector3D entryP = ellipsoid.pointAtAltitude(position, los, tile.getMaxElevation());
final NormalizedGeodeticPoint entry = ellipsoid.transform(entryP, ellipsoid.getBodyFrame(), null,
tile.getMinimumLongitude());
- foundIntersection = tile.cellIntersection(entry, ellipsoid.convertLos(entryP, exitP),
- tile.getFloorLatitudeIndex(currentGuess.getLatitude()),
- tile.getFloorLongitudeIndex(currentGuess.getLongitude()));
-
- } else { // with a DEM
+ return tile.cellIntersection(entry, ellipsoid.convertLos(entryP, exitP),
+ tile.getFloorLatitudeIndex(closeGuess.getLatitude()),
+ tile.getFloorLongitudeIndex(closeGuess.getLongitude()));
- // Keep the initial guess
- final NormalizedGeodeticPoint currentGuess0 = closeGuess;
+ } else {
+ // regular curved ellipsoid model
- // number of times cell intersection (with DEM) is performed for null intersection (used to avoid infinite loop)
- int nbCall = 0;
- // Shift for s to find the solution if foundIntersection is null
- double deltaS = -1.;
- // if the shifts in one way was not successful, try the other way
- boolean secondChance = false;
+ NormalizedGeodeticPoint currentGuess = closeGuess;
- while (foundIntersection == null && (nbCall < NB_TIME_CELL_INTERSECTION)) {
+ // normally, we should succeed at first attempt but in very rare cases
+ // we may loose the intersection (typically because some corrections introduced
+ // between the first intersection and the refining have slightly changed the
+ // relative geometry between Digital Elevation Model and Line Of Sight).
+ // In these rare cases, we have to recover a new intersection
+ for (int i = 0; i < MAX_REFINING_ATTEMPTS; ++i) {
- final Vector3D delta = ellipsoid.transform(currentGuess).subtract(position);
- final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
- final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
- ellipsoid.getBodyFrame(), null);
+ final Vector3D delta = ellipsoid.transform(currentGuess).subtract(position);
+ final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
+ final Vector3D projectedP = new Vector3D(1, position, s, los);
+ final GeodeticPoint projected = ellipsoid.transform(projectedP, ellipsoid.getBodyFrame(), null);
final NormalizedGeodeticPoint normalizedProjected =
new NormalizedGeodeticPoint(projected.getLatitude(),
projected.getLongitude(),
@@ -211,49 +240,69 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
currentGuess.getLongitude());
final Tile tile = cache.getTile(normalizedProjected.getLatitude(), normalizedProjected.getLongitude());
- foundIntersection = tile.cellIntersection(normalizedProjected,
- ellipsoid.convertLos(normalizedProjected, los),
- tile.getFloorLatitudeIndex(normalizedProjected.getLatitude()),
- tile.getFloorLongitudeIndex(normalizedProjected.getLongitude()));
-
- // For extremely rare case : the cell intersection gave no results ...
- // We use as a new guess a slightly modified projected geodetic point (which is on the LOS line)
- if (foundIntersection == null) {
- final double shiftedS = s + deltaS;
- final GeodeticPoint currentGuessGP = ellipsoid.transform(new Vector3D(1, position, shiftedS, los),
- ellipsoid.getBodyFrame(), null);
+ final Vector3D topoLOS = ellipsoid.convertLos(normalizedProjected, los);
+ final int iLat = tile.getFloorLatitudeIndex(normalizedProjected.getLatitude());
+ final int iLon = tile.getFloorLongitudeIndex(normalizedProjected.getLongitude());
+ final NormalizedGeodeticPoint foundIntersection = tile.cellIntersection(normalizedProjected, topoLOS, iLat, iLon);
+
+ if (foundIntersection != null) {
+ // nominal case, we were able to refine the intersection
+ return foundIntersection;
+ } else {
+ // extremely rare case: we have lost the intersection
+
+ // find a start point for new search, leaving the current cell behind
+ final double cellBoundaryLatitude = tile.getLatitudeAtIndex(topoLOS.getY() <= 0 ? iLat : iLat + 1);
+ final double cellBoundaryLongitude = tile.getLongitudeAtIndex(topoLOS.getX() <= 0 ? iLon : iLon + 1);
+ final Vector3D cellExit = new Vector3D(1, selectClosest(latitudeCrossing(ellipsoid, projectedP, los, cellBoundaryLatitude, projectedP),
+ longitudeCrossing(ellipsoid, projectedP, los, cellBoundaryLongitude, projectedP),
+ projectedP),
+ STEP, los);
+ final GeodeticPoint egp = ellipsoid.transform(cellExit, ellipsoid.getBodyFrame(), null);
+ final NormalizedGeodeticPoint cellExitGP = new NormalizedGeodeticPoint(egp.getLatitude(),
+ egp.getLongitude(),
+ egp.getAltitude(),
+ currentGuess.getLongitude());
+ if (tile.interpolateElevation(cellExitGP.getLatitude(), cellExitGP.getLongitude()) >= cellExitGP.getAltitude()) {
+ // extremely rare case! The line-of-sight traversed the Digital Elevation Model
+ // during the very short forward step we used to move to next cell
+ // we consider this point to be OK
+ return cellExitGP;
+ }
+
+
+ // We recompute fully a new guess, starting from the point after current cell
+ final GeodeticPoint currentGuessGP = intersection(ellipsoid, cellExit, los);
currentGuess = new NormalizedGeodeticPoint(currentGuessGP.getLatitude(),
currentGuessGP.getLongitude(),
currentGuessGP.getAltitude(),
projected.getLongitude());
- // to avoid infinite loop ...
- nbCall++;
-
- // if impossible to find a solution with deltaS = -1
- // we start a new search with deltaS = +1
- if (nbCall == NB_TIME_CELL_INTERSECTION && !secondChance) {
- currentGuess = currentGuess0;
- deltaS = 1.;
- nbCall = 0;
- secondChance = true; // to avoid infinite loop if second chance does not work !
- } // end if nbCall == NB_TIME_CELL_INTERSECTION
- } // end if foundIntersection = null
- } // end while foundIntersection = null
+ }
+
+ }
+
+ // no intersection found
+ return null;
} // end test on flatbody
- return foundIntersection;
}
/** {@inheritDoc} */
@Override
public double getElevation(final double latitude, final double longitude) {
- DumpManager.dumpAlgorithm(flatBody ? AlgorithmId.DUVENHAGE_FLAT_BODY : AlgorithmId.DUVENHAGE);
+ DumpManager.dumpAlgorithm(this.algorithmId);
final Tile tile = cache.getTile(latitude, longitude);
return tile.interpolateElevation(latitude, longitude);
}
+ /** {@inheritDoc} */
+ @Override
+ public AlgorithmId getAlgorithmId() {
+ return this.algorithmId;
+ }
+
/** Compute intersection of line with Digital Elevation Model in a sub-tile.
* @param depth recursion depth
* @param ellipsoid reference ellipsoid
@@ -277,7 +326,7 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
if (depth > 30) {
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
if (searchDomainSize(entryLat, entryLon, exitLat, exitLon) < 4) {
@@ -487,24 +536,26 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
if (gp != null) {
// improve the point, by projecting it back on the 3D line, fixing the small body curvature at cell level
- final Vector3D delta = ellipsoid.transform(gp).subtract(position);
- final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
- final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
- ellipsoid.getBodyFrame(), null);
- final NormalizedGeodeticPoint normalizedProjected = new NormalizedGeodeticPoint(projected.getLatitude(),
- projected.getLongitude(),
- projected.getAltitude(),
- gp.getLongitude());
- final NormalizedGeodeticPoint gpImproved = tile.cellIntersection(normalizedProjected,
- ellipsoid.convertLos(normalizedProjected, los),
- i, j);
-
- if (gpImproved != null) {
- final Vector3D point = ellipsoid.transform(gpImproved);
- final double dot = Vector3D.dotProduct(point.subtract(position), los);
- if (dot < intersectionDot) {
- intersectionGP = gpImproved;
- intersectionDot = dot;
+ final Vector3D delta = ellipsoid.transform(gp).subtract(position);
+ final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
+ if (s > 0) {
+ final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
+ ellipsoid.getBodyFrame(), null);
+ final NormalizedGeodeticPoint normalizedProjected = new NormalizedGeodeticPoint(projected.getLatitude(),
+ projected.getLongitude(),
+ projected.getAltitude(),
+ gp.getLongitude());
+ final NormalizedGeodeticPoint gpImproved = tile.cellIntersection(normalizedProjected,
+ ellipsoid.convertLos(normalizedProjected, los),
+ i, j);
+
+ if (gpImproved != null) {
+ final Vector3D point = ellipsoid.transform(gpImproved);
+ final double dot = Vector3D.dotProduct(point.subtract(position), los);
+ if (dot < intersectionDot) {
+ intersectionGP = gpImproved;
+ intersectionDot = dot;
+ }
}
}
@@ -599,7 +650,7 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
default :
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
}
@@ -621,7 +672,7 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
* @param latitude latitude with respect to ellipsoid
* @param closeReference reference point used to select the closest solution
* when there are two points at the desired latitude along the line
- * @return point at altitude, or closeReference if no such point can be found
+ * @return point at latitude, or closeReference if no such point can be found
*/
private Vector3D latitudeCrossing(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
@@ -639,8 +690,8 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
* @param los pixel line-of-sight, not necessarily normalized (in body frame)
* @param longitude longitude with respect to ellipsoid
* @param closeReference reference point used to select the closest solution
- * when there are two points at the desired latitude along the line
- * @return point at altitude, or closeReference if no such point can be found
+ * when there are two points at the desired longitude along the line
+ * @return point at longitude, or closeReference if no such point can be found
*/
private Vector3D longitudeCrossing(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
@@ -700,5 +751,4 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
}
}
-
}
diff --git a/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
index c56754a04103e49922494583b51f3822b8586711..f12af9f58b65fd1abf0c92a6df71487b2d4ad70b 100644
--- a/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -90,7 +90,7 @@ public class MinMaxTreeTile extends SimpleTile {
* Creates an empty tile.
* </p>
*/
- MinMaxTreeTile() {
+ protected MinMaxTreeTile() {
}
/** {@inheritDoc} */
diff --git a/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
index ddf6677bbf0ce9407bbbbde6b924e97f4377a447..1c4cdcf7693bd1ea9774886e51ae418ed41ae41f 100644
--- a/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/intersection/duvenhage/package-info.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..de741536ee0c10be3082342ecf2bf74d044ad8e0
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/package-info.java
@@ -0,0 +1,26 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides the Digital Elevation Model intersection using
+ * Bernardt Duvenhage's algorithm.
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ *
+ */
+package org.orekit.rugged.intersection.duvenhage;
diff --git a/src/main/java/org/orekit/rugged/intersection/package-info.java b/src/main/java/org/orekit/rugged/intersection/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..e2b84d3d7d5f0ff52f8653e27dd5bf505e408483
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/intersection/package-info.java
@@ -0,0 +1,27 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides the interface for Digital Elevation Model intersection
+ * algorithm, as well as some simple implementations.
+ *
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ *
+ */
+package org.orekit.rugged.intersection;
diff --git a/src/main/java/org/orekit/rugged/linesensor/LineDatation.java b/src/main/java/org/orekit/rugged/linesensor/LineDatation.java
index 903474a729efa44e4fad3c0b5bcf2070e1a7675c..e6299574424c248916c570fc3a90d11b34c43d3f 100644
--- a/src/main/java/org/orekit/rugged/linesensor/LineDatation.java
+++ b/src/main/java/org/orekit/rugged/linesensor/LineDatation.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/linesensor/LineSensor.java b/src/main/java/org/orekit/rugged/linesensor/LineSensor.java
index c4ab9a9b6a89783fc621ef65d86f7dd30ff58451..cdc266fa3067c7dbf7ab9c09332c12836daae399 100644
--- a/src/main/java/org/orekit/rugged/linesensor/LineSensor.java
+++ b/src/main/java/org/orekit/rugged/linesensor/LineSensor.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -18,13 +18,13 @@ package org.orekit.rugged.linesensor;
import java.util.stream.Stream;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.analysis.differentiation.Derivative;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.rugged.errors.DumpManager;
import org.orekit.rugged.los.TimeDependentLOS;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.ParameterDriver;
@@ -113,37 +113,36 @@ public class LineSensor {
/** Get the pixel normalized line-of-sight at some date,
* and their derivatives with respect to estimated parameters.
+ * @param <T> derivative type
* @param date current date
* @param i pixel index (must be between 0 and {@link #getNbPixels()} - 1
- * @param generator generator to use for building {@link DerivativeStructure} instances
+ * @param generator generator to use for building {@link Derivative} instances
* @return pixel normalized line-of-sight
- * @since 2.0
*/
- public FieldVector3D<DerivativeStructure> getLOSDerivatives(final AbsoluteDate date, final int i,
- final DSGenerator generator) {
+ public <T extends Derivative<T>> FieldVector3D<T> getLOSDerivatives(final AbsoluteDate date, final int i,
+ final DerivativeGenerator<T> generator) {
return los.getLOSDerivatives(i, date, generator);
}
/** Get the pixel normalized line-of-sight at some date,
* and their derivatives with respect to estimated parameters.
+ * @param <T> derivative type
* @param date current date
* @param i pixel index (must be between 0 and {@link #getNbPixels()} - 1
- * @param generator generator to use for building {@link DerivativeStructure} instances
+ * @param generator generator to use for building {@link Derivative} instances
* @return pixel normalized line-of-sight
* @since 2.0
*/
- public FieldVector3D<DerivativeStructure> getLOSDerivatives(final AbsoluteDate date, final double i,
- final DSGenerator generator) {
+ public <T extends Derivative<T>> FieldVector3D<T> getLOSDerivatives(final AbsoluteDate date, final double i,
+ final DerivativeGenerator<T> generator) {
// find surrounding pixels of pixelB (in order to interpolate LOS from pixelB (that is not an integer)
final int iInf = FastMath.max(0, FastMath.min(getNbPixels() - 2, (int) FastMath.floor(i)));
final int iSup = iInf + 1;
- final FieldVector3D<DerivativeStructure> interpolatedLos = new FieldVector3D<DerivativeStructure> (
- iSup - i,
- los.getLOSDerivatives(iInf, date, generator),
- i - iInf,
- los.getLOSDerivatives(iSup, date, generator)).normalize();
+ final FieldVector3D<T> interpolatedLos =
+ new FieldVector3D<> (iSup - i, los.getLOSDerivatives(iInf, date, generator),
+ i - iInf, los.getLOSDerivatives(iSup, date, generator)).normalize();
return interpolatedLos;
}
@@ -184,4 +183,11 @@ public class LineSensor {
return position;
}
+ /** Dump the rate for the current line number.
+ * @param lineNumber line number
+ */
+ public void dumpRate(final double lineNumber) {
+ final double rate = datationModel.getRate(lineNumber);
+ DumpManager.dumpSensorRate(this, lineNumber, rate);
+ }
}
diff --git a/src/main/java/org/orekit/rugged/linesensor/LinearLineDatation.java b/src/main/java/org/orekit/rugged/linesensor/LinearLineDatation.java
index a073a17c3938f749c81d48f1b67f730c7a83451e..9d477a27c84455af3879e254465c0689c180e063 100644
--- a/src/main/java/org/orekit/rugged/linesensor/LinearLineDatation.java
+++ b/src/main/java/org/orekit/rugged/linesensor/LinearLineDatation.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossing.java b/src/main/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossing.java
index 8562497bd883bfed862ff09683327484c3e099a9..23c0b9d6be6baf41082d03a3ded0e16fa9063b97 100644
--- a/src/main/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossing.java
+++ b/src/main/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossing.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -38,6 +38,7 @@ import org.hipparchus.util.FastMath;
import org.hipparchus.util.Precision;
import org.orekit.frames.Transform;
import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedInternalError;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.Constants;
@@ -151,7 +152,7 @@ public class SensorMeanPlaneCrossing {
this.meanPlaneNormal = meanPlaneNormal;
- this.cachedResults = new ArrayList<CrossingResult>(CACHED_RESULTS);
+ this.cachedResults = new ArrayList<>(CACHED_RESULTS);
cachedResults.forEach(crossingResult -> {
if (crossingResult != null && this.cachedResults.size() < CACHED_RESULTS) {
this.cachedResults.add(crossingResult);
@@ -537,7 +538,7 @@ public class SensorMeanPlaneCrossing {
evaluateLine(x, targetPV, scToBody.getBodyToInertial(date), scToBody.getScToInertial(date));
return 0.5 * FastMath.PI - FastMath.acos(Vector3D.dotProduct(targetDirection[0], meanPlaneNormal));
} catch (RuggedException re) {
- throw RuggedException.createInternalError(re);
+ throw new RuggedInternalError(re);
}
}
}, minLine, maxLine, startValue);
diff --git a/src/main/java/org/orekit/rugged/linesensor/SensorPixel.java b/src/main/java/org/orekit/rugged/linesensor/SensorPixel.java
index a0f65e239573330d40221e3778e5310368d77ede..514ebc7969db55a59a652f633612fd9825c37439 100644
--- a/src/main/java/org/orekit/rugged/linesensor/SensorPixel.java
+++ b/src/main/java/org/orekit/rugged/linesensor/SensorPixel.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java b/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java
index fa60b1579b5e2af9ed12c0b30668b2e55d5ca278..57b531fec9fa7f3f78d35fcfac3a284e04f5f5ce 100644
--- a/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java
+++ b/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -23,6 +23,7 @@ import org.hipparchus.exception.MathIllegalArgumentException;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedInternalError;
import org.orekit.time.AbsoluteDate;
/** Class devoted to locate where ground point crosses a sensor line.
@@ -80,7 +81,7 @@ public class SensorPixelCrossing {
try {
return Vector3D.angle(cross, getLOS(date, x)) - 0.5 * FastMath.PI;
} catch (RuggedException re) {
- throw RuggedException.createInternalError(re);
+ throw new RuggedInternalError(re);
}
}
};
diff --git a/src/main/java/org/orekit/rugged/linesensor/package-info.java b/src/main/java/org/orekit/rugged/linesensor/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..733adc93cf04c71d03aff7a5a904ebd7e3a68414
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/linesensor/package-info.java
@@ -0,0 +1,25 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides all the tools needed to deal with line sensor model.
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ *
+ */
+package org.orekit.rugged.linesensor;
diff --git a/src/main/java/org/orekit/rugged/los/FixedRotation.java b/src/main/java/org/orekit/rugged/los/FixedRotation.java
index 83ab388c215b6e928446a7ec3fb7453fabd4b4ed..5b416136738f83367c583ab4ad13fdb16e1f724f 100644
--- a/src/main/java/org/orekit/rugged/los/FixedRotation.java
+++ b/src/main/java/org/orekit/rugged/los/FixedRotation.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -18,14 +18,14 @@ package org.orekit.rugged.los;
import java.util.stream.Stream;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.analysis.differentiation.Derivative;
import org.hipparchus.geometry.euclidean.threed.FieldRotation;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.RotationConvention;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.utils.ParameterDriver;
import org.orekit.utils.ParameterObserver;
@@ -50,7 +50,7 @@ public class FixedRotation implements TimeIndependentLOSTransform {
private Rotation rotation;
/** Underlying rotation with derivatives. */
- private FieldRotation<DerivativeStructure> rDS;
+ private FieldRotation<?> rDS;
/** Driver for rotation angle. */
private final ParameterDriver angleDriver;
@@ -96,19 +96,31 @@ public class FixedRotation implements TimeIndependentLOSTransform {
}
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
@Override
- public FieldVector3D<DerivativeStructure> transformLOS(final int i, final FieldVector3D<DerivativeStructure> los,
- final DSGenerator generator) {
- if (rDS == null) {
+ public <T extends Derivative<T>> FieldVector3D<T> transformLOS(final int i, final FieldVector3D<T> los,
+ final DerivativeGenerator<T> generator) {
+ final FieldRotation<T> rD;
+ if (rDS == null || !rDS.getQ0().getField().equals(generator.getField())) {
+
// lazy evaluation of the rotation
- final FieldVector3D<DerivativeStructure> axisDS =
- new FieldVector3D<DerivativeStructure>(generator.constant(axis.getX()),
- generator.constant(axis.getY()),
- generator.constant(axis.getZ()));
- final DerivativeStructure angleDS = generator.variable(angleDriver);
- rDS = new FieldRotation<DerivativeStructure>(axisDS, angleDS, RotationConvention.VECTOR_OPERATOR);
+ final FieldVector3D<T> axisDS =
+ new FieldVector3D<>(generator.constant(axis.getX()),
+ generator.constant(axis.getY()),
+ generator.constant(axis.getZ()));
+ final T angleDS = generator.variable(angleDriver);
+ rD = new FieldRotation<>(axisDS, angleDS, RotationConvention.VECTOR_OPERATOR);
+
+ // cache evaluated rotation
+ rDS = rD;
+
+ } else {
+ // reuse cached value
+ rD = (FieldRotation<T>) rDS;
}
- return rDS.applyTo(los);
+
+ return rD.applyTo(los);
+
}
}
diff --git a/src/main/java/org/orekit/rugged/los/FixedZHomothety.java b/src/main/java/org/orekit/rugged/los/FixedZHomothety.java
index d27e544d8a248a8fab533a548bb52387bf36c755..f1f5c33b644addde78b9e5e11813317f2dbfbb67 100644
--- a/src/main/java/org/orekit/rugged/los/FixedZHomothety.java
+++ b/src/main/java/org/orekit/rugged/los/FixedZHomothety.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -18,11 +18,11 @@ package org.orekit.rugged.los;
import java.util.stream.Stream;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.analysis.differentiation.Derivative;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.utils.ParameterDriver;
import org.orekit.utils.ParameterObserver;
@@ -46,7 +46,7 @@ public class FixedZHomothety implements TimeIndependentLOSTransform {
private double factor;
/** Underlying homothety with derivatives. */
- private DerivativeStructure factorDS;
+ private Derivative<?> factorDS;
/** Driver for homothety factor. */
private final ParameterDriver factorDriver;
@@ -91,14 +91,26 @@ public class FixedZHomothety implements TimeIndependentLOSTransform {
}
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
@Override
- public FieldVector3D<DerivativeStructure> transformLOS(final int i, final FieldVector3D<DerivativeStructure> los,
- final DSGenerator generator) {
- if (factorDS == null) {
+ public <T extends Derivative<T>> FieldVector3D<T> transformLOS(final int i, final FieldVector3D<T> los,
+ final DerivativeGenerator<T> generator) {
+ final T factorD;
+ if (factorDS == null || !factorDS.getField().equals(generator.getField())) {
+
// lazy evaluation of the homothety
- factorDS = generator.variable(factorDriver);
+ factorD = generator.variable(factorDriver);
+
+ // cache evaluated homothety
+ factorDS = factorD;
+
+ } else {
+ // reuse cached value
+ factorD = (T) factorDS;
}
- return new FieldVector3D<DerivativeStructure>(los.getX(), los.getY(), factorDS.multiply(los.getZ()));
+
+ return new FieldVector3D<>(los.getX(), los.getY(), factorD.multiply(los.getZ()));
+
}
}
diff --git a/src/main/java/org/orekit/rugged/los/LOSBuilder.java b/src/main/java/org/orekit/rugged/los/LOSBuilder.java
index 9ff9c2406bba2ce48391692eda580f20b6e00bc4..3bc88855a3279cc0b235ea0c414d2e9c41a8fe3e 100644
--- a/src/main/java/org/orekit/rugged/los/LOSBuilder.java
+++ b/src/main/java/org/orekit/rugged/los/LOSBuilder.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -21,10 +21,10 @@ import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.analysis.differentiation.Derivative;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.ParameterDriver;
import org.orekit.utils.ParameterObserver;
@@ -63,7 +63,7 @@ public class LOSBuilder {
*/
public LOSBuilder(final List<Vector3D> rawLOS) {
this.rawLOS = rawLOS;
- this.transforms = new ArrayList<LOSTransform>();
+ this.transforms = new ArrayList<>();
this.timeIndependent = true;
}
@@ -122,8 +122,8 @@ public class LOSBuilder {
/** {@inheritDoc} */
@Override
- public FieldVector3D<DerivativeStructure> transformLOS(final int i, final FieldVector3D<DerivativeStructure> los,
- final AbsoluteDate date, final DSGenerator generator) {
+ public <T extends Derivative<T>> FieldVector3D<T> transformLOS(final int i, final FieldVector3D<T> los,
+ final AbsoluteDate date, final DerivativeGenerator<T> generator) {
return transform.transformLOS(i, los, generator);
}
@@ -158,7 +158,7 @@ public class LOSBuilder {
this.raw[i] = raw.get(i);
}
- this.transforms = new ArrayList<LOSTransform>(transforms);
+ this.transforms = new ArrayList<>(transforms);
}
@@ -179,14 +179,13 @@ public class LOSBuilder {
/** {@inheritDoc} */
@Override
- public FieldVector3D<DerivativeStructure> getLOSDerivatives(final int index, final AbsoluteDate date,
- final DSGenerator generator) {
+ public <T extends Derivative<T>> FieldVector3D<T> getLOSDerivatives(final int index, final AbsoluteDate date,
+ final DerivativeGenerator<T> generator) {
// the raw line of sights are considered to be constant
- FieldVector3D<DerivativeStructure> los =
- new FieldVector3D<DerivativeStructure>(generator.constant(raw[index].getX()),
- generator.constant(raw[index].getY()),
- generator.constant(raw[index].getZ()));
+ FieldVector3D<T> los = new FieldVector3D<>(generator.constant(raw[index].getX()),
+ generator.constant(raw[index].getY()),
+ generator.constant(raw[index].getZ()));
// apply the transforms, which depend on parameters and hence may introduce non-zero derivatives
for (final LOSTransform transform : transforms) {
diff --git a/src/main/java/org/orekit/rugged/los/LOSTransform.java b/src/main/java/org/orekit/rugged/los/LOSTransform.java
index 62e6bd1fe15913aa07b02b2128640d57a3e1e7b9..76e367f7de52aa69c14766591559802d4d0b92ae 100644
--- a/src/main/java/org/orekit/rugged/los/LOSTransform.java
+++ b/src/main/java/org/orekit/rugged/los/LOSTransform.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -18,10 +18,11 @@ package org.orekit.rugged.los;
import java.util.stream.Stream;
+import org.hipparchus.analysis.differentiation.Derivative;
import org.hipparchus.analysis.differentiation.DerivativeStructure;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.ParameterDriver;
@@ -46,14 +47,15 @@ public interface LOSTransform {
* are typically polynomials coefficients representing rotation angles.
* These polynomials can be used for example to model thermo-elastic effects.
* </p>
+ * @param <T> derivative type
* @param index los pixel index
* @param los line-of-sight to transform
* @param date date
* @param generator generator to use for building {@link DerivativeStructure} instances
* @return line of sight, and its first partial derivatives with respect to the parameters
*/
- FieldVector3D<DerivativeStructure> transformLOS(int index, FieldVector3D<DerivativeStructure> los,
- AbsoluteDate date, DSGenerator generator);
+ <T extends Derivative<T>> FieldVector3D<T> transformLOS(int index, FieldVector3D<T> los,
+ AbsoluteDate date, DerivativeGenerator<T> generator);
/** Get the drivers for LOS parameters.
* @return drivers for LOS parameters
diff --git a/src/main/java/org/orekit/rugged/los/PolynomialRotation.java b/src/main/java/org/orekit/rugged/los/PolynomialRotation.java
index 9bdcbdb1c80dcce8dc10bc321e78b65fad18c932..63e3082aa271ae64ccb6d99ef31af809043dd355 100644
--- a/src/main/java/org/orekit/rugged/los/PolynomialRotation.java
+++ b/src/main/java/org/orekit/rugged/los/PolynomialRotation.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -18,7 +18,8 @@ package org.orekit.rugged.los;
import java.util.stream.Stream;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.Field;
+import org.hipparchus.analysis.differentiation.Derivative;
import org.hipparchus.analysis.polynomials.PolynomialFunction;
import org.hipparchus.geometry.euclidean.threed.FieldRotation;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
@@ -26,7 +27,8 @@ import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.RotationConvention;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
-import org.orekit.rugged.utils.DSGenerator;
+import org.hipparchus.util.MathArrays;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.ParameterDriver;
import org.orekit.utils.ParameterObserver;
@@ -52,10 +54,10 @@ public class PolynomialRotation implements LOSTransform {
private PolynomialFunction angle;
/** Rotation axis and derivatives. */
- private FieldVector3D<DerivativeStructure> axisDS;
+ private FieldVector3D<?> axisDS;
/** Rotation angle polynomial and derivatives. */
- private DerivativeStructure[] angleDS;
+ private Derivative<?>[] angleDS;
/** Reference date for polynomial evaluation. */
private final AbsoluteDate referenceDate;
@@ -143,30 +145,44 @@ public class PolynomialRotation implements LOSTransform {
}
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
@Override
- public FieldVector3D<DerivativeStructure> transformLOS(final int i, final FieldVector3D<DerivativeStructure> los,
- final AbsoluteDate date, final DSGenerator generator) {
+ public <T extends Derivative<T>> FieldVector3D<T> transformLOS(final int i, final FieldVector3D<T> los,
+ final AbsoluteDate date,
+ final DerivativeGenerator<T> generator) {
+
+ final Field<T> field = generator.getField();
+ final FieldVector3D<T> axisD;
+ final T[] angleD;
+ if (axisDS == null || !axisDS.getX().getField().equals(field)) {
- if (angleDS == null) {
// lazy evaluation of the rotation
- axisDS = new FieldVector3D<DerivativeStructure>(generator.constant(axis.getX()),
- generator.constant(axis.getY()),
- generator.constant(axis.getZ()));
- angleDS = new DerivativeStructure[coefficientsDrivers.length];
- for (int k = 0; k < angleDS.length; ++k) {
- angleDS[k] = generator.variable(coefficientsDrivers[k]);
+ axisD = new FieldVector3D<>(generator.constant(axis.getX()),
+ generator.constant(axis.getY()),
+ generator.constant(axis.getZ()));
+ angleD = MathArrays.buildArray(field, coefficientsDrivers.length);
+ for (int k = 0; k < angleD.length; ++k) {
+ angleD[k] = generator.variable(coefficientsDrivers[k]);
}
+
+ // cache evaluated rotation parameters
+ axisDS = axisD;
+ angleDS = angleD;
+
+ } else {
+ // reuse cached values
+ axisD = (FieldVector3D<T>) axisDS;
+ angleD = (T[]) angleDS;
}
+
// evaluate polynomial, with all its partial derivatives
final double t = date.durationFrom(referenceDate);
- DerivativeStructure alpha = axisDS.getX().getField().getZero();
+ T alpha = field.getZero();
for (int k = angleDS.length - 1; k >= 0; --k) {
- alpha = alpha.multiply(t).add(angleDS[k]);
+ alpha = alpha.multiply(t).add(angleD[k]);
}
- return new FieldRotation<DerivativeStructure>(axisDS,
- alpha,
- RotationConvention.VECTOR_OPERATOR).applyTo(los);
+ return new FieldRotation<>(axisD, alpha, RotationConvention.VECTOR_OPERATOR).applyTo(los);
}
diff --git a/src/main/java/org/orekit/rugged/los/TimeDependentLOS.java b/src/main/java/org/orekit/rugged/los/TimeDependentLOS.java
index 08aca9937f58478d280dbdec46c6a4c5f671c6e6..09acacda4dcfa2efaf95100de33edad8f6214d64 100644
--- a/src/main/java/org/orekit/rugged/los/TimeDependentLOS.java
+++ b/src/main/java/org/orekit/rugged/los/TimeDependentLOS.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -18,10 +18,10 @@ package org.orekit.rugged.los;
import java.util.stream.Stream;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.analysis.differentiation.Derivative;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.ParameterDriver;
@@ -56,14 +56,15 @@ public interface TimeDependentLOS {
* method must have been set to {@code true} for the various parameters returned
* by {@link #getParametersDrivers()} that should be estimated.
* </p>
+ * @param <T> derivative type
* @param index los pixel index
* @param date date
- * @param generator generator to use for building {@link DerivativeStructure} instances
+ * @param generator generator to use for building {@link Derivative} instances
* @return line of sight, and its first partial derivatives with respect to the parameters
* @since 2.0
*/
- FieldVector3D<DerivativeStructure> getLOSDerivatives(int index, AbsoluteDate date,
- DSGenerator generator);
+ <T extends Derivative<T>> FieldVector3D<T> getLOSDerivatives(int index, AbsoluteDate date,
+ DerivativeGenerator<T> generator);
/** Get the drivers for LOS parameters.
* @return drivers for LOS parameters
diff --git a/src/main/java/org/orekit/rugged/los/TimeIndependentLOSTransform.java b/src/main/java/org/orekit/rugged/los/TimeIndependentLOSTransform.java
index f1abc03f3e1278c075620bd083fa454a3e453943..10ab25052714c4a975169ca807a0e720ec289ed4 100644
--- a/src/main/java/org/orekit/rugged/los/TimeIndependentLOSTransform.java
+++ b/src/main/java/org/orekit/rugged/los/TimeIndependentLOSTransform.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -18,10 +18,10 @@ package org.orekit.rugged.los;
import java.util.stream.Stream;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.analysis.differentiation.Derivative;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.utils.ParameterDriver;
/** Interface for lines-of-sight tranforms that do not depend on time.
@@ -50,13 +50,14 @@ public interface TimeIndependentLOSTransform {
* method must have been set to {@code true} for the various parameters returned
* by {@link #getParametersDrivers()} that should be estimated.
* </p>
+ * @param <T> derivative type
* @param index los pixel index
* @param los line-of-sight to transform
- * @param generator generator to use for building {@link DerivativeStructure} instances
+ * @param generator generator to use for building {@link Derivative} instances
* @return line of sight, and its first partial derivatives with respect to the parameters
*/
- FieldVector3D<DerivativeStructure> transformLOS(int index, FieldVector3D<DerivativeStructure> los,
- DSGenerator generator);
+ <T extends Derivative<T>> FieldVector3D<T> transformLOS(int index, FieldVector3D<T> los,
+ DerivativeGenerator<T> generator);
/** Get the drivers for LOS parameters.
* @return drivers for LOS parameters
diff --git a/src/main/java/org/orekit/rugged/los/package-info.java b/src/main/java/org/orekit/rugged/los/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..97fd1351a81e3857d57ad0a8e49260c0eba94f2f
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/los/package-info.java
@@ -0,0 +1,25 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides all the tools to build lines-of-sight (LOS).
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ *
+ */
+package org.orekit.rugged.los;
diff --git a/src/main/java/org/orekit/rugged/raster/EarthHemisphere.java b/src/main/java/org/orekit/rugged/raster/EarthHemisphere.java
new file mode 100644
index 0000000000000000000000000000000000000000..fd0292e4299b2e09821a16513230ff8288e70483
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/raster/EarthHemisphere.java
@@ -0,0 +1,42 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.raster;
+
+/**
+ * Enumerate for Earth hemispheres for tiles definition.
+ * <p>
+ * For Latitude: NORTH / SOUTH
+ * <p>
+ * For Longitude: WESTEXTREME / WEST / EAST / EASTEXTREME
+ * @author Guylaine Prat
+ * @since 4.0
+ */
+public enum EarthHemisphere {
+
+ /** South hemisphere. */
+ SOUTH,
+ /** North hemisphere. */
+ NORTH,
+ /** Extreme West. */
+ WESTEXTREME,
+ /** West hemisphere. */
+ WEST,
+ /** East hemisphere. */
+ EAST,
+ /** Extreme East. */
+ EASTEXTREME
+}
diff --git a/src/main/java/org/orekit/rugged/raster/SimpleTile.java b/src/main/java/org/orekit/rugged/raster/SimpleTile.java
index 5db49b4e9a39f3976aeb54029f43eb4fef3421f0..119ce06aee2c846c4c7f652dc83b85a0cee625c2 100644
--- a/src/main/java/org/orekit/rugged/raster/SimpleTile.java
+++ b/src/main/java/org/orekit/rugged/raster/SimpleTile.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -16,12 +16,11 @@
*/
package org.orekit.rugged.raster;
+import java.util.Arrays;
+
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.hipparchus.util.Precision;
-import java.util.Arrays;
-
-import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.errors.DumpManager;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
@@ -268,7 +267,7 @@ public class SimpleTile implements Tile {
public double interpolateElevation(final double latitude, final double longitude) {
final double doubleLatitudeIndex = getDoubleLatitudeIndex(latitude);
- final double doubleLongitudeIndex = getDoubleLontitudeIndex(longitude);
+ final double doubleLongitudeIndex = getDoubleLongitudeIndex(longitude);
if (doubleLatitudeIndex < -TOLERANCE || doubleLatitudeIndex >= (latitudeRows - 1 + TOLERANCE) ||
doubleLongitudeIndex < -TOLERANCE || doubleLongitudeIndex >= (longitudeColumns - 1 + TOLERANCE)) {
throw new RuggedException(RuggedMessages.OUT_OF_TILE_ANGLES,
@@ -302,7 +301,7 @@ public class SimpleTile implements Tile {
/** {@inheritDoc} */
@Override
- public NormalizedGeodeticPoint cellIntersection(final GeodeticPoint p, final Vector3D los,
+ public NormalizedGeodeticPoint cellIntersection(final NormalizedGeodeticPoint p, final Vector3D los,
final int latitudeIndex, final int longitudeIndex) {
// ensure neighboring cells to not fall out of tile
@@ -317,10 +316,16 @@ public class SimpleTile implements Tile {
final double z10 = getElevationAtIndices(iLat, jLong + 1);
final double z11 = getElevationAtIndices(iLat + 1, jLong + 1);
+ // normalize back to tile coordinates
+ final NormalizedGeodeticPoint tileP = new NormalizedGeodeticPoint(p.getLatitude(),
+ p.getLongitude(),
+ p.getAltitude(),
+ x00);
+
// line-of-sight coordinates at close points
- final double dxA = (p.getLongitude() - x00) / longitudeStep;
- final double dyA = (p.getLatitude() - y00) / latitudeStep;
- final double dzA = p.getAltitude();
+ final double dxA = (tileP.getLongitude() - x00) / longitudeStep;
+ final double dyA = (tileP.getLatitude() - y00) / latitudeStep;
+ final double dzA = tileP.getAltitude();
final double dxB = dxA + los.getX() / longitudeStep;
final double dyB = dyA + los.getY() / latitudeStep;
final double dzB = dzA + los.getZ();
@@ -368,8 +373,8 @@ public class SimpleTile implements Tile {
}
- final NormalizedGeodeticPoint p1 = interpolate(t1, p, dxA, dyA, los, x00);
- final NormalizedGeodeticPoint p2 = interpolate(t2, p, dxA, dyA, los, x00);
+ final NormalizedGeodeticPoint p1 = interpolate(t1, tileP, dxA, dyA, los, x00);
+ final NormalizedGeodeticPoint p2 = interpolate(t2, tileP, dxA, dyA, los, x00);
// select the first point along line-of-sight
if (p1 == null) {
@@ -384,7 +389,7 @@ public class SimpleTile implements Tile {
/** Interpolate point along a line.
* @param t abscissa along the line
- * @param p start point
+ * @param tileP start point, normalized to tile area
* @param dxP relative coordinate of the start point with respect to current cell
* @param dyP relative coordinate of the start point with respect to current cell
* @param los direction of the line-of-sight, in geodetic space
@@ -392,7 +397,7 @@ public class SimpleTile implements Tile {
* be normalized between lc-Ï€ and lc+Ï€
* @return interpolated point along the line
*/
- private NormalizedGeodeticPoint interpolate(final double t, final GeodeticPoint p,
+ private NormalizedGeodeticPoint interpolate(final double t, final NormalizedGeodeticPoint tileP,
final double dxP, final double dyP,
final Vector3D los, final double centralLongitude) {
@@ -403,9 +408,9 @@ public class SimpleTile implements Tile {
final double dx = dxP + t * los.getX() / longitudeStep;
final double dy = dyP + t * los.getY() / latitudeStep;
if (dx >= -TOLERANCE && dx <= 1 + TOLERANCE && dy >= -TOLERANCE && dy <= 1 + TOLERANCE) {
- return new NormalizedGeodeticPoint(p.getLatitude() + t * los.getY(),
- p.getLongitude() + t * los.getX(),
- p.getAltitude() + t * los.getZ(),
+ return new NormalizedGeodeticPoint(tileP.getLatitude() + t * los.getY(),
+ tileP.getLongitude() + t * los.getX(),
+ tileP.getAltitude() + t * los.getZ(),
centralLongitude);
} else {
return null;
@@ -422,14 +427,14 @@ public class SimpleTile implements Tile {
/** {@inheritDoc} */
@Override
public int getFloorLongitudeIndex(final double longitude) {
- return (int) FastMath.floor(getDoubleLontitudeIndex(longitude));
+ return (int) FastMath.floor(getDoubleLongitudeIndex(longitude));
}
/** Get the latitude index of a point.
* @param latitude geodetic latitude (rad)
* @return latitude index (it may lie outside of the tile!)
*/
- private double getDoubleLatitudeIndex(final double latitude) {
+ protected double getDoubleLatitudeIndex(final double latitude) {
return (latitude - minLatitude) / latitudeStep;
}
@@ -437,7 +442,7 @@ public class SimpleTile implements Tile {
* @param longitude geodetic longitude (rad)
* @return longitude index (it may lie outside of the tile!)
*/
- private double getDoubleLontitudeIndex(final double longitude) {
+ protected double getDoubleLongitudeIndex(final double longitude) {
return (longitude - minLongitude) / longitudeStep;
}
@@ -472,5 +477,4 @@ public class SimpleTile implements Tile {
}
}
}
-
}
diff --git a/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java b/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
index b05b7cd361bb4adab2921da78bafc607ac139b1e..8376541c0f9b50b21e559055eed308189c5d97f0 100644
--- a/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
+++ b/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -16,8 +16,6 @@
*/
package org.orekit.rugged.raster;
-import org.orekit.rugged.raster.TileFactory;
-
/** Simple implementation of a {@link TileFactory} for {@link SimpleTile}.
* @author Luc Maisonobe
*/
diff --git a/src/main/java/org/orekit/rugged/raster/Tile.java b/src/main/java/org/orekit/rugged/raster/Tile.java
index 634da34d6b56a4247aeca5a2958dcff375df63be..ec4a0f77715fa26e10629c81289e20c0fdaa89fe 100644
--- a/src/main/java/org/orekit/rugged/raster/Tile.java
+++ b/src/main/java/org/orekit/rugged/raster/Tile.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -17,7 +17,6 @@
package org.orekit.rugged.raster;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
/** Interface representing a raster tile.
@@ -44,7 +43,7 @@ public interface Tile extends UpdatableTile {
* <p>
* This enumerate represent the position of a point taking this off-by-one property
* into account, the value {@link #HAS_INTERPOLATION_NEIGHBORS} correspond to points that
- * do have the necessary four neightbors, whereas the other values correspond to points
+ * do have the necessary four neighbors, whereas the other values correspond to points
* that are either completely outside of the tile or within the tile but in either the
* northernmost row or easternmost column.
* </p>
@@ -257,7 +256,19 @@ public interface Tile extends UpdatableTile {
double interpolateElevation(double latitude, double longitude);
/** Find the intersection of a line-of-sight and a Digital Elevation Model cell.
- * @param p point on the line
+ * <p>
+ * Beware that for continuity reasons, the point argument in {@code cellIntersection} is normalized
+ * with respect to other points used by the caller. This implies that the longitude may be
+ * outside of the [-Ï€ ; +Ï€] interval (or the [0 ; 2Ï€] interval, depending on the DEM). In particular,
+ * when a Line Of Sight crosses the antimeridian at ±π longitude, the library may call the
+ * {@code cellIntersection} method with a point having a longitude of -π-ε to ensure this continuity.
+ * As tiles are stored with longitude clipped to a some DEM specific interval (either [-Ï€ ; +Ï€] or [0 ; 2Ï€]),
+ * implementations MUST take care to clip the input point back to the tile interval using
+ * {@link org.hipparchus.util.MathUtils#normalizeAngle(double, double) MathUtils.normalizeAngle(p.getLongitude(),
+ * someLongitudeWithinTheTile)}. The output point normalization should also be made consistent with
+ * the current tile.
+ * </p>
+ * @param p point on the line (beware its longitude is <em>not</em> normalized with respect to tile)
* @param los line-of-sight, in the topocentric frame (East, North, Zenith) of the point,
* scaled to match radians in the horizontal plane and meters along the vertical axis
* @param latitudeIndex latitude index of the Digital Elevation Model cell
@@ -265,8 +276,8 @@ public interface Tile extends UpdatableTile {
* @return point corresponding to line-of-sight crossing the Digital Elevation Model surface
* if it lies within the cell, null otherwise
*/
- NormalizedGeodeticPoint cellIntersection(GeodeticPoint p, Vector3D los,
- int latitudeIndex, int longitudeIndex);
+ NormalizedGeodeticPoint cellIntersection(NormalizedGeodeticPoint p, Vector3D los,
+ int latitudeIndex, int longitudeIndex);
/** Check if a tile covers a ground point.
* @param latitude ground point latitude
diff --git a/src/main/java/org/orekit/rugged/raster/TileFactory.java b/src/main/java/org/orekit/rugged/raster/TileFactory.java
index 19cef8ebfd50f3f09f5a2661b51eee128f27a950..ccb2644a08df897eccb7d87ab267851961daf156 100644
--- a/src/main/java/org/orekit/rugged/raster/TileFactory.java
+++ b/src/main/java/org/orekit/rugged/raster/TileFactory.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/raster/TileUpdater.java b/src/main/java/org/orekit/rugged/raster/TileUpdater.java
index 659942f1357ec736ad3249b096508891805e2444..ffaecf812dcb7154ec969342314925440e5f5297 100644
--- a/src/main/java/org/orekit/rugged/raster/TileUpdater.java
+++ b/src/main/java/org/orekit/rugged/raster/TileUpdater.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -18,7 +18,7 @@ package org.orekit.rugged.raster;
/** Interface used to update Digital Elevation Model tiles.
* <p>
- * Implementations of this interface are must be provided by
+ * Implementations of this interface must be provided by
* the image processing mission-specific layer, thus allowing
* the Rugged library to access the Digital Elevation Model data.
* </p>
diff --git a/src/main/java/org/orekit/rugged/raster/TilesCache.java b/src/main/java/org/orekit/rugged/raster/TilesCache.java
index 6e487987487563aaf6911174a6405686032756ab..58ca33e818c4c51072bbd7c573852420a727782e 100644
--- a/src/main/java/org/orekit/rugged/raster/TilesCache.java
+++ b/src/main/java/org/orekit/rugged/raster/TilesCache.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -16,9 +16,13 @@
*/
package org.orekit.rugged.raster;
-import org.hipparchus.util.FastMath;
import java.lang.reflect.Array;
+import org.hipparchus.util.FastMath;
+import org.hipparchus.util.MathUtils;
+import org.hipparchus.util.Precision;
+import org.orekit.bodies.GeodeticPoint;
+import org.orekit.rugged.errors.DumpManager;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
@@ -28,15 +32,23 @@ import org.orekit.rugged.errors.RuggedMessages;
* </p>
* @param <T> Type of tiles.
* @author Luc Maisonobe
+ * @author Guylaine Prat
*/
public class TilesCache<T extends Tile> {
+ /** Epsilon to test step equality in latitude and longitude. */
+ private static double STEP_EQUALITY = 5 * Precision.EPSILON;
+
/** Factory for empty tiles. */
private final TileFactory<T> factory;
/** Updater for retrieving tiles data. */
private final TileUpdater updater;
+ /**Flag to tell if the Digital Elevation Model tiles are overlapping.
+ * @since 4.0 */
+ private final boolean isOverlapping;
+
/** Cache. */
private final T[] tiles;
@@ -44,22 +56,27 @@ public class TilesCache<T extends Tile> {
* @param factory factory for creating empty tiles
* @param updater updater for retrieving tiles data
* @param maxTiles maximum number of tiles stored simultaneously in the cache
+ * @param isOverlappingTiles flag to tell if the DEM tiles are overlapping:
+ * true if overlapping; false otherwise.
*/
- public TilesCache(final TileFactory<T> factory, final TileUpdater updater, final int maxTiles) {
+ public TilesCache(final TileFactory<T> factory, final TileUpdater updater,
+ final int maxTiles, final boolean isOverlappingTiles) {
this.factory = factory;
this.updater = updater;
+ this.isOverlapping = isOverlappingTiles;
@SuppressWarnings("unchecked")
final T[] array = (T[]) Array.newInstance(Tile.class, maxTiles);
this.tiles = array;
}
/** Get the tile covering a ground point.
- * @param latitude ground point latitude
- * @param longitude ground point longitude
+ * @param latitude ground point latitude (rad)
+ * @param longitude ground point longitude (rad)
* @return tile covering the ground point
*/
public T getTile(final double latitude, final double longitude) {
+ // Search the current (latitude, longitude) in the tiles from the cache
for (int i = 0; i < tiles.length; ++i) {
final T tile = tiles[i];
if (tile != null && tile.getLocation(latitude, longitude) == Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
@@ -71,34 +88,1093 @@ public class TilesCache<T extends Tile> {
--i;
}
tiles[0] = tile;
-
return tile;
-
}
}
- // none of the tiles in the cache covers the specified points
+ // None of the tiles in the cache covers the specified point
- // make some room in the cache, possibly evicting the least recently used one
+ // Make some room in the cache, possibly evicting the least recently used one
+ // in order to add the new tile
for (int i = tiles.length - 1; i > 0; --i) {
tiles[i] = tiles[i - 1];
}
- // create the tile and retrieve its data
+ // Fully create a tile given a latitude and longitude
+ final T tile = createTile(latitude, longitude);
+
+ // At this stage the found tile must be checked (HAS_INTERPOLATION_NEIGHBORS ?)
+ // taking into account if the DEM tiles are overlapping or not
+
+ if ( !isOverlapping ) { // DEM with seamless tiles (no overlapping)
+
+ // Check if the tile HAS INTERPOLATION NEIGHBORS (the point (latitude, longitude) is inside the tile),
+ // otherwise the point (latitude, longitude) is on the edge of the tile:
+ // one must create a zipper tile because tiles are not overlapping ...
+ final Tile.Location pointLocation = tile.getLocation(latitude, longitude);
+
+ // We are on the edge of the tile
+ if (pointLocation != Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
+
+ // Create a "zipper tile"
+ return createZipperTile(tile, latitude, longitude, pointLocation);
+
+ } else { // we are NOT on the edge of the tile
+
+ tiles[0] = tile;
+ return tile;
+
+ } // end if (location != Tile.Location.HAS_INTERPOLATION_NEIGHBORS)
+
+ } else { // isOverlapping: DEM with overlapping tiles (according to the flag ...)
+
+ // Check if the tile HAS INTERPOLATION NEIGHBORS (the (latitude, longitude) is inside the tile)
+ if (tile.getLocation(latitude, longitude) != Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
+ // this should happen only if user set up an inconsistent TileUpdater
+ throw new RuggedException(RuggedMessages.TILE_WITHOUT_REQUIRED_NEIGHBORS_SELECTED,
+ FastMath.toDegrees(latitude), FastMath.toDegrees(longitude));
+ }
+
+ tiles[0] = tile;
+ return tile;
+
+ } // end if (!isOverlapping)
+ }
+
+ /** Create a tile defines by its latitude and longitude.
+ * @param latitude latitude of the desired tile (rad)
+ * @param longitude longitude of the desired tile (rad)
+ * @return the tile
+ * @since 4.0
+ */
+ private T createTile(final double latitude, final double longitude) {
+
+ // Create the tile according to the current (latitude, longitude) and retrieve its data
final T tile = factory.createTile();
+
+ // In case dump is asked for, suspend the dump manager as we don't need to dump anything here.
+ // For instance for SRTM DEM, the user needs to read Geoid data that are not useful in the dump
+ final Boolean wasSuspended = DumpManager.suspend();
+
+ // Retrieve the tile data
updater.updateTile(latitude, longitude, tile);
+
+ // Resume the dump manager if necessary
+ DumpManager.resume(wasSuspended);
+
+ // Last step to fully create the tile (in order to create the MinMax kd tree)
tile.tileUpdateCompleted();
+ return tile;
+ }
+
+ /** Create a zipper tile for DEM with seamless tiles (no overlapping).
+ * @param currentTile current tile
+ * @param latitude ground point latitude (rad)
+ * @param longitude ground point longitude (rad)
+ * @param pointLocation ground point location with respect to the tile
+ * @return zipper tile covering the ground point
+ * @since 4.0
+ */
+ private T createZipperTile(final T currentTile,
+ final double latitude, final double longitude,
+ final Tile.Location pointLocation) {
+
+ T zipperTile = null;
- if (tile.getLocation(latitude, longitude) != Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
- // this should happen only if user set up an inconsistent TileUpdater
- throw new RuggedException(RuggedMessages.TILE_WITHOUT_REQUIRED_NEIGHBORS_SELECTED,
- FastMath.toDegrees(latitude),
- FastMath.toDegrees(longitude));
+ // One must create a zipper tile between this tile and the neighbor tile
+ // according to the ground point location
+ switch (pointLocation) {
+
+ case NORTH: // pointLocation such as latitudeIndex > latitudeRows - 2
+
+ zipperTile = createZipperNorthOrSouth(EarthHemisphere.NORTH, longitude, currentTile);
+ break;
+
+ case SOUTH: // pointLocation such as latitudeIndex < 0
+
+ zipperTile = createZipperNorthOrSouth(EarthHemisphere.SOUTH, longitude, currentTile);
+ break;
+
+ case WEST: // pointLocation such as longitudeIndex < 0
+
+ zipperTile = createZipperWestOrEast(EarthHemisphere.WEST, latitude, currentTile);
+ break;
+
+ case EAST: // pointLocation such as longitudeIndex > longitudeColumns - 2
+
+ zipperTile = createZipperWestOrEast(EarthHemisphere.EAST, latitude, currentTile);
+ break;
+
+ // One must create a corner zipper tile between this tile and the 3 surrounding tiles
+ // according to the ground point location
+ case NORTH_WEST:
+
+ zipperTile = createCornerZipper(EarthHemisphere.NORTH, EarthHemisphere.WEST, latitude, longitude, currentTile);
+ break;
+
+ case NORTH_EAST:
+
+ zipperTile = createCornerZipper(EarthHemisphere.NORTH, EarthHemisphere.EAST, latitude, longitude, currentTile);
+ break;
+
+ case SOUTH_WEST:
+
+ zipperTile = createCornerZipper(EarthHemisphere.SOUTH, EarthHemisphere.WEST, latitude, longitude, currentTile);
+ break;
+
+ case SOUTH_EAST:
+
+ zipperTile = createCornerZipper(EarthHemisphere.SOUTH, EarthHemisphere.EAST, latitude, longitude, currentTile);
+ break;
+
+ default:
+ // impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+
+ } // end switch
+
+ // again make some room in the cache, possibly evicting the 2nd least recently used one
+ for (int i = tiles.length - 1; i > 0; --i) {
+ tiles[i] = tiles[i - 1];
}
- tiles[0] = tile;
- return tile;
+ tiles[1] = currentTile;
+ tiles[0] = zipperTile;
+
+ return (T) zipperTile;
+ }
+
+ /** Initialize the zipper tile for a given geometry and the full set of elevations.
+ * @param zipperLatMin zipper min latitude (ra)
+ * @param zipperLonMin zipper min longitude (rad)
+ * @param zipperLatStep zipper latitude step (rad)
+ * @param zipperLonStep zipper longitude step (rad)
+ * @param zipperLatRows zipper latitude rows
+ * @param zipperLonCols zipper longitude columns
+ * @param zipperElevations zipper elevations
+ * @return the zipper tile
+ * @since 4.0
+ */
+ private T initializeZipperTile(final double zipperLatMin, final double zipperLonMin,
+ final double zipperLatStep, final double zipperLonStep,
+ final int zipperLatRows, final int zipperLonCols,
+ final double[][] zipperElevations) {
+
+ // Create an empty tile
+ final T zipperTile = factory.createTile();
+
+ // Set the tile geometry
+ zipperTile.setGeometry(zipperLatMin, zipperLonMin, zipperLatStep, zipperLonStep,
+ zipperLatRows, zipperLonCols);
+
+ // Fill in the tile with the relevant elevations
+ for (int iLat = 0; iLat < zipperLatRows; iLat++) {
+ for (int jLon = 0; jLon < zipperLonCols; jLon++) {
+ zipperTile.setElevation(iLat, jLon, zipperElevations[iLat][jLon]);
+ }
+ }
+
+ // Last step in order to create the MinMax kd tree
+ zipperTile.tileUpdateCompleted();
+
+ return zipperTile;
+ }
+
+ /** Create the zipper tile between the current tile and the Northern or Southern tile of the current tile.
+ * for a given longitude. The Northern or Southern tiles of the current tile may have a change in
+ * resolution either in longitude or in latitude wrt the current tile.
+ * The zipper has 4 rows in latitude.
+ * @param latitudeHemisphere hemisphere for latitude: NORTH / SOUTH
+ * @param longitude given longitude (rad)
+ * @param currentTile current tile
+ * @return Northern or Southern zipper tile of the current tile (according to latitudeHemisphere)
+ * @since 4.0
+ */
+ private T createZipperNorthOrSouth(final EarthHemisphere latitudeHemisphere, final double longitude, final T currentTile) {
+
+ final int currentTileLatRows = currentTile.getLatitudeRows();
+ final int currentTileLonCols = currentTile.getLongitudeColumns();
+ final double currentTileLatStep = currentTile.getLatitudeStep();
+ final double currentTileLonStep = currentTile.getLongitudeStep();
+ final double currentTileMinLat = currentTile.getMinimumLatitude();
+ final double currentTileMinLon = currentTile.getMinimumLongitude();
+
+ // Get the Northern or Southern tile
+ final T tileNorthOrSouth = createNorthOrSouthTile(latitudeHemisphere, longitude, currentTileMinLat, currentTileLatStep, currentTileLatRows);
+
+ // If NORTH hemisphere:
+ // Create zipper tile between the current tile and the Northern tile;
+ // 2 rows belong to the North part of the current tile
+ // 2 rows belong to the South part of the Northern tile
+
+ // If SOUTH hemisphere:
+ // Create zipper tile between the current tile and the Southern tile;
+ // 2 rows belong to the South part of the current tile
+ // 2 rows belong to the North part of the Southern tile
+
+ // Initialize the zipper latitude step and number of rows (4)
+ final int zipperLatRows = 4;
+ double zipperLatStep = currentTileLatStep;
+
+ // Check if latitude steps are the same between the current tile and the Northern or Southern tile
+ boolean isSameStepLat = true;
+ final double northSouthLatitudeStep = tileNorthOrSouth.getLatitudeStep();
+
+ if (!(Math.abs(currentTileLatStep - northSouthLatitudeStep) < STEP_EQUALITY)) {
+ // Steps are not the same
+ isSameStepLat = false;
+ // Recompute zipper latitude step if the North or South tile latitude step is smaller
+ if (northSouthLatitudeStep < currentTileLatStep) {
+ zipperLatStep = northSouthLatitudeStep;
+ }
+ }
+
+ // Initialize the zipper longitude step and number of columns with current tile step and columns
+ double zipperLonStep = currentTileLonStep;
+ int zipperLonCols = currentTileLonCols;
+
+ // Check if longitude steps are the same
+ boolean isSameStepLon = true;
+ final double northSouthLongitudeStep = tileNorthOrSouth.getLongitudeStep();
+
+ if (!(Math.abs(currentTileLonStep - northSouthLongitudeStep) < STEP_EQUALITY)) {
+ // Steps are not the same
+ isSameStepLon = false;
+ // Recompute zipper longitude step and columns if the North or South tile longitude step is smaller
+ if (northSouthLongitudeStep < currentTileLonStep) {
+ zipperLonStep = northSouthLongitudeStep;
+ zipperLonCols = tileNorthOrSouth.getLongitudeColumns();
+ }
+ }
+
+ final double zipperLatMin;
+ final double zipperLonMin;
+ final double[][] elevations;
+
+ switch (latitudeHemisphere) {
+ case NORTH:
+ // Defines the zipper min latitude (center of the cell) wrt the current tile Northern latitude
+ // Explanation: we want the 2 first rows belongs to the current tile and 2 last rows to the Northern tile
+ // If zipperLatStep = currentTileLatStep, the 2 first rows = exactly lines of the current tile
+ // otherwise (currentTileLatStep > North tile step), the 2 first rows will be smaller (in latitude) than the 2 lines of the current tile
+ final double currentTileNorthernLatitude = currentTileMinLat - 0.5 * currentTileLatStep + currentTileLatRows * currentTileLatStep;
+ // Zipper min latitude = center of the Southern zipper cell in latitude
+ // In case of resolution change zipperLatStep may be different from currentTileLatStep
+ zipperLatMin = currentTileNorthernLatitude - 2 * zipperLatStep + 0.5 * zipperLatStep;
+
+ // Define the zipper min longitude = current tile min longitude
+ zipperLonMin = currentTileMinLon;
+
+ // Fill in the zipper elevations
+ elevations = getZipperNorthSouthElevations(zipperLonCols, tileNorthOrSouth, currentTile,
+ isSameStepLat, isSameStepLon,
+ zipperLatMin, zipperLonMin, zipperLatStep, zipperLonStep);
+ break;
+
+ case SOUTH:
+ // Defines the zipper min latitude wrt the current tile Southern latitude
+ // Explanation: we want the 2 last rows belongs to the current tile and 2 first rows to the Southern tile
+ // If zipperLatStep = currentTileLatStep, the 2 last rows = exactly lines of the current tile
+ // otherwise (currentTileLatStep > South tile step), the 2 last rows will be smaller (in latitude) than the 2 lines of the current tile
+ final double currentTileSouthernLatitude = currentTileMinLat - 0.5 * currentTileLatStep;
+ // Zipper min latitude = center of the Southern zipper cell in latitude
+ // In case of resolution change zipperLatStep may be different from currentTileLatStep
+ zipperLatMin = currentTileSouthernLatitude - 2 * zipperLatStep + 0.5 * zipperLatStep;
+
+ // Define the zipper min longitude = current tile min longitude
+ zipperLonMin = currentTileMinLon;
+
+ // Fill in the zipper elevations
+ elevations = getZipperNorthSouthElevations(zipperLonCols, currentTile, tileNorthOrSouth,
+ isSameStepLat, isSameStepLon,
+ zipperLatMin, zipperLonMin, zipperLatStep, zipperLonStep);
+ break;
+
+ default:
+ // impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ }
+
+ final T zipperNorthOrSouth = initializeZipperTile(zipperLatMin, zipperLonMin,
+ zipperLatStep, zipperLonStep,
+ zipperLatRows, zipperLonCols, elevations);
+ return zipperNorthOrSouth;
+ }
+
+ /** Create the zipper tile between the current tile and the Western or Eastern tile of the current tile.
+ * for a given latitude. The Western or Eastern tiles of the current tile have the same
+ * resolution in longitude and in latitude as the current tile (for known DEMs).
+ * The zipper has 4 columns in longitude.
+ * @param longitudeHemisphere hemisphere for longitude: WEST / EAST
+ * @param latitude given latitude (rad)
+ * @param currentTile current tile
+ * @return Western or Eastern zipper tile of the current tile (according to longitudeHemisphere)
+ * @since 4.0
+ */
+ private T createZipperWestOrEast(final EarthHemisphere longitudeHemisphere, final double latitude, final T currentTile) {
+
+ final int currentTileLatRows = currentTile.getLatitudeRows();
+ final int currentTileLonCols = currentTile.getLongitudeColumns();
+ final double currentTileLatStep = currentTile.getLatitudeStep();
+ final double currentTileLonStep = currentTile.getLongitudeStep();
+ final double currentTileMinLon = currentTile.getMinimumLongitude();
+
+ // Get the West or East Tile
+ final T tileWestOrEast = createEastOrWestTile(longitudeHemisphere, latitude, currentTileMinLon, currentTileLonStep, currentTileLonCols);
+
+ if (!(Math.abs(currentTileLatStep - tileWestOrEast.getLatitudeStep()) < STEP_EQUALITY) ||
+ !(Math.abs(currentTileLonStep - tileWestOrEast.getLongitudeStep()) < STEP_EQUALITY)) {
+ // Steps are not the same.
+ // Along Western or Eastern edges of the tiles: no change of resolution may occurs in known DEMs.
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ }
+
+ // If WEST hemisphere
+ // Create zipper tile between the current tile and the Western tile;
+ // 2 cols belong to the West part of the current tile
+ // 2 cols belong to the East part of the West tile
+
+ // If EAST hemisphere
+ // Create zipper tile between the current tile and the Eastern tile;
+ // 2 cols belong to the East part of the current tile
+ // 2 cols belong to the West part of the East tile
+
+ final double zipperLonStep = currentTileLonStep;
+ final int zipperLatRows = currentTileLatRows;
+ final int zipperLonCols = 4;
+
+ final double zipperLonMin;
+ final double[][] elevations;
+
+ switch (longitudeHemisphere) {
+ case WEST:
+ zipperLonMin = currentTileMinLon - 2 * currentTileLonStep;
+ elevations = getZipperEastWestElevations(zipperLatRows, currentTile, tileWestOrEast);
+ break;
+
+ case EAST:
+ zipperLonMin = currentTileMinLon + (currentTileLonCols - 2) * currentTileLonStep;
+ elevations = getZipperEastWestElevations(zipperLatRows, tileWestOrEast, currentTile);
+ break;
+
+ default:
+ // impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ }
+
+ final T zipperWestOrEast = initializeZipperTile(currentTile.getMinimumLatitude(), zipperLonMin,
+ currentTileLatStep, zipperLonStep,
+ zipperLatRows, zipperLonCols, elevations);
+ return zipperWestOrEast;
+ }
+
+ /** Get the latitude index of a point.
+ * @param latitude geodetic latitude (rad)
+ * @param latitudeMin min latitude of the tile (rad)
+ * @param latitudeStep latitude step of the tile (rad)
+ * @param latitudeRows number of rows in latitude
+ * @return latitude index (it may lie outside of the tile!)
+ * @since 4.0
+ */
+ private int computeLatitudeIndex(final double latitude, final double latitudeMin, final double latitudeStep, final int latitudeRows) {
+ // Compute the difference in latitude wrt the Southern edge latitude of the tile
+ // TBN: latitude min is at the center of the Southern cell tiles.
+ final double doubleLatitudeIndex = (latitude - (latitudeMin - 0.5 * latitudeStep)) / latitudeStep;
+ return FastMath.max(0, FastMath.min(latitudeRows - 1, (int) FastMath.floor(doubleLatitudeIndex)));
+ }
+
+ /** Get the longitude index of a point.
+ * @param longitude geodetic longitude (rad)
+ * @param longitudeMin min longitude of the tile (rad)
+ * @param longitudeStep longitude step of the tile (rad)
+ * @param longitudeColumns number of columns in longitude
+ * @return longitude index (it may lie outside of the tile!)
+ * @since 4.0
+ */
+ private int computeLongitudeIndex(final double longitude, final double longitudeMin, final double longitudeStep, final int longitudeColumns) {
+ // Compute the difference in longitude wrt the Western edge longitude of the tile
+ // TBN: longitude min is at the center of the Western cell tiles.
+ final double doubleLongitudeIndex = (longitude - (longitudeMin - 0.5 * longitudeStep)) / longitudeStep;
+ return FastMath.max(0, FastMath.min(longitudeColumns - 1, (int) FastMath.floor(doubleLongitudeIndex)));
+ }
+
+ /** Get the elevations for the zipper tile between a northern and a southern tiles with 4 rows in latitude.
+ * @param zipperLonCols number of column in longitude
+ * @param northernTile the tile which is the northern
+ * @param southernTile the tile which is the southern
+ * @param isSameStepLat flag to tell is latitude steps are the same (= true)
+ * @param isSameStepLon flag to tell is longitude steps are the same (= true)
+ * @param zipperLatMin zipper tile min latitude (rad)
+ * @param zipperLonMin zipper tile min longitude (rad)
+ * @param zipperLatStep zipper tile latitude step (rad)
+ * @param zipperLonStep zipper tile longitude step (rad)
+ * @return the elevations to fill in the zipper tile between a northern and a southern tiles
+ * @since 4.0
+ */
+ private double[][] getZipperNorthSouthElevations(final int zipperLonCols,
+ final T northernTile, final T southernTile,
+ final boolean isSameStepLat, final boolean isSameStepLon,
+ final double zipperLatMin, final double zipperLonMin,
+ final double zipperLatStep, final double zipperLonStep) {
+
+ final double[][] elevations = new double[4][zipperLonCols];
+
+ if (isSameStepLat && isSameStepLon) { // tiles with same steps in latitude and longitude
+
+ for (int jLon = 0; jLon < zipperLonCols; jLon++) {
+ // Part from the northern tile
+ final int lat3 = 1;
+ elevations[3][jLon] = northernTile.getElevationAtIndices(lat3, jLon);
+ final int lat2 = 0;
+ elevations[2][jLon] = northernTile.getElevationAtIndices(lat2, jLon);
+
+ // Part from the southern tile
+ final int lat1 = southernTile.getLatitudeRows() - 1;
+ elevations[1][jLon] = southernTile.getElevationAtIndices(lat1, jLon);
+ final int lat0 = southernTile.getLatitudeRows() - 2;
+ elevations[0][jLon] = southernTile.getElevationAtIndices(lat0, jLon);
+ }
+
+ } else { // tiles with different steps
+
+ // To cover every cases and as zipper with such characteristics are rare,
+ // we will use conversion from (latitude, longitude) to tile indices
+
+ // We assure to be inside a cell by adding a delta step (to avoid inappropriate index computation)
+ // TBN: zipperLatStep/zipperLonStep are the smallest steps vs Northern and Southern tiles
+ final double deltaLon = 0.1 * zipperLonStep;
+ double zipperLonCurrent = zipperLonMin + deltaLon;
+
+ // Assure that the longitude belongs to [-180, + 180]
+ final double zipperLonMax = MathUtils.normalizeAngle(zipperLonMin + (zipperLonCols - 1) * zipperLonStep, 0.0);
+
+ // Northern Tile
+ final double northernMinLat = northernTile.getMinimumLatitude();
+ final double northernLatStep = northernTile.getLatitudeStep();
+ final int northernLatRows = northernTile.getLatitudeRows();
+ final double northernMinLon = northernTile.getMinimumLongitude();
+ final double northernLonStep = northernTile.getLongitudeStep();
+ final int northernLonCols = northernTile.getLongitudeColumns();
+
+ // Southern Tile
+ final double southernMinLat = southernTile.getMinimumLatitude();
+ final double southernLatStep = southernTile.getLatitudeStep();
+ final int southernLatRows = southernTile.getLatitudeRows();
+ final double southernMinLon = southernTile.getMinimumLongitude();
+ final double southernLonStep = southernTile.getLongitudeStep();
+ final int southernLonCols = southernTile.getLongitudeColumns();
+
+ while (zipperLonCurrent <= zipperLonMax + 2 * deltaLon) {
+
+ // Compute zipper tile longitude index
+ final int zipperLonIndex = computeLongitudeIndex(zipperLonCurrent, zipperLonMin, zipperLonStep, zipperLonCols);
+
+ // Part from the northern tile
+ // ---------------------------
+ // Compute northern longitude
+ final int northenLongitudeIndex = computeLongitudeIndex(zipperLonCurrent, northernMinLon, northernLonStep, northernLonCols);
+
+ final double zipperLat3 = zipperLatMin + (3 + 0.1) * zipperLatStep;
+ // lat3 would be 1 if Northern latitude step smallest; could be 0 if biggest
+ final int lat3Index = computeLatitudeIndex(zipperLat3, northernMinLat, northernLatStep, northernLatRows);
+ elevations[3][zipperLonIndex] = northernTile.getElevationAtIndices(lat3Index, northenLongitudeIndex);
+
+ // lat2 is 0 whatever Northern latitude step
+ final int lat2Index = 0;
+ elevations[2][zipperLonIndex] = northernTile.getElevationAtIndices(lat2Index, northenLongitudeIndex);
+
+ // Part from the southern tile
+ // ---------------------------
+ // Compute southern longitude
+ final int southernLongitudeIndex = computeLongitudeIndex(zipperLonCurrent, southernMinLon, southernLonStep, southernLonCols);
+ // lat1 is Southern latitude rows - 1 whatever Southern latitude step
+ final int lat1Index = southernTile.getLatitudeRows() - 1;
+ elevations[1][zipperLonIndex] = southernTile.getElevationAtIndices(lat1Index, southernLongitudeIndex);
+
+ final double zipperLat0 = zipperLatMin + 0.1 * zipperLatStep;
+ // lat1 would be Southern latitude rows - 2 if Southern latitude step smallest; could be Southern latitude rows - 1 if biggest
+ final int lat0Index = computeLatitudeIndex(zipperLat0, southernMinLat, southernLatStep, southernLatRows);
+ elevations[0][zipperLonIndex] = southernTile.getElevationAtIndices(lat0Index, southernLongitudeIndex);
+
+ // Next longitude
+ // --------------
+ zipperLonCurrent += zipperLonStep;
+
+ } // end loop on zipperLonCurrent
+ }
+ return elevations;
+ }
+
+ /** Get the elevations for the zipper tile between a eastern and a western tiles with 4 columns in longitude.
+ * @param zipperLatRows number of rows in latitude
+ * @param easternTile the tile which is the eastern
+ * @param westernTile the tile which is the western
+ * @return the elevations to fill in the zipper tile between a eastern and a western tiles
+ * @since 4.0
+ */
+ private double[][] getZipperEastWestElevations(final int zipperLatRows,
+ final T easternTile, final T westernTile) {
+
+ final double[][] elevations = new double[zipperLatRows][4];
+
+ for (int iLat = 0; iLat < zipperLatRows; iLat++) {
+ // Part from the eastern tile
+ final int lon3 = 1;
+ elevations[iLat][3] = easternTile.getElevationAtIndices(iLat, lon3);
+ final int lon2 = 0;
+ elevations[iLat][2] = easternTile.getElevationAtIndices(iLat, lon2);
+
+ // Part from the western tile
+ final int lon1 = westernTile.getLongitudeColumns() - 1;
+ elevations[iLat][1] = westernTile.getElevationAtIndices(iLat, lon1);
+ final int lon0 = westernTile.getLongitudeColumns() - 2;
+ elevations[iLat][0] = westernTile.getElevationAtIndices(iLat, lon0);
+ }
+ return elevations;
+ }
+
+ /** Create the corner zipper tile.
+ * Hypothesis: along Western or Eastern edges of the tiles: no change of resolution may occurs in known DEMs.
+ * @param latitudeHemisphere latitude hemisphere (North or South)
+ * @param longitudeHemisphere longitude hemisphere (West or East)
+ * @param latitude ground point latitude (rad)
+ * @param longitude ground point longitude (rad)
+ * @param currentTile current tile
+ * @return the corner zipper tile
+ * @since 4.0
+ */
+ private T createCornerZipper(final EarthHemisphere latitudeHemisphere, final EarthHemisphere longitudeHemisphere,
+ final double latitude, final double longitude, final T currentTile) {
+
+ final int currentTileLatRows = currentTile.getLatitudeRows();
+ final int currentTileLonCols = currentTile.getLongitudeColumns();
+ final double currentTileLatStep = currentTile.getLatitudeStep();
+ final double currentTileLonStep = currentTile.getLongitudeStep();
+ final double currentTileLonMin = currentTile.getMinimumLongitude();
+ final double currentTileLatMin = currentTile.getMinimumLatitude();
+
+ final T belowLeftTile;
+ final T belowRightTile;
+ final T aboveLeftTile;
+ final T aboveRightTile;
+
+ switch (latitudeHemisphere) {
+ case NORTH:
+
+ switch (longitudeHemisphere) {
+ case WEST:
+
+ // Get the West Tile
+ final T tileWest = createEastOrWestTile(EarthHemisphere.WEST, latitude,
+ currentTileLonMin, currentTileLonStep, currentTileLonCols);
+ // Get the North Tile
+ T tileNorth = createNorthOrSouthTile(EarthHemisphere.NORTH, longitude,
+ currentTileLatMin, currentTileLatStep, currentTileLatRows);
+ // Get the North-West Tile
+ final T tileNorthWest = createIntercardinalTile(EarthHemisphere.NORTH,
+ currentTileLatMin, currentTileLatStep, currentTileLatRows,
+ EarthHemisphere.WEST,
+ currentTileLonMin, currentTileLonStep, currentTileLonCols);
+ belowLeftTile = tileWest;
+ belowRightTile = currentTile;
+ aboveLeftTile = tileNorthWest;
+ aboveRightTile = tileNorth;
+
+ break;
+
+ case EAST:
+
+ // Get the East Tile
+ final T tileEast = createEastOrWestTile(EarthHemisphere.EAST, latitude,
+ currentTileLonMin, currentTileLonStep, currentTileLonCols);
+ // Get the North Tile
+ tileNorth = createNorthOrSouthTile(EarthHemisphere.NORTH, longitude,
+ currentTileLatMin, currentTileLatStep, currentTileLatRows);
+ // Get the North-East Tile
+ final T tileNorthEast = createIntercardinalTile(EarthHemisphere.NORTH,
+ currentTileLatMin, currentTileLatStep, currentTileLatRows,
+ EarthHemisphere.EAST,
+ currentTileLonMin, currentTileLonStep, currentTileLonCols);
+ belowLeftTile = currentTile;
+ belowRightTile = tileEast;
+ aboveLeftTile = tileNorth;
+ aboveRightTile = tileNorthEast;
+
+ break;
+
+ default:
+ // impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ } // end switch longitudeHemisphere
+
+ break;
+
+ case SOUTH:
+
+ switch (longitudeHemisphere) {
+ case WEST:
+
+ // Get the West Tile
+ final T tileWest = createEastOrWestTile(EarthHemisphere.WEST, latitude,
+ currentTileLonMin, currentTileLonStep, currentTileLonCols);
+ // Get the South Tile
+ T tileSouth = createNorthOrSouthTile(EarthHemisphere.SOUTH, longitude,
+ currentTileLatMin, currentTileLatStep, currentTileLatRows);
+ // Get the South-West Tile
+ final T tileSouthhWest = createIntercardinalTile(EarthHemisphere.SOUTH,
+ currentTileLatMin, currentTileLatStep, currentTileLatRows,
+ EarthHemisphere.WEST,
+ currentTileLonMin, currentTileLonStep, currentTileLonCols);
+ belowLeftTile = tileSouthhWest;
+ belowRightTile = tileSouth;
+ aboveLeftTile = tileWest;
+ aboveRightTile = currentTile;
+
+ break;
+
+ case EAST:
+
+ // Get the East Tile
+ final T tileEast = createEastOrWestTile(EarthHemisphere.EAST, latitude,
+ currentTileLonMin, currentTileLonStep, currentTileLonCols);
+ // Get the South Tile
+ tileSouth = createNorthOrSouthTile(EarthHemisphere.SOUTH, longitude,
+ currentTileLatMin, currentTileLatStep, currentTileLatRows);
+ // Get the South-East Tile
+ final T tileSouthhEast = createIntercardinalTile(EarthHemisphere.SOUTH,
+ currentTileLatMin, currentTileLatStep, currentTileLatRows,
+ EarthHemisphere.EAST,
+ currentTileLonMin, currentTileLonStep, currentTileLonCols);
+ belowLeftTile = tileSouth;
+ belowRightTile = tileSouthhEast;
+ aboveLeftTile = currentTile;
+ aboveRightTile = tileEast;
+
+ break;
+
+ default:
+ // case impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ } // end switch longitudeHemisphere
+
+ break;
+
+ default:
+ // case impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ } // end switch latitudeHemisphere
+
+
+ // Check that tiles at same latitude have same steps in longitude and latitude
+ // Along Western or Eastern edges of the tiles: no change of resolution may occurs in known DEMs.
+ if (!(Math.abs(belowLeftTile.getLatitudeStep() - belowRightTile.getLatitudeStep()) < STEP_EQUALITY) ||
+ !(Math.abs(belowLeftTile.getLongitudeStep() - belowRightTile.getLongitudeStep()) < STEP_EQUALITY) ||
+ !(Math.abs(aboveLeftTile.getLatitudeStep() - aboveRightTile.getLatitudeStep()) < STEP_EQUALITY) ||
+ !(Math.abs(aboveLeftTile.getLongitudeStep() - aboveRightTile.getLongitudeStep()) < STEP_EQUALITY)) {
+ // Steps are not the same.
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ }
+
+
+ // Compute the zipper steps in latitude and longitude.
+ // If steps are different, the zipper will have the smallest steps.
+
+ // at this stage the latitude steps of the right and left tiles are the same
+ final double belowLatitudeStep = belowRightTile.getLatitudeStep();
+ final double aboveLatitudeStep = aboveRightTile.getLatitudeStep();
+
+ // initialize the zipper latitude step
+ double zipperLatStep = belowLatitudeStep;
+
+ // check if latitude steps are the same between the above and below tiles
+ boolean isSameStepLat = true;
+
+ if (!(Math.abs(belowLatitudeStep - aboveLatitudeStep) < STEP_EQUALITY)) {
+
+ // Latitude steps are not the same
+ isSameStepLat = false;
+
+ // Recompute zipper latitude step if the above tiles latitude step is smaller
+ if (aboveLatitudeStep < belowLatitudeStep) {
+ zipperLatStep = aboveLatitudeStep;
+ }
+ }
+
+ // at this stage the longitude steps of the right and left tiles are the same
+ final double belowLongitudeStep = belowRightTile.getLongitudeStep();
+ final double aboveLongitudeStep = aboveRightTile.getLongitudeStep();
+
+ // initialize the zipper longitude step
+ double zipperLonStep = belowLongitudeStep;
+
+ // check if longitude steps are the same between the above and below tiles
+ boolean isSameStepLon = true;
+
+ if (!(Math.abs(belowLongitudeStep - aboveLongitudeStep) < STEP_EQUALITY)) {
+
+ // Longitude steps are not the same
+ isSameStepLon = false;
+
+ // Recompute zipper longitude step if the above tiles longitude step is smaller
+ if (aboveLongitudeStep < belowLongitudeStep) {
+ zipperLonStep = aboveLongitudeStep;
+ }
+ }
+
+ // Define the zipper min latitude and min longitude.
+ // Explanation:
+ // We want the zipper 2 first rows belongs to the below tiles and the zipper 2 last rows to the above tiles.
+ // We want the zipper 2 first columns belongs to the left tiles and the zipper 2 last columns to the right tiles.
+ // We use the current tile origin AND the zipper steps to compute the zipper origin
+ final GeodeticPoint zipperCorner = computeCornerZipperOrigin(zipperLatStep, zipperLonStep,
+ latitudeHemisphere, currentTileLatMin,
+ currentTileLatStep, currentTileLatRows,
+ longitudeHemisphere, currentTileLonMin,
+ currentTileLonStep, currentTileLonCols);
+
+ // Initialize corner tile
+ return initializeCornerZipperTile(zipperCorner.getLatitude(), zipperCorner.getLongitude(), zipperLatStep, zipperLonStep,
+ belowLeftTile, aboveLeftTile, belowRightTile, aboveRightTile,
+ isSameStepLat, isSameStepLon);
+
+ }
+
+ /** Initialize a corner zipper tile (with 4 rows in latitude and 4 columns in longitude).
+ * @param zipperLatMin zipper min latitude (ra)
+ * @param zipperLonMin zipper min longitude (rad)
+ * @param zipperLatStep zipper latitude step (rad)
+ * @param zipperLonStep zipper longitude step (rad)
+ * @param belowLeftTile below left tile
+ * @param aboveLeftTile above left tile
+ * @param belowRightTile below right tile
+ * @param aboveRightTile above right tile
+ * @param isSameStepLat flag to tell if latitude steps are the same (true)
+ * @param isSameStepLon flag to tell if longitude steps are the same (true)
+ * @return corner zipper tile
+ * @since 4.0
+ */
+ private T initializeCornerZipperTile(final double zipperLatMin, final double zipperLonMin,
+ final double zipperLatStep, final double zipperLonStep,
+ final T belowLeftTile, final T aboveLeftTile, final T belowRightTile, final T aboveRightTile,
+ final boolean isSameStepLat, final boolean isSameStepLon) {
+
+ // Defines with 4 cells from each of the 4 tiles at the corner
+ final int zipperLatRows = 4;
+ final int zipperLonCols = 4;
+ final double[][] elevations = new double[zipperLatRows][zipperLonCols];
+
+ if (isSameStepLat && isSameStepLon) { // tiles with same steps in latitude and longitude
+
+ // Rows 0 and 1 of zipper:
+ // 2 first cells belong to the below left tile and 2 last cells to the below right tile
+
+ // row 0
+ elevations[0][0] = belowLeftTile.getElevationAtIndices(belowLeftTile.getLatitudeRows() - 2, belowLeftTile.getLongitudeColumns() - 2);
+ elevations[0][1] = belowLeftTile.getElevationAtIndices(belowLeftTile.getLatitudeRows() - 2, belowLeftTile.getLongitudeColumns() - 1);
+
+ elevations[0][2] = belowRightTile.getElevationAtIndices(belowRightTile.getLatitudeRows() - 2, 0);
+ elevations[0][3] = belowRightTile.getElevationAtIndices(belowRightTile.getLatitudeRows() - 2, 1);
+
+ // row 1
+ elevations[1][0] = belowLeftTile.getElevationAtIndices(belowLeftTile.getLatitudeRows() - 1, belowLeftTile.getLongitudeColumns() - 2);
+ elevations[1][1] = belowLeftTile.getElevationAtIndices(belowLeftTile.getLatitudeRows() - 1, belowLeftTile.getLongitudeColumns() - 1);
+
+ elevations[1][2] = belowRightTile.getElevationAtIndices(belowRightTile.getLatitudeRows() - 1, 0);
+ elevations[1][3] = belowRightTile.getElevationAtIndices(belowRightTile.getLatitudeRows() - 1, 1);
+
+ // Rows 2 and 3 of zipper:
+ // 2 first cells belong to the above left tile and 2 last cells to the above right tile
+
+ // row 2
+ elevations[2][0] = aboveLeftTile.getElevationAtIndices(0, aboveLeftTile.getLongitudeColumns() - 2);
+ elevations[2][1] = aboveLeftTile.getElevationAtIndices(0, aboveLeftTile.getLongitudeColumns() - 1);
+
+ elevations[2][2] = aboveRightTile.getElevationAtIndices(0, 0);
+ elevations[2][3] = aboveRightTile.getElevationAtIndices(0, 1);
+
+ // row 3
+ elevations[3][0] = aboveLeftTile.getElevationAtIndices(1, aboveLeftTile.getLongitudeColumns() - 2);
+ elevations[3][1] = aboveLeftTile.getElevationAtIndices(1, aboveLeftTile.getLongitudeColumns() - 1);
+
+ elevations[3][2] = aboveRightTile.getElevationAtIndices(1, 0);
+ elevations[3][3] = aboveRightTile.getElevationAtIndices(1, 1);
+
+
+ } else { // tiles with different steps
+
+ // To cover every cases and as zipper with such characteristics are rare,
+ // we will use conversion from (latitude, longitude) to tile indices
+
+ // We assure to be inside a cell by adding a delta step (to avoid inappropriate index computation)
+ // TBN: zipperLatStep/zipperLonStep are the smallest steps vs below and above tiles
+
+ // Compute latitude and longitude of each zipper cells
+ final double zipperLat0 = zipperLatMin + 0.1 * zipperLatStep;
+ final double zipperLat1 = zipperLat0 + zipperLatStep;
+ final double zipperLat2 = zipperLat1 + zipperLatStep;
+ final double zipperLat3 = zipperLat2 + zipperLatStep;
+
+ final double zipperLon0 = zipperLonMin + 0.1 * zipperLonStep;
+ final double zipperLon1 = zipperLon0 + zipperLonStep;
+ final double zipperLon2 = zipperLon1 + zipperLonStep;
+ final double zipperLon3 = zipperLon2 + zipperLonStep;
+
+ // Compute the tiles index in latitude
+ final int belowLeftLatitudeIndex0 = computeLatitudeIndex(zipperLat0, belowLeftTile.getMinimumLatitude(), belowLeftTile.getLatitudeStep(), belowLeftTile.getLatitudeRows());
+ final int belowLeftLatitudeIndex1 = computeLatitudeIndex(zipperLat1, belowLeftTile.getMinimumLatitude(), belowLeftTile.getLatitudeStep(), belowLeftTile.getLatitudeRows());
+
+ final int belowRightLatitudeIndex0 = computeLatitudeIndex(zipperLat0, belowRightTile.getMinimumLatitude(), belowRightTile.getLatitudeStep(), belowRightTile.getLatitudeRows());
+ final int belowRightLatitudeIndex1 = computeLatitudeIndex(zipperLat1, belowRightTile.getMinimumLatitude(), belowRightTile.getLatitudeStep(), belowRightTile.getLatitudeRows());
+
+ final int aboveLeftLatitudeIndex2 = computeLatitudeIndex(zipperLat2, aboveLeftTile.getMinimumLatitude(), aboveLeftTile.getLatitudeStep(), aboveLeftTile.getLatitudeRows());
+ final int aboveLeftLatitudeIndex3 = computeLatitudeIndex(zipperLat3, aboveLeftTile.getMinimumLatitude(), aboveLeftTile.getLatitudeStep(), aboveLeftTile.getLatitudeRows());
+
+ final int aboveRightLatitudeIndex2 = computeLatitudeIndex(zipperLat2, aboveRightTile.getMinimumLatitude(), aboveRightTile.getLatitudeStep(), aboveRightTile.getLatitudeRows());
+ final int aboveRightLatitudeIndex3 = computeLatitudeIndex(zipperLat3, aboveRightTile.getMinimumLatitude(), aboveRightTile.getLatitudeStep(), aboveRightTile.getLatitudeRows());
+
+ // Compute the tiles index in longitude
+ final int belowLeftLongitudeIndex0 = computeLongitudeIndex(zipperLon0, belowLeftTile.getMinimumLongitude(), belowLeftTile.getLongitudeStep(), belowLeftTile.getLongitudeColumns());
+ final int belowLeftLongitudeIndex1 = computeLongitudeIndex(zipperLon1, belowLeftTile.getMinimumLongitude(), belowLeftTile.getLongitudeStep(), belowLeftTile.getLongitudeColumns());
+
+ final int belowRightLongitudeIndex2 = computeLongitudeIndex(zipperLon2, belowRightTile.getMinimumLongitude(), belowRightTile.getLongitudeStep(), belowRightTile.getLongitudeColumns());
+ final int belowRightLongitudeIndex3 = computeLongitudeIndex(zipperLon3, belowRightTile.getMinimumLongitude(), belowRightTile.getLongitudeStep(), belowRightTile.getLongitudeColumns());
+
+ final int aboveLeftLongitudeIndex0 = computeLongitudeIndex(zipperLon0, aboveLeftTile.getMinimumLongitude(), aboveLeftTile.getLongitudeStep(), aboveLeftTile.getLongitudeColumns());
+ final int aboveLeftLongitudeIndex1 = computeLongitudeIndex(zipperLon1, aboveLeftTile.getMinimumLongitude(), aboveLeftTile.getLongitudeStep(), aboveLeftTile.getLongitudeColumns());
+
+ final int aboveRightLongitudeIndex2 = computeLongitudeIndex(zipperLon2, aboveRightTile.getMinimumLongitude(), aboveRightTile.getLongitudeStep(), aboveRightTile.getLongitudeColumns());
+ final int aboveRightLongitudeIndex3 = computeLongitudeIndex(zipperLon3, aboveRightTile.getMinimumLongitude(), aboveRightTile.getLongitudeStep(), aboveRightTile.getLongitudeColumns());
+
+ // Rows 0 and 1 of zipper:
+ // 2 first cells belong to the below left tile and 2 last cells to the below right tile
+
+ // row 0
+ elevations[0][0] = belowLeftTile.getElevationAtIndices(belowLeftLatitudeIndex0, belowLeftLongitudeIndex0);
+ elevations[0][1] = belowLeftTile.getElevationAtIndices(belowLeftLatitudeIndex0, belowLeftLongitudeIndex1);
+
+ elevations[0][2] = belowRightTile.getElevationAtIndices(belowRightLatitudeIndex0, belowRightLongitudeIndex2);
+ elevations[0][3] = belowRightTile.getElevationAtIndices(belowRightLatitudeIndex0, belowRightLongitudeIndex3);
+
+ // row 1
+ elevations[1][0] = belowLeftTile.getElevationAtIndices(belowLeftLatitudeIndex1, belowLeftLongitudeIndex0);
+ elevations[1][1] = belowLeftTile.getElevationAtIndices(belowLeftLatitudeIndex1, belowLeftLongitudeIndex1);
+
+ elevations[1][2] = belowRightTile.getElevationAtIndices(belowRightLatitudeIndex1, belowRightLongitudeIndex2);
+ elevations[1][3] = belowRightTile.getElevationAtIndices(belowRightLatitudeIndex1, belowRightLongitudeIndex3);
+
+ // Rows 2 and 3 of zipper:
+ // 2 first cells belong to the above left tile and 2 last cells to the above right tile
+
+ // row 2
+ elevations[2][0] = aboveLeftTile.getElevationAtIndices(aboveLeftLatitudeIndex2, aboveLeftLongitudeIndex0);
+ elevations[2][1] = aboveLeftTile.getElevationAtIndices(aboveLeftLatitudeIndex2, aboveLeftLongitudeIndex1);
+
+ elevations[2][2] = aboveRightTile.getElevationAtIndices(aboveRightLatitudeIndex2, aboveRightLongitudeIndex2);
+ elevations[2][3] = aboveRightTile.getElevationAtIndices(aboveRightLatitudeIndex2, aboveRightLongitudeIndex3);
+
+ // row 3
+ elevations[3][0] = aboveLeftTile.getElevationAtIndices(aboveLeftLatitudeIndex3, aboveLeftLongitudeIndex0);
+ elevations[3][1] = aboveLeftTile.getElevationAtIndices(aboveLeftLatitudeIndex3, aboveLeftLongitudeIndex1);
+
+ elevations[3][2] = aboveRightTile.getElevationAtIndices(aboveRightLatitudeIndex3, aboveRightLongitudeIndex2);
+ elevations[3][3] = aboveRightTile.getElevationAtIndices(aboveRightLatitudeIndex3, aboveRightLongitudeIndex3);
+
+ } // end test isSameStepLat && isSameStepLon
+
+ // Initialize the corner zipper tile
+ final T cornerZipperTile = initializeZipperTile(zipperLatMin, zipperLonMin,
+ zipperLatStep, zipperLonStep,
+ zipperLatRows, zipperLonCols, elevations);
+
+ return cornerZipperTile;
+ }
+
+ /**
+ * Create the tile in intercardinal direction of the current Tile i.e. NW, NE, SW, SE.
+ * @param latitudeHemisphere hemisphere for latitude: NORTH / SOUTH
+ * @param latitudeMin latitude minimum for the tile (rad)
+ * @param latitudeStep latitude step (rad)
+ * @param latitudeRows latitude rows
+ * @param longitudeHemisphere hemisphere for longitude : WEST / EAST
+ * @param longitudeMin longitude minimum for the tile (rad)
+ * @param longitudeStep longitude step (rad)
+ * @param longitudeCols longitude columns
+ * @return the tile in intercardinal direction
+ * @since 4.0
+ */
+ private T createIntercardinalTile(final EarthHemisphere latitudeHemisphere,
+ final double latitudeMin, final double latitudeStep, final int latitudeRows,
+ final EarthHemisphere longitudeHemisphere,
+ final double longitudeMin, final double longitudeStep, final int longitudeCols) {
+
+ // longitudeHemisphere = +1 : East or = -1 : West
+ final int lonHemisphere;
+ switch (longitudeHemisphere) {
+ case EAST:
+ lonHemisphere = +1;
+ break;
+ case WEST:
+ lonHemisphere = -1;
+ break;
+ default:
+ // impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ }
+
+ // latitudeHemisphere = +1 : North or = -1 : South
+ final int latHemisphere;
+ switch (latitudeHemisphere) {
+ case NORTH:
+ latHemisphere = +1;
+ break;
+ case SOUTH:
+ latHemisphere = -1;
+ break;
+ default:
+ // impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ }
+
+ final double latToGetIntercardinalTile = latitudeMin + latHemisphere * latitudeRows * latitudeStep;
+ final double lonToGetIntercardinalTile = longitudeMin + lonHemisphere * longitudeCols * longitudeStep;
+ final T intercardinalTile = createTile(latToGetIntercardinalTile, lonToGetIntercardinalTile);
+ return intercardinalTile;
+ }
+
+ /** Compute the corner zipper tile origin (min latitude and min longitude).
+ * @param zipperLatStep zipper latitude step (rad)
+ * @param zipperLonStep zipper longitude step (rad)
+ * @param latitudeHemisphere latitude hemisphere of the zipper vs the current tile
+ * @param currentTileLatMin current tile latitude origin (rad)
+ * @param currentTileLatStep current tile latitude step (rad)
+ * @param currentTileLatRows current tile latitude rows
+ * @param longitudeHemisphere longitude hemisphere of the zipper vs the current tile
+ * @param currentTileLonMin current tile tile longitude origin (rad)
+ * @param currentTileLonStep current tile longitude step (rad)
+ * @param currentTileLonCols current tile longitude columns
+ * @return corner zipper tile origin point
+ * @since 4.0
+ */
+ private GeodeticPoint computeCornerZipperOrigin(final double zipperLatStep, final double zipperLonStep,
+ final EarthHemisphere latitudeHemisphere,
+ final double currentTileLatMin, final double currentTileLatStep, final int currentTileLatRows,
+ final EarthHemisphere longitudeHemisphere,
+ final double currentTileLonMin, final double currentTileLonStep, final int currentTileLonCols) {
+ final double zipperLatMin;
+ final double zipperLonMin;
+
+ // Explanation:
+ // We want the zipper 2 first rows belongs to the below tiles and the zipper 2 last rows to the above tiles.
+ // We want the zipper 2 first columns belongs to the left tiles and the zipper 2 last columns to the right tiles.
+ // We use the current tile origin AND the zipper steps to compute the zipper origin
+
+ switch (latitudeHemisphere) {
+ case NORTH:
+
+ switch (longitudeHemisphere) {
+ case WEST:
+ zipperLatMin = currentTileLatMin + currentTileLatRows * currentTileLatStep - 2 * zipperLatStep;
+ zipperLonMin = currentTileLonMin - 2 * zipperLonStep;
+ break;
+
+ case EAST:
+ zipperLatMin = currentTileLatMin + currentTileLatRows * currentTileLatStep - 2 * zipperLatStep;
+ zipperLonMin = currentTileLonMin + currentTileLonCols * currentTileLonStep - 2 * zipperLonStep;
+ break;
+
+ default:
+ // case impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ } // end switch longitudeHemisphere
+
+ break;
+
+ case SOUTH:
+
+ switch (longitudeHemisphere) {
+ case WEST:
+ zipperLatMin = currentTileLatMin - 2 * zipperLatStep;
+ zipperLonMin = currentTileLonMin - 2 * zipperLonStep;
+ break;
+
+ case EAST:
+ zipperLatMin = currentTileLatMin - 2 * zipperLatStep;
+ zipperLonMin = currentTileLonMin + currentTileLonCols * currentTileLonStep - 2 * zipperLonStep;
+ break;
+
+ default:
+ // case impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ } // end switch longitudeHemisphere
+
+ break;
+
+ default:
+ // impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ } // end switch latitudeHemisphere
+
+ return new GeodeticPoint(zipperLatMin, zipperLonMin, 0);
}
+
+ /** Create the Northern or Southern tile of a given tile defined by minLat, longitude, latitudeRows and latStep.
+ * @param latitudeHemisphere latitude hemisphere
+ * @param longitude longitude to define the tile (rad)
+ * @param latitudeMin minimum latitude to define the tile (rad)
+ * @param latitudeStep latitude step (rad)
+ * @param latitudeRows latitude rows
+ * @return North or South tile according to the Earth hemisphere
+ * @since 4.0
+ */
+ private T createNorthOrSouthTile(final EarthHemisphere latitudeHemisphere, final double longitude,
+ final double latitudeMin, final double latitudeStep, final int latitudeRows) {
+ // hemisphere = +1 : North or = -1 : South
+ final int hemisphere;
+ switch (latitudeHemisphere) {
+ case NORTH:
+ hemisphere = +1;
+ break;
+ case SOUTH:
+ hemisphere = -1;
+ break;
+ default:
+ // impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ }
+
+ final double latToGetNewTile = latitudeMin + hemisphere * latitudeRows * latitudeStep;
+ return createTile(latToGetNewTile, longitude);
+ }
+
+
+ /** Create the Eastern or Western tile of a given tile defined by latitude, minLon, longitudeCols and lonStep.
+ * @param longitudeHemisphere longitude hemisphere
+ * @param latitude latitude to define the tile (rad)
+ * @param longitudeMin minimum longitude to define the tile (rad)
+ * @param longitudeStep longitude step (rad)
+ * @param longitudeCols longitude columns
+ * @return East or West tile tile according to the Earth hemisphere
+ * @since 4.0
+ */
+ private T createEastOrWestTile(final EarthHemisphere longitudeHemisphere, final double latitude,
+ final double longitudeMin, final double longitudeStep, final int longitudeCols) {
+ // hemisphere = +1 : East or = -1 : West
+ final int hemisphere;
+ switch (longitudeHemisphere) {
+ case EAST:
+ hemisphere = +1;
+ break;
+ case WEST:
+ hemisphere = -1;
+ break;
+ default:
+ // impossible to reach
+ throw new RuggedException(RuggedMessages.INTERNAL_ERROR);
+ }
+
+ final double lonToGetNewTile = longitudeMin + hemisphere * longitudeCols * longitudeStep;
+ return createTile(latitude, lonToGetNewTile);
+ }
}
diff --git a/src/main/java/org/orekit/rugged/raster/UpdatableTile.java b/src/main/java/org/orekit/rugged/raster/UpdatableTile.java
index c34af1ae4ce07f62f142187d554cbb793c9267f6..ad06213ddcb705c8539b853f37411a6059bebe06 100644
--- a/src/main/java/org/orekit/rugged/raster/UpdatableTile.java
+++ b/src/main/java/org/orekit/rugged/raster/UpdatableTile.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/raster/package-info.java b/src/main/java/org/orekit/rugged/raster/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..6a09d34dc8fa870d85beadae1f5c686681ef443e
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/raster/package-info.java
@@ -0,0 +1,29 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides the interface used to update Digital Elevation
+ * Model tiles to be implemented by the user,
+ * the interface representing a raster tile, as well as a simple model.
+ * It provides also the interface representing a factory for raster tile,
+ * as well as a simple implementation.
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ *
+ */
+package org.orekit.rugged.raster;
diff --git a/src/main/java/org/orekit/rugged/refraction/AtmosphericComputationParameters.java b/src/main/java/org/orekit/rugged/refraction/AtmosphericComputationParameters.java
index 8baf276011c5a9defa27d20b606e2f5d14ced966..7eb96d681d1e62e1594df69aef35e1ca9df0a1f9 100644
--- a/src/main/java/org/orekit/rugged/refraction/AtmosphericComputationParameters.java
+++ b/src/main/java/org/orekit/rugged/refraction/AtmosphericComputationParameters.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -27,6 +27,7 @@ import org.orekit.rugged.utils.GridCreation;
* @author Guylaine Prat
* @since 2.1
*/
+
public class AtmosphericComputationParameters {
/** Margin for definition of the interpolation grid.
@@ -38,11 +39,21 @@ public class AtmosphericComputationParameters {
/** Default value for line step. */
private static final int DEFAULT_STEP_LINE = 100;
+ /** Default margin for computation of inverse location with atmospheric refraction correction.
+ * @since 3.0
+ */
+ private static final double DEFAULT_INVLOC_MARGIN = 0.8;
+
/** Actual values for pixel step in case default are overwritten. */
private int pixelStep;
/** Actual values for line step in case default are overwritten. */
private int lineStep;
+ /** Actual values for inverse location margin with atmospheric refraction in case default are overwritten.
+ * @since 3.0
+ */
+ private double invlocMargin;
+
// Definition of grids for sensor (u = along pixel; v = along line)
/** Linear grid in pixel. */
private double[] uGrid;
@@ -67,6 +78,7 @@ public class AtmosphericComputationParameters {
public AtmosphericComputationParameters() {
this.pixelStep = DEFAULT_STEP_PIXEL;
this.lineStep = DEFAULT_STEP_LINE;
+ this.invlocMargin = DEFAULT_INVLOC_MARGIN;
}
/** Configuration of the interpolation grid. This grid is associated to the given sensor,
@@ -94,13 +106,9 @@ public class AtmosphericComputationParameters {
}
this.nbLineGrid = (maxLine - minLine + 1 - 2 * MARGIN_LINE) / this.lineStep;
- // CHECKSTYLE: stop UnnecessaryParentheses check
-
// Compute the linear grids in pixel (u index) and line (v index)
- this.uGrid = GridCreation.createLinearGrid(0, (sensorNbPxs - 1), this.nbPixelGrid);
- this.vGrid = GridCreation.createLinearGrid((minLine + MARGIN_LINE), (maxLine - MARGIN_LINE), this.nbLineGrid);
-
- // CHECKSTYLE: resume UnnecessaryParentheses check
+ this.uGrid = GridCreation.createLinearGrid(0, sensorNbPxs - 1, this.nbPixelGrid);
+ this.vGrid = GridCreation.createLinearGrid(minLine + MARGIN_LINE, maxLine - MARGIN_LINE, this.nbLineGrid);
}
@@ -124,6 +132,33 @@ public class AtmosphericComputationParameters {
this.lineStep = gridLineStep;
}
+ /**
+ * Set the margin for computation of inverse location with atmospheric refraction correction.
+ * Overwrite the default value DEFAULT_INVLOC_MARGIN.
+ * No check is done about this margin. A recommended value is around 1.
+ * @param inverseLocMargin margin in pixel size to compute inverse location with atmospheric refraction correction.
+ * @since 3.0
+ */
+ public void setInverseLocMargin(final double inverseLocMargin) {
+ this.invlocMargin = inverseLocMargin;
+ }
+
+ /**
+ * @return the inverse location margin for computation of inverse location with atmospheric refraction correction.
+ * @since 3.0
+ */
+ public double getInverseLocMargin () {
+ return this.invlocMargin;
+ }
+
+ /**
+ * @return the default inverse location margin for computation of inverse location with atmospheric refraction correction.
+ * @since 3.0
+ */
+ public double getDefaultInverseLocMargin () {
+ return DEFAULT_INVLOC_MARGIN;
+ }
+
/**
* @return the size of pixel grid
*/
diff --git a/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java b/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java
index b2bf1bc99b0305ff087095c1cdb8e5cecb97724c..02416a1f724719f1bd239c92bf44dc766f9483f8 100644
--- a/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java
+++ b/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -37,7 +37,7 @@ public abstract class AtmosphericRefraction {
* By default: computation is set up.
* @since 2.1
*/
- private boolean mustBeComputed = true;
+ private boolean mustBeComputed;
/** The current atmospheric parameters.
* @since 2.1
@@ -47,12 +47,12 @@ public abstract class AtmosphericRefraction {
/** Bilinear interpolating function for pixel (used by inverse location).
* @since 2.1
*/
- private BilinearInterpolatingFunction bifPixel = null;
+ private BilinearInterpolatingFunction bifPixel;
/** Bilinear interpolating function of line (used by inverse location).
* @since 2.1
*/
- private BilinearInterpolatingFunction bifLine = null;
+ private BilinearInterpolatingFunction bifLine;
/**
* Default constructor.
@@ -60,6 +60,9 @@ public abstract class AtmosphericRefraction {
protected AtmosphericRefraction() {
// Set up the atmospheric parameters ... with lazy evaluation of the grid (done only if necessary)
this.atmosphericParams = new AtmosphericComputationParameters();
+ this.mustBeComputed = true;
+ this.bifPixel = null;
+ this.bifLine = null;
}
/** Apply correction to the intersected point with an atmospheric refraction model.
@@ -74,23 +77,6 @@ public abstract class AtmosphericRefraction {
public abstract NormalizedGeodeticPoint applyCorrection(Vector3D satPos, Vector3D satLos, NormalizedGeodeticPoint rawIntersection,
IntersectionAlgorithm algorithm);
- /** Apply correction to the intersected point with an atmospheric refraction model,
- * using a time optimized algorithm.
- * @param lineSensor the line sensor
- * @param sensorPixel the sensor pixel (must be defined)
- * @param satPos satellite position, in <em>body frame</em>
- * @param satLos sensor pixel line of sight, in <em>body frame</em>
- * @param rawIntersection intersection point before refraction correction
- * @param algorithm intersection algorithm
- * @return corrected point with the effect of atmospheric refraction
- * {@link org.orekit.rugged.utils.ExtendedEllipsoid#pointAtAltitude(Vector3D, Vector3D, double)} or see
- * {@link org.orekit.rugged.intersection.IntersectionAlgorithm#refineIntersection(org.orekit.rugged.utils.ExtendedEllipsoid, Vector3D, Vector3D, NormalizedGeodeticPoint)}
- * @since 2.1
- */
- public abstract NormalizedGeodeticPoint applyCorrection(LineSensor lineSensor, SensorPixel sensorPixel,
- Vector3D satPos, Vector3D satLos, NormalizedGeodeticPoint rawIntersection,
- IntersectionAlgorithm algorithm);
-
/** Deactivate computation (needed for the inverse location computation).
* @since 2.1
*/
@@ -134,9 +120,9 @@ public abstract class AtmosphericRefraction {
*/
public Boolean isSameContext(final String sensorName, final int minLine, final int maxLine) {
- return (Double.compare(atmosphericParams.getMinLineSensor(), minLine) == 0) &&
- (Double.compare(atmosphericParams.getMaxLineSensor(), maxLine) == 0) &&
- (atmosphericParams.getSensorName().compareTo(sensorName) == 0);
+ return Double.compare(atmosphericParams.getMinLineSensor(), minLine) == 0 &&
+ Double.compare(atmosphericParams.getMaxLineSensor(), maxLine) == 0 &&
+ atmosphericParams.getSensorName().compareTo(sensorName) == 0;
}
/** Get the computation parameters.
@@ -157,6 +143,17 @@ public abstract class AtmosphericRefraction {
atmosphericParams.setGridSteps(pixelStep, lineStep);
}
+ /**
+ * Set the margin for computation of inverse location with atmospheric refraction correction.
+ * Overwrite the default value DEFAULT_INVLOC_MARGIN.
+ * No check is done about this margin. A recommended value is around 1.
+ * @param inverseLocMargin margin in pixel size to compute inverse location with atmospheric refraction correction.
+ * @since 3.0
+ */
+ public void setInverseLocMargin(final double inverseLocMargin) {
+ atmosphericParams.setInverseLocMargin(inverseLocMargin);
+ }
+
/** Compute the correction functions for pixel and lines.
* The corrections are computed for pixels and lines, on a regular grid at sensor level.
* The corrections are based on the difference on grid nodes (where direct loc is known with atmosphere refraction)
@@ -188,9 +185,9 @@ public abstract class AtmosphericRefraction {
gridDiffLine[pixelIndex][lineIndex] = diffLine;
} else {
- // Impossible to find the point in the given min line and max line
- throw new RuggedException(RuggedMessages.INVALID_RANGE_FOR_LINES,
- atmosphericParams.getMinLineSensor(), atmosphericParams.getMaxLineSensor(), "");
+ // Impossible to find the sensor pixel in the given range lines
+ throw new RuggedException(RuggedMessages.SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES,
+ atmosphericParams.getMinLineSensor(), atmosphericParams.getMaxLineSensor());
}
}
}
diff --git a/src/main/java/org/orekit/rugged/refraction/ConstantRefractionLayer.java b/src/main/java/org/orekit/rugged/refraction/ConstantRefractionLayer.java
index 37567e0be8d57624133966f13dd946263ed20908..5d95986e9782d5ea199f28b35b504db9eff5846c 100644
--- a/src/main/java/org/orekit/rugged/refraction/ConstantRefractionLayer.java
+++ b/src/main/java/org/orekit/rugged/refraction/ConstantRefractionLayer.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java b/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java
index 547c8ec03d744defdb7144689bfc9e086b0ab88a..4aeeeeeffc5d9427a1710b42413be43e284d41ed 100644
--- a/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java
+++ b/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -26,8 +26,6 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
-import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.linesensor.SensorPixel;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
@@ -61,7 +59,7 @@ public class MultiLayerModel extends AtmosphericRefraction {
this.ellipsoid = ellipsoid;
- this.refractionLayers = new ArrayList<ConstantRefractionLayer>(15);
+ this.refractionLayers = new ArrayList<>(15);
this.refractionLayers.add(new ConstantRefractionLayer(100000.00, 1.000000));
this.refractionLayers.add(new ConstantRefractionLayer( 50000.00, 1.000000));
this.refractionLayers.add(new ConstantRefractionLayer( 40000.00, 1.000001));
@@ -248,17 +246,6 @@ public class MultiLayerModel extends AtmosphericRefraction {
return algorithm.refineIntersection(ellipsoid, pos, los, rawIntersection);
}
- /** {@inheritDoc} */
- @Override
- public NormalizedGeodeticPoint applyCorrection(final LineSensor lineSensor, final SensorPixel sensorPixel,
- final Vector3D satPos, final Vector3D satLos,
- final NormalizedGeodeticPoint rawIntersection,
- final IntersectionAlgorithm algorithm) {
-
- // TODO to be done
- throw new RuggedException(RuggedMessages.UNINITIALIZED_CONTEXT, "Atmospheric optimization for direct loc");
- }
-
} // end of class MultiLayerModel
/** Container for the (position, LOS) of the intersection with the lowest atmospheric layer.
diff --git a/src/main/java/org/orekit/rugged/refraction/package-info.java b/src/main/java/org/orekit/rugged/refraction/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..1ba9975392e2b8434f783f3c70905c763bb9d6ab
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/refraction/package-info.java
@@ -0,0 +1,27 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides the interface for atmospheric refraction model, as well as
+ * some classical models.
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ * @author Sergio Esteves
+ *
+ */
+package org.orekit.rugged.refraction;
diff --git a/src/main/java/org/orekit/rugged/utils/AbsoluteDateArrayHandling.java b/src/main/java/org/orekit/rugged/utils/AbsoluteDateArrayHandling.java
new file mode 100644
index 0000000000000000000000000000000000000000..815b7a67c438fd77ebfb927d7550b95cd55036a7
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/utils/AbsoluteDateArrayHandling.java
@@ -0,0 +1,174 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.utils;
+
+import org.hipparchus.exception.LocalizedCoreFormats;
+import org.orekit.errors.OrekitException;
+import org.orekit.time.AbsoluteDate;
+
+/** AbsoluteDateArrayHandling consist of additions to AbsoluteDate to handle arrays.
+ * @author Melina Vanel
+ */
+public class AbsoluteDateArrayHandling {
+
+ /** Dates array on which we want to apply time shift or compute duration. */
+ private final AbsoluteDate[] dates;
+
+ /** Simple constructor.
+ * @param dates is an array of absolute dates on which we want to apply time shift or
+ * compute duration
+ */
+ public AbsoluteDateArrayHandling(final AbsoluteDate[] dates) {
+ this.dates = dates.clone();
+ }
+
+ /** Get instance dates array.
+ * @return dates array
+ */
+ public AbsoluteDate[] getDates() {
+ return this.dates.clone();
+ }
+
+ /** Get time-shifted dates for several dates or several time shifts.
+ * If instance dates = [date1, date2, ..., daten] and argument
+ * dts = [dts1, dts2, ..., dtsn] then this function will return a matrix
+ * [[date1 shiftedby dts1, date1 shiftedBy dts2, ..., date1 shiftedBy dtsn],
+ * [date2 shiftedby dts1, date2 shiftedBy dts2, ..., date2 shiftedBy dtsn],
+ * [...]
+ * [daten shiftedby dts1, daten shiftedBy dts2, ..., date1 shiftedBy dtsn]].
+ * If ones want to apply only 1 time shift corresponding to 1 date see
+ * {@link #shiftedBy(double[])}.
+ * @param dts time shifts array in seconds we want to apply to dates
+ * @return a matrix of new dates, shifted with respect to wanted time
+ * shifts. If instance dates = [date1, date2, ..., daten] each line
+ * correspond to one date (for example date1 shiftedBy all timeshifts
+ * (building the different columns))
+ */
+ public AbsoluteDate[][] multipleShiftedBy(final double[] dts) {
+
+ final AbsoluteDate[][] datesShifted = new AbsoluteDate[dates.length][dts.length];
+ int index_dates = 0;
+
+ for (AbsoluteDate date: this.dates) {
+ final AbsoluteDate[] dateShifted = new AbsoluteDate[dts.length];
+ int index_dts = 0;
+ for (double dt: dts) {
+ dateShifted[index_dts] = date.shiftedBy(dt);
+ index_dts += 1;
+ }
+ datesShifted[index_dates] = dateShifted;
+ index_dates += 1;
+
+ }
+ return (AbsoluteDate[][]) datesShifted;
+ }
+
+ /** Get time-shifted dates for several dates and corresponding time shifts.
+ * If instance dates = [date1, date2, ..., daten] and argument
+ * dts = [dts1, dts2, ..., dtsn] then this function will return
+ * [date1 shiftedby dts1, date2 shiftedBy dts2, ..., daten shiftedBy dtsn]. If
+ * several time shift want to be applied on each date see
+ * {@link #multipleShiftedBy(double[])}.
+ * @param dts time shifts array in seconds we want to apply to corresponding dates.
+ * Warning, must be same length as dates.
+ * @return an 1D array of new dates, shifted with respect to wanted corresponding time
+ * shifts.
+ */
+ public AbsoluteDate[] shiftedBy(final double[] dts) {
+
+ // Check same dimensions
+ if (dates.length != dts.length) {
+ throw new OrekitException(LocalizedCoreFormats.DIMENSIONS_MISMATCH,
+ dates.length, dts.length);
+ }
+
+ final AbsoluteDate[] datesShifted = new AbsoluteDate[dates.length];
+ int index_dates = 0;
+
+ for (AbsoluteDate date: this.dates) {
+ datesShifted[index_dates] = date.shiftedBy(dts[index_dates]);
+ index_dates += 1;
+
+ }
+ return datesShifted;
+ }
+
+ /** Get array with durations between instances dates and given dates
+ * If instance dates = [date1, date2, ..., daten] and argument
+ * datesForDuration = [d1, d2, ..., dn] then this function will return a matrix
+ * [[date1 durationFrom d1, date1 durationFrom d2, ..., date1 durationFrom dn],
+ * [date2 durationFrom d1, date2 durationFrom d2, ..., date2 durationFrom dn],
+ * [...]
+ * [daten durationFrom d1, daten durationFrom d2, ..., date1 durationFrom dn]].
+ * If ones want to compute duration from only 1 date corresponding to 1 instance date see
+ * {@link #durationFrom(AbsoluteDate[])}.
+ * @param datesForDuration dates for which we want to compute the duration form instances dates
+ * @return a matrix of double representing durations from instance dates
+ * If instance dates = [date1, date2, ..., daten] each line
+ * correspond to one date (for example date1 duration from all given dates in arguments
+ * (building the different columns))
+ */
+ public double[][] multipleDurationFrom(final AbsoluteDate[] datesForDuration) {
+
+ final double[][] durationsFromDates = new double[dates.length][datesForDuration.length];
+ int index_dates = 0;
+
+ for (AbsoluteDate date: this.dates) {
+ final double[] durationFromDate = new double[datesForDuration.length];
+ int index_datesForDuration = 0;
+ for (AbsoluteDate dateForDuration: datesForDuration) {
+ durationFromDate[index_datesForDuration] = date.durationFrom(dateForDuration);
+ index_datesForDuration += 1;
+ }
+ durationsFromDates[index_dates] = durationFromDate;
+ index_dates += 1;
+
+ }
+ return (double[][]) durationsFromDates;
+ }
+
+ /** Get array with durations between instances dates and corresponding given dates
+ * If instance dates = [date1, date2, ..., daten] and argument
+ * datesForDuration = [d1, d2, ..., dn] then this function will return
+ * [date1 durationFrom d1, date2 durationFrom d2, ..., daten durationFrom dn]. If
+ * duration from from all arguments dates wants to be compute on each date see
+ * {@link #multipleDurationFrom(AbsoluteDate[])}.
+ * @param datesForDuration dates for which we want to compute the duration form instances dates.
+ * Warning must have same length as instance dates.
+ * @return a array of double representing durations between instance dates and corresponding
+ * argument dates
+ */
+ public double[] durationFrom(final AbsoluteDate[] datesForDuration) {
+
+ // Check same dimensions
+ if (dates.length != datesForDuration.length) {
+ throw new OrekitException(LocalizedCoreFormats.DIMENSIONS_MISMATCH,
+ dates.length, datesForDuration.length);
+ }
+
+ final double[] durationsFromDates = new double[dates.length];
+ int index_dates = 0;
+
+ for (AbsoluteDate date: this.dates) {
+ durationsFromDates[index_dates] = date.durationFrom(datesForDuration[index_dates]);
+ index_dates += 1;
+
+ }
+ return durationsFromDates;
+ }
+
+}
diff --git a/src/main/java/org/orekit/rugged/utils/DSGenerator.java b/src/main/java/org/orekit/rugged/utils/DSGenerator.java
index 535474fa07e1f13a90e2b032a292f712cda501eb..6fefff07ade5e4debf8cf2efae081a90cc09d631 100644
--- a/src/main/java/org/orekit/rugged/utils/DSGenerator.java
+++ b/src/main/java/org/orekit/rugged/utils/DSGenerator.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -16,8 +16,6 @@
*/
package org.orekit.rugged.utils;
-import java.util.List;
-
import org.hipparchus.analysis.differentiation.DerivativeStructure;
import org.orekit.utils.ParameterDriver;
@@ -27,29 +25,8 @@ import org.orekit.utils.ParameterDriver;
* </p>
* @author Luc Maisonobe
* @since 2.0
+ * @deprecated as of 2.2, replaced by {@link DerivativeGenerator}
*/
-public interface DSGenerator {
-
- /** Get the parameters selected for estimation.
- * @return parameters selected for estimation
- */
- List<ParameterDriver> getSelected();
-
- /** Generate a constant {@link DerivativeStructure}.
- * @param value value of the constant
- * @return constant {@link DerivativeStructure}
- */
- DerivativeStructure constant(double value);
-
- /** Generate a {@link DerivativeStructure} representing the
- * parameter driver either as a canonical variable or a constant.
- * <p>
- * The instance created is a variable only if the parameter
- * has been selected for estimation, otherwise it is a constant.
- * </p>
- * @param driver driver for the variable
- * @return variable {@link DerivativeStructure}
- */
- DerivativeStructure variable(ParameterDriver driver);
-
+public interface DSGenerator extends DerivativeGenerator<DerivativeStructure> {
+ // nothing specialized here
}
diff --git a/src/main/java/org/orekit/rugged/utils/DerivativeGenerator.java b/src/main/java/org/orekit/rugged/utils/DerivativeGenerator.java
new file mode 100644
index 0000000000000000000000000000000000000000..6603e7683bf6b48c90185dd5d7f43afd7bc7d00f
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/utils/DerivativeGenerator.java
@@ -0,0 +1,64 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.utils;
+
+import java.util.List;
+
+import org.hipparchus.Field;
+import org.hipparchus.analysis.differentiation.Derivative;
+import org.orekit.utils.ParameterDriver;
+
+/** Generator for {@link Derivative} instances from {@link ParameterDriver}.
+ * <p>
+ * Note that this interface is for Rugged library internal use only.
+ * </p>
+ * @author Luc Maisonobe
+ * @since 2.0
+ */
+public interface DerivativeGenerator<T extends Derivative<T>> {
+
+ /** Get the parameters selected for estimation.
+ * @return parameters selected for estimation
+ */
+ List<ParameterDriver> getSelected();
+
+ /** Generate a constant {@link Derivative}.
+ * @param value value of the constant
+ * @return constant {@link Derivative}
+ */
+ T constant(double value);
+
+ /** Generate a {@link Derivative} representing the
+ * parameter driver either as a canonical variable or a constant.
+ * <p>
+ * The instance created is a variable only if the parameter
+ * has been selected for estimation, otherwise it is a constant.
+ * </p>
+ * @param driver driver for the variable
+ * @return variable {@link Derivative}
+ */
+ T variable(ParameterDriver driver);
+
+ /** Get the {@link Field} to which the generated derivatives belongs.
+ * @return {@link Field} to which the generated derivatives belongs
+ * @since 2.2
+ */
+ default Field<T> getField() {
+ return constant(0).getField();
+ }
+
+}
diff --git a/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java b/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
index 6cc42556f3e35e6a0bc278f492de761824411c12..5541eab6f7d91e206bc09865e411327a0a2d81fc 100644
--- a/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
+++ b/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/utils/GridCreation.java b/src/main/java/org/orekit/rugged/utils/GridCreation.java
index d31612b527614af1ba0a88194cc1a7b5461ff937..07b4695bc686f8ff92872dbbd4071b8d96298a03 100644
--- a/src/main/java/org/orekit/rugged/utils/GridCreation.java
+++ b/src/main/java/org/orekit/rugged/utils/GridCreation.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/utils/MaxSelector.java b/src/main/java/org/orekit/rugged/utils/MaxSelector.java
index 7037eddd72efa173f3313eb071d8363b5f22fbc8..02e23e156da2152d18b3857e7a54a01ebf687f1d 100644
--- a/src/main/java/org/orekit/rugged/utils/MaxSelector.java
+++ b/src/main/java/org/orekit/rugged/utils/MaxSelector.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/utils/MinSelector.java b/src/main/java/org/orekit/rugged/utils/MinSelector.java
index ec126ed1d218f5f59e7147baa0e4b2b7b523b5f2..07e729dfd9af1c9793c0163bd642a310c398751e 100644
--- a/src/main/java/org/orekit/rugged/utils/MinSelector.java
+++ b/src/main/java/org/orekit/rugged/utils/MinSelector.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java b/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java
index 543e8bec5d706de361bd63f7d90ce018ed6e438a..bab2c086fb4a6b75bde885ad028f3990a0a5bbc0 100644
--- a/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java
+++ b/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/utils/RoughVisibilityEstimator.java b/src/main/java/org/orekit/rugged/utils/RoughVisibilityEstimator.java
index 98c7bd0cf0c82c4f6d77ee6b6defac4ef99f897c..ed20cac42e61feb05207de051c12479e6286f00b 100644
--- a/src/main/java/org/orekit/rugged/utils/RoughVisibilityEstimator.java
+++ b/src/main/java/org/orekit/rugged/utils/RoughVisibilityEstimator.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -72,7 +72,7 @@ public class RoughVisibilityEstimator {
// project spacecraft position-velocity to ground
final Frame bodyFrame = ellipsoid.getBodyFrame();
final int n = positionsVelocities.size();
- this.pvGround = new ArrayList<TimeStampedPVCoordinates>(n);
+ this.pvGround = new ArrayList<>(n);
for (final TimeStampedPVCoordinates pv : positionsVelocities) {
final Transform t = frame.getTransformTo(bodyFrame, pv.getDate());
pvGround.add(ellipsoid.projectToGround(t.transformPVCoordinates(pv), bodyFrame));
diff --git a/src/main/java/org/orekit/rugged/utils/Selector.java b/src/main/java/org/orekit/rugged/utils/Selector.java
index c3dc0b034851af38f9aad0acee3d3168f43b9f91..cfd69c653619022ba7e6bf482eb5f85752a30ab6 100644
--- a/src/main/java/org/orekit/rugged/utils/Selector.java
+++ b/src/main/java/org/orekit/rugged/utils/Selector.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java b/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
index aca3456a1aa23cff4db4992520e152d6958d0314..449cb9024596a53337264308b3984871f229420c 100644
--- a/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
+++ b/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -121,17 +121,17 @@ public class SpacecraftToObservedBody implements Serializable {
// set up the cache for position-velocities
final TimeStampedCache<TimeStampedPVCoordinates> pvCache =
- new ImmutableTimeStampedCache<TimeStampedPVCoordinates>(pvInterpolationNumber, positionsVelocities);
+ new ImmutableTimeStampedCache<>(pvInterpolationNumber, positionsVelocities);
// set up the cache for attitudes
final TimeStampedCache<TimeStampedAngularCoordinates> aCache =
- new ImmutableTimeStampedCache<TimeStampedAngularCoordinates>(aInterpolationNumber, quaternions);
+ new ImmutableTimeStampedCache<>(aInterpolationNumber, quaternions);
final int n = (int) FastMath.ceil(maxDate.durationFrom(minDate) / tStep);
this.tStep = tStep;
- this.bodyToInertial = new ArrayList<Transform>(n);
- this.inertialToBody = new ArrayList<Transform>(n);
- this.scToInertial = new ArrayList<Transform>(n);
+ this.bodyToInertial = new ArrayList<>(n);
+ this.inertialToBody = new ArrayList<>(n);
+ this.scToInertial = new ArrayList<>(n);
for (AbsoluteDate date = minDate; bodyToInertial.size() < n; date = date.shiftedBy(tStep)) {
// interpolate position-velocity, allowing slight extrapolation near the boundaries
@@ -200,7 +200,7 @@ public class SpacecraftToObservedBody implements Serializable {
this.bodyToInertial = bodyToInertial;
this.scToInertial = scToInertial;
- this.inertialToBody = new ArrayList<Transform>(bodyToInertial.size());
+ this.inertialToBody = new ArrayList<>(bodyToInertial.size());
for (final Transform b2i : bodyToInertial) {
inertialToBody.add(b2i.getInverse());
}
@@ -300,8 +300,8 @@ public class SpacecraftToObservedBody implements Serializable {
* @return true if date is in the supported range
*/
public boolean isInRange(final AbsoluteDate date) {
- return (minDate.durationFrom(date) <= overshootTolerance) &&
- (date.durationFrom(maxDate) <= overshootTolerance);
+ return minDate.durationFrom(date) <= overshootTolerance &&
+ date.durationFrom(maxDate) <= overshootTolerance;
}
}
diff --git a/src/main/java/org/orekit/rugged/utils/package-info.java b/src/main/java/org/orekit/rugged/utils/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..cf44e9619c901ca033b062462dd1a5808441dc0a
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/utils/package-info.java
@@ -0,0 +1,25 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.
+ */
+/**
+ *
+ * This package provides useful objects.
+ *
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ *
+ */
+package org.orekit.rugged.utils;
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_da.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_da.utf8
index 30a675f16e0c3bb415f7866d69203832895380ef..ecb9bd7eeb717b1f17404812f3f2687c62c2d80b 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_da.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_da.utf8
@@ -96,3 +96,9 @@ INVALID_STEP = skridt {0} er ikke gyldigt : {1}
# range between min line {0} and max line {1} too small {2}
INVALID_RANGE_FOR_LINES = interval mellem minimumslinje {0} og maksimumslinje {1} for lille {2}
+
+# impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}
+SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})
+SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE = <MISSING TRANSLATION>
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8
index 63f06fe26e823245d490aeab49e6a28714125ced..9cda208b301d4714b3970c91c49f8970059372b6 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8
@@ -96,3 +96,9 @@ INVALID_STEP = <MISSING TRANSLATION>
# range between min line {0} and max line {1} is invalid {2}
INVALID_RANGE_FOR_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}
+SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})
+SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE = <MISSING TRANSLATION>
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
index ec8394218db8d9c69365b155fed52d251c16a6aa..97b94dfc34b4e354e86b3160489b5faa6a19208b 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
@@ -96,3 +96,9 @@ INVALID_STEP = step {0} is not valid : {1}
# range between min line {0} and max line {1} is invalid {2}
INVALID_RANGE_FOR_LINES = range between min line {0} and max line {1} is invalid {2}
+
+# impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}
+SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES = impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}
+
+# impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})
+SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE = impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8
index 872c2fcb92de319989c71fcee05431ba5ffa6b91..b29c953a4b995bf04b1831ca1cd9508f87cb70a3 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8
@@ -96,3 +96,9 @@ INVALID_STEP = <MISSING TRANSLATION>
# range between min line {0} and max line {1} is invalid {2}
INVALID_RANGE_FOR_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}
+SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})
+SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE = <MISSING TRANSLATION>
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
index 59152480f0f0a248198f43aa31e0b356e0affa4b..7c9f324e05f7300fb994e2e02fce2a0fa64fd702 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
@@ -96,3 +96,9 @@ INVALID_STEP = le pas {0} n''est pas valable : {1}
# range between min line {0} and max line {1} is invalid {2}
INVALID_RANGE_FOR_LINES = l''écart entre la ligne min {0} et la ligne max {1} est non valide {2}
+
+# impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}
+SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES = impossible de trouver le pixel senseur dans l''intervalle de lignes (avec réfraction atmosphérique) entre les lignes {0} et {1}
+
+# impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})
+SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE = impossible de trouver le pixel senseur: pixel {0} en dehors de l''intervalle [ {1} , {2} [ (avec la marge pour la réfraction atmosphérique = {3})
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8
index 7953c301262bff78a6be8e08af1cb01cd78e29a5..a459e9b0c12c9d9fa9b7115bca9b22861897c35b 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8
@@ -96,3 +96,9 @@ INVALID_STEP = <MISSING TRANSLATION>
# range between min line {0} and max line {1} is invalid {2}
INVALID_RANGE_FOR_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}
+SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})
+SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE = <MISSING TRANSLATION>
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8
index b6101683412513d15e9a761c7e5ec9f25efa0595..7d55d0fa9b9c56674dc70d6cf484f9b418a0b789 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8
@@ -95,4 +95,10 @@ NO_LAYER_DATA = nessun dato atmosferico all''altitudine {0} (altitudine più bas
INVALID_STEP = Step {0} non valido: {1}
# range between min line {0} and max line {1} too small {2}
- INVALID_RANGE_FOR_LINES = Scarto fra la linea min {0} e la linea max {1} troppo piccolo {2}
+INVALID_RANGE_FOR_LINES = Scarto fra la linea min {0} e la linea max {1} troppo piccolo {2}
+
+# impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}
+SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})
+SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE = <MISSING TRANSLATION>
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_no.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_no.utf8
index 33a5f7d52284c566c277b958edbbb5a0d025777d..e8bd40390ffdc3f92377a4559605b941c1be0a32 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_no.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_no.utf8
@@ -96,3 +96,10 @@ INVALID_STEP = steget {0} er ikke gyldig: {1}
# range between min line {0} and max line {1} is invalid {2}
INVALID_RANGE_FOR_LINES = avstanden mellom min linje {0} og max linje {1} er ugyldig {2}
+
+# impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}
+SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})
+SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE = <MISSING TRANSLATION>
+
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_ro.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_ro.utf8
index d2a286608423c53dfbce9fc037c9dda42f8aacc9..b77290b0947b2ccfb16cd14d47358e30880a837c 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_ro.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_ro.utf8
@@ -96,3 +96,10 @@ INVALID_STEP = <MISSING TRANSLATION>
# range between min line {0} and max line {1} is invalid {2}
INVALID_RANGE_FOR_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel in given range lines (with atmospheric refraction) between lines {0} and {1}
+SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES = <MISSING TRANSLATION>
+
+# impossible to find sensor pixel: pixel {0} outside interval [ {1} , {2} [ (with atmospheric refraction margin = {3})
+SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE = <MISSING TRANSLATION>
+
diff --git a/src/site/markdown/building.md b/src/site/markdown/building.md
index d620655a8bdeb797009e2711b352b3fce87ca6d6..a04bc7a6f9a3c3586c840f4bb646a7f589ff81fe 100644
--- a/src/site/markdown/building.md
+++ b/src/site/markdown/building.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -35,8 +35,9 @@ For systems not providing maven as a package, maven can be
Apache Software Foundation. This site also explains the
installation procedure.
-As with all maven enabled projects, building Rugged is straightforward, simply
-run:
+As with all maven enabled projects, building official released versions of
+Rugged is straightforward (see below for the special case of development versions),
+simply run:
mvn package
@@ -46,12 +47,54 @@ 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.
+This command should always work for released Rugged versions as they
+always depend only on released Orekit versions. Maven knows how
+to download the pre-built binary for released Orekit versions.
+The previous command may not work for development Rugged versions as they
+may depend on unreleased Orekit versions. Maven cannot download
+pre-built binaries for unreleased Orekit versions as none are
+publicly available. In this case the command above will end with an error message
+like:
+
+ [ERROR] Failed to execute goal on project rugged: Could not resolve dependencies for project org.orekit:rugged:jar:X.x-SNAPSHOT: Could not find artifact org.orekit:orekit:jar:Y.y-SNAPSHOT
+
+In this case, you should build the missing Orekit artifact and
+install it in your local maven repository beforehand. This is done by cloning
+the Orekit source from Orekit git repository at Gitlab in some
+temporary folder and install it with maven. This is done by
+running the commands below (using Linux command syntax):
+
+ git clone -b develop https://gitlab.orekit.org/orekit/orekit.git
+ cd orekit
+ mvn install
+
+If, in a similar way, the command above ends with an error message like:
+
+ [ERROR] Failed to execute goal on project orekit: Could not resolve dependencies for project org.orekit:orekit:jar:Y.y-SNAPSHOT:
+ The following artifacts could not be resolved: org.hipparchus:hipparchus-core:jar:Z.z-SNAPSHOT, org.hipparchus:hipparchus-geometry:jar:Z.z-SNAPSHOT,
+ ...
+ Could not find artifact org.hipparchus:hipparchus-core:jar:Z.Z-SNAPSHOT
+
+Before building the Orekit artefact, you should start by building the missing Hipparchus artifact
+and install it in your local maven repository
+beforehand, in the same way as Orekit, by cloning
+the Hipparchus source from Hipparchus git repository at GitHub:
+
+ git clone https://github.com/Hipparchus-Math/hipparchus.git
+ cd hipparchus
+ mvn install
+
+Once the Orekit (and possibly Hipparchus) development version has been installed locally using
+the previous commands, you can delete the cloned folder if you want. You can then
+attempt again the mvn command at Rugged level, this time it should succeed as the
+necessary artifact is now locally available.
+
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)
page at the maven site.
If you already use maven for your own projects (or simply eclipse, see
-below), you may want to install rugged in your local repository. This is done
+below), you may want to install rugged in your local maven repository. This is done
with the following command:
mvn install
@@ -72,25 +115,27 @@ site at the [Eclipse Foundation](http://www.eclipse.org/downloads/).
The simplest way to use Rugged with Eclipse is to follow these steps:
- * unpack the distribution inside your Eclipse workspace
+ * using your operating system tools, unpack the source distribution directly
+ inside your Eclipse workspace. The source distribution file name has a name
+ of the form rugged-x.y-sources.zip where x.y is the version number. Unpacking
+ this zip file should create a folder of the form rugged-x.y in your workspace.
+
+
+ * using Eclipse, import the project by selecting in the top level "File" menu
+ the entry "Import..."
+
+ * in the wizard that should appear, select "Maven -> Existing Maven Projects"
- * create a new java project from existing sources and direct Eclipse to the
- directory where you unpacked Rugged
+ * select the folder you just created in your workspace by unpacking the
+ source distribution. The "pom.xml" file describing the project will be
+ automatically selected. Click finish
- * set the source folders to
- * src/main/java
- * src/test/java
- * src/main/resources
- * src/test/resources
+The Rugged library should be configured automatically, including the dependency
+to the underlying Orekit library.
- in the source tab of the Configure Build Path dialog
+Now you have an rugged-x.y project in you workspace, and you can create your
+own application projects that will depend on the Rugged project.
- * set the external libraries to JRE system library (provided by Eclipse),
- Junit 4.x (provided by Eclipse), Hipparchus (available at
- Hipparchus project
- [downloads page](https://www.hipparchus.org/downloads.html)),
- and Orekit (available at Orekit
- [download page](https://www.orekit.org/download.html))
- in the libraries tab of the Configure Build Path dialog
+You can also check everything works correctly by running the junit tests.
-[Top of the page](#top)
\ No newline at end of file
+[Top of the page](#top)
diff --git a/src/site/markdown/configuration.md b/src/site/markdown/configuration.md
index 0239a94378744748c6b7a47dda87ce1896eac830..612dd0a58a1fd935564d4a47bf41542e88d42ee3 100644
--- a/src/site/markdown/configuration.md
+++ b/src/site/markdown/configuration.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -27,7 +27,7 @@ into `orekit-data` and add the following lines at the start of your program (bef
first time):
File orekitData = new File("/path/to/the/folder/orekit-data");
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(orekitData));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(orekitData));
This is sufficient to start working.
diff --git a/src/site/markdown/contact.md b/src/site/markdown/contact.md
index a5033b6eef8b0a4d0f8a5c79b05a7aa904d4c7b9..715f8790dcd6bdb6a48b3486be2a0cc9b3c27867 100644
--- a/src/site/markdown/contact.md
+++ b/src/site/markdown/contact.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -30,24 +30,24 @@ The main categories are:
## Technical contact
If for some reason you cannot use the public forums, you can reach the CS
-Systèmes d'Information Rugged team for any question (either technically
+GROUP Rugged team for any question (either technically
oriented or administrative) at the following email address:
-[rugged@c-s.fr](mailto:rugged@c-s.fr)
+[rugged@csgroup.eu](mailto:rugged@csgroup.eu)
## Administrative contact
-If you want to discuss with the space division staff at CS Systèmes d'Information,
+If you want to discuss with the space division staff at CS GROUP,
please use the following address:
- CS Systèmes d'Information
- BU E-space & Geoinformation
- parc de la plaine - 5 rue Brindejonc des Moulinais
+ CS GROUP
+ Space Business Unit
+ Parc de la Plaine - 6 rue Brindejonc des Moulinais
BP 15872
- 31506 Toulouse CEDEX 5
+ 31506 Toulouse Cedex 5
FRANCE
- phone: +33 5-61-17-66-66 (ask for Luc Maisonobe or Sébastien Harasse)
- fax: +33 5-61-34-84-15
+ phone: +33 5-61-17-66-66 (ask for Jonathan Guinet or Guylaine Prat)
+
[Top of the page](#top)
-
\ No newline at end of file
+
diff --git a/src/site/markdown/contributing.md b/src/site/markdown/contributing.md
index 0e3eb12e1164024f8ba215c138cb8bb0a3290928..033b8d2de8c59ab1e634577120c68c905563dd94 100644
--- a/src/site/markdown/contributing.md
+++ b/src/site/markdown/contributing.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
diff --git a/src/site/markdown/design/design.md b/src/site/markdown/design/design-major-functions.md
similarity index 99%
rename from src/site/markdown/design/design.md
rename to src/site/markdown/design/design-major-functions.md
index d7509c87df757aa2304d83423b61fa974ac9c91b..5853d9c046a6231764bd80263091f2b8be761356 100644
--- a/src/site/markdown/design/design.md
+++ b/src/site/markdown/design/design-major-functions.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
diff --git a/src/site/markdown/design/digital-elevation-model.md b/src/site/markdown/design/digital-elevation-model.md
index ad2c9e5c5897f91e840a710cb7e147ee2a21a67a..ee3fac3329eaa8f4775dff243044354017a36cf3 100644
--- a/src/site/markdown/design/digital-elevation-model.md
+++ b/src/site/markdown/design/digital-elevation-model.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -33,7 +33,7 @@ implementations among which user can select.
Five different algorithms are predefined in Rugged:
* a recursive algorithm based on Bernardt Duvenhage's 2009 paper
- [Using An Implicit Min/Max KD-Tree for Doing Efficient Terrain Line of Sight Calculations](http://researchspace.csir.co.za/dspace/bitstream/10204/3041/1/Duvenhage_2009.pdf)
+ [Using An Implicit Min/Max KD-Tree for Doing Efficient Terrain Line of Sight Calculations](https://researchspace.csir.co.za/dspace/bitstream/10204/3041/1/Duvenhage_2009.pdf)
* an alternate version of the Duvenhage algorithm using flat-body hypothesis,
* a basic scan algorithm sequentially checking all pixels in the rectangular array defined by Digital Elevation Model entry and exit points,
* an algorithm that ignores the Digital Elevation Model and uses a constant elevation over the ellipsoid.
diff --git a/src/site/markdown/design/overview.md b/src/site/markdown/design/overview.md
index 18c3819f6fe2ca670ad64023376d924669a2efed..99b0195e0701aed05c98ad293c24edb238b0badb 100644
--- a/src/site/markdown/design/overview.md
+++ b/src/site/markdown/design/overview.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
diff --git a/src/site/markdown/design/technical-choices.md b/src/site/markdown/design/technical-choices.md
index 7526760f5168af9fcfba9c55c71c045809fd0f0e..58233b3d53ce6bd2ceeb4553e6cf6346849274ae 100644
--- a/src/site/markdown/design/technical-choices.md
+++ b/src/site/markdown/design/technical-choices.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -105,7 +105,7 @@ components between Q1 and Q2 or -Q1 and Q2 leads to completely different rotatio
will typically have one sign change per orbit at some random point. The third reason is that instead of doing an
interpolation that respect quaternions constraint, the interpolation departs from the constraint first and attempts to
recover afterwards in a normalization step. Orekit uses a method based on Sergeï Tanygin's paper
-[Attitude interpolation](http://www.agi.com/resources/white-papers/attitude-interpolation) with slight
+[Attitude interpolation](https://www.agi.com/resources/whitepapers/attitude-interpolation) with slight
changes to use modified Rodrigues vectors as defined in Malcolm D Shuster's
[A Survey of Attitude Representations](http://www.ladispe.polito.it/corsi/Meccatronica/02JHCOR/2011-12/Slides/Shuster_Pub_1993h_J_Repsurv_scan.pdf),
despite attitude is still represented by quaternions in Orekit (Rodrigues vectors are used only for interpolation).
diff --git a/src/site/markdown/downloads.md b/src/site/markdown/downloads.md.vm
similarity index 69%
rename from src/site/markdown/downloads.md
rename to src/site/markdown/downloads.md.vm
index 448dd956f826ba54fd028e860ff8b54621207032..bdef3066bb532c76d153f6a38c7f470a189e6677 100644
--- a/src/site/markdown/downloads.md
+++ b/src/site/markdown/downloads.md.vm
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -16,7 +16,7 @@
# Downloads
-## Development Library version
+<h2>Development Library version</h2>
The development version of the Rugged library is always available to
download from our version control system. We use [Git](http://git-scm.com/ "Git homepage")
@@ -31,7 +31,7 @@ development environment:
git clone -b develop https://gitlab.orekit.org/orekit/rugged.git
-## Released Library versions
+<h2>Released Library versions</h2>
Rugged is provided both in several packaging systems. You can pick up
the one that better suits your needs. Source packages are the most complete
@@ -43,23 +43,20 @@ with groupID org.orekit and artifactId rugged so maven
internal mechanism will download automatically all artifacts and dependencies
as required.
+#set ( $versions = {"3.0": "2022-07-05", "2.2": "2020-07-31", "2.1": "2019-03-14", "2.0": "2017-12-19", "1.0": "2016-02-10"} )
+#foreach( $version in $versions.entrySet() )
-| package | link |
-|----------|-----------------------------------------------------------------------------------------------------------|
-| source | [`rugged-2.0-sources.zip`](https://gitlab.orekit.org/orekit/rugged/uploads/f7f30111d4d3cef19636cb7c504530dd/rugged-2.0-sources.zip) |
-| binary | [`rugged-2.0.jar`](https://gitlab.orekit.org/orekit/rugged/uploads/8393279152c0cad15659e145018fa834/rugged-2.0.jar) |
-| javadoc | [`rugged-2.0-javadoc.jar`](https://gitlab.orekit.org/orekit/rugged/uploads/b42c3ef2fcff36aa44570d114102a439/rugged-2.0-javadoc.jar) |
-version 2.0 downloads (release date: 2017-12-19)
+| package | link |
+|----------|---------------------------------------------------------------------------------------------------------------------------------------|
+| source | [rugged-${version.key}-sources.jar](https://search.maven.org/remotecontent?filepath=org/orekit/rugged/${version.key}/rugged-${version.key}-sources.jar) |
+| binary | [rugged-${version.key}.jar](https://search.maven.org/remotecontent?filepath=org/orekit/rugged/${version.key}/rugged-${version.key}.jar) |
+| javadoc | [rugged-${version.key}-javadoc.jar](https://search.maven.org/remotecontent?filepath=org/orekit/rugged/${version.key}/rugged-${version.key}-javadoc.jar) |
+version ${version.key} downloads (release date: ${version.value})
-| package | link |
-|----------|-----------------------------------------------------------------------------------------------------------|
-| source | [`rugged-1.0-sources.zip`](https://gitlab.orekit.org/orekit/rugged/uploads/0a5e5a39e72dfa94f54c3193170d5ee2/rugged-1.0-sources.zip) |
-| binary | [`rugged-1.0.jar`](https://gitlab.orekit.org/orekit/rugged/uploads/55df1454320b8f625c05d9bee5c9abcd/rugged-1.0.jar) |
-| javadoc | [`rugged-1.0-javadoc.jar`](https://gitlab.orekit.org/orekit/rugged/uploads/8f7f399b1dd6ebf55b17f9a49fc88782/rugged-1.0-javadoc.jar) |
-version 1.0 downloads (release date: 2016-02-10)
+#end
-## Data
+<h2>Data</h2>
For convenience, a zip archive containing some configuration data is available
for download. Similar files can be custom made by users with updated data.
@@ -70,7 +67,7 @@ file from the forge, to unzip it anywhere you want, rename the `orekit-data-mast
into `orekit-data` and add the following lines at the start of your program:
File orekitData = new File("/path/to/the/folder/orekit-data");
- DataProvidersManager manager = DataProvidersManager.getInstance();
+ DataProvidersManager manager = DataContext.getDefault().getDataProvidersManager();
manager.addProvider(new DirectoryCrawler(orekitData));
This file contains the following data sets. Note that the data is updated only
diff --git a/src/site/markdown/faq.md b/src/site/markdown/faq.md
index 697867b8a25ae906a2f2495744a547205f1f83cf..441e9443154902bbdc1551dd35841fad0e9637e1 100644
--- a/src/site/markdown/faq.md
+++ b/src/site/markdown/faq.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -85,7 +85,7 @@ file from the forge, to unzip it anywhere you want, rename the `orekit-data-mast
into `orekit-data` and add the following lines at the start of your program:
File orekitData = new File("/path/to/the/folder/orekit-data");
- DataProvidersManager manager = DataProvidersManager.getInstance();
+ DataProvidersManager manager = DataContext.getDefault().getDataProvidersManager();
manager.addProvider(new DirectoryCrawler(orekitData));
Using a folder allows one to change the data in it after the initial download, e.g., adding new EOP files as they
diff --git a/src/site/markdown/guidelines.md b/src/site/markdown/guidelines.md
index fc6746dca77d10d6c01cd87e71bf4de5f310046e..1d26084667d5509510c72357c89e780beed9b39c 100644
--- a/src/site/markdown/guidelines.md
+++ b/src/site/markdown/guidelines.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -234,4 +234,4 @@ root directory.
fix _all_ errors and warnings found by checkstyle
[Top of the page](#top)
-
\ No newline at end of file
+
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index ea5d6286546fefcc09896c0820188bceab18da69..904fef2f68ee6c7788a35b8527a3045455c055ff 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -98,7 +98,7 @@ interoperability in space systems.
## Maintained library
-Rugged has been in development since 2014 inside [CS Systèmes d'Information](http://www.c-s.fr/ "CS SI homepage")
+Rugged has been in development since 2014 inside [CS GROUP](https://www.csgroup.eu/ "CS GROUP homepage")
and is still used and maintained by its dual teams
of space dynamics and image processing experts.
@@ -106,7 +106,10 @@ Rugged is used for image processing of the Sentinel 2 mission at European Space
Agency (ESA), as well as in the frame of ESA Scientific Exploitation of Operational Missions (SEOM),
to calculate topographic shadow masks for Sentinel 2 products.
-Rugged has been also used as a Research Library by the French Space Agency (CNES) for
-study on refining for VHR push broom sensors (Pleiades).
+Rugged has been used to validate Airbus Defence and Space (ADS) geolocation library.
-[Top of the page](#top)
\ No newline at end of file
+Rugged has been also used as a Research Library by the French Space Agency (CNES) for refinement studies for VHR push broom sensors (Pleiades).
+
+Rugged is used for study purposes inside CS GROUP.
+
+[Top of the page](#top)
diff --git a/src/site/markdown/release-guide.md b/src/site/markdown/release-guide.md
new file mode 100644
index 0000000000000000000000000000000000000000..bd183cbc363dc08a4fdb116d49aab844f517ba51
--- /dev/null
+++ b/src/site/markdown/release-guide.md
@@ -0,0 +1,383 @@
+# Rugged Release Guide
+
+This release guide is largely inspired from [Hipparchus Release
+Guide](https://www.hipparchus.org/release-guide.html) and [Orekit Release Guide](https://www.orekit.org/site-orekit-development/release-guide.html). It lists the steps that
+have been used in the past to release a new version of Rugged. When in doubt
+ask the experts: Sébastien Dinot <sebastien.dinot@csgroup.eu> for website questions
+and Jonathan Guinet <jonathan.guinet@csgroup.eu> or Guylaine Prat <guylaine.prat@csgroup.eu> for everything else.
+
+## Prerequisites
+
+1. Obtain private key of the Rugged Signing Key, key id:
+ `9A928E5485FBC44A2A4F9C2E9128808ECB6C9DED`
+2. Register for account on OSSRH and associate it with the Rugged project, see:
+ https://central.sonatype.org/pages/ossrh-guide.html
+
+If you need help with either, ask on the [development section of the Rugged
+forum](https://forum.orekit.org/c/rugged-development/).
+
+Once you have a SonaType OSS account, the corresponding credentials must be set
+in the `servers` section of your `$HOME/.m2/settings.xml` file, using an id of
+`ossrh`:
+
+ <servers>
+ <server>
+ <id>ossrh</id>
+ <username>the user name to connect to the OSS site</username>
+ <password>the encrypted password</password>
+ </server>
+ </servers>
+
+Use `mvn -ep` to generate an encrypted password.
+
+## Install Graphviz
+
+[Graphviz (dot)](https://graphviz.org) is used to generated diagrams of
+the technical documentation (static site).
+
+## Verify the status of develop branch
+
+Before anything, check on the [continuous integration
+site](https://sonar.orekit.org/dashboard?id=org.orekit%3Arugged) that everything is fine on
+develop branch:
+
+* All tests pass;
+* Code coverage is up to the requirements;
+* There are no bugs, vulnerabilities or code smells.
+
+If not, fix the warnings and errors first !
+
+It is also necessary to check on the [Gitlab CI/CD](https://gitlab.orekit.org/orekit/rugged/pipelines)
+that everything is fine on develop branch (i.e. all stages are passed).
+
+## Prepare Git branch for release
+
+Release will be performed on a dedicated branch, not directly on master or
+develop branch. So a new branch must be created as follows and used for
+everything else:
+
+ git branch release-X.Y
+ git checkout release-X.Y
+
+## Update maven plugins versions
+
+Release is a good opportunity to update the maven plugin versions. They are all
+gathered at one place, in a set of properties in `rugged/pom.xml`, for instance:
+
+ <rugged.spotbugs-maven-plugin.version>4.0.4</rugged.spotbugs-maven-plugin.version>
+ <rugged.jacoco-maven-plugin.version>0.8.5</rugged.jacoco-maven-plugin.version>
+ <rugged.maven-assembly-plugin.version>3.1.1</rugged.maven-assembly-plugin.version>
+ ...
+
+You can find the latest version of the plugins using the search feature at
+[http://search.maven.org/#search](http://search.maven.org/#search). The
+properties name all follow the pattern `rugged.some-plugin-name.version`, the
+plugin name should be used in the web form to check for available versions.
+
+Beware that in some cases, the latest version cannot be used due to
+incompatibilities. For example when a plugin was not recently updated and
+conflicts appear with newer versions of its dependencies.
+
+Beware also that some plugins use configuration files that may need update too.
+This is typically the case with `maven-checkstyle-plugin` and
+`spotbugs-maven-plugin`. The `/checkstyle.xml` and `/spotbugs-exclude-filter.xml` files may need to be checked.
+
+Before committing these changes, you have to check that everything works. So
+run the following command:
+
+ mvn clean
+ LANG=C mvn -Prelease site
+
+If something goes wrong, either fix it by changing the plugin configuration or
+roll back to an earlier version of the plugin.
+
+Browse the generated site starting at page `target/site/index.html` and check
+that everything is rendered properly. You may also check the contents of the pages.
+
+When everything runs fine and the generated site is OK, then you can commit the
+changes:
+
+ git add rugged/pom.xml rugged/checkstyle.xml rugged/spotbugs-exclude-filter.xml
+ git commit -m "Updated maven plugins versions."
+
+## Updating changes.xml
+
+Finalize the file `src/changes/changes.xml` file.
+
+The release date and description, which are often only set to `TBD` during
+development, must be set to appropriate values. The release date at this step
+is only a guess one or two weeks in the future, in order to take into account
+the 5 days release vote delay.
+
+Replace the `TBD` description with a text describing the version released:
+state if it is a minor or major version, list the major features introduced by
+the version etc (see examples in descriptions of former versions).
+
+Commit the `changes.xml` file.
+
+ git add src/changes/changes.xml
+ git commit -m "Updated changes.xml for official release."
+
+## Updating documentation
+
+Several files must be updated to take into account the new version:
+
+| file name | usage | required update |
+|-------------------------------------|----------------------------|--------------------------------------------------------------------------------------------------------|
+| `src/site/markdown/index.md` | site home page | Update the text about the new features (see changes from **changes.xml**) |
+| `src/site/markdown/downloads.md.vm` | downloads links | Declare the new versions, don't forget the date |
+
+Once the files have been updated, commit the changes:
+
+ git add src/site/markdown/*.md
+ git commit -m "Updated documentation for the release."
+
+## Change library version number
+
+The `pom.xml` file contains the version number of the library. During
+development, this version number has the form `X.Y-SNAPSHOT`. For release, the
+`-SNAPSHOT` part must be removed.
+
+Commit the change:
+
+ git add pom.xml
+ git commit -m "Dropped -SNAPSHOT in version number for official release."
+
+## Check the JavaDoc
+
+Depending the JDK version (Oracle, OpenJDK, etc), some JavaDoc warnings can be present.
+Make sure there is no JavaDoc warnings by running the following command:
+
+ mvn javadoc:javadoc
+
+If possible, run the above command with different JDK versions.
+
+## Tag and sign the git repository
+
+When all previous steps have been performed, the local git repository holds the
+final state of the sources and build files for the release. It must be tagged
+and the tag must be signed. Note that before the vote is finished, the tag can
+only signed with a `-RCx` suffix to denote Release Candidate. The final tag
+without the `-RCx` suffix will be put once the vote succeeds, on the same
+commit (which will therefore have two tags). Tagging and signing is done using
+the following command, with `-RCn` replaced with the Release Candidate number:
+
+ git tag X.Y-RCn -s -u 9A928E5485FBC44A2A4F9C2E9128808ECB6C9DED -m "Release Candidate n for version X.Y."
+
+The tag should be verified using command:
+
+ git tag -v X.Y-RCn
+
+## Pushing the branch and the tag
+
+When the tag is ready, the branch and the tag must be pushed to Gitlab so
+everyone can review it:
+
+ git push --tags origin release-X.Y
+
+## Static site (technical documentation)
+
+The static site is generated locally using:
+
+ mvn clean
+ LANG=C mvn site
+
+The official site is automatically updated on the hosting platform when work is
+merged into branches `develop`, `release-*` or `master`.
+
+## Generating signed artifacts
+
+When these settings have been set up, generating the artifacts is done by
+running the following commands:
+
+ mvn deploy -DskipStagingRepositoryClose=true -Prelease
+
+During the generation, maven will trigger gpg which will ask the user for the
+pass phrase to access the signing key. If maven didn’t prompt to you, you have to
+add `-Dgpg.passphrase=[passphrase]`
+
+Once the commands ends, log into the SonaType OSS site
+[https://oss.sonatype.org/](https://oss.sonatype.org/) and check the staging
+repository contains the expected artifacts with associated signatures and
+checksums:
+
+- rugged-X.Y.pom
+- rugged-X.Y.jar
+- rugged-X.Y-sources.jar
+- rugged-X.Y-javadoc.jar
+
+The signature and checksum files have similar names with added extensions `.asc`,
+`.md5` and `.sha1`.
+
+Sometimes, the deployment to Sonatype OSS site also adds files with double extension
+`.asc.md5` and `.asc.sha1`, which are in fact checksum files on a signature file
+and serve no purpose and can be deleted.
+
+Remove `rugged-X.Y.source-jar*` since they are duplicates of the
+`rugged-X.Y-sources.jar*` artifacts. Then click the “Close†button.
+
+## Calling for the vote
+
+Everything is now ready so the developers and PMC can vote for the release.
+Create a post in the [Rugged development category of the forum](https://forum.orekit.org/c/rugged-development/)
+with a subject line of the form:
+
+ [VOTE] Releasing Rugged X.Y from release candidate n
+
+and content of the form:
+
+ This is a VOTE in order to release version X.Y of the Rugged library.
+ Version X.Y is a maintenance release.
+
+
+ Highlights in the X.Y release are:
+ - feature 1 description
+ ...
+ - feature n description
+
+ The release candidate n can be found on the GitLab repository as
+ tag X.Y-RCn in the release-X.Y branch:
+ <https://gitlab.orekit.org/orekit/rugged/tree/X.Y-RCn>
+
+ The release notes can be read here:
+ <https://test.orekit.org/site-rugged-X.Y/changes-report.html>
+
+ Maven artifacts are available at
+ <https://oss.sonatype.org/content/repositories/orgorekit-xxxx/>
+
+ The votes will be tallied in 120 hours for now, on 20yy-mm-ddThh:mm:00Z
+ (this is UTC time).
+
+You should also ping PMC members so they are aware of the vote. Their
+vote is essential for a release as per project governance.
+
+## Failed vote
+
+If the vote fails, the maven artifacts must be removed from OSS site by
+dropping the repository. Then a new release candidate must
+be created, with a new number, a new tag and new artifacts. Another vote is
+needed for this new release candidate. So make the necessary changes and then
+start from the “Tag and sign the git repository†step.
+
+## Successful vote
+
+When the vote for a release candidate succeeds, follow the steps below to
+publish the release.
+
+## Tag release version
+
+As the vote passed, a final signed tag must be added to the succeeding release
+candidate, verified and pushed:
+
+ git tag X.Y -s -u 9A928E5485FBC44A2A4F9C2E9128808ECB6C9DED -m "Version X.Y."
+ git tag -v X.Y
+ git push --tags
+
+## Merge release branch into master
+
+Merge the release branch into the `master` branch to include any changes made.
+
+ git checkout master
+ git merge --no-ff release-X.Y
+
+Then commit and push.
+
+## Merge master branch into develop
+
+Merge the `master` branch into the `develop` branch to include any changes made.
+
+ git checkout develop
+ git merge --no-ff master
+
+Then update the version number to prepare for the next development cycle:
+
+- edit the pom.xml to update version to a SNAPSHOT,
+- make space in the `/src/changes/changes.xml` file for new changes.
+
+Then commit and push.
+
+## Publish maven artifacts
+
+The maven artifacts must be published using OSS site to release the repository.
+Select the Rugged repository in "Staging Repositories" and click the “Releaseâ€
+button in [Nexus Repository Manager](https://oss.sonatype.org/).
+
+## Upload to Gitlab
+
+Navigate to Projects > Rugged > Repository > Tags. Find the X.Y tag and
+click the edit button to enter release notes. Use the **path** in the [Nexus
+repository](https://packages.orekit.org/#browse/browse:maven-releases:org%2Forekit%2Frugged) to
+set the artifacts in the release notes.
+
+- rugged-X.Y.jar
+- rugged-X.Y-sources.jar
+- rugged-X.Y-javadoc.jar
+
+Navigate to Projects > Rugged > Project Overview > Releases and make sure it looks nice.
+
+## Synchronize the Github mirror
+
+To enhance the visibility of the project, [a mirror](https://github.com/CS-SI/Rugged) is maintained on Github.
+The releases created on Gitlab are not automatically pushed on this mirror.
+They have to be declared manually to make visible the vitality of Rugged.
+
+1. Login to Github
+2. Go to the [Rugged releases](https://github.com/CS-SI/Rugged/releases) page
+3. Click on the [Draft a new release](https://github.com/CS-SI/Rugged/releases) button
+4. In the "Tag version" field of the form and in the "Release title" field, enter the tag of the release to be declared
+5. Describe the release as it has been done on Gitlab
+6. Click on "Publish release"
+
+Github automically adds two assets (zip and tarball archives of the tagged source code).
+
+## Update Rugged website
+
+Several edits need to be made to the Rugged website after the vote.
+Fetch the current code:
+
+ git clone https://gitlab.orekit.org/orekit/website-2015
+
+Switch to `develop` branch.
+
+Edit `rugged/overview.html` with the new Orekit and Hipparchus versions.
+Don't forget to update the `rugged/img/rugged-architecture.png` image with the new dependencies.
+
+Create a new post for the release in `_post/` using as template a previous Rugged post (in order to be published in the Rugged News page).
+
+
+Once the modification pushed to develop branch, wait the pipeline on Gitlab is finished, then the [test website](https://test.orekit.org/rugged) will be updated.
+
+Once the modification validated, merge the develop branch into the master branch and pushed the master branch.
+Once the pipeline on Gitlab is finished, then the [website](https://www.orekit.org/rugged) will be updated.
+
+## Close X.Y milestone
+
+In Gitlab, navigate to Projects > Rugged > Issues > Milestones.
+Click “Close Milestone†for the line corresponding to the release X.Y.
+
+## Announce release
+
+The last step is to announce the release by creating a post in the
+[Rugged announcements category of the forum](https://forum.orekit.org/c/rugged-announcements/)
+with a subject line of the form:
+
+ Rugged X.Y released
+
+and content of the form:
+
+ The Rugged team is pleased to announce the release of Rugged version X.Y.
+ This is a minor/major version, including both new features and bug fixes.
+ The main changes are:
+
+ - feature 1 description
+ ...
+ - feature n description
+
+ This version depends on Orekit X.x and Hipparchus Y.y.
+
+ For complete release notes please see:
+ https://www.orekit.org/site-rugged-X.Y/changes-report.html
+
+ The maven artifacts are available in maven central.
+ The source and binaries can be retrieved from the forge releases page:
+ https://gitlab.orekit.org/orekit/rugged/-/releases
diff --git a/src/site/markdown/sources.md b/src/site/markdown/sources.md
index 27344b7d3846a03afb0ccb38515719d3d1e224f0..abce9d2a7ed9752fb64d8bb9276bf7d4a5c47b15 100644
--- a/src/site/markdown/sources.md
+++ b/src/site/markdown/sources.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -52,4 +52,4 @@ tab in Rugged Gitlab.
git clone -b develop git@gitlab.orekit.org:orekit/rugged.git
-[Top of the page](#top)
\ No newline at end of file
+[Top of the page](#top)
diff --git a/src/site/markdown/tutorials/direct-location-with-DEM.md b/src/site/markdown/tutorials/direct-location-with-DEM.md
index 26798b6a9dbee49b2cdb8bbc000d7ecbcc2e02ae..93b3b7a2fc89c05e5a2c83b314b1d6e27766b9a0 100644
--- a/src/site/markdown/tutorials/direct-location-with-DEM.md
+++ b/src/site/markdown/tutorials/direct-location-with-DEM.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -18,7 +18,7 @@
The aim of this tutorial is to compute a direct location grid by intersection of
the line of sight with a DEM (Digital Elevation Model), using Duvenhage's algorithm.
-This algorithm is the most performant one in Rugged.
+This algorithm is the most efficient one in Rugged.
The following figure shows the effects of taking into account the DEM in the computation of latitude, longitude and altitude:
@@ -28,7 +28,7 @@ The following figure shows the effects of taking into account the DEM in the com
Rugged does not parse DEM files but takes buffers of elevation data as input.
It is up to the calling application to read the DEM and load the data into buffers.
-Rugged provides a tile mecanism with cache for large DEMs allowing the user to load
+Rugged provides a tile mechanism with cache for large DEMs allowing the user to load
one tile at a time. This is in line with the format of world coverage DEMs such as SRTM.
Rugged offers an interface for updating the DEM tiles in cache with a callback function
triggered everytime a coordinate falls outside the current region.
@@ -108,14 +108,18 @@ Here's the source code of the class `VolcanicConeElevationUpdater` :
### Important notes on DEM tiles :
-* Ground point elevation are obtained by bilinear interpolation between 4 neighbouring cells. There is no specific algorithm for border management. As a consequence, a point falling on the border of the tile is considered outside. **DEM tiles must be overlapping by at least one line/column in all directions**.
+* Ground point elevation are obtained by bilinear interpolation between 4 neighbouring cells. There is no specific algorithm for border management in this computation. As a consequence, a point falling on the border of the tile is considered outside. **DEM tiles must be overlapping by at least one line/column in all directions**. Two options are available:
+
+ - until version 3.0, the DEM tiles should comply to the overlapping obligation.
+ - after version 3.0, the DEM tiles could be seamless (i.e. not overlapping). In that case, a specific algorithm creates zipper tiles on the fly, in order to comply to the overlapping obligation. The case of overlapping DEM tiles is still possible. The choice is given through the API `setDigitalElevationModel` (see below paragraph `Initializing Rugged with a DEM`).
* In Rugged terminology, the minimum latitude and longitude correspond to the centre of the farthest Southwest cell of the DEM. Be careful if using GDAL to pass the correct information as there is half a pixel shift with respect to the lower left corner coordinates in gdalinfo.
-The following diagram illustrates proper DEM tiling with one line/column overlaps between neighbouring tiles :
+The following diagram illustrates needed DEM tiling with one line/column overlaps between neighbouring tiles :
+
This diagram tries to represent the meaning of the different parameters in the definition of a tile :
@@ -131,12 +135,13 @@ Instantiate an object derived from TileUpdater :
int nbTiles = 8 ; //number max of tiles in Rugged cache
AlgorithmId algoId = AlgorithmId.DUVENHAGE;
+ boolean isOverlappingTiles = true;
Initialize Rugged with these parameters :
Rugged rugged = new RuggedBuilder().
- setDigitalElevationModel(updater, nbTiles).
+ setDigitalElevationModel(updater, nbTiles, isOverlappingTiles).
setAlgorithm(algoId).
setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF).
setTimeSpan(startDate, stopDate, 0.1, 10.0).
@@ -146,6 +151,10 @@ Initialize Rugged with these parameters :
addLineSensor(lineSensor).
build();
+To be noticed:
+
+one can use `setDigitalElevationModel(updater, nbTiles)` in the case of overlapping tiles (the flag isOverlappingTiles = true by default)
+
## Computing a direct location grid
In a similar way as in the first tutorial [Direct Location](./direct-location.html),
diff --git a/src/site/markdown/tutorials/direct-location.md b/src/site/markdown/tutorials/direct-location.md
index 3b74860cfa93a112a786fed9facdeb2e4c4aee12..ae4430bfd46e038e292d4e0f947da20418aff7ce 100644
--- a/src/site/markdown/tutorials/direct-location.md
+++ b/src/site/markdown/tutorials/direct-location.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
diff --git a/src/site/markdown/tutorials/inverse-location.md b/src/site/markdown/tutorials/inverse-location.md
index 72b2cbda670b68e93afca9c0d0538d53662358af..75fc5b4a528b8b2cb50bf134e4d9d95cf4bf7854 100644
--- a/src/site/markdown/tutorials/inverse-location.md
+++ b/src/site/markdown/tutorials/inverse-location.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
diff --git a/src/site/markdown/tutorials/matlab-example.md b/src/site/markdown/tutorials/matlab-example.md
index eedd485683bfb58f922bdaaf95d32d1654a8b36c..0bd53ce86f5937227aa9d5f7f3b7b691a49c97e2 100644
--- a/src/site/markdown/tutorials/matlab-example.md
+++ b/src/site/markdown/tutorials/matlab-example.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
diff --git a/src/site/markdown/tutorials/tile-updater.md b/src/site/markdown/tutorials/tile-updater.md
index 84eedc7a3f2238bafd1d4445556cbafe2d4ade1a..d19bf873335709670cf71ba5e4e2e6ed453c1ee0 100644
--- a/src/site/markdown/tutorials/tile-updater.md
+++ b/src/site/markdown/tutorials/tile-updater.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2019 CS Systèmes d'Information
+<!--- Copyright 2013-2022 CS GROUP
Licensed 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
@@ -12,3 +12,735 @@
limitations under the License.
-->
+# Example with the real DEM SRTM
+
+This tutorial shows how to use the tile updater with a real DEM (for instance SRTM here).
+
+Same case as the tutorial [Direct location with a DEM](./direct-location-with-DEM.html).
+
+**WARNING**
+
+This tutorial will not be able to compile under [Rugged gitlab CI](https:gitlab.orekit.org/orekit/rugged/-/pipelines) as GDAL is not authorized in Rugged official releases.
+Don't commit under official branches (master, develop, release, ...) of Rugged, a pom.xml with the dependency to GDAL.
+
+## Needs
+
+### Install GDAL
+
+Search the web for how to install GDAL according to your OS.
+
+For instance for Linux/Ubuntu:
+
+The first time you want to install GDAL, you need to add a specific repository:
+
+For GDAL 3.x, use the following repository:
+
+ sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable
+
+For GDAL 2.x, use the following repository:
+
+ sudo add-apt-repository ppa:ubuntugis/ppa
+
+Then
+
+ sudo apt update
+ sudo apt install gdal-bin gdal-data libgdal-java
+
+### Add GDAL in pom.xml file
+
+In `<properties>` part:
+
+ <!-- GDAL version -->
+ <rugged.gdal.version>3.0.0</rugged.gdal.version>
+ <!-- GDAL native library path -->
+ <rugged.gdal.native.library.path>${env.GDAL_PATH}</rugged.gdal.native.library.path>
+
+and in `<dependencies>` part:
+
+ <dependency>
+ <groupId>org.gdal</groupId>
+ <artifactId>gdal</artifactId>
+ <version>${rugged.gdal.version}</version>
+ <type>jar</type>
+ <optional>false</optional>
+ </dependency>
+
+### Configure the environment variable GDAL_PATH
+
+To access GDAL libraries (.so files), one must configure the environment variable GDAL_PATH as defined in pom.xml (see above).
+
+For instance (for Linux) according to the GDAL version and the linux distribution:
+
+ export GDAL_PATH=/COTS/gdal-3.0.0/swig/java/
+ or
+
+ export GDAL_PATH=/usr/lib/jni
+
+### Get the following SRTM tile
+
+This example needs one tile under a specific directory: `17/05/srtm_17_05.tif`
+
+For instance from : [SRTM Tile Grabber](http://dwtkns.com/srtm/)
+
+ srtm_17_05.zip
+
+and unzip it under a directory like : `mypath/dem-data/SRTM/17/05/`
+or changed the method: `getRasterFilePath(latitude, longitude)`
+
+### Get the GEOID data: egm96_15.gtx
+
+This example needs the geoid file: `egm96_15.gtx`
+
+For instance from the [GeographicLib](https:geographiclib.sourceforge.io/C++/doc/geoid.html)
+
+### Update the path in variables demRootDir and geoidFilePath
+
+Into the following code ...
+
+## Code example
+
+This is a whole example using the SRTM tiles.
+
+ public class DirectLocationWithSRTMdem {
+
+ // Root dir for the SRTM tiles
+ final static String demRootDir = "/mypath/dem-data/SRTM";
+
+ // File path for the GEOID
+ final static String geoidFilePath = "/mypath/dem-data/GEOID/egm96_15.gtx";
+
+ // Geoid elevations
+ static GEOIDelevationReader geoidElevationReader;
+ static GdalTransformTools geoidGTTools;
+ static double[][] geoidElevations;
+
+
+ public static void main(String[] args) {
+
+ try {
+
+ // Initialize Orekit, assuming an orekit-data folder is in user home directory
+ File home = new File(System.getProperty("user.home"));
+ File orekitData = new File(home, "orekit-data");
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(orekitData));
+
+
+ // Initialize the DEM datas
+ // ========================
+ // Initialize GDAL
+ org.gdal.gdal.gdal.AllRegister();
+
+ // Get the GEOID data once for all
+ geoidElevationReader = new GEOIDelevationReader(geoidFilePath);
+ geoidGTTools = new GdalTransformTools(geoidElevationReader.getGeoidGeoTransformInfo(),
+ geoidElevationReader.getGeoidLonSize(), geoidElevationReader.getGeoidLatSize());
+ geoidElevations = geoidElevationReader.getElevationsWholeEarth();
+
+ // Initialize the SRTM tile updater
+
+ // SRTM elevations are given over the GEOID.
+ // Rugged needs elevations over the ellipsoid so the Geoid must be added to raw SRTM elevations.
+ SRTMelevationUpdater srtmUpdater = new SRTMelevationUpdater(demRootDir);
+
+
+ // Sensor's definition
+ // ===================
+ // Line of sight
+ // -------------
+ // The raw viewing direction of pixel i with respect to the instrument is defined by the vector:
+ List<Vector3D> rawDirs = new ArrayList<Vector3D>();
+ for (int i = 0; i < 2000; i++) {
+ // 20° field of view, 2000 pixels
+ rawDirs.add(new Vector3D(0d, i*FastMath.toRadians(20)/2000d, 1d));
+ }
+
+ // The instrument is oriented 10° off nadir around the X-axis, we need to rotate the viewing
+ // direction to obtain the line of sight in the satellite frame
+ LOSBuilder losBuilder = new LOSBuilder(rawDirs);
+ losBuilder.addTransform(new FixedRotation("10-degrees-rotation", Vector3D.PLUS_I, FastMath.toRadians(10)));
+
+ TimeDependentLOS lineOfSight = losBuilder.build();
+
+ // Datation model
+ // --------------
+ // We use Orekit for handling time and dates, and Rugged for defining the datation model:
+ TimeScale gps = TimeScalesFactory.getGPS();
+ AbsoluteDate absDate = new AbsoluteDate("2009-12-11T16:59:30.0", gps);
+ LinearLineDatation lineDatation = new LinearLineDatation(absDate, 1d, 20);
+
+ // Line sensor
+ // -----------
+ // With the LOS and the datation now defined, we can initialize a line sensor object in Rugged:
+ LineSensor lineSensor = new LineSensor("mySensor", lineDatation, Vector3D.ZERO, lineOfSight);
+
+
+ // Satellite position, velocity and attitude
+ // =========================================
+
+ // Reference frames
+ // ----------------
+ // In our application, we simply need to know the name of the frames we are working with. Positions and
+ // velocities are given in the ITRF terrestrial frame, while the quaternions are given in EME2000
+ // inertial frame.
+ Frame eme2000 = FramesFactory.getEME2000();
+ boolean simpleEOP = true; // we don't want to compute tiny tidal effects at millimeter level
+ Frame itrf = FramesFactory.getITRF(IERSConventions.IERS_2010, simpleEOP);
+
+ // Satellite attitude
+ // ------------------
+ ArrayList<TimeStampedAngularCoordinates> satelliteQList = new ArrayList<TimeStampedAngularCoordinates>();
+
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T16:58:42.592937", -0.340236d, 0.333952d, -0.844012d, -0.245684d);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T16:59:06.592937", -0.354773d, 0.329336d, -0.837871d, -0.252281d);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T16:59:30.592937", -0.369237d, 0.324612d, -0.831445d, -0.258824d);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T16:59:54.592937", -0.3836d, 0.319792d, -0.824743d, -0.265299d);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:00:18.592937", -0.397834d, 0.314883d, -0.817777d, -0.271695d);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:00:42.592937", -0.411912d, 0.309895d, -0.810561d, -0.278001d);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:01:06.592937", -0.42581d, 0.304838d, -0.803111d, -0.284206d);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:01:30.592937", -0.439505d, 0.299722d, -0.795442d, -0.290301d);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:01:54.592937", -0.452976d, 0.294556d, -0.787571d, -0.296279d);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:02:18.592937", -0.466207d, 0.28935d, -0.779516d, -0.302131d);
+
+ // Positions and velocities
+ // ------------------------
+ ArrayList<TimeStampedPVCoordinates> satellitePVList = new ArrayList<TimeStampedPVCoordinates>();
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T16:58:42.592937", -726361.466d, -5411878.485d, 4637549.599d, -2463.635d, -4447.634d, -5576.736d);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T16:59:04.192937", -779538.267d, -5506500.533d, 4515934.894d, -2459.848d, -4312.676d, -5683.906d);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T16:59:25.792937", -832615.368d, -5598184.195d, 4392036.13d, -2454.395d, -4175.564d, -5788.201d);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T16:59:47.392937", -885556.748d, -5686883.696d, 4265915.971d, -2447.273d, -4036.368d, -5889.568d);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:00:08.992937", -938326.32d, -5772554.875d, 4137638.207d, -2438.478d, -3895.166d, -5987.957d);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:00:30.592937", -990887.942d, -5855155.21d, 4007267.717d, -2428.011d, -3752.034d, -6083.317d);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:00:52.192937", -1043205.448d, -5934643.836d, 3874870.441d, -2415.868d, -3607.05d, -6175.6d);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:01:13.792937", -1095242.669d, -6010981.571d, 3740513.34d, -2402.051d, -3460.291d, -6264.76d);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:01:35.392937", -1146963.457d, -6084130.93d, 3604264.372d, -2386.561d, -3311.835d, -6350.751d);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:01:56.992937", -1198331.706d, -6154056.146d, 3466192.446d, -2369.401d, -3161.764d, -6433.531d);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:02:18.592937", -1249311.381d, -6220723.191d, 3326367.397d, -2350.574d, -3010.159d, -6513.056d);
+
+
+ // Rugged initialization
+ // ---------------------
+ Rugged rugged = new RuggedBuilder().
+ setAlgorithm(AlgorithmId.DUVENHAGE).
+ setDigitalElevationModel(srtmUpdater, SRTMelevationUpdater.NUMBER_TILES_CACHED, false).
+ setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF).
+ setTimeSpan(absDate, absDate.shiftedBy(60.0), 0.01, 5 / lineSensor.getRate(0)).
+ setTrajectory(InertialFrameId.EME2000,
+ satellitePVList, 4, CartesianDerivativesFilter.USE_P,
+ satelliteQList, 4, AngularDerivativesFilter.USE_R).
+ addLineSensor(lineSensor).
+ build();
+
+ // Direct location of a single sensor pixel (first line, first pixel)
+ // ------------------------------------------------------------------
+ Vector3D position = lineSensor.getPosition(); // This returns a zero vector since we set the relative position of the sensor w.r.T the satellite to 0.
+ AbsoluteDate firstLineDate = lineSensor.getDate(0);
+ Vector3D los = lineSensor.getLOS(firstLineDate, 0);
+ GeodeticPoint upLeftPoint = rugged.directLocation(firstLineDate, position, los);
+ System.out.format(Locale.US, "upper left point: φ = %8.3f °, λ = %8.3f °, h = %8.3f m (elevation with SRTM + Geoid))%n",
+ FastMath.toDegrees(upLeftPoint.getLatitude()),
+ FastMath.toDegrees(upLeftPoint.getLongitude()),
+ upLeftPoint.getAltitude());
+
+ // DEM SRTM with Geoid: (value of GEOID checked with QGIS around -30 meters)
+ // upper left point: φ = 37.585 °, λ = -96.950 °, h = 344.024 m
+
+ // DEM SRTM without Geoid (not to be used as elevation must be over ellipsoid for Rugged):
+ // upper left point: φ = 37.585 °, λ = -96.950 °, h = 373.675 m
+
+
+
+ } catch (OrekitException oe) {
+ System.err.println(oe.getLocalizedMessage());
+ System.exit(1);
+ } catch (RuggedException re) {
+ System.err.println(re.getLocalizedMessage());
+ System.exit(1);
+ }
+
+ }
+
+
+ private static void addSatellitePV(TimeScale gps, Frame eme2000, Frame itrf,
+ ArrayList<TimeStampedPVCoordinates> satellitePVList,
+ String absDate,
+ double px, double py, double pz, double vx, double vy, double vz) {
+
+ AbsoluteDate ephemerisDate = new AbsoluteDate(absDate, gps);
+ Vector3D position = new Vector3D(px, py, pz); // in ITRF, unit: m
+ Vector3D velocity = new Vector3D(vx, vy, vz); // in ITRF, unit: m/s
+ PVCoordinates pvITRF = new PVCoordinates(position, velocity);
+ Transform transform = itrf.getTransformTo(eme2000, ephemerisDate);
+ PVCoordinates pvEME2000 = transform.transformPVCoordinates(pvITRF);
+ satellitePVList.add(new TimeStampedPVCoordinates(ephemerisDate, pvEME2000.getPosition(), pvEME2000.getVelocity(), Vector3D.ZERO));
+
+ }
+
+ private static void addSatelliteQ(TimeScale gps, ArrayList<TimeStampedAngularCoordinates> satelliteQList, String absDate,
+ double q0, double q1, double q2, double q3) {
+ AbsoluteDate attitudeDate = new AbsoluteDate(absDate, gps);
+ Rotation rotation = new Rotation(q0, q1, q2, q3, true); // q0 is the scalar term
+ TimeStampedAngularCoordinates pair =
+ new TimeStampedAngularCoordinates(attitudeDate, rotation, Vector3D.ZERO, Vector3D.ZERO);
+ satelliteQList.add(pair);
+ }
+
+
+ /**
+ * To read SRTM tiles (get from http://dwtkns.com/srtm/)
+ */
+ private static class SRTMelevationUpdater implements TileUpdater {
+
+ /** Nb cached tiles send to init rugged. */
+ public static final int NUMBER_TILES_CACHED = 8;
+
+ /** Last lat value used to ask to update a tile. */
+ private double lastLat = Double.NaN;
+
+ /** Last lon value used to ask to update a tile. */
+ private double lastLon = Double.NaN;
+
+ /** Nb times the same lat/lon value is used to ask to update a tile (used to avoid infinite loop). */
+ private int nbCall = 0;
+
+ /** Nb time rugged ask exactly same DEM tile: means that infinite loop. */
+ private static final int NB_TIME_ASK_SAME_TILE = 1000;
+
+ /** Raster root directory, should contains raster files. */
+ private String srtmRootDirectory;
+
+
+ /**
+ * Constructor.
+ */
+ public SRTMelevationUpdater(final String SRTMrootDirectory) {
+
+ this.srtmRootDirectory = SRTMrootDirectory;
+ checkRasterDirectory(SRTMrootDirectory);
+ }
+
+ /** Update given tile using SRTM elevation.
+ * @param latitude latitude that must be covered by the tile (rad)
+ * @param longitude longitude that must be covered by the tile (rad)
+ * @param tile to update
+ */
+ @Override
+ public void updateTile(final double latitude, final double longitude, final UpdatableTile tile) {
+
+ // Check if latitude and longitude already known
+ if (latitude == this.lastLat && longitude == this.lastLon) {
+ this.nbCall++;
+ } else {
+ this.lastLat = latitude;
+ this.lastLon = longitude;
+ this.nbCall = 0;
+ }
+ if (this.nbCall > NB_TIME_ASK_SAME_TILE) {
+ String str = String.format("infinite loop for %3.8f long %3.8f lat ", longitude, latitude);
+ DummyLocalizable message = new DummyLocalizable(str);
+ throw new RuggedException(message);
+ }
+
+ // Compute the SRTM tile name according to the latitude and longitude
+ String rasterFileName = getRasterFilePath(latitude, longitude);
+
+ File rasterFile = new File(rasterFileName);
+ if (!rasterFile.exists()) {
+ // No SRTM tile found. We may be on water.
+ // For instance one can read the geoid ...
+ System.out.format("WARNING: No DEM tile found for latitude (deg) = %3.8f and longitude (deg) = %3.8f." +
+ " SRTM file %s wasn't found. %n",
+ FastMath.toDegrees(latitude), FastMath.toDegrees(longitude), rasterFileName);
+ return;
+ }
+
+ // Open the SRTM tile
+ org.gdal.gdal.Dataset srtmDataset = org.gdal.gdal.gdal.Open(rasterFileName, org.gdal.gdalconst.gdalconst.GA_ReadOnly);
+
+ // Get information about the tile
+ int rasterLonSize = srtmDataset.GetRasterXSize();
+ int rasterLatSize = srtmDataset.GetRasterYSize();
+ double[] srtmGeoTransformInfo = srtmDataset.GetGeoTransform();
+
+ double minLat = Double.NaN;
+ double minLon = Double.NaN;
+ double lonStep = Double.NaN;
+ double latStep = Double.NaN;
+
+ if (srtmGeoTransformInfo.length < 6) { // Check that the geoTransformInfo is correct
+ String str = "GDALGeoTransform has < 6 elements";
+ DummyLocalizable message = new DummyLocalizable(str);
+ throw new RuggedException(message);
+ } else {
+ // Get the latitudes and longitudes datas (in degrees)
+ lonStep = FastMath.abs(srtmGeoTransformInfo[1]);
+ latStep = FastMath.abs(srtmGeoTransformInfo[5]);
+
+ minLon = srtmGeoTransformInfo[0] + 0.5 * lonStep;
+ minLat = srtmGeoTransformInfo[3] - (rasterLatSize - 0.5) * latStep;
+ }
+
+ // Get the raster band from the tile
+ org.gdal.gdal.Band band = srtmDataset.GetRasterBand(1);
+
+ // Define Tile Geometry
+ // TBN: angles needed in radians
+ tile.setGeometry(FastMath.toRadians(minLat), FastMath.toRadians(minLon), FastMath.toRadians(latStep), FastMath.toRadians(lonStep), rasterLatSize, rasterLonSize);
+
+ // Loop over raster values
+ double[] data = new double[rasterLatSize * rasterLonSize];
+
+ // To use geo transform information from GDAL
+ GdalTransformTools srtmGTTools = new GdalTransformTools(srtmGeoTransformInfo, rasterLonSize, rasterLatSize);
+
+ // We read all raster at once to limit the numbers of Band.ReadRaster calls
+ band.ReadRaster(0, 0, rasterLonSize, rasterLatSize, data);
+
+ // Get the no data value from the raster
+ Double[] noDataValue = new Double[1];
+ band.GetNoDataValue(noDataValue);
+
+ // test if the no data value exists
+ Boolean noDataValueExist = false;
+ if (noDataValue[0] != null) noDataValueExist = true;
+
+ // from bottom left to upper right corner
+ for (int iLat = rasterLatSize - 1; iLat >= 0; iLat--) {
+ for (int jLon = 0; jLon < rasterLonSize; jLon++) {
+
+ double elevationOverGeoid = 0.0;
+
+ // Get elevation over GEOID (for SRTM)
+ elevationOverGeoid = data[iLat * rasterLonSize + jLon];
+
+ if (noDataValueExist && (elevationOverGeoid == noDataValue[0])) {
+ elevationOverGeoid = 0.0;
+ }
+
+ // The elevation value we send to rugged must be computed against ellipsoid
+ // => for SRTM , we must add geoid value
+ double lonDeg = srtmGTTools.getXFromPixelLine(jLon, iLat);
+ double latDeg = srtmGTTools.getYFromPixelLine(jLon, iLat);
+
+ // Get the geoid elevation at latDeg and lonDeg
+ int geoidIndexLatitude = (int) FastMath.floor(geoidGTTools.getLineNumFromLatLon(latDeg, lonDeg));
+ int geoidIndexLongitude = (int) FastMath.floor(geoidGTTools.getPixelNumFromLatLon(latDeg, lonDeg));
+
+ double elevationOverEllipsoid = elevationOverGeoid + geoidElevations[geoidIndexLatitude][geoidIndexLongitude];
+
+ // Set elevation over the ellipsoid
+ tile.setElevation(rasterLatSize - 1 - iLat, jLon, elevationOverEllipsoid);
+ }
+ }
+ band.delete();
+ band = null;
+ srtmDataset.delete();
+ srtmDataset = null;
+ }
+
+ /** Get the file path to the SRTM tile.
+ * Need the SRTM tif file named, for instance: srtm_17_05.tif under the directory rootDirectory/17/05/
+ * @param latitude latitude (rad)
+ * @param longitude longitude (rad)
+ * @return the SRTM tile path
+ */
+ private String getRasterFilePath(final double latitude, final double longitude) {
+
+ double latDeg = FastMath.toDegrees(latitude);
+ // Assure that the longitude belongs to [-180, + 180]
+ double lonDeg = FastMath.toDegrees(MathUtils.normalizeAngle(longitude, 0.0));
+
+ // Compute parent dir with longitude value according to SRTM naming convention
+ int parentDirValue = (int) (1 + (lonDeg + 180.) / 5);
+ String parentDir = String.format("%02d", parentDirValue);
+
+ // Compute sub dir with latitude value according to SRTM naming convention
+ int subDirValue = (int) (1 + (60. - latDeg) / 5);
+ String subDir = String.format("%02d", subDirValue);
+
+ String filePath = this.srtmRootDirectory + File.separator + parentDir + File.separator + subDir + File.separator +
+ "srtm_" + parentDir + "_" + subDir + ".tif";
+
+ return filePath;
+ }
+
+ /** Chech the root directory for the SRTM files and the presence of .tif
+ * @param directory
+ * @return true if everything OK
+ */
+ private boolean checkRasterDirectory(final String directory) {
+
+ if (directory == null) {
+
+ String str = "Directory not defined";
+ DummyLocalizable message = new DummyLocalizable(str);
+ throw new RuggedException(message);
+
+ } else {
+ try {
+ Path dir = FileSystems.getDefault().getPath(directory);
+ DirectoryStream<Path> stream = Files.newDirectoryStream(dir);
+ boolean found = false;
+ for (Path path : stream) {
+ if (!found) {
+ File currentFile = path.toFile();
+ if (currentFile.isDirectory()) {
+ found = checkRasterDirectory(currentFile.getAbsolutePath());
+ } else {
+ String filePath = currentFile.getAbsolutePath();
+ if (filePath.matches(".*.tif")) {
+ found = true;
+ }
+ }
+ if (found) {
+ stream.close();
+ return true;
+ }
+ }
+ }
+ stream.close();
+
+ String str = "SRTM raster file (.tif) not found in " + directory;
+ DummyLocalizable message = new DummyLocalizable(str);
+ throw new RuggedException(message);
+
+ } catch (IOException e) {
+ String str = "Directory for SRTM tiles not found " + directory;
+ DummyLocalizable message = new DummyLocalizable(str);
+ throw new RuggedException(message);
+ }
+ }
+ }
+ }
+
+ /**
+ * To read the GEOID
+ */
+ private static class GEOIDelevationReader {
+
+ /** Geoid dataset */
+ private org.gdal.gdal.Dataset geoidDataset = null;
+
+ /** Geoid elevations for the whole Earth (read from Geoid dataset).
+ * Filled in with GDAL convention : [0][0] = North West */
+ private double[][] elevationsWholeEarth = null;
+
+ /** the Geo transform info */
+ private double[] geoidGeoTransformInfo;
+
+ /** Size in longitude of the Geoid (number of columns/pixels). */
+ private int geoidLonSize;
+
+ /** Size in latitude of the Geoid (number of lines). */
+ private int geoidLatSize;
+
+ /**
+ * Constructor
+ * @param geoidFilePath path to geoid file
+ */
+ public GEOIDelevationReader(String geoidFilePath) {
+
+ // Open the Geoid dataset
+ openGeoid(geoidFilePath);
+
+ // Analyze and read the raster: initialize this.elevationsWholeEarth
+ this.geoidGeoTransformInfo = readRaster();
+ }
+
+ /**
+ * Analyse and read the Geoid raster. Initialize elevationsWholeEarth (fill in with GDAL convention : [0][0] = North West)
+ * @return the geoTransformInfo (read from the geoidDataset)
+ */
+ private double[] readRaster() {
+
+ // Analyse the Geoid dataset
+ this.geoidLonSize = geoidDataset.GetRasterXSize();
+ this.geoidLatSize = geoidDataset.GetRasterYSize();
+
+ // Get the Geo transform info: lon origin (deg), lon step (deg), 0, lat origin (deg), 0, lat step (deg)
+ double[] geoTransformInfo = geoidDataset.GetGeoTransform();
+ if (geoTransformInfo.length < 6) { // should not occur; if a problem occurs : the default transform value is set to (0,1,0,0,0,1)
+ String str = "GDALGeoTransform does not contains 6 elements";
+ DummyLocalizable message = new DummyLocalizable(str);
+ throw new RuggedException(message);
+ }
+
+ // Read the raster
+ // ===============
+ // To store the raster data
+ double[] data = new double[this.geoidLatSize * this.geoidLonSize];
+ // Get the raster
+ Band band = geoidDataset.GetRasterBand(1);
+ // We read all the raster once for all
+ band.ReadRaster(0, 0, this.geoidLonSize, this.geoidLatSize, data);
+ // Get the no data value from the raster
+ Double[] noDataValue = new Double[1];
+ band.GetNoDataValue(noDataValue);
+ // test if the no data value exists
+ Boolean noDataValueExist = false;
+ if (noDataValue[0] != null) noDataValueExist = true;
+
+ // Read the full raster all in once ...
+ this.elevationsWholeEarth = new double[this.geoidLatSize][this.geoidLonSize];
+
+ // from bottom left to upper right corner (GDAL convention)
+ for (int iLat = this.geoidLatSize - 1; iLat >= 0; iLat--) {
+ for (int jLon = 0; jLon < this.geoidLonSize; jLon++) {
+ // if jlon = 0 and ilat = rasterLatSize (721) : crash
+ // if iLat = 720 and jlon = rasterLonSize (1440) : crash
+
+ // Read the data with GDAL convention :
+ // iLat = 0 at North; iLat = rasterLatSize - 1 at South;
+ // jLon = 0 at West; jLon = rasterLonSize - 1 at East
+ double elevationOverEllipsoid = data[iLat * this.geoidLonSize + jLon];
+ if (noDataValueExist && (elevationOverEllipsoid == noDataValue[0])) {
+ elevationOverEllipsoid = 0.0;
+ }
+ // Set elevation for current latitude and longitude
+ // IMPORTANT : keep the GDAL convention [0][0] = North West
+ this.elevationsWholeEarth[iLat][jLon] = elevationOverEllipsoid;
+
+ } // end loop jLon
+ } // end loop iLat
+
+
+ // Close Dataset and Band once the raster is read ...
+ band.delete();
+ band = null;
+ geoidDataset.delete();
+ geoidDataset = null;
+
+ // Return the Geo Transform info
+ return geoTransformInfo;
+ }
+
+
+ public double[][] getElevationsWholeEarth() {
+ return elevationsWholeEarth;
+ }
+
+ public double[] getGeoidGeoTransformInfo() {
+ return geoidGeoTransformInfo;
+ }
+
+ public int getGeoidLonSize() {
+ return geoidLonSize;
+ }
+
+ public int getGeoidLatSize() {
+ return geoidLatSize;
+ }
+
+ /** Open the geoid dataset
+ * @param geoidFilePath the geoid file path
+ * @return the geoid dataset
+ */
+ public org.gdal.gdal.Dataset openGeoid(String geoidFilePath) throws RuggedException {
+
+ this.geoidDataset = (org.gdal.gdal.Dataset) org.gdal.gdal.gdal.Open(geoidFilePath, org.gdal.gdalconst.gdalconst.GA_ReadOnly);
+
+ if (this.geoidDataset == null) {
+ throw new RuggedException(RuggedMessages.UNKNOWN_TILE);
+
+ }
+ return this.geoidDataset;
+ }
+ }
+
+ /**
+ * Tool using GeoTransform info returned from GDAL.
+ */
+ static private class GdalTransformTools {
+
+ /** GeoTransform info from Gdal. */
+ private double[] gtInfo;
+
+ /** x size (longitude in deg). */
+ private double xSize;
+
+ /** y size (latitude in deg). */
+ private double ySize;
+
+ /**
+ * Constructor.
+ * @param gtInfo geo transform info from gdal
+ * @param xSize x size (longitude in deg)
+ * @param ySize y size (latitude in deg)
+ */
+ public GdalTransformTools(final double[] gtInfo, final double xSize, final double ySize) {
+ // We suppose gtInfo[5] and gtInfo[1] different from 0
+ // no tests are performed about gtInfo values ... as org.gdal.gdal.Dataset.GetGeoTransform will give
+ // a default transform value set to (0,1,0,0,0,1) if problems
+ this.gtInfo = gtInfo;
+ this.xSize = xSize;
+ this.ySize = ySize;
+ }
+
+ /**
+ * Get X (longitude) coord from pixel and line.
+ * @param pixelNum pixel number
+ * @param lineNum line number
+ * @return X coord (longitude in degrees) from pixel and line. For Gdal = Upper left corner of the cell.
+ */
+ public double getXFromPixelLine(final double pixelNum, final double lineNum) {
+ return gtInfo[0] + gtInfo[1] * pixelNum + gtInfo[2] * lineNum;
+ }
+
+ /**
+ * Get Y (latitude) coord from pixel and line.
+ * @param pixelNum pixel number
+ * @param lineNum line number
+ * @return Y coord (latitude in degrees) from pixel and line. For Gdal = Upper left corner of the cell.
+ */
+ public double getYFromPixelLine(final double pixelNum, final double lineNum) {
+ return gtInfo[3] + gtInfo[4] * pixelNum + gtInfo[5] * lineNum;
+ }
+
+ /**
+ * Get pixel number from latitude and longitude.
+ * @param lat latitude (deg)
+ * @param lon longitude (deg)
+ * @return pixel number (pixel number = index in longitude). For Gdal = Upper left corner of the cell.
+ */
+ public double getPixelNumFromLatLon(final double lat, final double lon) {
+ // We suppose gtInfo[5] and gtInfo[1] different from 0
+ double tmp = gtInfo[2] / gtInfo[5];
+ double value = (lon - tmp * lat - gtInfo[0] + tmp * gtInfo[3]) / (gtInfo[1] - tmp * gtInfo[4]);
+
+ // if value = xSize, don't convert value to get the inverse value from getLatMax and getLonMax
+ if (value >= xSize) {
+ value = value % xSize;
+ }
+ return value;
+ }
+
+ /**
+ * Get line number from latitude and longitude.
+ * @param lat latitude (deg)
+ * @param lon longitude (deg)
+ * @return line number (line number = index in latitude). For Gdal = Upper left corner of the cell.
+ */
+ public double getLineNumFromLatLon(final double lat, final double lon) {
+ // We suppose gtInfo[1] and gtInfo[5] different from 0
+ double tmp = gtInfo[4] / gtInfo[1];
+ double value = (lat - tmp * lon - gtInfo[3] + tmp * gtInfo[0]) / (gtInfo[5] - tmp * gtInfo[2]);
+ if (value >= ySize) { // if value = xSize, don't convert value to get the inverse value from getLatMax and getLonMax
+ value = value % ySize;
+ }
+ return value;
+ }
+ }
+ }
+
+
+**To be noticed:**
+
+if you are using a version of Rugged ≤ 3.0, you need to replace the call:
+
+ setDigitalElevationModel(srtmUpdater, SRTMelevationUpdater.NUMBER_TILES_CACHED, false)
+
+by
+
+ setDigitalElevationModel(srtmUpdater, SRTMelevationUpdater.NUMBER_TILES_CACHED)
+
+and use a DEM with overlapping tiles as explained in [Direct location with a DEM](./direct-location-with-DEM.html).
+
\ No newline at end of file
diff --git a/src/site/resources/images/logo_cs_2008_baseline_ang.jpg b/src/site/resources/images/logo_cs_2008_baseline_ang.jpg
deleted file mode 100644
index 6048a9c633821780b68be257486b7c963f92cfb5..0000000000000000000000000000000000000000
Binary files a/src/site/resources/images/logo_cs_2008_baseline_ang.jpg and /dev/null differ
diff --git a/src/site/resources/images/logo_cs_group.png b/src/site/resources/images/logo_cs_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..481fe0c708a7cefb80858a62de20cc947c9ea010
Binary files /dev/null and b/src/site/resources/images/logo_cs_group.png differ
diff --git a/src/site/resources/images/rugged-architecture.odg b/src/site/resources/images/rugged-architecture.odg
index e1449e7299ab529ff5854e316977a4ad006bb011..b99bcf16f0bea913ad43f2b32b1d71155ebd94d2 100644
Binary files a/src/site/resources/images/rugged-architecture.odg and b/src/site/resources/images/rugged-architecture.odg differ
diff --git a/src/site/resources/images/rugged-architecture.png b/src/site/resources/images/rugged-architecture.png
index d0304d24a51fe6806cba404af5f64a6380b9c14a..70458ba77935fc4ca3828cad54f5aa9f587afcb4 100644
Binary files a/src/site/resources/images/rugged-architecture.png and b/src/site/resources/images/rugged-architecture.png differ
diff --git a/src/site/resources/images/rugged-logo-small.jpg b/src/site/resources/images/rugged-logo-small.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..199352c7786c4eda30b106a28ce43268fbcd86b5
Binary files /dev/null and b/src/site/resources/images/rugged-logo-small.jpg differ
diff --git a/src/site/resources/images/rugged-logo.jpg b/src/site/resources/images/rugged-logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..52ced7407785c22025d63dc6cc0724565ea53fc2
Binary files /dev/null and b/src/site/resources/images/rugged-logo.jpg differ
diff --git a/src/site/resources/images/rugged-logo.png b/src/site/resources/images/rugged-logo.png
deleted file mode 100644
index 16ced1419a788f1026ffc0fb4482f19bd71edbe4..0000000000000000000000000000000000000000
Binary files a/src/site/resources/images/rugged-logo.png and /dev/null differ
diff --git a/src/site/site.xml b/src/site/site.xml
index 1f4bfe373ce62cad26c9e951215ca5caa91efbc3..f17381caa7d3eaa620ae7e6e78268755de800c50 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2013-2019 CS Systèmes d'Information
+ Copyright 2013-2022 CS GROUP
Licensed 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
@@ -15,13 +15,13 @@
-->
<project name="Rugged">
<bannerLeft>
- <name>CS Systèmes d'Information</name>
- <src>/images/logo_cs_2008_baseline_ang.jpg</src>
- <href>http://www.c-s.fr/</href>
+ <name>CS GROUP</name>
+ <src>/images/logo_cs_group.png</src>
+ <href>https://www.csgroup.eu/</href>
</bannerLeft>
<bannerRight>
<name>Rugged</name>
- <src>/images/rugged-logo.png</src>
+ <src>/images/rugged-logo-small.jpg</src>
<href>/index.html</href>
</bannerRight>
<body>
@@ -31,28 +31,30 @@
<item name="Building" href="/building.html" />
<item name="Configuration" href="/configuration.html" />
<item name="FAQ" href="/faq.html" />
- <item name="License" href="/licenses.html" />
+ <item name="License" href="/licenses.html" />
<item name="Downloads" href="/downloads.html" />
<item name="Changes" href="/changes-report.html" />
<item name="Contact" href="/contact.html" />
</menu>
<menu name="Design">
- <item name="Overview" href="/design/overview.html" />
- <item name="Technical choices" href="/design/technical-choices.html" />
- <item name="Digital Elevation Model" href="/design/digital-elevation-model.html" />
- <item name="Design" href="/design/design.html" />
+ <item name="Overview" href="/design/overview.html" />
+ <item name="Technical choices" href="/design/technical-choices.html" />
+ <item name="Digital Elevation Model" href="/design/digital-elevation-model.html" />
+ <item name="Design of the major functions" href="/design/design-major-functions.html" />
</menu>
<menu name="Tutorials">
<item name="Direct location" href="/tutorials/direct-location.html" />
<item name="Direct location with DEM" href="/tutorials/direct-location-with-DEM.html" />
<item name="Inverse location" href="/tutorials/inverse-location.html" />
+ <item name="Tile updater example" href="/tutorials/tile-updater.html" />
<item name="Matlab examples" href="/tutorials/matlab-example.html" />
</menu>
<menu name="Development">
<item name="Contributing" href="/contributing.html" />
<item name="Guidelines" href="/guidelines.html" />
<item name="Javadoc" href="/apidocs/index.html" />
- </menu>
+ <item name="Release guide" href="/release-guide.html" />
+ </menu>
<menu ref="reports"/>
</body>
<poweredBy>
diff --git a/src/test/java/org/orekit/rugged/TestUtils.java b/src/test/java/org/orekit/rugged/TestUtils.java
index 1c8c97e2353361f59c4033f78154f2ac7e4992aa..fa0f3400a6737def026a538a0be68269b5730747 100644
--- a/src/test/java/org/orekit/rugged/TestUtils.java
+++ b/src/test/java/org/orekit/rugged/TestUtils.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -38,7 +38,7 @@ import org.orekit.bodies.BodyShape;
import org.orekit.bodies.CelestialBodyFactory;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.forces.gravity.HolmesFeatherstoneAttractionModel;
import org.orekit.forces.gravity.ThirdBodyAttraction;
import org.orekit.forces.gravity.potential.GravityFieldFactory;
@@ -58,7 +58,6 @@ import org.orekit.propagation.Propagator;
import org.orekit.propagation.SpacecraftState;
import org.orekit.propagation.analytical.KeplerianPropagator;
import org.orekit.propagation.numerical.NumericalPropagator;
-import org.orekit.propagation.sampling.OrekitFixedStepHandler;
import org.orekit.propagation.semianalytical.dsst.utilities.JacobiPolynomials;
import org.orekit.propagation.semianalytical.dsst.utilities.NewcombOperators;
import org.orekit.rugged.linesensor.SensorPixel;
@@ -107,8 +106,8 @@ public class TestUtils {
TimeScalesFactory.clearUTCTAIOffsetsLoaders();
GravityFieldFactory.clearPotentialCoefficientsReaders();
GravityFieldFactory.clearOceanTidesReaders();
- DataProvidersManager.getInstance().clearProviders();
- DataProvidersManager.getInstance().clearLoadedDataNames();
+ DataContext.getDefault().getDataProvidersManager().clearProviders();
+ DataContext.getDefault().getDataProvidersManager().clearLoadedDataNames();
}
/** Clean up of factory map
@@ -218,6 +217,8 @@ public class TestUtils {
// gravity.field.order = 12
AbsoluteDate date = new AbsoluteDate("2012-01-01T00:00:00.000", TimeScalesFactory.getUTC());
Frame eme2000 = FramesFactory.getEME2000();
+
+ // Observation satellite about 800km above ground
return new CircularOrbit(7173352.811913891,
-4.029194321683225E-4, 0.0013530362644647786,
FastMath.toRadians(98.63218182243709),
@@ -302,14 +303,10 @@ public class TestUtils {
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedPVCoordinates> list = new ArrayList<TimeStampedPVCoordinates>();
- propagator.setMasterMode(step, new OrekitFixedStepHandler() {
- public void handleStep(SpacecraftState currentState, boolean isLast) {
- list.add(new TimeStampedPVCoordinates(currentState.getDate(),
- currentState.getPVCoordinates().getPosition(),
- currentState.getPVCoordinates().getVelocity(),
- Vector3D.ZERO));
- }
- });
+ propagator.getMultiplexer().add(step, currentState -> list.add(new TimeStampedPVCoordinates(currentState.getDate(),
+ currentState.getPVCoordinates().getPosition(),
+ currentState.getPVCoordinates().getVelocity(),
+ Vector3D.ZERO)));
propagator.propagate(maxDate);
return list;
}
@@ -325,13 +322,9 @@ public class TestUtils {
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedAngularCoordinates> list = new ArrayList<TimeStampedAngularCoordinates>();
- propagator.setMasterMode(step, new OrekitFixedStepHandler() {
- public void handleStep(SpacecraftState currentState, boolean isLast) {
- list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
- currentState.getAttitude().getRotation(),
- Vector3D.ZERO, Vector3D.ZERO));
- }
- });
+ propagator.getMultiplexer().add(step, currentState -> list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
+ currentState.getAttitude().getRotation(),
+ Vector3D.ZERO, Vector3D.ZERO)));
propagator.propagate(maxDate);
return list;
}
diff --git a/src/test/java/org/orekit/rugged/adjustment/AdjustmentContextTest.java b/src/test/java/org/orekit/rugged/adjustment/AdjustmentContextTest.java
index aed3c818e5294399abedbf40e083359da72b2fc8..17dc22aa3cd6d2c36032273e1a2cbcb9f0bfd944 100644
--- a/src/test/java/org/orekit/rugged/adjustment/AdjustmentContextTest.java
+++ b/src/test/java/org/orekit/rugged/adjustment/AdjustmentContextTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/test/java/org/orekit/rugged/adjustment/InterSensorOptimizationProblemBuilderTest.java b/src/test/java/org/orekit/rugged/adjustment/InterSensorOptimizationProblemBuilderTest.java
index e6f9d0e4fd6419a359c07efa01670428b5a32516..32bd04330ca87563c141e46be3d9eb7e543d2d68 100644
--- a/src/test/java/org/orekit/rugged/adjustment/InterSensorOptimizationProblemBuilderTest.java
+++ b/src/test/java/org/orekit/rugged/adjustment/InterSensorOptimizationProblemBuilderTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/test/java/org/orekit/rugged/adjustment/util/InitGroundRefiningTest.java b/src/test/java/org/orekit/rugged/adjustment/util/InitGroundRefiningTest.java
index ce0739a6403b752c939c8f6bb10f313c3b39751d..fed94b8956ed4608b623294a659869d5411eff2f 100644
--- a/src/test/java/org/orekit/rugged/adjustment/util/InitGroundRefiningTest.java
+++ b/src/test/java/org/orekit/rugged/adjustment/util/InitGroundRefiningTest.java
@@ -12,7 +12,7 @@ import org.hipparchus.util.FastMath;
import org.junit.Assert;
import org.orekit.bodies.BodyShape;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.orbits.Orbit;
@@ -79,14 +79,14 @@ public class InitGroundRefiningTest {
try {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
// Initialize refining context
// ---------------------------
final String sensorName = "line";
- final double incidenceAngle = -5.0;
+ final double rollAngle = -5.0;
final String date = "2016-01-01T11:59:50.0";
- this.pleiadesViewingModel = new PleiadesViewingModel(sensorName, incidenceAngle, date);
+ this.pleiadesViewingModel = new PleiadesViewingModel(sensorName, rollAngle, date);
PleiadesOrbitModel orbitmodel = new PleiadesOrbitModel();
diff --git a/src/test/java/org/orekit/rugged/adjustment/util/InitInterRefiningTest.java b/src/test/java/org/orekit/rugged/adjustment/util/InitInterRefiningTest.java
index ecb5679fbd4889df6b4c5a5388bdae216bca04f5..2122b6556bd95c04594f56493fb789c98dbb4d01 100644
--- a/src/test/java/org/orekit/rugged/adjustment/util/InitInterRefiningTest.java
+++ b/src/test/java/org/orekit/rugged/adjustment/util/InitInterRefiningTest.java
@@ -8,6 +8,7 @@ import java.util.Arrays;
import java.util.List;
import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.analysis.differentiation.Gradient;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.random.GaussianRandomGenerator;
import org.hipparchus.random.UncorrelatedRandomVectorGenerator;
@@ -17,7 +18,7 @@ import org.junit.After;
import org.junit.Assert;
import org.orekit.bodies.BodyShape;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.orbits.Orbit;
@@ -33,7 +34,7 @@ import org.orekit.rugged.api.Rugged;
import org.orekit.rugged.api.RuggedBuilder;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.SensorPixel;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.AngularDerivativesFilter;
@@ -104,19 +105,19 @@ public class InitInterRefiningTest {
try {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
// Initialize refining context
// ---------------------------
final String sensorNameA = "SensorA";
- final double incidenceAngleA = -5.0;
+ final double rollAngleA = -5.0;
final String dateA = "2016-01-01T11:59:50.0";
- this.pleiadesViewingModelA = new PleiadesViewingModel(sensorNameA, incidenceAngleA, dateA);
+ this.pleiadesViewingModelA = new PleiadesViewingModel(sensorNameA, rollAngleA, dateA);
final String sensorNameB = "SensorB";
- final double incidenceAngleB = 0.0;
+ final double rollAngleB = 0.0;
final String dateB = "2016-01-01T12:02:50.0";
- this.pleiadesViewingModelB = new PleiadesViewingModel(sensorNameB, incidenceAngleB, dateB);
+ this.pleiadesViewingModelB = new PleiadesViewingModel(sensorNameB, rollAngleB, dateB);
PleiadesOrbitModel orbitmodelA = new PleiadesOrbitModel();
PleiadesOrbitModel orbitmodelB = new PleiadesOrbitModel();
@@ -268,11 +269,29 @@ public class InitInterRefiningTest {
* @param realPixelA real pixel from sensor A
* @param realPixelB real pixel from sensor B
* @return the distances of two real pixels computed between LOS and to the ground
+ * @deprecated as of 2.2, replaced by {@link #computeDistancesBetweenLOSGradient(SensorPixel, SensorPixel, double, double)}
*/
public DerivativeStructure[] computeDistancesBetweenLOSDerivatives(final SensorPixel realPixelA, final SensorPixel realPixelB,
- double losDistance, double earthDistance)
+ final double losDistance, final double earthDistance)
throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
-
+ final Gradient[] gradient = computeDistancesBetweenLOSGradient(realPixelA, realPixelB, losDistance, earthDistance);
+ final DerivativeStructure[] ds = new DerivativeStructure[gradient.length];
+ for (int i = 0; i < gradient.length; ++i) {
+ ds[i] = gradient[i].toDerivativeStructure();
+ }
+ return ds;
+ }
+
+ /** Compute the distances with derivatives between LOS of two real pixels (one from sensor A and one from sensor B)
+ * @param realPixelA real pixel from sensor A
+ * @param realPixelB real pixel from sensor B
+ * @return the distances of two real pixels computed between LOS and to the ground
+ * @since 2.2
+ */
+ public Gradient[] computeDistancesBetweenLOSGradient(final SensorPixel realPixelA, final SensorPixel realPixelB,
+ final double losDistance, final double earthDistance)
+ throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+
final SpacecraftToObservedBody scToBodyA = ruggedA.getScToBody();
final AbsoluteDate realDateA = lineSensorA.getDate(realPixelA.getLineNumber());
@@ -301,15 +320,14 @@ public class InitInterRefiningTest {
listLineSensor.addAll(ruggedA.getLineSensors());
listLineSensor.addAll(ruggedB.getLineSensors());
- DSGenerator generator = (DSGenerator) createGenerator.invoke(optimizationPbBuilder, listLineSensor);
+ @SuppressWarnings("unchecked")
+ DerivativeGenerator<Gradient> generator = (DerivativeGenerator<Gradient>) createGenerator.invoke(optimizationPbBuilder, listLineSensor);
- final DerivativeStructure[] distanceLOSwithDS = ruggedB.distanceBetweenLOSderivatives(
- lineSensorA, realDateA, realPixelA.getPixelNumber(),
- scToBodyA,
- lineSensorB, realDateB, realPixelB.getPixelNumber(),
- generator);
+ return ruggedB.distanceBetweenLOSderivatives(lineSensorA, realDateA, realPixelA.getPixelNumber(),
+ scToBodyA,
+ lineSensorB, realDateB, realPixelB.getPixelNumber(),
+ generator);
- return distanceLOSwithDS;
}
/** Generate noisy measurements (sensor to sensor mapping)
diff --git a/src/test/java/org/orekit/rugged/adjustment/util/PleiadesOrbitModel.java b/src/test/java/org/orekit/rugged/adjustment/util/PleiadesOrbitModel.java
index 5f76ebb808a0f108adb6a8eea66650655959c8e3..cca8dbc4d0a7e557a8f0ca387aeeab0826b79243 100644
--- a/src/test/java/org/orekit/rugged/adjustment/util/PleiadesOrbitModel.java
+++ b/src/test/java/org/orekit/rugged/adjustment/util/PleiadesOrbitModel.java
@@ -166,12 +166,11 @@ public class PleiadesOrbitModel {
propagator.propagate(minDate);
final List<TimeStampedPVCoordinates> list = new ArrayList<TimeStampedPVCoordinates>();
- propagator.setMasterMode(step,
- (currentState, isLast) ->
- list.add(new TimeStampedPVCoordinates(currentState.getDate(),
- currentState.getPVCoordinates().getPosition(),
- currentState.getPVCoordinates().getVelocity(),
- Vector3D.ZERO)));
+ propagator.getMultiplexer().add(step,
+ currentState -> list.add(new TimeStampedPVCoordinates(currentState.getDate(),
+ currentState.getPVCoordinates().getPosition(),
+ currentState.getPVCoordinates().getVelocity(),
+ Vector3D.ZERO)));
propagator.propagate(maxDate);
return list;
@@ -187,12 +186,11 @@ public class PleiadesOrbitModel {
propagator.setAttitudeProvider(createAttitudeProvider(earth, orbit));
propagator.propagate(minDate);
final List<TimeStampedAngularCoordinates> list = new ArrayList<>();
- propagator.setMasterMode(step,
- (currentState, isLast) ->
- list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
- currentState.getAttitude().getRotation(),
- Vector3D.ZERO,
- Vector3D.ZERO)));
+ propagator.getMultiplexer().add(step,
+ currentState -> list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
+ currentState.getAttitude().getRotation(),
+ Vector3D.ZERO,
+ Vector3D.ZERO)));
propagator.propagate(maxDate);
return list;
diff --git a/src/test/java/org/orekit/rugged/adjustment/util/PleiadesViewingModel.java b/src/test/java/org/orekit/rugged/adjustment/util/PleiadesViewingModel.java
index ab7561bbae3607b0ea22e914270572a1cf90c3c7..86f43bf1100c2c4cf1f300413d947d244526198e 100644
--- a/src/test/java/org/orekit/rugged/adjustment/util/PleiadesViewingModel.java
+++ b/src/test/java/org/orekit/rugged/adjustment/util/PleiadesViewingModel.java
@@ -28,21 +28,21 @@ public class PleiadesViewingModel {
private static final int DIMENSION = 40000;
private static final double LINE_PERIOD = 1.e-4;
- private double incidenceAngle;
+ private double rollAngle;
private LineSensor lineSensor;
private String referenceDate;
private String sensorName;
/** PleiadesViewingModel constructor.
* @param sensorName sensor name
- * @param incidenceAngle incidence angle
+ * @param rollAngle roll angle
* @param referenceDate reference date
*/
- public PleiadesViewingModel(final String sensorName, final double incidenceAngle, final String referenceDate) {
+ public PleiadesViewingModel(final String sensorName, final double rollAngle, final String referenceDate) {
this.sensorName = sensorName;
this.referenceDate = referenceDate;
- this.incidenceAngle = incidenceAngle;
+ this.rollAngle = rollAngle;
this.createLineSensor();
}
@@ -63,10 +63,12 @@ public class PleiadesViewingModel {
*/
public TimeDependentLOS buildLOS() {
- final LOSBuilder losBuilder = rawLOS(new Rotation(Vector3D.PLUS_I,
- FastMath.toRadians(incidenceAngle),
- RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
- Vector3D.PLUS_I, FastMath.toRadians(FOV / 2), DIMENSION);
+ // Roll angle applied to the LOS
+ // Compute the transformation of vector K (Z axis) through the rotation around I (X axis) with the roll angle
+ // If roll angle = 0: vector center = vector K (Z axis)
+ final LOSBuilder losBuilder = rawLOS(new Rotation(Vector3D.PLUS_I, FastMath.toRadians(rollAngle),
+ RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
+ Vector3D.PLUS_I, FastMath.toRadians(FOV / 2), DIMENSION);
losBuilder.addTransform(new FixedRotation(sensorName + InitInterRefiningTest.rollSuffix, Vector3D.MINUS_I, 0.00));
losBuilder.addTransform(new FixedRotation(sensorName + InitInterRefiningTest.pitchSuffix, Vector3D.MINUS_J, 0.00));
diff --git a/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java b/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java
index bce3be642ac73371c432a4c326badb470f0cd367..ef47fe0dd5d69ea3d1c325e90bc2f754b73ebf58 100644
--- a/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java
+++ b/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -46,7 +46,7 @@ import org.orekit.bodies.BodyShape;
import org.orekit.bodies.CelestialBodyFactory;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.forces.gravity.HolmesFeatherstoneAttractionModel;
import org.orekit.forces.gravity.ThirdBodyAttraction;
@@ -63,7 +63,6 @@ import org.orekit.propagation.Propagator;
import org.orekit.propagation.SpacecraftState;
import org.orekit.propagation.analytical.KeplerianPropagator;
import org.orekit.propagation.numerical.NumericalPropagator;
-import org.orekit.propagation.sampling.OrekitFixedStepHandler;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.linesensor.LineDatation;
@@ -99,7 +98,7 @@ public class RuggedBuilderTest {
throws URISyntaxException, NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
AbsoluteDate t0 = new AbsoluteDate("2012-01-01T00:00:00", TimeScalesFactory.getUTC());
List<TimeStampedPVCoordinates> pv = Arrays.asList(
@@ -166,6 +165,11 @@ public class RuggedBuilderTest {
Assert.assertEquals(RuggedMessages.UNINITIALIZED_CONTEXT, re.getSpecifier());
Assert.assertEquals("RuggedBuilder.setEllipsoid()", re.getParts()[0]);
}
+
+ Assert.assertTrue(builder.isOverlappingTiles());
+ builder.setOverlappingTiles(false);
+ Assert.assertTrue(!builder.isOverlappingTiles());
+
builder.setEllipsoid(EllipsoidId.GRS80, BodyRotatingFrameId.ITRF);
try {
builder.build();
@@ -315,7 +319,7 @@ public class RuggedBuilderTest {
throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
BodyShape earth = createEarth();
NormalizedSphericalHarmonicsProvider gravityField = createGravityField();
Orbit orbit = createOrbit(gravityField.getMu());
@@ -360,7 +364,7 @@ public class RuggedBuilderTest {
throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
AbsoluteDate t0 = new AbsoluteDate("2012-01-01T00:00:00", TimeScalesFactory.getUTC());
List<TimeStampedPVCoordinates> pv = Arrays.asList(
@@ -464,7 +468,7 @@ public class RuggedBuilderTest {
int dimension = 200;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = createEarth();
final Orbit orbit = createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -533,7 +537,7 @@ public class RuggedBuilderTest {
int dimension = 200;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = createEarth();
final Orbit orbit = createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -583,7 +587,7 @@ public class RuggedBuilderTest {
int dimension = 200;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = createEarth();
final Orbit orbit = createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -642,7 +646,7 @@ public class RuggedBuilderTest {
throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
// the following array is a real serialization file corresponding to the following
// made-up empty class that does not exist in Rugged:
@@ -825,14 +829,10 @@ public class RuggedBuilderTest {
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedPVCoordinates> list = new ArrayList<TimeStampedPVCoordinates>();
- propagator.setMasterMode(step, new OrekitFixedStepHandler() {
- public void handleStep(SpacecraftState currentState, boolean isLast) {
- list.add(new TimeStampedPVCoordinates(currentState.getDate(),
- currentState.getPVCoordinates().getPosition(),
- currentState.getPVCoordinates().getVelocity(),
- Vector3D.ZERO));
- }
- });
+ propagator.getMultiplexer().add(step, currentState -> list.add(new TimeStampedPVCoordinates(currentState.getDate(),
+ currentState.getPVCoordinates().getPosition(),
+ currentState.getPVCoordinates().getVelocity(),
+ Vector3D.ZERO)));
propagator.propagate(maxDate);
return list;
}
@@ -845,13 +845,9 @@ public class RuggedBuilderTest {
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedAngularCoordinates> list = new ArrayList<TimeStampedAngularCoordinates>();
- propagator.setMasterMode(step, new OrekitFixedStepHandler() {
- public void handleStep(SpacecraftState currentState, boolean isLast) {
- list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
- currentState.getAttitude().getRotation(),
- Vector3D.ZERO, Vector3D.ZERO));
- }
- });
+ propagator.getMultiplexer().add(step, currentState -> list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
+ currentState.getAttitude().getRotation(),
+ Vector3D.ZERO, Vector3D.ZERO)));
propagator.propagate(maxDate);
return list;
}
diff --git a/src/test/java/org/orekit/rugged/api/RuggedTest.java b/src/test/java/org/orekit/rugged/api/RuggedTest.java
index 0b2b555a2f79efde76578bd2ac73e2e828fc98e1..5c19b72cd724aed75241b1ce7eef7d8d1631b1b3 100644
--- a/src/test/java/org/orekit/rugged/api/RuggedTest.java
+++ b/src/test/java/org/orekit/rugged/api/RuggedTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -35,8 +35,8 @@ import java.util.List;
import java.util.Locale;
import org.hipparchus.analysis.differentiation.DSFactory;
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
import org.hipparchus.analysis.differentiation.FiniteDifferencesDifferentiator;
+import org.hipparchus.analysis.differentiation.Gradient;
import org.hipparchus.analysis.differentiation.UnivariateDifferentiableFunction;
import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.RotationConvention;
@@ -52,13 +52,14 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.orekit.bodies.BodyShape;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.forces.gravity.potential.NormalizedSphericalHarmonicsProvider;
import org.orekit.frames.Frame;
import org.orekit.frames.FramesFactory;
import org.orekit.orbits.Orbit;
+import org.orekit.propagation.EphemerisGenerator;
import org.orekit.propagation.Propagator;
import org.orekit.rugged.TestUtils;
import org.orekit.rugged.adjustment.GroundOptimizationProblemBuilder;
@@ -67,6 +68,7 @@ import org.orekit.rugged.adjustment.util.InitInterRefiningTest;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.IgnoreDEMAlgorithm;
+import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.linesensor.LineDatation;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.LinearLineDatation;
@@ -77,7 +79,9 @@ import org.orekit.rugged.los.TimeDependentLOS;
import org.orekit.rugged.raster.RandomLandscapeUpdater;
import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.raster.VolcanicConeElevationUpdater;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.refraction.AtmosphericRefraction;
+import org.orekit.rugged.utils.DerivativeGenerator;
+import org.orekit.rugged.utils.NormalizedGeodeticPoint;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.TimeScale;
import org.orekit.time.TimeScalesFactory;
@@ -106,7 +110,7 @@ public class RuggedTest {
int dimension = 2000;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
BodyShape earth = TestUtils.createEarth();
NormalizedSphericalHarmonicsProvider gravityField = TestUtils.createGravityField();
Orbit orbit = TestUtils.createOrbit(gravityField.getMu());
@@ -136,9 +140,9 @@ public class RuggedTest {
Propagator propagator = TestUtils.createPropagator(earth, gravityField, orbit);
propagator.propagate(lineDatation.getDate(firstLine).shiftedBy(-1.0));
- propagator.setEphemerisMode();
+ final EphemerisGenerator generator = propagator.getEphemerisGenerator();
propagator.propagate(lineDatation.getDate(lastLine).shiftedBy(+1.0));
- Propagator ephemeris = propagator.getGeneratedEphemeris();
+ Propagator ephemeris = generator.getGeneratedEphemeris();
Rugged rugged = new RuggedBuilder().
setDigitalElevationModel(updater, 8).
@@ -196,7 +200,7 @@ public class RuggedTest {
int dimension = 400;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -274,7 +278,7 @@ public class RuggedTest {
int dimension = 400;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -331,7 +335,7 @@ public class RuggedTest {
int dimension = 200;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -393,7 +397,7 @@ public class RuggedTest {
int dimension = 200;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -451,7 +455,7 @@ public class RuggedTest {
int dimension = 200;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -512,7 +516,7 @@ public class RuggedTest {
int dimension = 200;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -577,7 +581,7 @@ public class RuggedTest {
int nbSensors = 3;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -708,7 +712,7 @@ public class RuggedTest {
public void testInverseLocNearLineEnd() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
Vector3D offset = Vector3D.ZERO;
TimeScale gps = TimeScalesFactory.getGPS();
Frame eme2000 = FramesFactory.getEME2000();
@@ -810,7 +814,7 @@ public class RuggedTest {
public void testInverseLoc() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
Vector3D offset = Vector3D.ZERO;
TimeScale gps = TimeScalesFactory.getGPS();
Frame eme2000 = FramesFactory.getEME2000();
@@ -879,6 +883,17 @@ public class RuggedTest {
LinearLineDatation lineDatation = new LinearLineDatation(absDate, 0.03125d, 19.95565693384045);
LineSensor lineSensor = new LineSensor("QUICK_LOOK", lineDatation, offset,
new LOSBuilder(lineOfSight).build());
+
+ // in order not to have a problem when calling the pixelIsInside method (AtmosphericRefraction must be not null)
+ AtmosphericRefraction atmos = new AtmosphericRefraction() {
+ @Override
+ public NormalizedGeodeticPoint applyCorrection(Vector3D satPos, Vector3D satLos,
+ NormalizedGeodeticPoint rawIntersection, IntersectionAlgorithm algorithm) {
+ return rawIntersection;
+ }
+ };
+ atmos.deactivateComputation();
+
Rugged rugged = new RuggedBuilder().
setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID).
setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF).
@@ -888,6 +903,7 @@ public class RuggedTest {
satellitePVList, 6, CartesianDerivativesFilter.USE_P,
satelliteQList, 8, AngularDerivativesFilter.USE_R).
addLineSensor(lineSensor).
+ setRefractionCorrection(atmos).
build();
GeodeticPoint[] temp = rugged.directLocation("QUICK_LOOK", -250);
@@ -904,6 +920,28 @@ public class RuggedTest {
Assert.assertNotNull(sensorPixel);
+ Assert.assertFalse(inside(rugged, null, lineSensor));
+ Assert.assertFalse(inside(rugged, new SensorPixel(-100, -100), lineSensor));
+ Assert.assertFalse(inside(rugged, new SensorPixel(-100, +100), lineSensor));
+ Assert.assertFalse(inside(rugged, new SensorPixel(+100, -100), lineSensor));
+ Assert.assertFalse(inside(rugged, new SensorPixel(+100, +100), lineSensor));
+ Assert.assertTrue(inside(rugged, new SensorPixel(0.2, 0.3), lineSensor));
+
+ }
+
+ private boolean inside(final Rugged rugged, final SensorPixel sensorPixel, LineSensor lineSensor) {
+ try {
+ final Method inside =
+ Rugged.class.getDeclaredMethod("pixelIsInside",
+ SensorPixel.class,
+ LineSensor.class);
+ inside.setAccessible(true);
+ return ((Boolean) inside.invoke(rugged, sensorPixel, lineSensor)).booleanValue();
+ } catch (NoSuchMethodException | IllegalAccessException |
+ IllegalArgumentException | InvocationTargetException e) {
+ Assert.fail(e.getLocalizedMessage());
+ return false;
+ }
}
@Test
@@ -911,7 +949,7 @@ public class RuggedTest {
throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -967,7 +1005,7 @@ public class RuggedTest {
throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -1081,7 +1119,7 @@ public class RuggedTest {
public void testInverseLocationDerivativesWithAllCorrections()
{
doTestInverseLocationDerivatives(2000, true, true,
- 3.0e-10, 5.0e-10, 2.0e-12, 7.0e-8);
+ 7.0e-10, 5.0e-10, 2.0e-12, 7.0e-8);
}
/**
@@ -1104,7 +1142,7 @@ public class RuggedTest {
try {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -1170,7 +1208,8 @@ public class RuggedTest {
java.lang.reflect.Method getGenerator = GroundOptimizationProblemBuilder.class.getSuperclass().getDeclaredMethod("getGenerator");
getGenerator.setAccessible(true);
- DSGenerator generator = (DSGenerator) getGenerator.invoke(optimizationPbBuilder);
+ @SuppressWarnings("unchecked")
+ DerivativeGenerator<Gradient> generator = (DerivativeGenerator<Gradient>) getGenerator.invoke(optimizationPbBuilder);
double referenceLine = 0.87654 * dimension;
GeodeticPoint[] gp = rugged.directLocation("line", referenceLine);
@@ -1178,13 +1217,13 @@ public class RuggedTest {
Method inverseLoc = Rugged.class.getDeclaredMethod("inverseLocationDerivatives",
String.class, GeodeticPoint.class,
Integer.TYPE, Integer.TYPE,
- DSGenerator.class);
+ DerivativeGenerator.class);
inverseLoc.setAccessible(true);
int referencePixel = (3 * dimension) / 4;
- DerivativeStructure[] result =
- (DerivativeStructure[]) inverseLoc.invoke(rugged,
- "line", gp[referencePixel], 0, dimension,
- generator);
+ Gradient[] result =
+ (Gradient[]) inverseLoc.invoke(rugged,
+ "line", gp[referencePixel], 0, dimension,
+ generator);
Assert.assertEquals(referenceLine, result[0].getValue(), lineTolerance);
Assert.assertEquals(referencePixel, result[1].getValue(), pixelTolerance);
Assert.assertEquals(2, result[0].getFreeParameters());
@@ -1245,7 +1284,7 @@ public class RuggedTest {
throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -1324,7 +1363,7 @@ public class RuggedTest {
throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
AbsoluteDate crossing = new AbsoluteDate("2012-01-01T12:30:00.000", TimeScalesFactory.getUTC());
@@ -1388,27 +1427,27 @@ public class RuggedTest {
// Expected derivatives for
// minimum distance between LOS
- double[] expectedDminDerivatives = {3.88800245, -153874.01319097, -678866.03112033, 191294.06938169, 668600.16715270} ;
+ double[] expectedDminDerivatives = {-153874.01319097, -678866.03112033, 191294.06938169, 668600.16715270} ;
// minimum distance to the ground
- double[] expectedDcentralBodyDerivatives = {6368020.55910153, 7007767.46926062, -1577060.82402054, -6839286.39593802, 1956452.66636262};
+ double[] expectedDcentralBodyDerivatives = {7007767.46926062, -1577060.82402054, -6839286.39593802, 1956452.66636262};
- DerivativeStructure[] distancesBetweenLOSwithDS = refiningTest.computeDistancesBetweenLOSDerivatives(realPixelA, realPixelB, expectedDistanceBetweenLOS, expectedDistanceToTheGround);
+ Gradient[] distancesBetweenLOSGradient = refiningTest.computeDistancesBetweenLOSGradient(realPixelA, realPixelB, expectedDistanceBetweenLOS, expectedDistanceToTheGround);
// Minimum distance between LOS
- DerivativeStructure dMin = distancesBetweenLOSwithDS[0];
+ Gradient dMin = distancesBetweenLOSGradient[0];
// Minimum distance to the ground
- DerivativeStructure dCentralBody = distancesBetweenLOSwithDS[1];
+ Gradient dCentralBody = distancesBetweenLOSGradient[1];
Assert.assertEquals(expectedDistanceBetweenLOS, dMin.getValue(), 1.e-8);
Assert.assertEquals(expectedDistanceToTheGround, dCentralBody.getValue() , 1.e-5);
- for (int i = 0; i < dMin.getAllDerivatives().length; i++) {
- Assert.assertEquals(expectedDminDerivatives[i], dMin.getAllDerivatives()[i], 1.e-8);
+ for (int i = 0; i < dMin.getFreeParameters(); i++) {
+ Assert.assertEquals(expectedDminDerivatives[i], dMin.getPartialDerivative(i), 1.e-8);
}
- for (int i = 0; i < dCentralBody.getAllDerivatives().length; i++) {
- Assert.assertEquals(expectedDcentralBodyDerivatives[i], dCentralBody.getAllDerivatives()[i], 1.e-8);
+ for (int i = 0; i < dCentralBody.getFreeParameters(); i++) {
+ Assert.assertEquals(expectedDcentralBodyDerivatives[i], dCentralBody.getPartialDerivative(i), 3.e-8);
}
}
@@ -1418,7 +1457,7 @@ public class RuggedTest {
int dimension = 400;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -1464,6 +1503,9 @@ public class RuggedTest {
// Get the algorithm
assertTrue(rugged.getAlgorithm().getClass().isInstance(new IgnoreDEMAlgorithm()));
+ // Get the algorithm Id
+ assertEquals(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID, rugged.getAlgorithmId());
+
// Change the min and max line in inverse location to update the SensorMeanPlaneCrossing when the planeCrossing is not null
int minLine = firstLine;
int maxLine = lastLine;
diff --git a/src/test/java/org/orekit/rugged/errors/DumpManagerTest.java b/src/test/java/org/orekit/rugged/errors/DumpManagerTest.java
index a4b626afdf60bee541a3d1c59fe69af29c389fa6..9901b2fcdc3ab8974f9dbb94390ca062386ba5a3 100644
--- a/src/test/java/org/orekit/rugged/errors/DumpManagerTest.java
+++ b/src/test/java/org/orekit/rugged/errors/DumpManagerTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -33,7 +33,7 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.orekit.bodies.BodyShape;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.orbits.Orbit;
import org.orekit.rugged.TestUtils;
@@ -150,7 +150,7 @@ public class DumpManagerTest {
int dimension = 200;
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -234,9 +234,7 @@ public class DumpManagerTest {
@Test
public void testWriteError() throws URISyntaxException, IOException {
try {
- File dump = tempFolder.newFile();
- dump.setReadOnly();
- DumpManager.activate(dump);
+ DumpManager.activate(tempFolder.getRoot());
Assert.fail("an exception should have been thrown");
} catch (RuggedException re) {
Assert.assertEquals(RuggedMessages.DEBUG_DUMP_ACTIVATION_ERROR, re.getSpecifier());
diff --git a/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java b/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java
index 9b2bca87bbc5353708f772a1c8b8037711c706e5..a19b2e4cd29d1aa1334d451cd0952f85c3305ca5 100644
--- a/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java
+++ b/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -17,27 +17,46 @@
package org.orekit.rugged.errors;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
+import org.hipparchus.analysis.differentiation.DSFactory;
+import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.rugged.api.Rugged;
import org.orekit.rugged.linesensor.SensorPixel;
+import org.orekit.rugged.refraction.MultiLayerModel;
+import org.orekit.rugged.utils.DerivativeGenerator;
+import org.orekit.time.AbsoluteDate;
+import org.orekit.time.TimeScalesFactory;
+import org.orekit.utils.ParameterDriver;
public class DumpReplayerTest {
@@ -48,7 +67,7 @@ public class DumpReplayerTest {
public void testDirectLoc01() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
String dumpPath = getClass().getClassLoader().getResource("replay/replay-direct-loc-01.txt").toURI().getPath();
DumpReplayer replayer = new DumpReplayer();
@@ -71,7 +90,7 @@ public class DumpReplayerTest {
public void testDirectLoc02() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
String dumpPath = getClass().getClassLoader().getResource("replay/replay-direct-loc-02.txt").toURI().getPath();
DumpReplayer replayer = new DumpReplayer();
@@ -94,7 +113,7 @@ public class DumpReplayerTest {
public void testDirectLoc03() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
String dumpPath = getClass().getClassLoader().getResource("replay/replay-direct-loc-03.txt").toURI().getPath();
DumpReplayer replayer = new DumpReplayer();
@@ -117,7 +136,7 @@ public class DumpReplayerTest {
public void testDirectLoc04() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
String dumpPath = getClass().getClassLoader().getResource("replay/replay-direct-loc-04.txt").toURI().getPath();
File dump = tempFolder.newFile();
@@ -144,11 +163,38 @@ public class DumpReplayerTest {
}
+ @Test
+ public void testDirectLocNull() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+
+ // Create a dump file with NULL result for direct location
+ createDataForCreateRugged(bw);
+ bw.write("direct location: date 2012-01-01T12:29:30.85Z position 0.0e+00 0.0e+00 0.0e+00 " +
+ "los -2.2e-02 -9.1e-02 9.9e-01 lightTime false aberration false refraction false");
+ bw.newLine();
+ bw.write("direct location result: NULL");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(tempFile);
+ Rugged rugged = replayer.createRugged();
+ DumpReplayer.Result[] results = replayer.execute(rugged);
+
+ assertTrue(results[0].getExpected() == null);
+ tempFile.delete();
+ }
+
@Test
public void testInverseLoc01() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
String dumpPath = getClass().getClassLoader().getResource("replay/replay-inverse-loc-01.txt").toURI().getPath();
DumpReplayer replayer = new DumpReplayer();
@@ -170,7 +216,7 @@ public class DumpReplayerTest {
public void testInverseLoc02() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
String dumpPath = getClass().getClassLoader().getResource("replay/replay-inverse-loc-02.txt").toURI().getPath();
DumpReplayer replayer = new DumpReplayer();
@@ -192,7 +238,7 @@ public class DumpReplayerTest {
public void testInverseLoc03() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
String dumpPath = getClass().getClassLoader().getResource("replay/replay-inverse-loc-03.txt").toURI().getPath();
DumpReplayer replayer = new DumpReplayer();
@@ -209,12 +255,36 @@ public class DumpReplayerTest {
}
}
+
+ @Test
+ public void testInverseLocNull() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+
+ // Create a dump file with NULL result for inverse location
+ createDataForInvLocResult(bw);
+ bw.write("inverse location result: NULL");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(tempFile);
+ Rugged rugged = replayer.createRugged();
+ DumpReplayer.Result[] results = replayer.execute(rugged);
+
+ assertTrue(results[0].getExpected() == null);
+ tempFile.delete();
+ }
@Test
public void testCorruptedFiles() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
File folder = new File(getClass().getClassLoader().getResource("replay/replay-direct-loc-01.txt").toURI().getPath()).getParentFile();
for (final File file : folder.listFiles()) {
@@ -261,12 +331,12 @@ public class DumpReplayerTest {
}
}
-
+
@Test
public void testDirectLocIssue376_01() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
String dumpPath = getClass().getClassLoader().getResource("replay/replay-direct-loc-Issue376-01.txt").toURI().getPath();
@@ -281,12 +351,12 @@ public class DumpReplayerTest {
rugged.getEllipsoid().transform(replayedGP));
Assert.assertEquals(0.0, distance, 1.0e-8);
}
-
+
@Test
public void testDirectLocIssue376_02() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
String dumpPath = getClass().getClassLoader().getResource("replay/replay-direct-loc-Issue376-02.txt").toURI().getPath();
@@ -301,12 +371,12 @@ public class DumpReplayerTest {
rugged.getEllipsoid().transform(replayedGP));
Assert.assertEquals(0.0, distance, 1.0e-8);
}
-
+
@Test
public void testDirectLocIssue376_03() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
String dumpPath = getClass().getClassLoader().getResource("replay/replay-direct-loc-Issue376-03.txt").toURI().getPath();
@@ -324,4 +394,324 @@ public class DumpReplayerTest {
}
}
+ @Test
+ public void testCreateRuggedWithAtmosphere() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+
+ // CreateRugged with atmospheric refraction
+ bw.write("direct location: date 2012-01-01T12:30:00.0Z position 1.5e+00 0.e+00 -2.e-01 "+
+ "los 0.e+00 -7.5e-01 6.5e-01 lightTime true aberration true refraction true");
+ bw.newLine();
+ createDataForCreateRugged(bw);
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(tempFile);
+ Rugged rugged = replayer.createRugged();
+
+ assertTrue(rugged.getRefractionCorrection().getClass().isInstance(new MultiLayerModel(rugged.getEllipsoid())));
+ tempFile.delete();
+ }
+
+ @Test
+ public void testCreateRuggedNoDEMdata() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+
+ // CreateRugged with atmospheric refraction
+ bw.write("direct location: date 2012-01-01T12:30:00.0Z position 1.5e+00 0.e+00 -2.e-01 "+
+ "los 0.e+00 -7.5e-01 6.5e-01 lightTime true aberration true refraction false");
+ bw.newLine();
+ createDataForCreateRugged(bw);
+ bw.write("algorithm: DUVENHAGE");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(tempFile);
+ Rugged rugged = replayer.createRugged();
+
+ try {
+ replayer.execute(rugged);
+ Assert.fail("an exception should have been thrown");
+ } catch (RuggedException re) {
+ // as the execution stops in the TilesCache: one must reset the DumpManager state
+ DumpManager.endNicely();
+ Assert.assertEquals(RuggedMessages.NO_DEM_DATA, re.getSpecifier());
+ }
+ tempFile.delete();
+ }
+
+ @Test
+ public void testLineParserBadKey() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+ // this empty line to ensure coverage
+ bw.write("");
+ bw.newLine();
+ // LineParser.parse: case bad key
+ bw.write("dummy : dummy");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ try {
+ replayer.parse(tempFile);
+ Assert.fail("an exception should have been thrown");
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.CANNOT_PARSE_LINE, re.getSpecifier());
+ Assert.assertEquals(2, ((Integer) re.getParts()[0]).intValue());
+ Assert.assertEquals(tempFile, re.getParts()[1]);
+ Assert.assertTrue(re.getParts()[2].toString().contains("dummy : dummy"));
+ }
+ tempFile.delete();
+ }
+
+ @Test
+ public void testLineParserEndColon() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+ // LineParser.parse: case colon at end of line
+ bw.write("direct location result:");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ try {
+ replayer.parse(tempFile);
+ Assert.fail("an exception should have been thrown");
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.CANNOT_PARSE_LINE, re.getSpecifier());
+ Assert.assertEquals(1, ((Integer) re.getParts()[0]).intValue());
+ Assert.assertEquals(tempFile, re.getParts()[1]);
+ }
+ tempFile.delete();
+ }
+
+ @Test
+ public void testLineParserNoColon() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+ // LineParser.parse case no colon
+ bw.write("sensorName s0 nbPixels 200 position 1.5e+00 0.0e+00 -2.0e-01");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ try {
+ replayer.parse(tempFile);
+ Assert.fail("an exception should have been thrown");
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.CANNOT_PARSE_LINE, re.getSpecifier());
+ Assert.assertEquals(1, ((Integer) re.getParts()[0]).intValue());
+ Assert.assertEquals(tempFile, re.getParts()[1]);
+ }
+ tempFile.delete();
+ }
+
+ @Test
+ public void testParsedSensorGetDateGetLineCoverage() throws URISyntaxException, ClassNotFoundException, InstantiationException,
+ IllegalAccessException, IllegalArgumentException,
+ InvocationTargetException, NoSuchMethodException, SecurityException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ // ParsedSensor inner class
+ Class<?> innerClass = Class.forName("org.orekit.rugged.errors.DumpReplayer$ParsedSensor");
+ Constructor<?>[] constructors = innerClass.getDeclaredConstructors();
+ constructors[0].setAccessible(true);
+ Object parsedSensor = constructors[0].newInstance("dummy");
+
+
+ Method getLine = innerClass.getDeclaredMethod("getLine", AbsoluteDate.class);
+ getLine.setAccessible(true);
+ Method getDate = innerClass.getDeclaredMethod("getDate", double.class);
+ getDate.setAccessible(true);
+ Method setDatation = innerClass.getDeclaredMethod("setDatation", double.class, AbsoluteDate.class);
+ setDatation.setAccessible(true);
+
+ // datation with only one data
+ AbsoluteDate date0 = new AbsoluteDate("2012-01-06T02:27:16.139", TimeScalesFactory.getUTC());
+ setDatation.invoke(parsedSensor, 100., date0);
+
+ AbsoluteDate date = date0.shiftedBy(5.);
+ double foundLine = (double) getLine.invoke(parsedSensor, date);
+ assertEquals(100., foundLine, 1.e-15);
+
+ double line = 105.;
+ AbsoluteDate foundDate = (AbsoluteDate) getDate.invoke(parsedSensor, line);
+ assertEquals("2012-01-06T02:27:16.139",foundDate.toString(TimeScalesFactory.getUTC()));
+
+ // add datations data
+ AbsoluteDate date1 = date0.shiftedBy(10.);
+ AbsoluteDate date2 = date1.shiftedBy(10.);
+
+ setDatation.invoke(parsedSensor, 120., date1);
+ setDatation.invoke(parsedSensor, 150., date2);
+ foundLine = (double) getLine.invoke(parsedSensor, date);
+ assertEquals(110., foundLine, 1.e-15);
+
+ date = date2.shiftedBy(5.);
+ foundLine = (double) getLine.invoke(parsedSensor, date);
+ assertEquals(165., foundLine, 1.e-15);
+
+ date = date0.shiftedBy(-5.);
+ foundLine = (double) getLine.invoke(parsedSensor, date);
+ assertEquals(90., foundLine, 1.e-15);
+
+ }
+
+ @Test
+ public void testParsedSensorGetLOSCoverage() throws URISyntaxException, ClassNotFoundException, InstantiationException,
+ IllegalAccessException, IllegalArgumentException,
+ InvocationTargetException, NoSuchMethodException, SecurityException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ // ParsedSensor inner class
+ Class<?> innerClass = Class.forName("org.orekit.rugged.errors.DumpReplayer$ParsedSensor");
+ Constructor<?>[] constructors = innerClass.getDeclaredConstructors();
+ constructors[0].setAccessible(true);
+ Object parsedSensor = constructors[0].newInstance("dummy");
+
+ AbsoluteDate date = new AbsoluteDate("2012-01-06T02:27:16.139", TimeScalesFactory.getUTC());
+
+ // ParsedSensor.getLOS RunTimeException
+ Method getLos = innerClass.getDeclaredMethod("getLOS", int.class, AbsoluteDate.class);
+ getLos.setAccessible(true);
+ try {
+ getLos.invoke(parsedSensor, 1, date);
+ Assert.fail("an exception should have been thrown");
+ } catch (InvocationTargetException ite) {
+ RuggedInternalError rie = (RuggedInternalError) ite.getTargetException();
+ assertEquals(RuggedMessages.INTERNAL_ERROR, rie.getSpecifier());
+ assertEquals("https://gitlab.orekit.org/orekit/rugged/issues", rie.getParts()[0]);
+ assertTrue(rie.getMessage(Locale.FRENCH).startsWith("erreur interne"));
+ }
+ }
+
+ @Test
+ public void testParsedSensorLOSCoverage() throws URISyntaxException, ClassNotFoundException, InstantiationException,
+ IllegalAccessException, IllegalArgumentException,
+ InvocationTargetException, NoSuchMethodException, SecurityException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ // ParsedSensor inner class
+ Class<?> innerClass = Class.forName("org.orekit.rugged.errors.DumpReplayer$ParsedSensor");
+ Constructor<?>[] constructors = innerClass.getDeclaredConstructors();
+ constructors[0].setAccessible(true);
+ Object parsedSensor = constructors[0].newInstance("dummy");
+
+ AbsoluteDate date0 = new AbsoluteDate("2012-01-06T02:27:16.139", TimeScalesFactory.getUTC());
+ AbsoluteDate date = date0.shiftedBy(5.);
+ AbsoluteDate date1 = date0.shiftedBy(10.);
+ AbsoluteDate date2 = date1.shiftedBy(10.);
+
+ // ParsedSensor.setLos
+ Method setLos = innerClass.getDeclaredMethod("setLOS", AbsoluteDate.class, int.class, Vector3D.class);
+ setLos.setAccessible(true);
+ setLos.invoke(parsedSensor, date, 1, new Vector3D(0, 0, 0));
+ setLos.invoke(parsedSensor, date1, 100, new Vector3D(1, 1, 1));
+ setLos.invoke(parsedSensor, date2, 200, new Vector3D(2, 2, 2));
+ setLos.invoke(parsedSensor, date2.shiftedBy(10.), 200, new Vector3D(3, 3, 3));
+
+ // ParsedSensor.getLOSDerivatives
+ // Needs some LOS to be set
+ Method getLOSDerivatives = innerClass.getDeclaredMethod("getLOSDerivatives", int.class, AbsoluteDate.class, DerivativeGenerator.class);
+ getLOSDerivatives.setAccessible(true);
+
+ final DSFactory factory = new DSFactory(1, 1);
+ DerivativeGenerator<DerivativeStructure> generator = new DerivativeGenerator<DerivativeStructure>() {
+ @Override
+ public List<ParameterDriver> getSelected() {
+ return null;
+ }
+ @Override
+ public DerivativeStructure constant(final double value) {
+ return factory.constant(value);
+ }
+ @Override
+ public DerivativeStructure variable(final ParameterDriver driver) {
+ return null;
+ }
+ };
+ @SuppressWarnings("unchecked")
+ FieldVector3D<DerivativeStructure> fv= (FieldVector3D<DerivativeStructure>) getLOSDerivatives.invoke(parsedSensor, 1, date, generator);
+ assertEquals(0., fv.getX().getValue(), 1.e-15);
+ assertEquals(0., fv.getY().getValue(), 1.e-15);
+ assertEquals(0., fv.getZ().getValue(), 1.e-15);
+
+
+ // ParsedSensor.getParametersDrivers
+ Method getParametersDrivers = innerClass.getDeclaredMethod("getParametersDrivers");
+ getParametersDrivers.setAccessible(true);
+
+ getParametersDrivers.invoke(parsedSensor);
+ }
+
+ private void createDataForCreateRugged(BufferedWriter bw) throws IOException {
+
+ bw.write("ellipsoid: ae 6.378137e+06 f 3.35e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP");
+ bw.newLine();
+ bw.write("span: minDate 2012-01-01T12:29:00.85Z maxDate 2012-01-01T12:30:00.15Z " +
+ "tStep 1.e-03 tolerance 5.e+00 inertialFrame EME2000");
+ bw.newLine();
+ bw.write("transform: index 150 body r -8.0e-01 -3.4e-04 4.8e-04 -5.8e-01 Ω -8.7e-08 1.2e-09 -7.3e-05 " +
+ "ΩDot -1.6e-16 8.9e-17 1.9e-19 spacecraft p 1.3e+04 3.1e+03 -7.1e+06 v -3.1e+01 -8.0e+00 8.2e+00 " +
+ "a -9.3e-01 -8.3e+00 1.3e-03 r -6.8e-01 4.1e-01 -3.8e-01 4.6e-01 Ω -1.e-03 1.9e-04 1.6e-04 " +
+ "ΩDot -3.6e-07 2.0e-07 -1.2e-06");
+ bw.newLine();
+ }
+
+ private void createDataForInvLocResult(BufferedWriter bw) throws IOException {
+
+ bw.write("inverse location: sensorName s0 latitude 1.4e+00 longitude -8.8e-01 elevation 3.1e+01 minLine -23040 maxLine 39851 " +
+ "lightTime false aberration false refraction false");
+ bw.newLine();
+ bw.write("ellipsoid: ae 6.378e+06 f 3.35e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP");
+ bw.newLine();
+ bw.write("span: minDate 2015-07-07T18:38:55.0Z maxDate 2015-07-07T18:40:35.8Z tStep 1.e-01 tolerance 1.e+01 inertialFrame EME2000");
+ bw.newLine();
+ bw.write("transform: index 516 body r -2.2e-01 -7.3e-04 1.8e-04 -9.7e-01 Ω -1.1e-07 3.6e-09 -7.2e-05 " +
+ "ΩDot 0. 0. 0. spacecraft p -3.6e+02 -4.2e+02 -7.1e+06 v -7.4e+01 -3.4e+02 -1.8e-01 " +
+ "a 0. 0. 0. r -6.2e-02 7.4e-01 6.5e-01 4.1e-02 Ω 0. 0. 0. " +
+ "ΩDot 0. 0. 0.");
+ bw.newLine();
+ bw.write("sensor: sensorName s0 nbPixels 2552 position 0. 0. 0.");
+ bw.newLine();
+ bw.write("sensor mean plane: sensorName s0 minLine -23040 maxLine 39851 maxEval 50 accuracy 1.e-02 " +
+ "normal 9.e-01 -2.6e-02 1.8e-02 cachedResults 1 lineNumber 2.4e+04 date 2015-07-07T18:40:12.4Z " +
+ "target 5.8e+05 -7.1e+05 6.2e+06 targetDirection -1.5e-02 8.9e-02 9.9e-01 -2.0e-07 2.1e-08 -2.0e-07");
+ bw.newLine();
+ bw.write("sensor datation: sensorName s0 lineNumber 8.4e+03 date 2015-07-07T18:39:46.5Z");
+ bw.newLine();
+ bw.write("sensor rate: sensorName s0 lineNumber 2.4e+04 rate 6.3e+02");
+ bw.newLine();
+ }
}
diff --git a/src/test/java/org/orekit/rugged/errors/DumpTest.java b/src/test/java/org/orekit/rugged/errors/DumpTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..38c9790aca4425cfce0a392cd740072e64e0e8bc
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/errors/DumpTest.java
@@ -0,0 +1,158 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.errors;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.orekit.bodies.GeodeticPoint;
+import org.orekit.data.DataContext;
+import org.orekit.data.DirectoryCrawler;
+import org.orekit.frames.Frame;
+import org.orekit.frames.FramesFactory;
+import org.orekit.frames.Transform;
+import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.linesensor.SensorPixel;
+
+public class DumpTest {
+
+ @Rule
+ public TemporaryFolder tempFolder = new TemporaryFolder();
+
+ @Test
+ public void testGetKeyOrNameCoverage() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException, IOException {
+ File tempFile = tempFolder.newFile();
+ PrintWriter pw = new PrintWriter(tempFile, "UTF-8");
+ Dump dump = new Dump(pw);
+
+ Method getKeyOrName = dump.getClass().getDeclaredMethod("getKeyOrName", Frame.class);
+ getKeyOrName.setAccessible(true);
+
+ String dummyName = "dummy";
+ Frame frame = new Frame(FramesFactory.getEME2000(), Transform.IDENTITY, dummyName);
+
+ String foundName = (String) getKeyOrName.invoke(dump, frame);
+
+ assertTrue(foundName.equals(dummyName));
+ }
+
+ @Test
+ public void testInverseLocNull() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException, IOException {
+ File tempFile = tempFolder.newFile();
+ PrintWriter pw = new PrintWriter(tempFile, "UTF-8");
+ Dump dump = new Dump(pw);
+
+ Method dumpInverseLocationResult = dump.getClass().getDeclaredMethod("dumpInverseLocationResult", SensorPixel.class);
+ dumpInverseLocationResult.setAccessible(true);
+
+ SensorPixel px = null;
+ // just to ensure the test coverage
+ dumpInverseLocationResult.invoke(dump, px);
+
+ dump.deactivate();
+
+ // Check that the created file contains the line "inverse location result: NULL"
+ try (FileInputStream fis = new FileInputStream(tempFile);
+ InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8);
+ BufferedReader br = new BufferedReader(isr)) {
+ for (String line = br.readLine(); line != null; line = br.readLine()) {
+ final String trimmed = line.trim();
+ if (!(trimmed.length() == 0 || trimmed.startsWith("#"))) {
+ assertTrue(line.contains("inverse location result: NULL"));
+ }
+ }
+ }
+ }
+
+ @Test
+ public void testDirectLocNull() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException, IOException {
+ File tempFile = tempFolder.newFile();
+ PrintWriter pw = new PrintWriter(tempFile, "UTF-8");
+ Dump dump = new Dump(pw);
+
+ Method dumpDirectLocationResult = dump.getClass().getDeclaredMethod("dumpDirectLocationResult", GeodeticPoint.class);
+ dumpDirectLocationResult.setAccessible(true);
+
+ GeodeticPoint gp = null;
+ // just to ensure the coverage
+ dumpDirectLocationResult.invoke(dump, gp);
+ dump.deactivate();
+
+ // Check that the created file contains the line "inverse location result: NULL"
+ try (FileInputStream fis = new FileInputStream(tempFile);
+ InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8);
+ BufferedReader br = new BufferedReader(isr)) {
+ for (String line = br.readLine(); line != null; line = br.readLine()) {
+ final String trimmed = line.trim();
+ if (!(trimmed.length() == 0 || trimmed.startsWith("#"))) {
+ assertTrue(line.contains("direct location result: NULL"));
+ }
+ }
+ }
+ }
+
+ @Test
+ public void testSetMeanPlane() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException, IOException, URISyntaxException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ String dumpPath = getClass().getClassLoader().getResource("replay/replay-inverse-loc-02.txt").toURI().getPath();
+
+ // Regenerate a dump in order to write the "sensor mean plane: sensorName xxx lineNumber xxx targetDirection xxx targetDirection xxx ...."
+ File dummyDump = tempFolder.newFile();
+ DumpManager.activate(dummyDump);
+
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(new File(dumpPath));
+ Rugged rugged = replayer.createRugged();
+ replayer.execute(rugged);
+
+ DumpManager.deactivate();
+
+ // Check that the created dump contains the line " lineNumber xxx targetDirection xxx targetDirection xxx ...."
+ try (FileInputStream fis = new FileInputStream(dummyDump);
+ InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8);
+ BufferedReader br = new BufferedReader(isr)) {
+ for (String line = br.readLine(); line != null; line = br.readLine()) {
+ final String trimmed = line.trim();
+ if (!(trimmed.length() == 0 || trimmed.startsWith("#"))) {
+ if (line.contains("lineNumber ")&& line.contains("targetDirection ")) {
+ assertTrue(line.split("targetDirection").length == 6);
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/test/java/org/orekit/rugged/errors/RuggedExceptionTest.java b/src/test/java/org/orekit/rugged/errors/RuggedExceptionTest.java
index 8e837e8530f33ce4034f2738b59355fc8e2254d2..35ab40d43134c39c3eb7ebc987ecb8ba1dbe49d5 100644
--- a/src/test/java/org/orekit/rugged/errors/RuggedExceptionTest.java
+++ b/src/test/java/org/orekit/rugged/errors/RuggedExceptionTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -63,10 +63,18 @@ public class RuggedExceptionTest {
@Test
public void testInternalError() {
RuggedException re = new RuggedException(RuggedMessages.DUPLICATED_PARAMETER_NAME, "dummy");
- RuntimeException rte = RuggedException.createInternalError(re);
+ RuntimeException rte = new RuggedInternalError(re);
Assert.assertFalse(re.getLocalizedMessage().contains("https://gitlab.orekit.org/orekit/rugged/issues"));
Assert.assertTrue(rte.getLocalizedMessage().contains("https://gitlab.orekit.org/orekit/rugged/issues"));
Assert.assertTrue(rte.getMessage().contains("https://gitlab.orekit.org/orekit/rugged/issues"));
}
+ @Deprecated
+ @Test
+ public void testCoverage() {
+ RuggedExceptionWrapper rew = new RuggedExceptionWrapper(new RuggedException(RuggedMessages.DUPLICATED_PARAMETER_NAME, "dummy"));
+ RuggedException re = rew.getException();
+ Assert.assertEquals(RuggedMessages.DUPLICATED_PARAMETER_NAME, re.getSpecifier());
+ Assert.assertEquals("dummy", re.getParts()[0]);
+ }
}
diff --git a/src/test/java/org/orekit/rugged/errors/RuggedMessagesTest.java b/src/test/java/org/orekit/rugged/errors/RuggedMessagesTest.java
index af285d19e697ed5a7933d9fd358c242608ed134e..d70b430c3538f73ca391e0c409ade68b28283132 100644
--- a/src/test/java/org/orekit/rugged/errors/RuggedMessagesTest.java
+++ b/src/test/java/org/orekit/rugged/errors/RuggedMessagesTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -30,7 +30,7 @@ public class RuggedMessagesTest {
private final String[] LANGUAGES_LIST = { "da", "de", "en", "es", "fr", "gl", "it", "no", "ro" } ;
@Test
public void testMessageNumber() {
- Assert.assertEquals(33, RuggedMessages.values().length);
+ Assert.assertEquals(35, RuggedMessages.values().length);
}
@Test
@@ -96,6 +96,18 @@ public class RuggedMessagesTest {
}
}
+ @Test
+ public void testMissingLanguageMissingTranslation() {
+ Assert.assertEquals(RuggedMessages.INTERNAL_ERROR.getSourceString(),
+ RuggedMessages.INTERNAL_ERROR.getLocalizedString(Locale.KOREAN));
+ Assert.assertEquals(RuggedMessages.NO_DEM_DATA.getSourceString(),
+ RuggedMessages.NO_DEM_DATA.getLocalizedString(Locale.KOREAN));
+ Assert.assertEquals("ABCDEF {0}",
+ RuggedMessages.UNKNOWN_SENSOR.getLocalizedString(Locale.KOREAN));
+ Assert.assertEquals(RuggedMessages.EMPTY_TILE.getSourceString(),
+ RuggedMessages.EMPTY_TILE.getLocalizedString(Locale.KOREAN));
+ }
+
@Test
public void testVariablePartsConsistency() {
for (final String language : LANGUAGES_LIST) {
diff --git a/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
index 67eef7ba0960bc48d41b070fecd8eb13ce1c9dea..2e677d7cf9cddec63756e41efee36ff303944feb 100644
--- a/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -30,7 +30,7 @@ import org.junit.Before;
import org.junit.Test;
import org.orekit.attitudes.Attitude;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.frames.FramesFactory;
import org.orekit.frames.Transform;
@@ -50,7 +50,7 @@ import org.orekit.utils.PVCoordinates;
public abstract class AbstractAlgorithmTest {
- protected abstract IntersectionAlgorithm createAlgorithm(TileUpdater updater, int maxCachedTiles);
+ protected abstract IntersectionAlgorithm createAlgorithm(TileUpdater updater, int maxCachedTiles, boolean isOverlappingTiles);
@Test
public void testMayonVolcanoOnSubTileCorner() {
@@ -68,7 +68,7 @@ public abstract class AbstractAlgorithmTest {
final GeodeticPoint groundGP = new GeodeticPoint(latitude, longitude, altitude);
Vector3D groundP = earth.transform(groundGP);
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
// preliminary check: the point has been chosen in the spacecraft (YZ) plane
Transform earthToSpacecraft = new Transform(state.getDate(),
@@ -102,7 +102,7 @@ public abstract class AbstractAlgorithmTest {
final GeodeticPoint groundGP = new GeodeticPoint(latitude, longitude, altitude);
Vector3D groundP = earth.transform(groundGP);
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
// test direct location
Vector3D position = state.getPVCoordinates(earth.getBodyFrame()).getPosition();
@@ -129,7 +129,9 @@ public abstract class AbstractAlgorithmTest {
final GeodeticPoint groundGP = new GeodeticPoint(latitude, longitude, altitude);
Vector3D groundP = earth.transform(groundGP);
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
+ Assert.assertEquals( 0.0, algorithm.getElevation(latitude, longitude - 2.0e-5), 1.0e-6);
+ Assert.assertEquals(120.0, algorithm.getElevation(latitude, longitude + 2.0e-5), 1.0e-6);
// preliminary check: the point has been chosen in the spacecraft (YZ) plane
Transform earthToSpacecraft = new Transform(state.getDate(),
@@ -269,7 +271,7 @@ public abstract class AbstractAlgorithmTest {
public void setUp() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
earth = new ExtendedEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
Constants.WGS84_EARTH_FLATTENING,
FramesFactory.getITRF(IERSConventions.IERS_2010, true));
diff --git a/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
index a5bfe3a1a3cf8abe812a013ab9798a7f7368c36f..8418c83422a4767394320eb86c1219e3d87f7bda 100644
--- a/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -17,14 +17,22 @@
package org.orekit.rugged.intersection;
-import org.orekit.rugged.intersection.BasicScanAlgorithm;
-import org.orekit.rugged.intersection.IntersectionAlgorithm;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.raster.TileUpdater;
public class BasicScanAlgorithmTest extends AbstractAlgorithmTest {
- public IntersectionAlgorithm createAlgorithm(final TileUpdater updater, final int maxCachedTiles) {
- return new BasicScanAlgorithm(updater, maxCachedTiles);
+ public IntersectionAlgorithm createAlgorithm(final TileUpdater updater, final int maxCachedTiles, final boolean isOverlappingTiles) {
+ return new BasicScanAlgorithm(updater, maxCachedTiles, isOverlappingTiles);
}
+ @Test
+ public void testAlgorithmId() {
+ setUpMayonVolcanoContext();
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
+ assertEquals(AlgorithmId.BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY, algorithm.getAlgorithmId());
+ }
}
diff --git a/src/test/java/org/orekit/rugged/intersection/ConstantElevationAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/ConstantElevationAlgorithmTest.java
index a9360c60fcd29b9cd8aef268bb98a6db60b7da66..cd148cf2b867aee8672592a9c5c32fbd04a66969 100644
--- a/src/test/java/org/orekit/rugged/intersection/ConstantElevationAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/ConstantElevationAlgorithmTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -17,6 +17,8 @@
package org.orekit.rugged.intersection;
+import static org.junit.Assert.assertEquals;
+
import java.io.File;
import java.net.URISyntaxException;
@@ -28,11 +30,12 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.orekit.attitudes.Attitude;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.frames.FramesFactory;
import org.orekit.orbits.CartesianOrbit;
import org.orekit.propagation.SpacecraftState;
+import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.intersection.duvenhage.DuvenhageAlgorithm;
import org.orekit.rugged.raster.CheckedPatternElevationUpdater;
import org.orekit.rugged.raster.TileUpdater;
@@ -51,7 +54,7 @@ public class ConstantElevationAlgorithmTest {
final Vector3D los = new Vector3D(-0.626242839, 0.0124194184, -0.7795291301);
IntersectionAlgorithm duvenhage = new DuvenhageAlgorithm(new CheckedPatternElevationUpdater(FastMath.toRadians(1.0),
256, 150.0, 150.0),
- 8, false);
+ 8, false, true);
IntersectionAlgorithm constantElevation = new ConstantElevationAlgorithm(150.0);
NormalizedGeodeticPoint gpRef = duvenhage.intersection(earth, state.getPVCoordinates().getPosition(), los);
NormalizedGeodeticPoint gpConst = constantElevation.intersection(earth, state.getPVCoordinates().getPosition(), los);
@@ -96,11 +99,20 @@ public class ConstantElevationAlgorithmTest {
double elevation0 = ignore.getElevation(gpRef.getLatitude(), gpConst.getLatitude());
Assert.assertEquals(elevation0, 0.0, 1.e-15);
}
+
+ @Test
+ public void testAlgorithmId() {
+ IntersectionAlgorithm constantElevation = new ConstantElevationAlgorithm(0.0);
+ assertEquals(AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID, constantElevation.getAlgorithmId());
+
+ IntersectionAlgorithm ignore = new IgnoreDEMAlgorithm();
+ assertEquals(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID, ignore.getAlgorithmId());
+ }
@Before
public void setUp() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
earth = new ExtendedEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
Constants.WGS84_EARTH_FLATTENING,
FramesFactory.getITRF(IERSConventions.IERS_2010, true));
diff --git a/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
index 9a23632c14f3fba5cffb2bb51c264f8a79c5b3c5..09de20ae1d53c8ae5b593ef56f0d4235dd9fc2db 100644
--- a/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -19,6 +19,9 @@ package org.orekit.rugged.intersection.duvenhage;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
+
+import static org.junit.Assert.assertEquals;
+
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -27,6 +30,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.errors.OrekitException;
+import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.AbstractAlgorithmTest;
@@ -40,14 +44,14 @@ import org.orekit.rugged.utils.NormalizedGeodeticPoint;
public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
- protected IntersectionAlgorithm createAlgorithm(final TileUpdater updater, final int maxCachedTiles) {
- return new DuvenhageAlgorithm(updater, maxCachedTiles, false);
+ protected IntersectionAlgorithm createAlgorithm(final TileUpdater updater, final int maxCachedTiles, final boolean isOverlappingTiles) {
+ return new DuvenhageAlgorithm(updater, maxCachedTiles, false, isOverlappingTiles);
}
@Test
public void testNumericalIssueAtTileExit() {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
Vector3D los = new Vector3D( 0.5127552821932051, -0.8254313129088879, -0.2361041470463311);
GeodeticPoint intersection = algorithm.refineIntersection(earth, position, los,
@@ -58,7 +62,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
@Test
public void testCrossingBeforeLineSegmentStart() {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
Vector3D los = new Vector3D( 0.42804005978915904, -0.8670291034054828, -0.2550338037664377);
GeodeticPoint intersection = algorithm.refineIntersection(earth, position, los,
@@ -69,7 +73,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
@Test
public void testWrongPositionMissesGround() {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
Vector3D position = new Vector3D(7.551889113912788E9, -3.173692685491814E10, 1.5727517321541348E9);
Vector3D los = new Vector3D(0.010401349221417867, -0.17836068905951286, 0.9839101973923178);
try {
@@ -101,7 +105,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
}
}
};
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
try {
algorithm.intersection(earth,
new Vector3D(-3010311.9672771087, 5307094.8081077365, 1852867.7919871407),
@@ -114,7 +118,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
@Test
public void testPureEastWestLOS() {
updater = new CheckedPatternElevationUpdater(FastMath.toRadians(1.0),1201, 41.0, 1563.0);
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
NormalizedGeodeticPoint gp =
algorithm.intersection(earth,
new Vector3D(-3041185.154503948, 6486750.132281409, -32335.022880173332),
@@ -133,7 +137,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
updater.updateTile((3 * size) / 2, (3 * size) / 2, northTile);
MinMaxTreeTile southTile = new MinMaxTreeTileFactory().createTile();
updater.updateTile((-3 * size) / 2, (3 * size) / 2, southTile);
- IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
// line of sight in the South West corner
Assert.assertEquals(northTile.getMinimumLongitude() - 0.0625 * northTile.getLongitudeStep(),
@@ -191,6 +195,17 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
1.0e-6);
}
+
+ @Test
+ public void testAlgorithmId() {
+ setUpMayonVolcanoContext();
+
+ final IntersectionAlgorithm algorithm = new DuvenhageAlgorithm(updater, 8, false, true);
+ assertEquals(AlgorithmId.DUVENHAGE, algorithm.getAlgorithmId());
+
+ final IntersectionAlgorithm algorithmFlatBody = new DuvenhageAlgorithm(updater, 8, true, true);
+ assertEquals(AlgorithmId.DUVENHAGE_FLAT_BODY, algorithmFlatBody.getAlgorithmId());
+ }
private NormalizedGeodeticPoint findExit(IntersectionAlgorithm algorithm, Tile tile, Vector3D position, Vector3D los) {
diff --git a/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java b/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
index 78b87a5278febd633fa0bcb9d7fc9a27ec933008..dbd8778374cd89ed17c4e0782d09c7fbaa2c9b24 100644
--- a/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/test/java/org/orekit/rugged/linesensor/FixedRotationTest.java b/src/test/java/org/orekit/rugged/linesensor/FixedRotationTest.java
index 571c8ac85a1978a567dda09f599008838d56890f..5d69b5fd35921e20724f7f8dd520f97740e8e0ef 100644
--- a/src/test/java/org/orekit/rugged/linesensor/FixedRotationTest.java
+++ b/src/test/java/org/orekit/rugged/linesensor/FixedRotationTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -40,7 +40,7 @@ import org.junit.Test;
import org.orekit.rugged.los.FixedRotation;
import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.los.TimeDependentLOS;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.ParameterDriver;
@@ -158,7 +158,7 @@ public class FixedRotationTest {
driver.setSelected(true);
}
final DSFactory factoryS = new DSFactory(selected.size(), 1);
- DSGenerator generator = new DSGenerator() {
+ DerivativeGenerator<DerivativeStructure> generator = new DerivativeGenerator<DerivativeStructure>() {
/** {@inheritDoc} */
@Override
diff --git a/src/test/java/org/orekit/rugged/linesensor/PolynomialRotationTest.java b/src/test/java/org/orekit/rugged/linesensor/PolynomialRotationTest.java
index 7c095bfd2bef5ea8c373887400bc5db22143baa1..b14891f5087ff383efbda5607a00b5f514bbd717 100644
--- a/src/test/java/org/orekit/rugged/linesensor/PolynomialRotationTest.java
+++ b/src/test/java/org/orekit/rugged/linesensor/PolynomialRotationTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -21,10 +21,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
+import org.hipparchus.Field;
import org.hipparchus.analysis.UnivariateMatrixFunction;
import org.hipparchus.analysis.differentiation.DSFactory;
import org.hipparchus.analysis.differentiation.DerivativeStructure;
import org.hipparchus.analysis.differentiation.FiniteDifferencesDifferentiator;
+import org.hipparchus.analysis.differentiation.Gradient;
+import org.hipparchus.analysis.differentiation.GradientField;
import org.hipparchus.analysis.differentiation.UnivariateDifferentiableMatrixFunction;
import org.hipparchus.analysis.polynomials.PolynomialFunction;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
@@ -41,7 +44,7 @@ import org.junit.Test;
import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.los.PolynomialRotation;
import org.orekit.rugged.los.TimeDependentLOS;
-import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.ParameterDriver;
@@ -173,8 +176,8 @@ public class PolynomialRotationTest {
for (final ParameterDriver driver : selected) {
driver.setSelected(true);
}
- final DSFactory factoryS = new DSFactory(selected.size(), 1);
- DSGenerator generator = new DSGenerator() {
+ final GradientField field = GradientField.getField(selected.size());
+ DerivativeGenerator<Gradient> generator = new DerivativeGenerator<Gradient>() {
/** {@inheritDoc} */
@Override
@@ -184,23 +187,29 @@ public class PolynomialRotationTest {
/** {@inheritDoc} */
@Override
- public DerivativeStructure constant(final double value) {
- return factoryS.constant(value);
+ public Gradient constant(final double value) {
+ return Gradient.constant(selected.size(), value);
}
/** {@inheritDoc} */
@Override
- public DerivativeStructure variable(final ParameterDriver driver) {
+ public Gradient variable(final ParameterDriver driver) {
int index = 0;
for (ParameterDriver d : getSelected()) {
if (d == driver) {
- return factoryS.variable(index, driver.getValue());
+ return Gradient.variable(selected.size(), index, driver.getValue());
}
++index;
}
return constant(driver.getValue());
}
+ /** {@inheritDoc} */
+ @Override
+ public Field<Gradient> getField() {
+ return field;
+ }
+
};
Assert.assertEquals(7, generator.getSelected().size());
@@ -226,7 +235,7 @@ public class PolynomialRotationTest {
DerivativeStructure[][] mDS = f.value(factory11.variable(0, driver.getValue()));
for (int i = 0; i < raw.size(); ++i) {
Vector3D los = tdl.getLOS(i, date);
- FieldVector3D<DerivativeStructure> losDS = tdl.getLOSDerivatives(i, date, generator);
+ FieldVector3D<Gradient> losDS = tdl.getLOSDerivatives(i, date, generator);
Assert.assertEquals(los.getX(), losDS.getX().getValue(), 2.0e-15);
Assert.assertEquals(los.getY(), losDS.getY().getValue(), 2.0e-15);
Assert.assertEquals(los.getZ(), losDS.getZ().getValue(), 2.0e-15);
diff --git a/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java b/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java
index d80aa5d8805ef42cf844053b6bad383326dcbddf..753d103f0412d5986370dc00d694ccc6aac153a0 100644
--- a/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java
+++ b/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -36,7 +36,7 @@ import org.orekit.attitudes.YawCompensation;
import org.orekit.bodies.BodyShape;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.frames.FramesFactory;
import org.orekit.frames.Transform;
@@ -44,10 +44,10 @@ import org.orekit.orbits.CircularOrbit;
import org.orekit.orbits.Orbit;
import org.orekit.orbits.PositionAngle;
import org.orekit.propagation.Propagator;
-import org.orekit.propagation.SpacecraftState;
import org.orekit.propagation.analytical.KeplerianPropagator;
-import org.orekit.propagation.sampling.OrekitFixedStepHandler;
import org.orekit.rugged.TestUtils;
+import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.linesensor.SensorMeanPlaneCrossing.CrossingResult;
import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
@@ -148,8 +148,7 @@ public class SensorMeanPlaneCrossingTest {
private void doTestDerivative(boolean lightTimeCorrection,
boolean aberrationOfLightCorrection,
- double tol)
- {
+ double tol) {
final Vector3D position = new Vector3D(1.5, Vector3D.PLUS_I);
final Vector3D normal = Vector3D.PLUS_I;
@@ -202,8 +201,8 @@ public class SensorMeanPlaneCrossingTest {
Assert.assertTrue(result.getLine() - refLine > 1.9);
} else {
// the simple model from which reference results have been compute applies here
- Assert.assertEquals(refLine, result.getLine(), 7.0e-14 * refLine);
- Assert.assertEquals(0.0, result.getDate().durationFrom(refDate), 2.0e-13);
+ Assert.assertEquals(refLine, result.getLine(), 5.0e-11* refLine);
+ Assert.assertEquals(0.0, result.getDate().durationFrom(refDate), 1.0e-9);
Assert.assertEquals(0.0, Vector3D.angle(los.get(refPixel), result.getTargetDirection()), 5.4e-15);
}
@@ -217,6 +216,20 @@ public class SensorMeanPlaneCrossingTest {
Vector3D.distance(result.getTargetDirectionDerivative(), dirDer),
tol * dirDer.getNorm());
+ try {
+ mean.getScToBody().getBodyToInertial(refDate.shiftedBy(-Constants.JULIAN_CENTURY));
+ Assert.fail("an exception should have been thrown");
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.OUT_OF_TIME_RANGE, re.getSpecifier());
+ }
+ try {
+ mean.getScToBody().getBodyToInertial(refDate.shiftedBy(Constants.JULIAN_CENTURY));
+ Assert.fail("an exception should have been thrown");
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.OUT_OF_TIME_RANGE, re.getSpecifier());
+ }
+ Assert.assertNotNull(mean.getScToBody().getBodyToInertial(refDate));
+
}
@Test
@@ -316,14 +329,10 @@ public class SensorMeanPlaneCrossingTest {
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedPVCoordinates> list = new ArrayList<TimeStampedPVCoordinates>();
- propagator.setMasterMode(step, new OrekitFixedStepHandler() {
- public void handleStep(SpacecraftState currentState, boolean isLast) {
- list.add(new TimeStampedPVCoordinates(currentState.getDate(),
- currentState.getPVCoordinates().getPosition(),
- currentState.getPVCoordinates().getVelocity(),
- Vector3D.ZERO));
- }
- });
+ propagator.getMultiplexer().add(step, currentState -> list.add(new TimeStampedPVCoordinates(currentState.getDate(),
+ currentState.getPVCoordinates().getPosition(),
+ currentState.getPVCoordinates().getVelocity(),
+ Vector3D.ZERO)));
propagator.propagate(maxDate);
return list;
}
@@ -336,13 +345,9 @@ public class SensorMeanPlaneCrossingTest {
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedAngularCoordinates> list = new ArrayList<TimeStampedAngularCoordinates>();
- propagator.setMasterMode(step, new OrekitFixedStepHandler() {
- public void handleStep(SpacecraftState currentState, boolean isLast) {
- list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
- currentState.getAttitude().getRotation(),
- Vector3D.ZERO, Vector3D.ZERO));
- }
- });
+ propagator.getMultiplexer().add(step, currentState -> list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
+ currentState.getAttitude().getRotation(),
+ Vector3D.ZERO, Vector3D.ZERO)));
propagator.propagate(maxDate);
return list;
}
@@ -351,7 +356,7 @@ public class SensorMeanPlaneCrossingTest {
public void setUp() throws URISyntaxException {
TestUtils.clearFactories();
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
}
}
diff --git a/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
index f450c008ba370290e35c4d335ed8839a9403b928..7d5adbcff1bfa11a2923da6ab98b5ccf17d766dd 100644
--- a/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
index 0a5e9b9bc54d5275d4304dd8b2ac8cfceb573cfe..ad1a69036714f6882d692b19c299d479dc3c9a6b 100644
--- a/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/test/java/org/orekit/rugged/raster/CountingFactory.java b/src/test/java/org/orekit/rugged/raster/CountingFactory.java
index 7256f0e59f250cd23f4ca78f39bd1429419334c9..ad714f48a821df6bdaa50c5c39c1159a9008b4c2 100644
--- a/src/test/java/org/orekit/rugged/raster/CountingFactory.java
+++ b/src/test/java/org/orekit/rugged/raster/CountingFactory.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -16,10 +16,6 @@
*/
package org.orekit.rugged.raster;
-import org.orekit.rugged.raster.SimpleTile;
-import org.orekit.rugged.raster.SimpleTileFactory;
-import org.orekit.rugged.raster.TileFactory;
-
public class CountingFactory implements TileFactory<SimpleTile> {
private int count;
diff --git a/src/test/java/org/orekit/rugged/raster/DummySRTMsimpleElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/DummySRTMsimpleElevationUpdater.java
new file mode 100644
index 0000000000000000000000000000000000000000..39a07832ccf9bdd5bf2bdc9df6c7c601a15713cd
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/raster/DummySRTMsimpleElevationUpdater.java
@@ -0,0 +1,139 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.raster;
+
+import org.hipparchus.util.FastMath;
+import org.hipparchus.util.MathUtils;
+
+/**
+ * To simulate DEM SRTM3 V4.0 tiles (without the real data !)
+ * The tiles are seamless = no overlapping
+ *
+ * @author Guylaine Prat
+ */
+public class DummySRTMsimpleElevationUpdater implements TileUpdater {
+
+ /** SRTM tile size (deg) */
+ private double tileSizeDeg = 5.;
+
+ /** SRTM tile step (rad) */
+ private double stepRad;
+
+ /** SRTM tile number of rows and columns */
+ private int n;
+
+ /** Factor to change resolution above 60 degrees and below 60 degrees */
+ private int resolutionChange;
+
+ private double elevation1;
+ private double elevation2;
+
+ /**
+ * Constructor with dummy elevations to fill in the tile ...
+ * @param rowCol SRTM tile number of rows and column
+ * @param elevation1 chosen elevation1 (m)
+ * @param elevation2 chosen elevation2 (m)
+ * @param resolutionChange factor to change resolution at +/- 60 degrees
+ */
+ public DummySRTMsimpleElevationUpdater(final int rowCol, final double elevation1, final double elevation2, final int resolutionChange) {
+
+ this.n = rowCol;
+ this.stepRad = FastMath.toRadians(this.tileSizeDeg / this.n);
+ this.resolutionChange = resolutionChange;
+
+ this.elevation1 = elevation1;
+ this.elevation2 = elevation2;
+ }
+
+ /**
+ * Update the tile
+ * @param latitude latitude (rad)
+ * @param longitude longitude (rad)
+ * @param tile to be updated
+ */
+ public void updateTile(final double latitude, final double longitude, UpdatableTile tile) {
+
+ int numberOfStep;
+
+ // Change the tile step for latitude above 60 degrees and below 60 degrees
+ if (FastMath.toDegrees(latitude) > 60. || FastMath.toDegrees(latitude) < -60.) {
+ // step * resolutionChange for latitude > 60 or < -60
+ this.stepRad = FastMath.toRadians(this.tileSizeDeg*this.resolutionChange / this.n);
+ numberOfStep = this.n/this.resolutionChange;
+
+ } else { // step = tile size / n
+ this.stepRad = FastMath.toRadians(this.tileSizeDeg / this.n);
+ numberOfStep = this.n;
+ }
+
+ // Get the tile indices that contents the current latitude and longitude
+ int[] tileIndex = findIndexInTile(latitude, longitude);
+ double latIndex = tileIndex[0];
+ double lonIndex = tileIndex[1];
+
+ // Init the tile geometry with the Rugged convention:
+ // the minimum latitude and longitude correspond to the center of the most South-West cell,
+ // and the maximum latitude and longitude correspond to the center of the most North-East cell.
+ // For SRTM : origin latitude is at North of the tile (and latitude step is < 0)
+ double minLatitude = FastMath.toRadians(60. - latIndex*5.) + 0.5*stepRad;
+ double minLongitude = FastMath.toRadians(-180. + (lonIndex - 1)*5.) + 0.5*stepRad;
+
+ tile.setGeometry(minLatitude, minLongitude, stepRad, stepRad, numberOfStep, numberOfStep);
+
+ for (int i = 0; i < numberOfStep; ++i) {
+ int p = (int) FastMath.floor((FastMath.abs(minLatitude) + i * stepRad) / stepRad);
+ for (int j = 0; j < numberOfStep; ++j) {
+ int q = (int) FastMath.floor((FastMath.abs(minLongitude) + j * stepRad) / stepRad);
+ double factor = FastMath.sin(minLatitude + i*stepRad - (minLongitude + j*stepRad))*
+ FastMath.cos(minLatitude + i*stepRad + (minLongitude + j*stepRad));
+ tile.setElevation(i, j, (((p ^ q) & 0x1) == 0) ? factor*lonIndex*elevation1 + q : factor*latIndex*elevation2 + q*p);
+ }
+ }
+ }
+
+ /**
+ * Find tile indices that contain the given (latitude, longitude)
+ * @param latitude latitude (rad)
+ * @param longitude longitude (rad)
+ * @return array : [0] = latitude tile index and [1] = longitude tile index
+ */
+ private int[] findIndexInTile(final double latitude, final double longitude) {
+
+ double latDeg = FastMath.toDegrees(latitude);
+
+ // Assure that the longitude belongs to [-180, + 180]
+ double lonDeg = FastMath.toDegrees(MathUtils.normalizeAngle(longitude, 0.0));
+
+ // Compute longitude tile name with longitude value:
+ // For SRTM with 5 degrees tiles: tile longitude index 1 starts at 180 deg W; tile longitude index 72 starts at 175 deg E
+ int tileLongIndex = (int) (1 + (lonDeg + 180.)/5.);
+
+ // Compute latitude tile name with latitude value:
+ // For SRTM with 5 degrees tiles: tile latitude index 1 starts at 60 deg N; tile latitude index 23 starts at 50 deg S
+ int tileLatIndex = (int) (1 + (60. - latDeg)/5.);
+
+ return new int[] {tileLatIndex, tileLongIndex};
+ }
+
+ public double getTileStepDeg() {
+ return FastMath.toDegrees(this.stepRad);
+ }
+
+ public double getTileSizeDeg() {
+ return this.tileSizeDeg;
+ }
+}
diff --git a/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java b/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
index 0b29e0b8552be6bbd23deea2acacf0ae84a7d272..df3940dc8808fef86162d7f9246506ef9f6ee77a 100644
--- a/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java b/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
index ceea009d15237ab357a189734d03c1a57eeea58f..a40bbcaa7fa933d2babd220be9bc82ff78cad2d9 100644
--- a/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
+++ b/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -18,15 +18,14 @@ package org.orekit.rugged.raster;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
+import org.hipparchus.util.MathUtils;
import org.junit.Assert;
import org.junit.Test;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
-import org.orekit.rugged.raster.SimpleTile;
-import org.orekit.rugged.raster.SimpleTileFactory;
-import org.orekit.rugged.raster.Tile;
import org.orekit.rugged.raster.Tile.Location;
+import org.orekit.rugged.utils.NormalizedGeodeticPoint;
public class SimpleTileTest {
@@ -101,6 +100,29 @@ public class SimpleTileTest {
}
}
+
+ @Test
+ public void testZipper() {
+
+ SimpleTile tile0 = new SimpleTileFactory().createTile();
+ tile0.setGeometry(1.0, 2.0, 0.1, 0.2, 100, 200);
+ for (int i = 0; i < tile0.getLatitudeRows(); ++i) {
+ for (int j = 0; j < tile0.getLongitudeColumns(); ++j) {
+ tile0.setElevation(i, j, 1000 * i + j);
+ }
+ }
+ tile0.tileUpdateCompleted();
+
+ Assert.assertEquals(Location.SOUTH_WEST, tile0.getLocation( 0.0, 1.0));
+ Assert.assertEquals(Location.WEST, tile0.getLocation( 6.0, 1.0));
+ Assert.assertEquals(Location.NORTH_WEST, tile0.getLocation(12.0, 1.0));
+ Assert.assertEquals(Location.SOUTH, tile0.getLocation( 0.0, 22.0));
+ Assert.assertEquals(Location.HAS_INTERPOLATION_NEIGHBORS, tile0.getLocation( 6.0, 22.0));
+ Assert.assertEquals(Location.NORTH, tile0.getLocation(12.0, 22.0));
+ Assert.assertEquals(Location.SOUTH_EAST, tile0.getLocation( 0.0, 43.0));
+ Assert.assertEquals(Location.EAST, tile0.getLocation( 6.0, 43.0));
+ Assert.assertEquals(Location.NORTH_EAST, tile0.getLocation(12.0, 43.0));
+ }
@Test
public void testOutOfBoundsIndices() {
@@ -219,16 +241,44 @@ public class SimpleTileTest {
tile.setElevation(21, 14, 162.0);
tile.setElevation(21, 15, 95.0);
tile.tileUpdateCompleted();
- GeodeticPoint gpA = new GeodeticPoint(tile.getLatitudeAtIndex(20) + 0.1 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(14) + 0.2 * tile.getLongitudeStep(),
- 300.0);
- GeodeticPoint gpB = new GeodeticPoint(tile.getLatitudeAtIndex(20) + 0.7 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(14) + 0.9 * tile.getLongitudeStep(),
- 10.0);
- GeodeticPoint gpIAB = tile.cellIntersection(gpA, los(gpA, gpB), 20, 14);
+ NormalizedGeodeticPoint gpA = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(20) + 0.1 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(14) + 0.2 * tile.getLongitudeStep(),
+ 300.0, tile.getLongitudeAtIndex(14));
+ NormalizedGeodeticPoint gpB = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(20) + 0.7 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(14) + 0.9 * tile.getLongitudeStep(),
+ 10.0, tile.getLongitudeAtIndex(14));
+ NormalizedGeodeticPoint gpIAB = tile.cellIntersection(gpA, los(gpA, gpB), 20, 14);
+ checkInLine(gpA, gpB, gpIAB);
+ checkOnTile(tile, gpIAB);
+ NormalizedGeodeticPoint gpIBA = tile.cellIntersection(gpB, los(gpB, gpA), 20, 14);
+ checkInLine(gpA, gpB, gpIBA);
+ checkOnTile(tile, gpIBA);
+
+ Assert.assertEquals(gpIAB.getLatitude(), gpIBA.getLatitude(), 1.0e-10);
+ Assert.assertEquals(gpIAB.getLongitude(), gpIBA.getLongitude(), 1.0e-10);
+ Assert.assertEquals(gpIAB.getAltitude(), gpIBA.getAltitude(), 1.0e-10);
+
+ }
+
+ @Test
+ public void testCellIntersection2PiWrapping() {
+ SimpleTile tile = new SimpleTileFactory().createTile();
+ tile.setGeometry(0.0, 0.0, 0.025, 0.025, 50, 50);
+ tile.setElevation(20, 14, 91.0);
+ tile.setElevation(20, 15, 210.0);
+ tile.setElevation(21, 14, 162.0);
+ tile.setElevation(21, 15, 95.0);
+ tile.tileUpdateCompleted();
+ NormalizedGeodeticPoint gpA = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(20) + 0.1 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(14) + 0.2 * tile.getLongitudeStep(),
+ 300.0, +4 * FastMath.PI);
+ NormalizedGeodeticPoint gpB = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(20) + 0.7 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(14) + 0.9 * tile.getLongitudeStep(),
+ 10.0, +4 * FastMath.PI);
+ NormalizedGeodeticPoint gpIAB = tile.cellIntersection(gpA, los(gpA, gpB), 20, 14);
checkInLine(gpA, gpB, gpIAB);
checkOnTile(tile, gpIAB);
- GeodeticPoint gpIBA = tile.cellIntersection(gpB, los(gpB, gpA), 20, 14);
+ NormalizedGeodeticPoint gpIBA = tile.cellIntersection(gpB, los(gpB, gpA), 20, 14);
checkInLine(gpA, gpB, gpIBA);
checkOnTile(tile, gpIBA);
@@ -247,19 +297,19 @@ public class SimpleTileTest {
tile.setElevation(21, 14, 162.0);
tile.setElevation(21, 15, 95.0);
tile.tileUpdateCompleted();
- GeodeticPoint gpA = new GeodeticPoint(tile.getLatitudeAtIndex(20) + 0.1 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(14) + 0.2 * tile.getLongitudeStep(),
- 120.0);
- GeodeticPoint gpB = new GeodeticPoint(tile.getLatitudeAtIndex(20) + 0.7 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(14) + 0.9 * tile.getLongitudeStep(),
- 130.0);
+ NormalizedGeodeticPoint gpA = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(20) + 0.1 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(14) + 0.2 * tile.getLongitudeStep(),
+ 120.0, tile.getLongitudeAtIndex(14));
+ NormalizedGeodeticPoint gpB = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(20) + 0.7 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(14) + 0.9 * tile.getLongitudeStep(),
+ 130.0, tile.getLongitudeAtIndex(14));
// the line from gpA to gpB should traverse the DEM twice within the tile
// we use the points in the two different orders to retrieve both solutions
- GeodeticPoint gpIAB = tile.cellIntersection(gpA, los(gpA, gpB), 20, 14);
+ NormalizedGeodeticPoint gpIAB = tile.cellIntersection(gpA, los(gpA, gpB), 20, 14);
checkInLine(gpA, gpB, gpIAB);
checkOnTile(tile, gpIAB);
- GeodeticPoint gpIBA = tile.cellIntersection(gpB, los(gpB, gpA), 20, 14);
+ NormalizedGeodeticPoint gpIBA = tile.cellIntersection(gpB, los(gpB, gpA), 20, 14);
checkInLine(gpA, gpB, gpIBA);
checkOnTile(tile, gpIBA);
@@ -278,12 +328,12 @@ public class SimpleTileTest {
tile.setElevation(21, 14, 162.0);
tile.setElevation(21, 15, 95.0);
tile.tileUpdateCompleted();
- GeodeticPoint gpA = new GeodeticPoint(tile.getLatitudeAtIndex(20) + 0.1 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(14) + 0.2 * tile.getLongitudeStep(),
- 180.0);
- GeodeticPoint gpB = new GeodeticPoint(tile.getLatitudeAtIndex(20) + 0.7 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(14) + 0.9 * tile.getLongitudeStep(),
- 190.0);
+ NormalizedGeodeticPoint gpA = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(20) + 0.1 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(14) + 0.2 * tile.getLongitudeStep(),
+ 180.0, tile.getLongitudeAtIndex(14));
+ NormalizedGeodeticPoint gpB = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(20) + 0.7 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(14) + 0.9 * tile.getLongitudeStep(),
+ 190.0, tile.getLongitudeAtIndex(14));
Assert.assertNull(tile.cellIntersection(gpA, los(gpA, gpB), 20, 14));
@@ -298,17 +348,17 @@ public class SimpleTileTest {
tile.setElevation(1, 0, 40.0);
tile.setElevation(1, 1, 40.0);
tile.tileUpdateCompleted();
- GeodeticPoint gpA = new GeodeticPoint(tile.getLatitudeAtIndex(0) + 0.25 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
- 50.0);
- GeodeticPoint gpB = new GeodeticPoint(tile.getLatitudeAtIndex(0) + 0.75 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
- 20.0);
-
- GeodeticPoint gpIAB = tile.cellIntersection(gpA, los(gpA, gpB), 0, 0);
+ NormalizedGeodeticPoint gpA = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(0) + 0.25 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
+ 50.0, tile.getLongitudeAtIndex(0));
+ NormalizedGeodeticPoint gpB = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(0) + 0.75 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
+ 20.0, tile.getLongitudeAtIndex(0));
+
+ NormalizedGeodeticPoint gpIAB = tile.cellIntersection(gpA, los(gpA, gpB), 0, 0);
checkInLine(gpA, gpB, gpIAB);
checkOnTile(tile, gpIAB);
- GeodeticPoint gpIBA = tile.cellIntersection(gpB, los(gpB, gpA), 0, 0);
+ NormalizedGeodeticPoint gpIBA = tile.cellIntersection(gpB, los(gpB, gpA), 0, 0);
checkInLine(gpA, gpB, gpIBA);
checkOnTile(tile, gpIBA);
@@ -327,12 +377,12 @@ public class SimpleTileTest {
tile.setElevation(1, 0, 40.0);
tile.setElevation(1, 1, 40.0);
tile.tileUpdateCompleted();
- GeodeticPoint gpA = new GeodeticPoint(tile.getLatitudeAtIndex(0) + 0.25 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
- 45.0);
- GeodeticPoint gpB = new GeodeticPoint(tile.getLatitudeAtIndex(0) + 0.75 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
- 55.0);
+ NormalizedGeodeticPoint gpA = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(0) + 0.25 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
+ 45.0, tile.getLongitudeAtIndex(0));
+ NormalizedGeodeticPoint gpB = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(0) + 0.75 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
+ 55.0, tile.getLongitudeAtIndex(0));
Assert.assertNull(tile.cellIntersection(gpA, los(gpA, gpB), 0, 0));
@@ -347,12 +397,12 @@ public class SimpleTileTest {
tile.setElevation(1, 0, 40.0);
tile.setElevation(1, 1, 40.0);
tile.tileUpdateCompleted();
- GeodeticPoint gpA = new GeodeticPoint(tile.getLatitudeAtIndex(0) + 0.25 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
- 45.0);
- GeodeticPoint gpB = new GeodeticPoint(tile.getLatitudeAtIndex(0) + 0.75 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
- 50.0);
+ NormalizedGeodeticPoint gpA = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(0) + 0.25 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
+ 45.0, tile.getLongitudeAtIndex(0));
+ NormalizedGeodeticPoint gpB = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(0) + 0.75 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
+ 50.0, tile.getLongitudeAtIndex(0));
Assert.assertNull(tile.cellIntersection(gpA, los(gpA, gpB), 0, 0));
@@ -367,17 +417,17 @@ public class SimpleTileTest {
tile.setElevation(1, 0, 40.0);
tile.setElevation(1, 1, 40.0);
tile.tileUpdateCompleted();
- GeodeticPoint gpA = new GeodeticPoint(tile.getLatitudeAtIndex(0) + 0.25 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
- 32.5);
- GeodeticPoint gpB = new GeodeticPoint(tile.getLatitudeAtIndex(0) + 0.75 * tile.getLatitudeStep(),
- tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
- 37.5);
-
- GeodeticPoint gpIAB = tile.cellIntersection(gpA, los(gpA, gpB), 0, 0);
+ NormalizedGeodeticPoint gpA = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(0) + 0.25 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
+ 32.5, tile.getLongitudeAtIndex(0));
+ NormalizedGeodeticPoint gpB = new NormalizedGeodeticPoint(tile.getLatitudeAtIndex(0) + 0.75 * tile.getLatitudeStep(),
+ tile.getLongitudeAtIndex(0) + 0.50 * tile.getLongitudeStep(),
+ 37.5, tile.getLongitudeAtIndex(0));
+
+ NormalizedGeodeticPoint gpIAB = tile.cellIntersection(gpA, los(gpA, gpB), 0, 0);
checkInLine(gpA, gpB, gpIAB);
checkOnTile(tile, gpIAB);
- GeodeticPoint gpIBA = tile.cellIntersection(gpB, los(gpB, gpA), 0, 0);
+ NormalizedGeodeticPoint gpIBA = tile.cellIntersection(gpB, los(gpB, gpA), 0, 0);
checkInLine(gpA, gpB, gpIBA);
checkOnTile(tile, gpIBA);
@@ -435,7 +485,7 @@ public class SimpleTileTest {
1.0e-10);
Assert.assertEquals(gpI.getLongitude(),
- gpA.getLongitude() * (1 - t) + gpB.getLongitude() * t,
+ MathUtils.normalizeAngle(gpA.getLongitude() * (1 - t) + gpB.getLongitude() * t, gpI.getLongitude()),
1.0e-10);
}
diff --git a/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java b/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
index 4f3d8ffb670e2882f1222c9e830df8a54b1f4129..9c399e6221ad15bd96a00e478fc9fd7bbe5aa9de 100644
--- a/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
+++ b/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -16,19 +16,34 @@
*/
package org.orekit.rugged.raster;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.FileNotFoundException;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.net.URISyntaxException;
+import java.util.Map;
+
import org.hipparchus.random.RandomGenerator;
import org.hipparchus.random.Well19937a;
import org.hipparchus.util.FastMath;
+import org.hipparchus.util.MathUtils;
import org.junit.Assert;
import org.junit.Test;
+/**
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
+ */
public class TilesCacheTest {
@Test
public void testSingleTile() {
CountingFactory factory = new CountingFactory();
TilesCache<SimpleTile> cache = new TilesCache<SimpleTile>(factory,
- new CheckedPatternElevationUpdater(FastMath.toRadians(3.0), 11, 10.0, 20.0), 1000);
+ new CheckedPatternElevationUpdater(FastMath.toRadians(3.0), 11, 10.0, 20.0), 1000,true);
SimpleTile tile = cache.getTile(FastMath.toRadians(-23.2), FastMath.toRadians(137.5));
Assert.assertEquals(1, factory.getCount());
Assert.assertEquals(-24.0, FastMath.toDegrees(tile.getMinimumLatitude()), 1.0e-10);
@@ -43,7 +58,7 @@ public class TilesCacheTest {
public void testEviction() {
CountingFactory factory = new CountingFactory();
TilesCache<SimpleTile> cache = new TilesCache<SimpleTile>(factory,
- new CheckedPatternElevationUpdater(FastMath.toRadians(1.0), 11, 10.0, 20.0), 12);
+ new CheckedPatternElevationUpdater(FastMath.toRadians(1.0), 11, 10.0, 20.0), 12, true);
// fill up the 12 tiles we can keep in cache
for (int i = 0; i < 4; ++i) {
@@ -97,7 +112,7 @@ public class TilesCacheTest {
TilesCache<SimpleTile> cache =
new TilesCache<SimpleTile>(factory,
new CheckedPatternElevationUpdater(0.125, 9, 10.0, 20.0),
- 12);
+ 12, true);
SimpleTile regularTile = cache.getTile(0.2, 0.6);
Assert.assertEquals(1, factory.getCount());
@@ -125,7 +140,7 @@ public class TilesCacheTest {
TilesCache<SimpleTile> cache =
new TilesCache<SimpleTile>(factory,
new CheckedPatternElevationUpdater(FastMath.toRadians(1.0), 11, 10.0, 20.0),
- 16);
+ 16, true);
cache.getTile(FastMath.toRadians(1.5), FastMath.toRadians(0.5));
cache.getTile(FastMath.toRadians(3.5), FastMath.toRadians(2.5));
@@ -158,5 +173,1116 @@ public class TilesCacheTest {
Assert.assertEquals(17, factory.getCount());
}
+
+ @Test
+ public void testDummySRTM() throws URISyntaxException, FileNotFoundException, UnsupportedEncodingException {
+
+ // Simple SRTM with 2 elevations
+ int rowCols = 1000;
+ DummySRTMsimpleElevationUpdater srtmUpdater = new DummySRTMsimpleElevationUpdater(rowCols, 10.0, 20.0, 3);
+ double tileSizeDeg = srtmUpdater.getTileSizeDeg();
+
+ CountingFactory factory = new CountingFactory();
+ TilesCache<SimpleTile> cache = new TilesCache<SimpleTile>(factory, srtmUpdater , 5, false);
+
+ boolean isDifferentStep = false;
+ double epsilonLatLon = 1.e-5;
+ double latTileDeg;
+ double lonTileDeg;
+ double latDeg;
+ double lonDeg;
+
+ // ##########################################################
+ // Tiles with same resolution
+ // ##########################################################
+
+ // North-East hemisphere
+ // =====================
+ latTileDeg = 47.;
+ lonTileDeg = 12.3;
+
+ SimpleTile tileNEhemisphere = cache.getTile(FastMath.toRadians(latTileDeg), FastMath.toRadians(lonTileDeg));
+
+ // Latitude North of the tile
+ latDeg = getNorthernEdgeOfTile(tileNEhemisphere);
+ lonDeg = lonTileDeg;
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.NORTH, tileNEhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Latitude South of the tile
+ latDeg = getSouthernEdgeOfTile(tileNEhemisphere);
+ lonDeg = lonTileDeg;
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.SOUTH, tileNEhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Longitude West of the tile
+ latDeg = latTileDeg;
+ lonDeg = getWesternEdgeOfTile(tileNEhemisphere);
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.WEST, tileNEhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Longitude East of the tile
+ latDeg = latTileDeg;
+ lonDeg = getEasternEdgeOfTile(tileNEhemisphere);
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.EAST,tileNEhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Check the 4 corner zipper tiles
+ check4cornersZipperTiles(tileNEhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // South-East hemisphere
+ // =====================
+ latTileDeg = -16.2;
+ lonTileDeg = 22.3;
+ SimpleTile tileSEhemisphere = cache.getTile(FastMath.toRadians(latTileDeg), FastMath.toRadians(lonTileDeg));
+
+ // Latitude North of the tile
+ latDeg = getNorthernEdgeOfTile(tileSEhemisphere);
+ lonDeg = lonTileDeg;
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.NORTH, tileSEhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Latitude South of the tile
+ latDeg = getSouthernEdgeOfTile(tileSEhemisphere);
+ lonDeg = lonTileDeg;
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.SOUTH, tileSEhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Longitude West of the tile
+ latDeg = latTileDeg;
+ lonDeg = getWesternEdgeOfTile(tileSEhemisphere);
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.WEST, tileSEhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Longitude East of the tile
+ latDeg = latTileDeg;
+ lonDeg = getEasternEdgeOfTile(tileSEhemisphere);
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.EAST, tileSEhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Check the 4 corner zipper tiles
+ check4cornersZipperTiles(tileSEhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // North-West hemisphere
+ // =====================
+ latTileDeg = 46.8;
+ lonTileDeg = -66.5;
+
+ SimpleTile tileNWhemisphere = cache.getTile(FastMath.toRadians(latTileDeg), FastMath.toRadians(lonTileDeg));
+
+ // Latitude North of the tile
+ latDeg = getNorthernEdgeOfTile(tileNWhemisphere);
+ lonDeg = lonTileDeg;
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.NORTH, tileNWhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Latitude South of the tile
+ latDeg = getSouthernEdgeOfTile(tileNWhemisphere);
+ lonDeg = lonTileDeg;
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.SOUTH, tileNWhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Longitude West of the tile
+ latDeg = latTileDeg;
+ lonDeg = getWesternEdgeOfTile(tileNWhemisphere);
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.WEST, tileNWhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Longitude East of the tile
+ latDeg = latTileDeg;
+ lonDeg = getEasternEdgeOfTile(tileNWhemisphere);
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.EAST, tileNWhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Check the 4 corner zipper tiles
+ check4cornersZipperTiles(tileNWhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // South-West hemisphere
+ // =====================
+ latTileDeg = -28.8 ;
+ lonTileDeg = -58.4;
+ SimpleTile tileSWhemisphere = cache.getTile(FastMath.toRadians(latTileDeg), FastMath.toRadians(lonTileDeg));
+
+ // Latitude North of the tile
+ latDeg = getNorthernEdgeOfTile(tileSWhemisphere);
+ lonDeg = lonTileDeg;
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.NORTH, tileSWhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Latitude South of the tile
+ latDeg = getSouthernEdgeOfTile(tileSWhemisphere);
+ lonDeg = lonTileDeg;
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.SOUTH, tileSWhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Longitude West of the tile
+ latDeg = latTileDeg;
+ lonDeg = getWesternEdgeOfTile(tileSWhemisphere);
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.WEST, tileSWhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Longitude East of the tile
+ latDeg = latTileDeg;
+ lonDeg = getEasternEdgeOfTile(tileSWhemisphere);
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.EAST, tileSWhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Check the 4 corner zipper tiles
+ check4cornersZipperTiles(tileSWhemisphere, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Anti meridians (180 degrees W/E)
+ // =====================
+ // tile SRTM 72/16: 175 - 180 East / 15 - 20 South
+ latTileDeg = -18.;
+ lonTileDeg = 178.;
+ SimpleTile tileAntiMeridianEast = cache.getTile(FastMath.toRadians(latTileDeg), FastMath.toRadians(lonTileDeg));
+
+ // Longitude East of the tile
+ latDeg = latTileDeg;
+ lonDeg = getEasternEdgeOfTile(tileAntiMeridianEast);
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.EAST,tileAntiMeridianEast, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // tile SRTM 01/16: 175 - 180 West / 15 - 20 South
+ latTileDeg = -18.;
+ lonTileDeg = -178.;
+ SimpleTile tileAntiMeridianWest = cache.getTile(FastMath.toRadians(latTileDeg), FastMath.toRadians(lonTileDeg));
+
+ // Longitude West of the tile
+ latDeg = latTileDeg;
+ lonDeg = getWesternEdgeOfTile(tileAntiMeridianWest);
+
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.WEST,tileAntiMeridianWest, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // ##########################################################
+ // Tiles around the resolution change (around +/- 60 degrees)
+ // ##########################################################
+
+ // Cleanup
+ clearFactoryMaps(CountingFactory.class);
+
+ rowCols = 10;
+ srtmUpdater = new DummySRTMsimpleElevationUpdater(rowCols, 10.0, 20.0, 2);
+ tileSizeDeg = srtmUpdater.getTileSizeDeg();
+
+ factory = new CountingFactory();
+ cache = new TilesCache<SimpleTile>(factory, srtmUpdater , 5, false);
+
+ // Above 60 degrees
+ // ================
+
+ // Current tile is below 60 degrees
+ // --------------------------------
+ latTileDeg = 59.;
+ lonTileDeg = 12.3;
+
+ SimpleTile tileAround60deg = cache.getTile(FastMath.toRadians(latTileDeg), FastMath.toRadians(lonTileDeg));
+
+ // Latitude North of the tile
+ latDeg = getNorthernEdgeOfTile(tileAround60deg);
+ lonDeg = lonTileDeg;
+
+ isDifferentStep = true;
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.NORTH, tileAround60deg, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+ isDifferentStep = false;
+
+ // Check the 4 corner zipper tiles
+ isDifferentStep = true;
+ check4cornersZipperTiles(tileAround60deg, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+ isDifferentStep = false;
+
+ // Current tile is above 60 degrees
+ // --------------------------------
+ latTileDeg = 61.;
+ lonTileDeg = 12.3;
+
+ tileAround60deg = cache.getTile(FastMath.toRadians(latTileDeg), FastMath.toRadians(lonTileDeg));
+
+ // Latitude South of the tile
+ latDeg = getSouthernEdgeOfTile(tileAround60deg);
+ lonDeg = lonTileDeg;
+
+ isDifferentStep = true;
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.SOUTH, tileAround60deg, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+ isDifferentStep = false;
+
+ // Check the 4 corner zipper tiles
+ isDifferentStep = true;
+ check4cornersZipperTiles(tileAround60deg, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+ isDifferentStep = false;
+
+ // Below -60 degrees
+ // =================
+
+ // Current tile is above -60 degrees
+ // --------------------------------
+ latTileDeg = -59.;
+ lonTileDeg = 12.3;
+
+ SimpleTile tileAroundMinus60deg = cache.getTile(FastMath.toRadians(latTileDeg), FastMath.toRadians(lonTileDeg));
+
+ // Latitude South of the tile
+ latDeg = getSouthernEdgeOfTile(tileAroundMinus60deg);
+ lonDeg = lonTileDeg;
+
+ isDifferentStep = true;
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.SOUTH, tileAroundMinus60deg, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+ isDifferentStep = false;
+
+ // Check the 4 corner zipper tiles
+ isDifferentStep = true;
+ check4cornersZipperTiles(tileAroundMinus60deg, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+ isDifferentStep = false;
+
+ // Current tile is below -60 degrees
+ // --------------------------------
+ latTileDeg = -61.;
+ lonTileDeg = 12.3;
+
+ tileAroundMinus60deg = cache.getTile(FastMath.toRadians(latTileDeg), FastMath.toRadians(lonTileDeg));
+
+ // Latitude North of the tile
+ latDeg = getNorthernEdgeOfTile(tileAroundMinus60deg);
+ lonDeg = lonTileDeg;
+
+ isDifferentStep = true;
+ searchAndVerifyZipperTile(latDeg, lonDeg, Tile.Location.NORTH, tileAroundMinus60deg, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+ isDifferentStep = false;
+
+ // Check the 4 corner zipper tiles
+ isDifferentStep = true;
+ check4cornersZipperTiles(tileAroundMinus60deg, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+ isDifferentStep = false;
+
+ }
+
+ /**
+ * Check the computed zipper tile
+ * @param latDeg latitude belonging to the zipper tile (deg)
+ * @param lonDeg longitude belonging to the zipper tile (deg)
+ * @param zipperLocation location of the zipper tile according to the current tile
+ * @param tile the current tile
+ * @param tileSizeDeg the current tile size (deg)
+ * @param cache the tiles cache
+ * @param epsilonLatLon epsilon to compare latitude and longitude
+ * @param isDifferentStep flag to tell if zipper is at the edge of tiles with different steps
+ * @return the zipper tile
+ */
+ private SimpleTile searchAndVerifyZipperTile(double latDeg, double lonDeg, Tile.Location zipperLocation, SimpleTile tile, final double tileSizeDeg,
+ TilesCache<SimpleTile> cache, double epsilonLatLon, boolean isDifferentStep) {
+
+ SimpleTile zipperTile = cache.getTile(FastMath.toRadians(latDeg), FastMath.toRadians(lonDeg));
+
+ checkGeodeticPointBelongsToZipper(FastMath.toRadians(latDeg), FastMath.toRadians(lonDeg), zipperTile);
+
+ if (!isDifferentStep) {
+ checkZipperTile(zipperTile, zipperLocation, tile, tileSizeDeg, cache, epsilonLatLon);
+ } else {
+ checkZipperTileDifferentStep(zipperTile, zipperLocation, tile, tileSizeDeg, cache, epsilonLatLon);
+ }
+
+ return zipperTile;
+ }
+
+ private void check4cornersZipperTiles(SimpleTile tile, final double tileSizeDeg,
+ TilesCache<SimpleTile> cache, double epsilonLatLon,
+ boolean isDifferentStep) {
+ double latDeg;
+ double lonDeg;
+
+ SimpleTile cornerZipperTile;
+
+ // Latitude/Longitude corner NW
+ latDeg = getNorthernEdgeOfTile(tile);
+ lonDeg = getWesternEdgeOfTile(tile);
+ cornerZipperTile = cache.getTile(FastMath.toRadians(latDeg), FastMath.toRadians(lonDeg));
+
+ checkGeodeticPointBelongsToZipper(FastMath.toRadians(latDeg), FastMath.toRadians(lonDeg), cornerZipperTile);
+ checkCornerZipperTile(cornerZipperTile, Tile.Location.NORTH_WEST, tile, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Latitude/Longitude corner SW
+ latDeg = getSouthernEdgeOfTile(tile);
+ lonDeg = getWesternEdgeOfTile(tile);
+ cornerZipperTile = cache.getTile(FastMath.toRadians(latDeg), FastMath.toRadians(lonDeg));
+
+ checkGeodeticPointBelongsToZipper(FastMath.toRadians(latDeg), FastMath.toRadians(lonDeg), cornerZipperTile);
+ checkCornerZipperTile(cornerZipperTile, Tile.Location.SOUTH_WEST, tile, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Latitude/Longitude corner NE
+ latDeg = getNorthernEdgeOfTile(tile);
+ lonDeg = getEasternEdgeOfTile(tile);
+ cornerZipperTile = cache.getTile(FastMath.toRadians(latDeg), FastMath.toRadians(lonDeg));
+
+ checkGeodeticPointBelongsToZipper(FastMath.toRadians(latDeg), FastMath.toRadians(lonDeg), cornerZipperTile);
+ checkCornerZipperTile(cornerZipperTile, Tile.Location.NORTH_EAST, tile, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+
+ // Latitude/Longitude corner SE
+ latDeg = getSouthernEdgeOfTile(tile);
+ lonDeg = getEasternEdgeOfTile(tile);
+ cornerZipperTile = cache.getTile(FastMath.toRadians(latDeg), FastMath.toRadians(lonDeg));
+
+ checkGeodeticPointBelongsToZipper(FastMath.toRadians(latDeg), FastMath.toRadians(lonDeg), cornerZipperTile);
+ checkCornerZipperTile(cornerZipperTile, Tile.Location.SOUTH_EAST, tile, tileSizeDeg, cache, epsilonLatLon, isDifferentStep);
+ }
+
+ private void checkGeodeticPointBelongsToZipper(double latitude, double longitude, SimpleTile cornerZipperTile) {
+
+ double latMin = cornerZipperTile.getMinimumLatitude();
+ double lonMin = cornerZipperTile.getMinimumLongitude();
+ double latMax = cornerZipperTile.getLatitudeAtIndex(cornerZipperTile.getLatitudeRows() - 1);
+ double lonMax = cornerZipperTile.getLongitudeAtIndex(cornerZipperTile.getLongitudeColumns() - 1);
+
+ // this test purpose is to ensure the geodetic points belongs to the zipper tile
+ assertTrue((latMin <= latitude) && (latitude <= latMax));
+ assertTrue((lonMin <= longitude) && (longitude <= lonMax));
+
+ }
+ private void checkCornerZipperTile(SimpleTile cornerZipperTile, Tile.Location location, SimpleTile originTile,
+ double tileSizeDeg, TilesCache<SimpleTile> cache, double epsilonLatLon, boolean isDifferentStep) {
+
+ SurroundingTiles surroundingTiles = new SurroundingTiles(originTile, tileSizeDeg, cache);
+
+ if (location == Tile.Location.SOUTH_WEST) {
+
+ SimpleTile tileBelow = surroundingTiles.getTileBelow();
+ SimpleTile tileLeft = surroundingTiles.getTileLeft();
+
+ if (! isDifferentStep) {
+ // The 2 following tiles are the same if the tiles step are the same
+ SimpleTile belowLeftOfCurrent = new SurroundingTiles(tileLeft, tileSizeDeg, cache).getTileBelow();
+ SimpleTile leftBelowOfCurrent = new SurroundingTiles(tileBelow, tileSizeDeg, cache).getTileLeft();
+
+ SimpleTile belowRight = tileBelow;
+ SimpleTile belowLeft1 = belowLeftOfCurrent;
+ SimpleTile belowLeft2 = leftBelowOfCurrent;
+ SimpleTile aboveRight = originTile;
+ SimpleTile aboveLeft = tileLeft;
+
+ checkCornerElevations(cornerZipperTile, originTile, belowLeft1, belowRight, aboveLeft, aboveRight, epsilonLatLon);
+ checkCornerElevations(cornerZipperTile, originTile, belowLeft2, belowRight, aboveLeft, aboveRight, epsilonLatLon);
+
+ } else {
+
+ // Tiles at same latitude have same resolutions
+ SimpleTile leftBelowOfCurrent = new SurroundingTiles(tileBelow, tileSizeDeg, cache).getTileLeft();
+
+ SimpleTile belowRight = tileBelow;
+ SimpleTile belowLeft = leftBelowOfCurrent;
+ SimpleTile aboveRight = originTile;
+ SimpleTile aboveLeft = tileLeft;
+
+ checkCornerElevationsDifferentStep(cornerZipperTile, originTile, belowLeft, belowRight, aboveLeft, aboveRight, epsilonLatLon);
+ }
+ } else if (location == Tile.Location.NORTH_WEST) {
+
+ SimpleTile tileAbove = surroundingTiles.getTileAbove();
+ SimpleTile tileLeft = surroundingTiles.getTileLeft();
+
+ if (! isDifferentStep) {
+
+ // The 2 following tiles are the same if the tiles step are the same
+ SimpleTile aboveLeftOfCurrent = new SurroundingTiles(tileLeft, tileSizeDeg, cache).getTileAbove();
+ SimpleTile leftAboveOfCurrent = new SurroundingTiles(tileAbove, tileSizeDeg, cache).getTileLeft();
+
+ SimpleTile belowRight = originTile;
+ SimpleTile belowLeft = tileLeft;
+ SimpleTile aboveRight = tileAbove;
+ SimpleTile aboveLeft1 = aboveLeftOfCurrent;
+ SimpleTile aboveLeft2 = leftAboveOfCurrent;
+
+ checkCornerElevations(cornerZipperTile, originTile, belowLeft, belowRight, aboveLeft1, aboveRight, epsilonLatLon);
+ checkCornerElevations(cornerZipperTile, originTile, belowLeft, belowRight, aboveLeft2, aboveRight, epsilonLatLon);
+
+ } else {
+
+ // Tiles at same latitude have same resolutions
+ SimpleTile leftAboveOfCurrent = new SurroundingTiles(tileAbove, tileSizeDeg, cache).getTileLeft();
+
+ SimpleTile belowRight = originTile;
+ SimpleTile belowLeft = tileLeft;
+ SimpleTile aboveRight = tileAbove;
+ SimpleTile aboveLeft = leftAboveOfCurrent;
+
+ checkCornerElevationsDifferentStep(cornerZipperTile, originTile, belowLeft, belowRight, aboveLeft, aboveRight, epsilonLatLon);
+ }
+
+
+ } else if (location == Tile.Location.SOUTH_EAST) {
+
+ SimpleTile tileBelow = surroundingTiles.getTileBelow();
+ SimpleTile tileRight = surroundingTiles.getTileRight();
+ if (! isDifferentStep) {
+
+ // The 2 following tiles are the same if the tiles step are the same
+ SimpleTile belowRightOfCurrent = new SurroundingTiles(tileRight, tileSizeDeg, cache).getTileBelow();
+ SimpleTile rightBelowOfCurrent = new SurroundingTiles(tileBelow, tileSizeDeg, cache).getTileRight();
+
+ SimpleTile belowRight1 = belowRightOfCurrent;
+ SimpleTile belowRight2 = rightBelowOfCurrent;
+ SimpleTile belowLeft = tileBelow;
+ SimpleTile aboveRight = tileRight;
+ SimpleTile aboveLeft = originTile;
+
+ checkCornerElevations(cornerZipperTile, originTile, belowLeft, belowRight1, aboveLeft, aboveRight, epsilonLatLon);
+ checkCornerElevations(cornerZipperTile, originTile, belowLeft, belowRight2, aboveLeft, aboveRight, epsilonLatLon);
+
+ } else {
+
+ // Tiles at same latitude have same resolutions
+ SimpleTile belowRightOfCurrent = new SurroundingTiles(tileRight, tileSizeDeg, cache).getTileBelow();
+
+ SimpleTile belowRight = belowRightOfCurrent;
+ SimpleTile belowLeft = tileBelow;
+ SimpleTile aboveRight = tileRight;
+ SimpleTile aboveLeft = originTile;
+
+ checkCornerElevationsDifferentStep(cornerZipperTile, originTile, belowLeft, belowRight, aboveLeft, aboveRight, epsilonLatLon);
+ }
+ } else if (location == Tile.Location.NORTH_EAST) {
+
+ SimpleTile tileAbove = surroundingTiles.getTileAbove();
+ SimpleTile tileRight = surroundingTiles.getTileRight();
+
+ if (! isDifferentStep) {
+
+ // The 2 following tiles are the same if the tiles step are the same
+ SimpleTile aboveRightOfCurrent = new SurroundingTiles(tileRight, tileSizeDeg, cache).getTileAbove();
+ SimpleTile rightAboveOfCurrent = new SurroundingTiles(tileAbove, tileSizeDeg, cache).getTileRight();
+
+ SimpleTile belowRight = tileRight;
+ SimpleTile belowLeft = originTile;
+ SimpleTile aboveRight1 = aboveRightOfCurrent;
+ SimpleTile aboveRight2 = rightAboveOfCurrent;
+ SimpleTile aboveLeft = tileAbove;
+
+ checkCornerElevations(cornerZipperTile, originTile, belowLeft, belowRight, aboveLeft, aboveRight1, epsilonLatLon);
+ checkCornerElevations(cornerZipperTile, originTile, belowLeft, belowRight, aboveLeft, aboveRight2, epsilonLatLon);
+ } else {
+
+ // Tiles at same latitude have same resolutions
+ SimpleTile aboveRightOfCurrent = new SurroundingTiles(tileRight, tileSizeDeg, cache).getTileAbove();
+
+ SimpleTile belowRight = tileRight;
+ SimpleTile belowLeft = originTile;
+ SimpleTile aboveRight = aboveRightOfCurrent;
+ SimpleTile aboveLeft = tileAbove;
+
+ checkCornerElevationsDifferentStep(cornerZipperTile, originTile, belowLeft, belowRight, aboveLeft, aboveRight, epsilonLatLon);
+ }
+ }
+ }
+ private void checkCornerElevations(SimpleTile cornerZipperTile, SimpleTile originTile,
+ SimpleTile belowLeft, SimpleTile belowRight, SimpleTile aboveLeft, SimpleTile aboveRight,
+ double epsilonLatLon) {
+
+ // row 0 of zipper
+ double cornerZipperElevation = cornerZipperTile.getElevationAtIndices(0, 0);
+ double belowLeftElevation = belowLeft.getElevationAtIndices(belowLeft.getLatitudeRows() - 2, belowLeft.getLongitudeColumns() - 2);
+ assertEquals(belowLeftElevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(0, 1);
+ belowLeftElevation = belowLeft.getElevationAtIndices(belowLeft.getLatitudeRows() - 2, belowLeft.getLongitudeColumns() - 1);
+ assertEquals(belowLeftElevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(0, 2);
+ double belowRightElevation = belowRight.getElevationAtIndices(belowRight.getLatitudeRows() - 2, 0);
+ assertEquals(belowRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(0, 3);
+ belowRightElevation = belowRight.getElevationAtIndices(belowRight.getLatitudeRows() - 2, 1);
+ assertEquals(belowRightElevation, cornerZipperElevation, epsilonLatLon);
+
+
+ // row 1 of zipper
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(1, 0);
+ belowLeftElevation = belowLeft.getElevationAtIndices(belowLeft.getLatitudeRows() - 1, belowLeft.getLongitudeColumns() - 2);
+ assertEquals(belowLeftElevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(1, 1);
+ belowLeftElevation = belowLeft.getElevationAtIndices(belowLeft.getLatitudeRows() - 1, belowLeft.getLongitudeColumns() - 1);
+ assertEquals(belowLeftElevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(1, 2);
+ belowRightElevation = belowRight.getElevationAtIndices(belowRight.getLatitudeRows() - 1, 0);
+ assertEquals(belowRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(1, 3);
+ belowRightElevation = belowRight.getElevationAtIndices(belowRight.getLatitudeRows() - 1, 1);
+ assertEquals(belowRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ // row 2 of zipper
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(2, 0);
+ double aboveLeftELevation = aboveLeft.getElevationAtIndices(0, aboveLeft.getLongitudeColumns() - 2);
+ assertEquals(aboveLeftELevation, cornerZipperElevation, epsilonLatLon);
+ //double leftAboveOfCurrentELevation = leftAboveOfCurrent.getElevationAtIndices(0, leftAboveOfCurrent.getLongitudeColumns() - 2);
+ //assertEquals(leftAboveOfCurrentELevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(2, 1);
+ aboveLeftELevation = aboveLeft.getElevationAtIndices(0, aboveLeft.getLongitudeColumns() - 1);
+ assertEquals(aboveLeftELevation, cornerZipperElevation, epsilonLatLon);
+ //leftAboveOfCurrentELevation = leftAboveOfCurrent.getElevationAtIndices(0, leftAboveOfCurrent.getLongitudeColumns() - 1);
+ //assertEquals(leftAboveOfCurrentELevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(2, 2);
+ double aboveRightElevation = aboveRight.getElevationAtIndices(0, 0);
+ assertEquals(aboveRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(2, 3);
+ aboveRightElevation = aboveRight.getElevationAtIndices(0, 1);
+ assertEquals(aboveRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ // row 3 of zipper
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(3, 0);
+ aboveLeftELevation = aboveLeft.getElevationAtIndices(1, aboveLeft.getLongitudeColumns() - 2);
+ assertEquals(aboveLeftELevation, cornerZipperElevation, epsilonLatLon);
+ //leftAboveOfCurrentELevation = leftAboveOfCurrent.getElevationAtIndices(1, leftAboveOfCurrent.getLongitudeColumns() - 2);
+ //assertEquals(leftAboveOfCurrentELevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(3, 1);
+ aboveLeftELevation = aboveLeft.getElevationAtIndices(1, aboveLeft.getLongitudeColumns() - 1);
+ assertEquals(aboveLeftELevation, cornerZipperElevation, epsilonLatLon);
+ //leftAboveOfCurrentELevation = leftAboveOfCurrent.getElevationAtIndices(1, leftAboveOfCurrent.getLongitudeColumns() - 1);
+ //assertEquals(leftAboveOfCurrentELevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(3, 2);
+ aboveRightElevation = aboveRight.getElevationAtIndices(1, 0);
+ assertEquals(aboveRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(3, 3);
+ aboveRightElevation = aboveRight.getElevationAtIndices(1, 1);
+ assertEquals(aboveRightElevation, cornerZipperElevation, epsilonLatLon);
+ }
+
+ private void checkCornerElevationsDifferentStep(SimpleTile cornerZipperTile, SimpleTile originTile,
+ SimpleTile belowLeft, SimpleTile belowRight, SimpleTile aboveLeft, SimpleTile aboveRight,
+ double epsilonLatLon) {
+
+
+ // We assure to be inside a cell by adding a delta step (to avoid inappropriate index computation)
+ double deltaLon = 0.1*cornerZipperTile.getLongitudeStep();
+ double zipperLongitude0 = cornerZipperTile.getLongitudeAtIndex(0) + deltaLon;
+ double zipperLongitude1 = cornerZipperTile.getLongitudeAtIndex(1) + deltaLon;
+ double zipperLongitude2 = cornerZipperTile.getLongitudeAtIndex(2) + deltaLon;
+ double zipperLongitude3 = cornerZipperTile.getLongitudeAtIndex(3) + deltaLon;
+
+ double deltaLat = 0.1*cornerZipperTile.getLatitudeStep();
+ double zipperLatitude0 = cornerZipperTile.getLatitudeAtIndex(0) + deltaLat;
+ double zipperLatitude1 = cornerZipperTile.getLatitudeAtIndex(1) + deltaLat;
+ double zipperLatitude2 = cornerZipperTile.getLatitudeAtIndex(2) + deltaLat;
+ double zipperLatitude3 = cornerZipperTile.getLatitudeAtIndex(3) + deltaLat;
+
+ // Longitudes for column 0 of corner zipper
+ double aboveLeftDoubleLongitudeIndex0 = computeLongitudeIndexDifferentStep(zipperLongitude0, aboveLeft);
+ int aboveLeftLongitudeIndex0 = FastMath.max(0, FastMath.min(aboveLeft.getLongitudeColumns() - 1, (int) FastMath.floor(aboveLeftDoubleLongitudeIndex0)));
+
+ double belowLeftDoubleLongitudeIndex0 = computeLongitudeIndexDifferentStep(zipperLongitude0, belowLeft);
+ int belowLeftLongitudeIndex0 = FastMath.max(0, FastMath.min(belowLeft.getLongitudeColumns() - 1, (int) FastMath.floor(belowLeftDoubleLongitudeIndex0)));
+
+ // Longitudes for column 1 of corner zipper
+ double aboveLeftDoubleLongitudeIndex1 = computeLongitudeIndexDifferentStep(zipperLongitude1, aboveLeft);
+ int aboveLeftLongitudeIndex1 = FastMath.max(0, FastMath.min(aboveLeft.getLongitudeColumns() - 1, (int) FastMath.floor(aboveLeftDoubleLongitudeIndex1)));
+
+ double belowLeftDoubleLongitudeIndex1 = computeLongitudeIndexDifferentStep(zipperLongitude1, belowLeft);
+ int belowLeftLongitudeIndex1 = FastMath.max(0, FastMath.min(belowLeft.getLongitudeColumns() - 1, (int) FastMath.floor(belowLeftDoubleLongitudeIndex1)));
+
+ // Longitudes for column 2 of corner zipper
+ double aboveRightDoubleLongitudeIndex2 = computeLongitudeIndexDifferentStep(zipperLongitude2, aboveRight);
+ int aboveRightLongitudeIndex2 = FastMath.max(0, FastMath.min(aboveRight.getLongitudeColumns() - 1, (int) FastMath.floor(aboveRightDoubleLongitudeIndex2)));
+
+ double belowRightDoubleLongitudeIndex2 = computeLongitudeIndexDifferentStep(zipperLongitude2, belowRight);
+ int belowRightLongitudeIndex2 = FastMath.max(0, FastMath.min(belowRight.getLongitudeColumns() - 1, (int) FastMath.floor(belowRightDoubleLongitudeIndex2)));
+
+ // Longitudes for column 3 of corner zipper
+ double aboveRightDoubleLongitudeIndex3 = computeLongitudeIndexDifferentStep(zipperLongitude3, aboveRight);
+ int aboveRightLongitudeIndex3 = FastMath.max(0, FastMath.min(aboveRight.getLongitudeColumns() - 1, (int) FastMath.floor(aboveRightDoubleLongitudeIndex3)));
+
+ double belowRightDoubleLongitudeIndex3 = computeLongitudeIndexDifferentStep(zipperLongitude3, belowRight);
+ int belowRightLongitudeIndex3 = FastMath.max(0, FastMath.min(belowRight.getLongitudeColumns() - 1, (int) FastMath.floor(belowRightDoubleLongitudeIndex3)));
+
+
+ // row 0 of zipper
+ double belowLeftDoubleLatitudeIndex0 = computeLatitudeIndexDifferentStep(zipperLatitude0, belowLeft);
+ int belowLeftLatitudeIndex0 = FastMath.max(0, FastMath.min(belowLeft.getLatitudeRows() - 1, (int) FastMath.floor(belowLeftDoubleLatitudeIndex0)));
+
+ double belowLeftElevation = belowLeft.getElevationAtIndices(belowLeftLatitudeIndex0, belowLeftLongitudeIndex0);
+ double cornerZipperElevation = cornerZipperTile.getElevationAtIndices(0, 0);
+ assertEquals(belowLeftElevation, cornerZipperElevation, epsilonLatLon);
+
+ belowLeftElevation = belowLeft.getElevationAtIndices(belowLeftLatitudeIndex0, belowLeftLongitudeIndex1);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(0, 1);
+ assertEquals(belowLeftElevation, cornerZipperElevation, epsilonLatLon);
+
+
+ double belowRightDoubleLatitudeIndex0 = computeLatitudeIndexDifferentStep(zipperLatitude0, belowRight);
+ int belowRightLatitudeIndex0 = FastMath.max(0, FastMath.min(belowRight.getLatitudeRows() - 1, (int) FastMath.floor(belowRightDoubleLatitudeIndex0)));
+
+ double belowRightElevation = belowRight.getElevationAtIndices(belowRightLatitudeIndex0, belowRightLongitudeIndex2);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(0, 2);
+ assertEquals(belowRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ belowRightElevation = belowRight.getElevationAtIndices(belowRightLatitudeIndex0, belowRightLongitudeIndex3);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(0, 3);
+ assertEquals(belowRightElevation, cornerZipperElevation, epsilonLatLon);
+
+
+ // row 1 of zipper
+ double belowLeftDoubleLatitudeIndex1 = computeLatitudeIndexDifferentStep(zipperLatitude1, belowLeft);
+ int belowLeftLatitudeIndex1 = FastMath.max(0, FastMath.min(belowLeft.getLatitudeRows() - 1, (int) FastMath.floor(belowLeftDoubleLatitudeIndex1)));
+
+ belowLeftElevation = belowLeft.getElevationAtIndices(belowLeftLatitudeIndex1, belowLeftLongitudeIndex0);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(1, 0);
+ assertEquals(belowLeftElevation, cornerZipperElevation, epsilonLatLon);
+
+ belowLeftElevation = belowLeft.getElevationAtIndices(belowLeftLatitudeIndex1, belowLeftLongitudeIndex1);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(1, 1);
+ assertEquals(belowLeftElevation, cornerZipperElevation, epsilonLatLon);
+
+
+ double belowRightDoubleLatitudeIndex1 = computeLatitudeIndexDifferentStep(zipperLatitude1, belowRight);
+ int belowRightLatitudeIndex1 = FastMath.max(0, FastMath.min(belowRight.getLatitudeRows() - 1, (int) FastMath.floor(belowRightDoubleLatitudeIndex1)));
+
+ belowRightElevation = belowRight.getElevationAtIndices(belowRightLatitudeIndex1, belowRightLongitudeIndex2);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(1, 2);
+ assertEquals(belowRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(1, 3);
+ belowRightElevation = belowRight.getElevationAtIndices(belowRightLatitudeIndex1, belowRightLongitudeIndex3);
+ assertEquals(belowRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ // row 2 of zipper
+ double aboveLeftDoubleLatitudeIndex2 = computeLatitudeIndexDifferentStep(zipperLatitude2, aboveLeft);
+ int aboveLeftLatitudeIndex2 = FastMath.max(0, FastMath.min(aboveLeft.getLatitudeRows() - 1, (int) FastMath.floor(aboveLeftDoubleLatitudeIndex2)));
+
+ double aboveLeftELevation = aboveLeft.getElevationAtIndices(aboveLeftLatitudeIndex2, aboveLeftLongitudeIndex0);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(2, 0);
+ assertEquals(aboveLeftELevation, cornerZipperElevation, epsilonLatLon);
+
+ aboveLeftELevation = aboveLeft.getElevationAtIndices(aboveLeftLatitudeIndex2, aboveLeftLongitudeIndex1);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(2, 1);
+ assertEquals(aboveLeftELevation, cornerZipperElevation, epsilonLatLon);
+
+
+ double aboveRightDoubleLatitudeIndex2 = computeLatitudeIndexDifferentStep(zipperLatitude2, aboveRight);
+ int aboveRightLatitudeIndex2 = FastMath.max(0, FastMath.min(aboveRight.getLatitudeRows() - 1, (int) FastMath.floor(aboveRightDoubleLatitudeIndex2)));
+
+ double aboveRightElevation = aboveRight.getElevationAtIndices(aboveRightLatitudeIndex2, aboveRightLongitudeIndex2);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(2, 2);
+ assertEquals(aboveRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ aboveRightElevation = aboveRight.getElevationAtIndices(aboveRightLatitudeIndex2, aboveRightLongitudeIndex3);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(2, 3);
+ assertEquals(aboveRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ // row 3 of zipper
+ double aboveLeftDoubleLatitudeIndex3 = computeLatitudeIndexDifferentStep(zipperLatitude3, aboveLeft);
+ int aboveLeftLatitudeIndex3 = FastMath.max(0, FastMath.min(aboveLeft.getLatitudeRows() - 1, (int) FastMath.floor(aboveLeftDoubleLatitudeIndex3)));
+
+ aboveLeftELevation = aboveLeft.getElevationAtIndices(aboveLeftLatitudeIndex3, aboveLeftLongitudeIndex0);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(3, 0);
+ assertEquals(aboveLeftELevation, cornerZipperElevation, epsilonLatLon);
+
+ aboveLeftELevation = aboveLeft.getElevationAtIndices(aboveLeftLatitudeIndex3, aboveLeftLongitudeIndex1);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(3, 1);
+ assertEquals(aboveLeftELevation, cornerZipperElevation, epsilonLatLon);
+
+ double aboveRightDoubleLatitudeIndex3 = computeLatitudeIndexDifferentStep(zipperLatitude3, aboveRight);
+ int aboveRightLatitudeIndex3 = FastMath.max(0, FastMath.min(aboveRight.getLatitudeRows() - 1, (int) FastMath.floor(aboveRightDoubleLatitudeIndex3)));
+
+ aboveRightElevation = aboveRight.getElevationAtIndices(aboveRightLatitudeIndex3, aboveRightLongitudeIndex2);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(3, 2);
+ assertEquals(aboveRightElevation, cornerZipperElevation, epsilonLatLon);
+
+ aboveRightElevation = aboveRight.getElevationAtIndices(aboveRightLatitudeIndex3, aboveRightLongitudeIndex3);
+ cornerZipperElevation = cornerZipperTile.getElevationAtIndices(3, 3);
+ assertEquals(aboveRightElevation, cornerZipperElevation, epsilonLatLon);
+ }
+
+
+ private void checkZipperTile(SimpleTile zipperTile, Tile.Location zipperLocation,
+ SimpleTile originTile, double tileSizeDeg,
+ TilesCache<SimpleTile> cache, double epsilonLatLon) {
+
+ SurroundingTiles surroundingTiles = new SurroundingTiles(originTile, tileSizeDeg, cache);
+
+ if (zipperLocation == Tile.Location.SOUTH) {
+ SimpleTile tileBelow = surroundingTiles.getTileBelow();
+ for (int jLon = 0; jLon < zipperTile.getLongitudeColumns(); jLon++) {
+ // row 0 of zipper
+ double zipperElevation = zipperTile.getElevationAtIndices(0, jLon);
+ double belowELevation = tileBelow.getElevationAtIndices(tileBelow.getLatitudeRows() - 2, jLon);
+ assertEquals(belowELevation, zipperElevation, epsilonLatLon);
+
+ // row 1 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(1, jLon);
+ belowELevation = tileBelow.getElevationAtIndices(tileBelow.getLatitudeRows() - 1, jLon);
+ assertEquals(belowELevation, zipperElevation, epsilonLatLon);
+
+ // row 2 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(2, jLon);
+ double originELevation = originTile.getElevationAtIndices(0, jLon);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // row 3 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(3, jLon);
+ originELevation = originTile.getElevationAtIndices(1, jLon);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+ }
+ } else if (zipperLocation == Tile.Location.NORTH) {
+ SimpleTile tileAbove = surroundingTiles.getTileAbove();
+ for (int jLon = 0; jLon < zipperTile.getLongitudeColumns(); jLon++) {
+ // row 0 of zipper
+ double zipperElevation = zipperTile.getElevationAtIndices(0, jLon);
+ double originELevation = originTile.getElevationAtIndices(originTile.getLatitudeRows() - 2, jLon);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // row 1 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(1, jLon);
+ originELevation = originTile.getElevationAtIndices(originTile.getLatitudeRows() - 1, jLon);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // row 2 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(2, jLon);
+ double aboveELevation = tileAbove.getElevationAtIndices(0, jLon);
+ assertEquals(aboveELevation, zipperElevation, epsilonLatLon);
+
+ // row 3 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(3, jLon);
+ aboveELevation = tileAbove.getElevationAtIndices(1, jLon);
+ assertEquals(aboveELevation, zipperElevation, epsilonLatLon);
+ }
+ } else if (zipperLocation == Tile.Location.WEST) {
+ SimpleTile tileLeft = surroundingTiles.getTileLeft();
+ for (int iLat = 0; iLat < zipperTile.getLatitudeRows(); iLat++) {
+ // col 0 of zipper
+ double zipperElevation = zipperTile.getElevationAtIndices(iLat, 0);
+ double leftELevation = tileLeft.getElevationAtIndices(iLat, tileLeft.getLongitudeColumns() - 2);
+ assertEquals(leftELevation, zipperElevation, epsilonLatLon);
+
+ // col 1 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 1);
+ leftELevation = tileLeft.getElevationAtIndices(iLat, tileLeft.getLongitudeColumns() - 1);
+ assertEquals(leftELevation, zipperElevation, epsilonLatLon);
+
+ // col 2 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 2);
+ double originELevation = originTile.getElevationAtIndices(iLat, 0);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // col 3 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 3);
+ originELevation = originTile.getElevationAtIndices(iLat, 1);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+ }
+
+ } else if (zipperLocation == Tile.Location.EAST) {
+ SimpleTile tileRight = surroundingTiles.getTileRight();
+ for (int iLat = 0; iLat < zipperTile.getLatitudeRows(); iLat++) {
+ // col 0 of zipper
+ double zipperElevation = zipperTile.getElevationAtIndices(iLat, 0);
+ double originELevation = originTile.getElevationAtIndices(iLat, originTile.getLongitudeColumns() - 2);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // col 1 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 1);
+ originELevation = originTile.getElevationAtIndices(iLat, originTile.getLongitudeColumns() - 1);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // col 2 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 2);
+ double rightELevation = tileRight.getElevationAtIndices(iLat, 0);
+ assertEquals(rightELevation, zipperElevation, epsilonLatLon);
+
+ // col 3 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 3);
+ rightELevation = tileRight.getElevationAtIndices(iLat, 1);
+ assertEquals(rightELevation, zipperElevation, epsilonLatLon);
+ }
+ }
+ }
+
+ private void checkZipperTileDifferentStep(SimpleTile zipperTile, Tile.Location zipperLocation,
+ SimpleTile originTile, double tileSizeDeg,
+ TilesCache<SimpleTile> cache, double epsilonLatLon) {
+
+ SurroundingTiles surroundingTiles = new SurroundingTiles(originTile, tileSizeDeg, cache);
+
+ if (zipperLocation == Tile.Location.SOUTH) {
+
+ SimpleTile tileBelow = surroundingTiles.getTileBelow();
+
+ for (int jLon = 0; jLon < zipperTile.getLongitudeColumns(); jLon++) {
+
+ // We assure to be inside a cell by adding a delta step (to avoid inappropriate index computation)
+ double deltaLon = 0.1*zipperTile.getLongitudeStep();
+ double zipperLongitude = zipperTile.getLongitudeAtIndex(jLon) + deltaLon;
+
+ double originTileDoubleLongitudeIndex = computeLongitudeIndexDifferentStep(zipperLongitude, originTile);
+ int originTileLongitudeIndex = FastMath.max(0, FastMath.min(originTile.getLongitudeColumns() - 1, (int) FastMath.floor(originTileDoubleLongitudeIndex)));
+
+ double belowTileDoubleLongitudeIndex = computeLongitudeIndexDifferentStep(zipperLongitude, tileBelow);
+ int belowTileLongitudeIndex = FastMath.max(0, FastMath.min(tileBelow.getLongitudeColumns() - 1, (int) FastMath.floor(belowTileDoubleLongitudeIndex)));
+
+ // row 0 of zipper
+ double zipperLat0 = zipperTile.getMinimumLatitude() + 0.1*zipperTile.getLatitudeStep();
+ double belowTileDoubleLatitudeIndex = computeLatitudeIndexDifferentStep(zipperLat0, tileBelow);
+ int belowTileLatitudeIndex0 = FastMath.max(0, FastMath.min(tileBelow.getLatitudeRows() - 1, (int) FastMath.floor(belowTileDoubleLatitudeIndex)));
+
+ double zipperElevation = zipperTile.getElevationAtIndices(0, jLon);
+ double belowELevation = tileBelow.getElevationAtIndices(belowTileLatitudeIndex0, belowTileLongitudeIndex);
+ assertEquals(belowELevation, zipperElevation, epsilonLatLon);
+
+ // row 1 of zipper
+ double zipperLat1 = zipperLat0 + zipperTile.getLatitudeStep();
+ belowTileDoubleLatitudeIndex = computeLatitudeIndexDifferentStep(zipperLat1, tileBelow);
+ int originTileLatitudeIndex1 = FastMath.max(0, FastMath.min(tileBelow.getLatitudeRows() - 1, (int) FastMath.floor(belowTileDoubleLatitudeIndex)));
+
+ zipperElevation = zipperTile.getElevationAtIndices(1, jLon);
+ belowELevation = tileBelow.getElevationAtIndices(originTileLatitudeIndex1, belowTileLongitudeIndex);
+ assertEquals(belowELevation, zipperElevation, epsilonLatLon);
+ // row 2 of zipper
+ double zipperLat2 = zipperLat0 + 2*zipperTile.getLatitudeStep();
+ double originTileDoubleLatitudeIndex = computeLatitudeIndexDifferentStep(zipperLat2, originTile);
+ int originTileLatitudeIndex2 = FastMath.max(0, FastMath.min(originTile.getLatitudeRows() - 1, (int) FastMath.floor(originTileDoubleLatitudeIndex)));
+
+ zipperElevation = zipperTile.getElevationAtIndices(2, jLon);
+ double originELevation = originTile.getElevationAtIndices(originTileLatitudeIndex2, originTileLongitudeIndex);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // row 3 of zipper
+ double zipperLat3 = zipperLat0 + 3*zipperTile.getLatitudeStep();
+ originTileDoubleLatitudeIndex = computeLatitudeIndexDifferentStep(zipperLat3, originTile);
+ int originTileLatitudeIndex3 = FastMath.max(0, FastMath.min(originTile.getLatitudeRows() - 1, (int) FastMath.floor(originTileDoubleLatitudeIndex)));
+
+ zipperElevation = zipperTile.getElevationAtIndices(3, jLon);
+ originELevation = originTile.getElevationAtIndices(originTileLatitudeIndex3, originTileLongitudeIndex);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+ }
+ } else if (zipperLocation == Tile.Location.NORTH) {
+
+ SimpleTile tileAbove = surroundingTiles.getTileAbove();
+
+ for (int jLon = 0; jLon < zipperTile.getLongitudeColumns(); jLon++) {
+
+ // We assure to be inside a cell by adding a delta step (to avoid inappropriate index computation)
+ double deltaLon = 0.1*zipperTile.getLongitudeStep();
+ double zipperLongitude = zipperTile.getLongitudeAtIndex(jLon) + deltaLon;
+
+ double originTileDoubleLongitudeIndex = computeLongitudeIndexDifferentStep(zipperLongitude,originTile);
+ int originTileLongitudeIndex = FastMath.max(0, FastMath.min(originTile.getLongitudeColumns() - 1, (int) FastMath.floor(originTileDoubleLongitudeIndex)));
+
+ double aboveTileDoubleLongitudeIndex = computeLongitudeIndexDifferentStep(zipperLongitude, tileAbove);
+ int aboveTileLongitudeIndex = FastMath.max(0, FastMath.min(tileAbove.getLongitudeColumns() - 1, (int) FastMath.floor(aboveTileDoubleLongitudeIndex)));
+
+ // row 0 of zipper
+ double zipperLat0 = zipperTile.getMinimumLatitude() + 0.1*zipperTile.getLatitudeStep();
+ double originTileDoubleLatitudeIndex = computeLatitudeIndexDifferentStep(zipperLat0, originTile);
+ int originTileLatitudeIndex0 = FastMath.max(0, FastMath.min(originTile.getLatitudeRows() - 1, (int) FastMath.floor(originTileDoubleLatitudeIndex)));
+
+ double zipperElevation = zipperTile.getElevationAtIndices(0, jLon);
+ double originELevation = originTile.getElevationAtIndices(originTileLatitudeIndex0, originTileLongitudeIndex);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // row 1 of zipper
+ double zipperLat1 = zipperLat0 + zipperTile.getLatitudeStep();
+ originTileDoubleLatitudeIndex = computeLatitudeIndexDifferentStep(zipperLat1, originTile);
+ int originTileLatitudeIndex1 = FastMath.max(0, FastMath.min(originTile.getLatitudeRows() - 1, (int) FastMath.floor(originTileDoubleLatitudeIndex)));
+
+ zipperElevation = zipperTile.getElevationAtIndices(1, jLon);
+ originELevation = originTile.getElevationAtIndices(originTileLatitudeIndex1, originTileLongitudeIndex);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // row 2 of zipper
+ double zipperLat2 = zipperLat0 + 2*zipperTile.getLatitudeStep();
+ double aboveTileDoubleLatitudeIndex = computeLatitudeIndexDifferentStep(zipperLat2, tileAbove);
+ int aboveTileLatitudeIndex2 = FastMath.max(0, FastMath.min(tileAbove.getLatitudeRows() - 1, (int) FastMath.floor(aboveTileDoubleLatitudeIndex)));
+
+ zipperElevation = zipperTile.getElevationAtIndices(2, jLon);
+ double aboveELevation = tileAbove.getElevationAtIndices(aboveTileLatitudeIndex2, aboveTileLongitudeIndex);
+ assertEquals(aboveELevation, zipperElevation, epsilonLatLon);
+
+ // row 3 of zipper
+ double zipperLat3 = zipperLat0 + 3*zipperTile.getLatitudeStep();
+ aboveTileDoubleLatitudeIndex = computeLatitudeIndexDifferentStep(zipperLat3, tileAbove);
+ int aboveTileLatitudeIndex3 = FastMath.max(0, FastMath.min(tileAbove.getLatitudeRows() - 1, (int) FastMath.floor(aboveTileDoubleLatitudeIndex)));
+
+ zipperElevation = zipperTile.getElevationAtIndices(3, jLon);
+ aboveELevation = tileAbove.getElevationAtIndices(aboveTileLatitudeIndex3, aboveTileLongitudeIndex);
+ assertEquals(aboveELevation, zipperElevation, epsilonLatLon);
+ }
+ } else if (zipperLocation == Tile.Location.WEST) {
+ SimpleTile tileLeft = surroundingTiles.getTileLeft();
+ for (int iLat = 0; iLat < zipperTile.getLatitudeRows(); iLat++) {
+ // col 0 of zipper
+ double zipperElevation = zipperTile.getElevationAtIndices(iLat, 0);
+ double leftELevation = tileLeft.getElevationAtIndices(iLat, tileLeft.getLongitudeColumns() - 2);
+ assertEquals(leftELevation, zipperElevation, epsilonLatLon);
+
+ // col 1 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 1);
+ leftELevation = tileLeft.getElevationAtIndices(iLat, tileLeft.getLongitudeColumns() - 1);
+ assertEquals(leftELevation, zipperElevation, epsilonLatLon);
+
+ // col 2 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 2);
+ double originELevation = originTile.getElevationAtIndices(iLat, 0);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // col 3 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 3);
+ originELevation = originTile.getElevationAtIndices(iLat, 1);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+ }
+
+ } else if (zipperLocation == Tile.Location.EAST) {
+ SimpleTile tileRight = surroundingTiles.getTileRight();
+ for (int iLat = 0; iLat < zipperTile.getLatitudeRows(); iLat++) {
+ // col 0 of zipper
+ double zipperElevation = zipperTile.getElevationAtIndices(iLat, 0);
+ double originELevation = originTile.getElevationAtIndices(iLat, originTile.getLongitudeColumns() - 2);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // col 1 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 1);
+ originELevation = originTile.getElevationAtIndices(iLat, originTile.getLongitudeColumns() - 1);
+ assertEquals(originELevation, zipperElevation, epsilonLatLon);
+
+ // col 2 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 2);
+ double rightELevation = tileRight.getElevationAtIndices(iLat, 0);
+ assertEquals(rightELevation, zipperElevation, epsilonLatLon);
+
+ // col 3 of zipper
+ zipperElevation = zipperTile.getElevationAtIndices(iLat, 3);
+ rightELevation = tileRight.getElevationAtIndices(iLat, 1);
+ assertEquals(rightELevation, zipperElevation, epsilonLatLon);
+ }
+ }
+ }
+
+ private double computeLatitudeIndexDifferentStep(double latitude, SimpleTile tileToSearchLatitudeIndex) {
+ // Formula different from code
+ return 0.5 + latitude/ tileToSearchLatitudeIndex.getLatitudeStep() - tileToSearchLatitudeIndex.getMinimumLatitude() / tileToSearchLatitudeIndex.getLatitudeStep();
+ }
+
+ private double computeLongitudeIndexDifferentStep(double longitude, SimpleTile tileToSearchLongitudeIndex) {
+ // Formula different from code
+ return 0.5 + longitude/ tileToSearchLongitudeIndex.getLongitudeStep() - tileToSearchLongitudeIndex.getMinimumLongitude() / tileToSearchLongitudeIndex.getLongitudeStep();
+ }
+
+ private final static double getNorthernEdgeOfTile(SimpleTile tile) {
+ double northernLatitudeForTile = getNorthernLatitudeForTile(tile);
+ // Inside the northern row of latitude
+ return northernLatitudeForTile - 0.1*FastMath.toDegrees(tile.getLatitudeStep());
+ }
+
+ private final static double getSouthernEdgeOfTile(SimpleTile tile) {
+ double southernLatitudeForTile = getSouthernLatitudeForTile(tile);
+ // Inside the southern row of latitude
+ return southernLatitudeForTile + 0.1*FastMath.toDegrees(tile.getLatitudeStep());
+ }
+
+ private final static double getWesternEdgeOfTile(SimpleTile tile) {
+ double westernLongitudeForTile = getWesternLongitudeForTile(tile);
+ // Inside the western column of longitude
+ return westernLongitudeForTile + 0.1*FastMath.toDegrees(tile.getLongitudeStep());
+ }
+
+ private final static double getEasternEdgeOfTile(SimpleTile tile) {
+ double easternLongitudeForTile = getEasternLongitudeForTile(tile);
+ // Inside the eastern column of longitude
+ return easternLongitudeForTile - 0.1*FastMath.toDegrees(tile.getLongitudeStep());
+ }
+
+ private final static double getNorthernLatitudeForTile(SimpleTile tile) {
+ return FastMath.toDegrees(tile.getMaximumLatitude()) + 0.5*FastMath.toDegrees(tile.getLatitudeStep());
+ }
+
+ private final static double getSouthernLatitudeForTile(SimpleTile tile) {
+ return FastMath.toDegrees(tile.getMinimumLatitude()) - 0.5*FastMath.toDegrees(tile.getLatitudeStep());
+ }
+
+ private final static double getWesternLongitudeForTile(SimpleTile tile) {
+ return FastMath.toDegrees(tile.getMinimumLongitude()) - 0.5*FastMath.toDegrees(tile.getLongitudeStep());
+ }
+
+ private final static double getEasternLongitudeForTile(SimpleTile tile) {
+ return FastMath.toDegrees(tile.getMaximumLongitude()) + 0.5*FastMath.toDegrees(tile.getLongitudeStep());
+ }
+
+ final static double epsilonElevation = 1.e-6;
+
+ final static java.text.DecimalFormatSymbols symbols = new java.text.DecimalFormatSymbols(java.util.Locale.US);
+ final static java.text.DecimalFormat dfs = new java.text.DecimalFormat("#.#####",symbols);
+
+ /** Clean up of factory map
+ * @param factoryClass
+ */
+ private static void clearFactoryMaps(Class<?> factoryClass) {
+ try {
+
+ for (Field field : factoryClass.getDeclaredFields()) {
+ if (Modifier.isStatic(field.getModifiers()) &&
+ Map.class.isAssignableFrom(field.getType())) {
+ field.setAccessible(true);
+ ((Map<?, ?>) field.get(null)).clear();
+ }
+ }
+ } catch (IllegalAccessException iae) {
+ Assert.fail(iae.getMessage());
+ }
+ }
+}
+
+class SurroundingTiles {
+
+ private double latDeg;
+ private double lonDeg;
+ private TilesCache<SimpleTile> cache;
+ private double tileSizeDeg;
+
+ SurroundingTiles(SimpleTile originTile, double tileSizeDeg, TilesCache<SimpleTile> cache) {
+
+ this.cache = cache;
+ this.tileSizeDeg = tileSizeDeg;
+
+ int latRows = originTile.getLatitudeRows();
+ int loncols = originTile.getLongitudeColumns();
+
+ // Get a middle point of the tile
+ this.latDeg = FastMath.toDegrees(originTile.getLatitudeAtIndex(latRows/2));
+ this.lonDeg = FastMath.toDegrees(originTile.getLongitudeAtIndex(loncols/2));
+ }
+
+ public SimpleTile getTileAbove() {
+
+ // get tile above ...
+ double latAbove = latDeg + tileSizeDeg;
+ return cache.getTile(FastMath.toRadians(latAbove), FastMath.toRadians(lonDeg));
+ }
+
+ public SimpleTile getTileBelow() {
+
+ // get tile below
+ double latBelow = latDeg - tileSizeDeg;
+ return cache.getTile(FastMath.toRadians(latBelow), FastMath.toRadians(lonDeg));
+ }
+
+ public SimpleTile getTileLeft() {
+
+ // get tile left
+ double lonLeftRad = FastMath.toRadians(lonDeg - tileSizeDeg);
+ // Assure that the longitude belongs to [-180, + 180]
+ double lonLeftNorm = MathUtils.normalizeAngle(lonLeftRad, 0.0);
+ return cache.getTile(FastMath.toRadians(latDeg), lonLeftNorm);
+ }
+
+ public SimpleTile getTileRight() {
+
+ // get tile right
+ double lonRightRad = FastMath.toRadians(lonDeg + tileSizeDeg);
+ // Assure that the longitude belongs to [-180, + 180]
+ double lonRightNorm = MathUtils.normalizeAngle(lonRightRad, 0.0);
+ return cache.getTile(FastMath.toRadians(latDeg), lonRightNorm);
+ }
}
+
+
diff --git a/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
index 71e605ea69a02d3dea9a33641038dbcc311a3297..8626c4ca31febc223924e3da62d8c2156270392c 100644
--- a/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/test/java/org/orekit/rugged/refraction/AtmosphericRefractionTest.java b/src/test/java/org/orekit/rugged/refraction/AtmosphericRefractionTest.java
index dda307f328f287f934e0359e0e194c5a1b9a9562..9ebf993c520eceb9db12f01e7081b867afb9641a 100644
--- a/src/test/java/org/orekit/rugged/refraction/AtmosphericRefractionTest.java
+++ b/src/test/java/org/orekit/rugged/refraction/AtmosphericRefractionTest.java
@@ -8,7 +8,12 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+import org.hipparchus.analysis.differentiation.Derivative;
+import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.RotationConvention;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
@@ -17,8 +22,11 @@ import org.junit.Assert;
import org.junit.Test;
import org.orekit.bodies.BodyShape;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
+import org.orekit.frames.Frame;
+import org.orekit.frames.FramesFactory;
+import org.orekit.models.earth.ReferenceEllipsoid;
import org.orekit.orbits.Orbit;
import org.orekit.rugged.TestUtils;
import org.orekit.rugged.api.AlgorithmId;
@@ -37,12 +45,17 @@ import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.los.TimeDependentLOS;
import org.orekit.rugged.raster.RandomLandscapeUpdater;
import org.orekit.rugged.raster.TileUpdater;
+import org.orekit.rugged.utils.DerivativeGenerator;
import org.orekit.rugged.utils.GeodeticUtilities;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.TimeScalesFactory;
import org.orekit.utils.AngularDerivativesFilter;
import org.orekit.utils.CartesianDerivativesFilter;
import org.orekit.utils.Constants;
+import org.orekit.utils.IERSConventions;
+import org.orekit.utils.ParameterDriver;
+import org.orekit.utils.TimeStampedAngularCoordinates;
+import org.orekit.utils.TimeStampedPVCoordinates;
public class AtmosphericRefractionTest {
@@ -54,6 +67,7 @@ public class AtmosphericRefractionTest {
int dimension = 4000;
RuggedBuilder builder = initRuggedForAtmosphericTests(dimension, sensorName);
+
// Build Rugged without atmospheric refraction model
Rugged ruggedWithout = builder.build();
@@ -80,7 +94,7 @@ public class AtmosphericRefractionTest {
final double epsilonPixel = pixelThreshold;
final double epsilonLine = lineThreshold;
- double earthRadius = ruggedWithout.getEllipsoid().getEquatorialRadius();
+ final double earthRadius = ruggedWithout.getEllipsoid().getEquatorialRadius();
// Direct loc on a line WITHOUT and WITH atmospheric correction
// ============================================================
@@ -120,15 +134,35 @@ public class AtmosphericRefractionTest {
GeodeticPoint dummyGP = new GeodeticPoint(dummyLat, dummyLon, 0.);
try {
ruggedWith.inverseLocation(sensorName, dummyGP, minLine, maxLine);
+ Assert.fail("an exeption should have been thrown");
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES, re.getSpecifier());
+ }
+
+ try {
+ ruggedWith.inverseLocation(sensorName,
+ gpWithAtmosphericRefractionCorrection[0],
+ 210, maxLine);
+ Assert.fail("an exeption should have been thrown");
} catch (RuggedException re) {
- Assert.assertEquals(RuggedMessages.INVALID_RANGE_FOR_LINES, re.getSpecifier());
+ Assert.assertEquals(RuggedMessages.SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES, re.getSpecifier());
}
+
+ try {
+ ruggedWith.inverseLocation(sensorName,
+ gpWithAtmosphericRefractionCorrection[0],
+ minLine, 190);
+ Assert.fail("an exeption should have been thrown");
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.SENSOR_PIXEL_NOT_FOUND_IN_RANGE_LINES, re.getSpecifier());
+ }
+
}
private RuggedBuilder initRuggedForAtmosphericTests(final int dimension, final String sensorName) throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
final BodyShape earth = TestUtils.createEarth();
final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
@@ -173,6 +207,182 @@ public class AtmosphericRefractionTest {
return builder;
}
+ /**
+ * Test for issue #391
+ */
+ @Test
+ public void testInverseLocationMargin() throws URISyntaxException {
+
+ String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
+
+ RuggedBuilder builder = new RuggedBuilder();
+
+ Frame ecf = FramesFactory.getITRF(IERSConventions.IERS_2010, true);
+ builder.setEllipsoid(ReferenceEllipsoid.getWgs84(ecf));
+
+ MultiLayerModel atmosphere = new MultiLayerModel(builder.getEllipsoid());
+ builder.setRefractionCorrection(atmosphere);
+
+ builder.setLightTimeCorrection(true);
+ builder.setAberrationOfLightCorrection(true);
+ builder.setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
+
+ AbsoluteDate start = AbsoluteDate.ARBITRARY_EPOCH;
+ AbsoluteDate end = start.shiftedBy(10);
+ AbsoluteDate middle = start.shiftedBy(end.durationFrom(start) / 2);
+ builder.setTimeSpan(start, end, 1e-3, 1e-3);
+
+ final double h = 500e3;
+ Vector3D p = new Vector3D(6378137 + h, 0, 0);
+ Vector3D v = Vector3D.ZERO;
+ List<TimeStampedPVCoordinates> pvs = Arrays.asList(
+ new TimeStampedPVCoordinates(start, p, v),
+ new TimeStampedPVCoordinates(end, p, v));
+
+ Rotation rotation = new Rotation(Vector3D.MINUS_I, Vector3D.MINUS_K, Vector3D.PLUS_K, Vector3D.PLUS_I);
+ TimeStampedAngularCoordinates attitude =
+ new TimeStampedAngularCoordinates(
+ middle, rotation,
+ Vector3D.PLUS_I.scalarMultiply(0.1), Vector3D.ZERO);
+ List<TimeStampedAngularCoordinates> attitudes = Arrays.asList(
+ attitude.shiftedBy(start.durationFrom(attitude.getDate())),
+ attitude,
+ attitude.shiftedBy(end.durationFrom(attitude.getDate())));
+
+ builder.setTrajectory(ecf,
+ pvs, 2, CartesianDerivativesFilter.USE_P,
+ attitudes, 2, AngularDerivativesFilter.USE_R);
+
+ final double iFov = 1e-6;
+ TimeDependentLOS los = new TimeDependentLOS() {
+ @Override
+ public int getNbPixels() {
+ return 1000;
+ }
+
+ @Override
+ public Vector3D getLOS(int index, AbsoluteDate date) {
+ // simplistic pinhole camera, assumes small angle
+ final double center = getNbPixels() / 2.0;
+ final double x = (index - center);
+ final double los = x * iFov;
+ return new Vector3D(los, 0, 1);
+ }
+
+ @Override
+ public <T extends Derivative<T>> FieldVector3D<T> getLOSDerivatives(
+ int index,
+ AbsoluteDate date,
+ DerivativeGenerator<T> generator) {
+ throw new UnsupportedOperationException("not implemented");
+ }
+
+ @Override
+ public Stream<ParameterDriver> getParametersDrivers() {
+ return Stream.empty();
+ }
+ };
+
+ LineSensor sensor = new LineSensor("sensor",
+ new LinearLineDatation(middle, 0, 1000),
+ Vector3D.ZERO,
+ los);
+ builder.addLineSensor(sensor);
+
+ Rugged ruggedWithDefaultMargin = builder.build();
+
+ GeodeticPoint point = ruggedWithDefaultMargin.directLocation(sensor.getName(), 1000)[500];
+ try {
+ final int maxLine = 4999; // works with 4980, fails with 4999
+ ruggedWithDefaultMargin.inverseLocation(sensor.getName(), point, 0, maxLine);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.SENSOR_PIXEL_NOT_FOUND_IN_PIXELS_LINE,re.getSpecifier());
+ }
+
+ // Check the default margin is equal to the used one
+ Assert.assertEquals(builder.getRefractionCorrection().getComputationParameters().getDefaultInverseLocMargin(),
+ builder.getRefractionCorrection().getComputationParameters().getInverseLocMargin(),
+ 1.0e-10);
+
+ // Change the margin to an admissible one for this case
+ builder.getRefractionCorrection().setInverseLocMargin(0.81);
+ Rugged ruggedWithCustomMargin = builder.build();
+
+ point = ruggedWithCustomMargin.directLocation(sensor.getName(), 1000)[500];
+ final int maxLine = 4999; // works with a margin > 0.803
+ SensorPixel pixel = ruggedWithCustomMargin.inverseLocation(sensor.getName(), point, 0, maxLine);
+ Assert.assertTrue(pixel != null);
+
+ }
+
+ /**
+ * Test for issue #392
+ */
+ @Test
+ public void testLightTimeCorrection() throws URISyntaxException {
+
+ String sensorName = "line";
+ int dimension = 4000;
+
+ RuggedBuilder builder = initRuggedForAtmosphericTests(dimension, sensorName);
+
+ // Build Rugged without atmospheric refraction but with light time correction
+ builder.setLightTimeCorrection(true);
+ Rugged ruggedWithLightTimeWithoutRefraction = builder.build();
+
+ // Defines atmospheric refraction model (with the default multi layers model)
+ AtmosphericRefraction atmosphericRefraction = new MultiLayerModel(builder.getEllipsoid());
+ int pixelStep = 100;
+ int lineStep = 100;
+ atmosphericRefraction.setGridSteps(pixelStep, lineStep);
+
+ // Add atmospheric refraction model
+ builder.setRefractionCorrection(atmosphericRefraction);
+
+ // Build Rugged without light time correction (with atmospheric refraction)
+ builder.setLightTimeCorrection(false);
+ Rugged ruggedWithoutLightTime = builder.build();
+
+ // Build Rugged with light time correction (with atmospheric refraction)
+ builder.setLightTimeCorrection(true);
+ Rugged ruggedWithLightTime = builder.build();
+
+
+ // Compare direct loc on a line :
+ // * with atmospheric refraction, WITHOUT and WITH light time correction:
+ // distance on ground must be not null and < 1.2 m (max shift at equator for orbit at 800km)
+ // * with light time correction, WITHOUT and WITH atmospheric refraction
+ // distance on ground must be not null and < 2 m (max shift due to atmospheric refraction)
+ // =========================================================================================
+ double chosenLine = 200.;
+ GeodeticPoint[] gpWithoutLightTime = ruggedWithoutLightTime.directLocation(sensorName, chosenLine);
+ GeodeticPoint[] gpWithLightTime = ruggedWithLightTime.directLocation(sensorName, chosenLine);
+
+ GeodeticPoint[] gpWithLightTimeWithoutRefraction = ruggedWithLightTimeWithoutRefraction.directLocation(sensorName, chosenLine);
+
+ double earthRadius = builder.getEllipsoid().getEquatorialRadius();
+
+ // Check the shift on the ground
+ for (int i = 0; i < gpWithLightTime.length; i++) {
+
+ double currentRadius = earthRadius + (gpWithLightTime[i].getAltitude() + gpWithoutLightTime[i].getAltitude())/2.;
+ // Compute distance between point (with atmospheric refraction) with light time correction and without
+ double distance = GeodeticUtilities.computeDistanceInMeter(currentRadius, gpWithLightTime[i], gpWithoutLightTime[i]);
+
+ // Check if the distance is not 0 and < 1.2m (at equator max of shift)
+ Assert.assertTrue(distance > 0.0);
+ Assert.assertTrue(distance <= 1.2);
+
+ // Compute distance between point (with light time correction) with refraction and without refraction
+ distance = GeodeticUtilities.computeDistanceInMeter(currentRadius, gpWithLightTime[i], gpWithLightTimeWithoutRefraction[i]);
+ // Check if the distance is not 0 and < 2m
+ Assert.assertTrue(distance > 0.0);
+ Assert.assertTrue(distance < 2.);
+ }
+ }
@Test
public void testBadConfig() {
diff --git a/src/test/java/org/orekit/rugged/refraction/MultiLayerModelTest.java b/src/test/java/org/orekit/rugged/refraction/MultiLayerModelTest.java
index cadca6e1c02a12940ec4144ff8f5d6091aef13f9..7424ffb82aa0a780a7b23960a0fc0e991546bd79 100644
--- a/src/test/java/org/orekit/rugged/refraction/MultiLayerModelTest.java
+++ b/src/test/java/org/orekit/rugged/refraction/MultiLayerModelTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -42,7 +42,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
public void testAlmostNadir() {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
final Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
final Vector3D los = new Vector3D( 0.5127552821932051, -0.8254313129088879, -0.2361041470463311);
final NormalizedGeodeticPoint rawIntersection =
@@ -63,7 +63,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
public void testNoOpRefraction() {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
final Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
final Vector3D los = los(position, FastMath.toRadians(50.0));
final NormalizedGeodeticPoint rawIntersection = algorithm.refineIntersection(earth, position, los,
@@ -91,7 +91,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
final Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
final Vector3D los = los(position, FastMath.toRadians(50.0));
final NormalizedGeodeticPoint rawIntersection = algorithm.refineIntersection(earth, position, los,
@@ -139,7 +139,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
final Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
final Vector3D los = los(position, FastMath.toRadians(50.0));
final NormalizedGeodeticPoint rawIntersection = algorithm.refineIntersection(earth, position, los,
@@ -181,7 +181,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
public void testMissingLayers() {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
final Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
final Vector3D los = los(position, FastMath.toRadians(50.0));
final NormalizedGeodeticPoint rawIntersection = algorithm.refineIntersection(earth, position, los,
@@ -206,7 +206,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
public void testLayersBelowDEM() {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
final Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
final Vector3D los = los(position, FastMath.toRadians(50.0));
final NormalizedGeodeticPoint rawIntersection = algorithm.refineIntersection(earth, position, los,
@@ -225,7 +225,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
public void testDivingAngleChange() {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8, true);
final Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
AtmosphericRefraction model = new MultiLayerModel(earth);
@@ -257,8 +257,8 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
}
@Override
- protected IntersectionAlgorithm createAlgorithm(TileUpdater updater, int maxCachedTiles) {
- return new DuvenhageAlgorithm(updater, maxCachedTiles, false);
+ protected IntersectionAlgorithm createAlgorithm(TileUpdater updater, int maxCachedTiles, boolean isOverlappingTiles) {
+ return new DuvenhageAlgorithm(updater, maxCachedTiles, false, isOverlappingTiles);
}
}
diff --git a/src/test/java/org/orekit/rugged/utils/AbsoluteDateForVectorisationTest.java b/src/test/java/org/orekit/rugged/utils/AbsoluteDateForVectorisationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9afe4469521a34dbfc377ebbbb7f60cb6ca7772a
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/utils/AbsoluteDateForVectorisationTest.java
@@ -0,0 +1,127 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.utils;
+
+
+import org.hipparchus.exception.LocalizedCoreFormats;
+import org.junit.Assert;
+import org.junit.Test;
+import org.orekit.errors.OrekitException;
+import org.orekit.time.AbsoluteDate;
+
+public class AbsoluteDateForVectorisationTest {
+ @Test
+ public void testShiftedBySeveralTimeShiftOneDate() {
+
+ AbsoluteDate date1 = new AbsoluteDate();
+ AbsoluteDate[] dates = new AbsoluteDate[] {date1};
+ double[] dts = new double[] {10.0, 20.0, 30.0};
+ AbsoluteDateArrayHandling datesForVect = new AbsoluteDateArrayHandling(dates);
+ AbsoluteDate[][] datesShifted = datesForVect.multipleShiftedBy(dts);
+ Assert.assertEquals(datesShifted[0][0].durationFrom(date1.shiftedBy(10)), 0.0, 1e-5);
+ Assert.assertEquals(datesShifted[0][1].durationFrom(date1.shiftedBy(20)), 0.0, 1e-5);
+
+ }
+
+ @Test
+ public void testShiftedByCorrespondingTimeShift() {
+
+ AbsoluteDate date1 = new AbsoluteDate();
+ AbsoluteDate date2 = date1.shiftedBy(10000);
+ AbsoluteDate date3 = date1.shiftedBy(20000);
+ AbsoluteDate[] dates = new AbsoluteDate[] {date1, date2, date3};
+ double[] dts = new double[] {10.0, 20.0, 30.0};
+ AbsoluteDateArrayHandling datesForVect = new AbsoluteDateArrayHandling(dates);
+ AbsoluteDate[] datesShifted = datesForVect.shiftedBy(dts);
+ Assert.assertEquals(datesShifted[0].durationFrom(date1.shiftedBy(10)), 0.0, 1e-5);
+ Assert.assertEquals(datesShifted[1].durationFrom(date1.shiftedBy(10020)), 0.0, 1e-5);
+ Assert.assertEquals(datesShifted[2].durationFrom(date1.shiftedBy(20030)), 0.0, 1e-5);
+
+ }
+
+ @Test
+ public void testShiftedBySeveralTimeShiftSeveralDates() {
+
+ AbsoluteDate date1 = new AbsoluteDate();
+ AbsoluteDate date2 = date1.shiftedBy(10000);
+ AbsoluteDate[] dates = new AbsoluteDate[] {date1, date2};
+ double[] dts = new double[] {10.0, 20.0, 30.0};
+ AbsoluteDateArrayHandling datesForVect = new AbsoluteDateArrayHandling(dates);
+ AbsoluteDate[][] datesShifted = datesForVect.multipleShiftedBy(dts);
+ Assert.assertEquals(datesShifted[0][0].durationFrom(date1.shiftedBy(10)), 0.0, 1e-5);
+ Assert.assertEquals(datesShifted[0][1].durationFrom(date1.shiftedBy(20)), 0.0, 1e-5);
+ Assert.assertEquals(datesShifted[1][1].durationFrom(date2.shiftedBy(20)), 0.0, 1e-5);
+ Assert.assertEquals(datesShifted[1][2].durationFrom(date2.shiftedBy(30)), 0.0, 1e-5);
+
+ }
+
+ @Test
+ public void testDurationFromSeveralDates() {
+
+ AbsoluteDate date1 = new AbsoluteDate();
+ AbsoluteDate date2 = date1.shiftedBy(10000);
+ AbsoluteDate date3 = date1.shiftedBy(20000);
+ AbsoluteDate date4 = date1.shiftedBy(100000);
+ AbsoluteDate[] dates = new AbsoluteDate[] {date1, date2, date3};
+ AbsoluteDate[] datesComputeDuration = new AbsoluteDate[] {date4, date1};
+ AbsoluteDateArrayHandling datesForVect = new AbsoluteDateArrayHandling(dates);
+ double[][] datesDurations = datesForVect.multipleDurationFrom(datesComputeDuration);
+ Assert.assertEquals(datesDurations[0][0], date1.durationFrom(date4), 1e-5);
+ Assert.assertEquals(datesDurations[0][1], date1.durationFrom(date1), 1e-5);
+ Assert.assertEquals(datesDurations[1][0], date2.durationFrom(date4), 1e-5);
+ Assert.assertEquals(datesDurations[1][1], date2.durationFrom(date1), 1e-5);
+ Assert.assertEquals(datesDurations[2][0], date3.durationFrom(date4), 1e-5);
+ Assert.assertEquals(datesDurations[2][1], date3.durationFrom(date1), 1e-5);
+
+ }
+
+ @Test
+ public void testDurationFromCorrespondingDates() {
+
+ AbsoluteDate date1 = new AbsoluteDate();
+ AbsoluteDate date2 = date1.shiftedBy(10000);
+ AbsoluteDate date3 = date1.shiftedBy(20000);
+ AbsoluteDate date4 = date1.shiftedBy(100000);
+ AbsoluteDate[] dates = new AbsoluteDate[] {date1, date2, date3};
+ AbsoluteDate[] datesComputeDuration = new AbsoluteDate[] {date4, date1, date2};
+ AbsoluteDateArrayHandling datesForVect = new AbsoluteDateArrayHandling(dates);
+ double[] datesDurations = datesForVect.durationFrom(datesComputeDuration);
+ Assert.assertEquals(datesDurations[0], date1.durationFrom(date4), 1e-5);
+ Assert.assertEquals(datesDurations[1], date2.durationFrom(date1), 1e-5);
+ Assert.assertEquals(datesDurations[2], date3.durationFrom(date2), 1e-5);
+
+ }
+
+ @Test
+ public void testExceptionDimensions() {
+
+ AbsoluteDate date1 = new AbsoluteDate();
+ AbsoluteDate date2 = date1.shiftedBy(10000);
+ AbsoluteDate date3 = date1.shiftedBy(20000);
+ AbsoluteDate date4 = date1.shiftedBy(100000);
+ AbsoluteDate[] dates = new AbsoluteDate[] {date1, date2, date3};
+ AbsoluteDate[] datesComputeDuration = new AbsoluteDate[] {date4, date1};
+ AbsoluteDateArrayHandling datesForVect = new AbsoluteDateArrayHandling(dates);
+ try {
+ datesForVect.durationFrom(datesComputeDuration);
+ Assert.fail("an exception should have been thrown");
+ } catch (OrekitException oe) {
+ Assert.assertEquals(LocalizedCoreFormats.DIMENSIONS_MISMATCH, oe.getSpecifier());
+ }
+ }
+
+}
diff --git a/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java b/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
index c065f18c3d78ba4e50c6cb33e87a91d268106af9..d262242a99910981d4984f5feb57838c37a6c423 100644
--- a/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
+++ b/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -16,25 +16,24 @@
*/
package org.orekit.rugged.utils;
-import org.hipparchus.geometry.euclidean.threed.Line;
-import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.hipparchus.util.FastMath;
import java.io.File;
import java.net.URISyntaxException;
+import org.hipparchus.geometry.euclidean.threed.Line;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.util.FastMath;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.frames.Frame;
import org.orekit.frames.FramesFactory;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
-import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.utils.Constants;
import org.orekit.utils.IERSConventions;
@@ -287,7 +286,7 @@ public class ExtendedEllipsoidTest {
try {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
Frame itrf = FramesFactory.getITRF(IERSConventions.IERS_2010, true);
ellipsoid = new ExtendedEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
diff --git a/src/test/java/org/orekit/rugged/utils/GeodeticUtilities.java b/src/test/java/org/orekit/rugged/utils/GeodeticUtilities.java
index 3b8ea48e7c8cd14ba18a3d3d57de253d964f934b..f221014bf9aa67f44b716807886f1203ae89b4ef 100644
--- a/src/test/java/org/orekit/rugged/utils/GeodeticUtilities.java
+++ b/src/test/java/org/orekit/rugged/utils/GeodeticUtilities.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -262,4 +262,4 @@ enum CardinalDirection {
}
return null;
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/orekit/rugged/utils/NormalizedGeodeticPointTest.java b/src/test/java/org/orekit/rugged/utils/NormalizedGeodeticPointTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..244c482321b4e6a03696c06d498751e0ba8967cb
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/utils/NormalizedGeodeticPointTest.java
@@ -0,0 +1,54 @@
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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.utils;
+
+import org.hipparchus.util.FastMath;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class NormalizedGeodeticPointTest {
+
+ /**
+ * check {@link NormalizedGeodeticPoint#equals(Object)}.
+ */
+ @Test
+ public void testEquals() {
+ // setup
+ NormalizedGeodeticPoint point = new NormalizedGeodeticPoint(1, 2, 3, 4);
+
+ // actions + verify
+ Assert.assertEquals(point, new NormalizedGeodeticPoint(1, 2, 3, 4));
+ Assert.assertFalse(point.equals(new NormalizedGeodeticPoint(0, 2, 3, 4)));
+ Assert.assertFalse(point.equals(new NormalizedGeodeticPoint(1, 0, 3, 4)));
+ Assert.assertFalse(point.equals(new NormalizedGeodeticPoint(1, 2, 0, 4)));
+ Assert.assertFalse(point.equals(new NormalizedGeodeticPoint(1, 2, 3, 10)));
+ Assert.assertFalse(point.equals(new Object()));
+ }
+
+ /**
+ * check {@link NormalizedGeodeticPoint#hashCode()}.
+ */
+ @Test
+ public void testHashCode() {
+ // setup
+ NormalizedGeodeticPoint point = new NormalizedGeodeticPoint(1, 2, 3, 4);
+
+ // actions + verify
+ Assert.assertEquals(point.hashCode(), new NormalizedGeodeticPoint(1, 2, 3, 4).hashCode());
+ Assert.assertNotEquals(point.hashCode(), new NormalizedGeodeticPoint(1, FastMath.nextUp(2), 3, 4).hashCode());
+ }
+}
diff --git a/src/test/java/org/orekit/rugged/utils/RoughVisibilityEstimatorTest.java b/src/test/java/org/orekit/rugged/utils/RoughVisibilityEstimatorTest.java
index f6e782b92650c36724e5ecff681c1e41dd5777d6..e0740bb7e800d9b87804ee78419713844da8a900 100644
--- a/src/test/java/org/orekit/rugged/utils/RoughVisibilityEstimatorTest.java
+++ b/src/test/java/org/orekit/rugged/utils/RoughVisibilityEstimatorTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -34,7 +34,7 @@ import org.orekit.bodies.BodyShape;
import org.orekit.bodies.CelestialBodyFactory;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.forces.gravity.HolmesFeatherstoneAttractionModel;
@@ -50,7 +50,6 @@ import org.orekit.orbits.PositionAngle;
import org.orekit.propagation.Propagator;
import org.orekit.propagation.SpacecraftState;
import org.orekit.propagation.numerical.NumericalPropagator;
-import org.orekit.propagation.sampling.OrekitFixedStepHandler;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.TimeScalesFactory;
import org.orekit.utils.Constants;
@@ -63,24 +62,23 @@ public class RoughVisibilityEstimatorTest {
public void testThreeOrbitsSpan() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
BodyShape earth = createEarth();
NormalizedSphericalHarmonicsProvider gravityField = createGravityField();
Orbit orbit = createOrbit(gravityField.getMu());
Propagator propagator = createPropagator(earth, gravityField, orbit);
final List<TimeStampedPVCoordinates> pv = new ArrayList<TimeStampedPVCoordinates>();
- propagator.setMasterMode(1.0, new OrekitFixedStepHandler() {
- public void handleStep(SpacecraftState currentState, boolean isLast) {
- pv.add(currentState.getPVCoordinates());
- }
- });
+ propagator.getMultiplexer().add(1.0, currentState -> pv.add(currentState.getPVCoordinates()));
propagator.propagate(orbit.getDate().shiftedBy(3 * orbit.getKeplerianPeriod()));
RoughVisibilityEstimator estimator = new RoughVisibilityEstimator(ellipsoid, orbit.getFrame(), pv);
AbsoluteDate d = estimator.estimateVisibility(new GeodeticPoint(FastMath.toRadians(-81.5),
FastMath.toRadians(-2.0),
0.0));
- Assert.assertEquals("2012-01-01T03:47:08.814", d.toString(TimeScalesFactory.getUTC()));
+ Assert.assertEquals(0.0,
+ new AbsoluteDate("2012-01-01T03:47:08.814121623",
+ TimeScalesFactory.getUTC()).durationFrom(d),
+ 1.0e-8);
}
@@ -88,24 +86,23 @@ public class RoughVisibilityEstimatorTest {
public void testOneOrbitsSpan() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
BodyShape earth = createEarth();
NormalizedSphericalHarmonicsProvider gravityField = createGravityField();
Orbit orbit = createOrbit(gravityField.getMu());
Propagator propagator = createPropagator(earth, gravityField, orbit);
final List<TimeStampedPVCoordinates> pv = new ArrayList<TimeStampedPVCoordinates>();
- propagator.setMasterMode(1.0, new OrekitFixedStepHandler() {
- public void handleStep(SpacecraftState currentState, boolean isLast) {
- pv.add(currentState.getPVCoordinates());
- }
- });
+ propagator.getMultiplexer().add(1.0, currentState -> pv.add(currentState.getPVCoordinates()));
propagator.propagate(orbit.getDate().shiftedBy(orbit.getKeplerianPeriod()));
RoughVisibilityEstimator estimator = new RoughVisibilityEstimator(ellipsoid, orbit.getFrame(), pv);
AbsoluteDate d = estimator.estimateVisibility(new GeodeticPoint(FastMath.toRadians(43.303),
FastMath.toRadians(-46.126),
0.0));
- Assert.assertEquals("2012-01-01T01:02:39.123", d.toString(TimeScalesFactory.getUTC()));
+ Assert.assertEquals(0.0,
+ new AbsoluteDate("2012-01-01T01:02:39.122526662",
+ TimeScalesFactory.getUTC()).durationFrom(d),
+ 1.0e-8);
}
@@ -176,7 +173,7 @@ public class RoughVisibilityEstimatorTest {
try {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
Frame itrf = FramesFactory.getITRF(IERSConventions.IERS_2010, true);
ellipsoid = new ExtendedEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
diff --git a/src/test/java/org/orekit/rugged/utils/SpacecraftToObservedBodyTest.java b/src/test/java/org/orekit/rugged/utils/SpacecraftToObservedBodyTest.java
index cbd67c2f133df021bf4556515db6173f4670e9d2..6717b2936af56447cb9a7e108337b0146f082be6 100644
--- a/src/test/java/org/orekit/rugged/utils/SpacecraftToObservedBodyTest.java
+++ b/src/test/java/org/orekit/rugged/utils/SpacecraftToObservedBodyTest.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.orekit.bodies.BodyShape;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.frames.FramesFactory;
@@ -115,7 +115,7 @@ public class SpacecraftToObservedBodyTest {
try {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(new File(path)));
earth = TestUtils.createEarth();
orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
diff --git a/src/test/resources/assets/org/orekit/rugged/RuggedMessages_ko.utf8 b/src/test/resources/assets/org/orekit/rugged/RuggedMessages_ko.utf8
new file mode 100644
index 0000000000000000000000000000000000000000..ab4e739779cb393190efdf1a20b26bb440e08f1b
--- /dev/null
+++ b/src/test/resources/assets/org/orekit/rugged/RuggedMessages_ko.utf8
@@ -0,0 +1,8 @@
+# no Digital Elevation Model data at latitude {0} and longitude {1}
+NO_DEM_DATA = <MISSING TRANSLATION>
+
+# unknown sensor {0}
+UNKNOWN_SENSOR = ABCDEF {0}
+
+# tile is empty: {0} ⨉ {1}
+EMPTY_TILE =
\ No newline at end of file
diff --git a/src/test/resources/replay/replay-direct-loc-Issue376-01.txt b/src/test/resources/replay/replay-direct-loc-Issue376-01.txt
index 89e6aee2d61f3063490e19fa66279d0d42d311f6..8d3a0975b33115277140dea55a7c5e7a273c50a2 100644
--- a/src/test/resources/replay/replay-direct-loc-Issue376-01.txt
+++ b/src/test/resources/replay/replay-direct-loc-Issue376-01.txt
@@ -7,8 +7,8 @@ span: minDate 2018-11-17T09:28:09.75815400000000Z maxDate 2018-11-17T09:28:24.37
transform: index 3749 body r -1.582419730578572e-01 -8.877875020391763e-04 1.556906340657658e-04 -9.873999521756794e-01 Ω -1.314379576583188e-07 1.929883563714465e-09 -7.292103298515694e-05 ΩDot -1.238204383721699e-16 -4.429578390177184e-17 2.220234885205757e-19 spacecraft p -2.043780763621181e+06 2.649055676516346e+06 -6.230074460056063e+06 v 8.500193464365886e+03 -1.120156363674237e+04 -7.562611889558547e+03 a -7.774014494482032e+02 -2.165448216679694e+02 2.038618372832540e+02 r -4.471787778551135e-01 -2.556359378108412e-01 7.875656535717214e-01 3.382628404801900e-01 Ω 1.895876683374440e-03 6.208707436271533e-04 6.748857995964048e-04 ΩDot 2.850236048816703e-06 1.374797997377696e-04 -1.976120196823438e-05
algorithm: DUVENHAGE
ellipsoid: ae 6.378137000000000e+06 f 3.352810664747481e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP
-DEM tile: t0 latMin 7.854054356026650e-01 latStep 1.454441043328608e-05 latRows 6000 lonMin 1.745401974046496e-01 lonStep 1.454441043328608e-05 lonCols 6000
-DEM cell: t0 latIndex 1051 lonIndex 4137 elevation 1.309400956268308e+01
+DEM tile: t0 latMin 7.854054356026650e-01 latStep 1.454441043328608e-05 latRows 1850 lonMin 1.745401974046496e-01 lonStep 1.454441043328608e-05 lonCols 2950
+DEM cell: t0 latIndex 1051 lonIndex 2937 elevation 1.309400956268308e+01
DEM cell: t0 latIndex 1809 lonIndex 653 elevation 3.915338283287048e+03
DEM cell: t0 latIndex 1743 lonIndex 2713 elevation 3.241641450760227e+03
DEM cell: t0 latIndex 1744 lonIndex 2713 elevation 3.183645801580853e+03
@@ -42,4 +42,8 @@ DEM cell: t0 latIndex 1750 lonIndex 2691 elevation 2.046708412363307e+03
DEM cell: t0 latIndex 1751 lonIndex 2691 elevation 1.988712685290527e+03
DEM cell: t0 latIndex 1752 lonIndex 2690 elevation 1.767717871236589e+03
DEM cell: t0 latIndex 1752 lonIndex 2691 elevation 1.932716958217748e+03
-direct location result: latitude 8.108743132084988e-01 longitude 2.136723329659456e-01 elevation 2.015454838793325e+03
+DEM cell: t0 latIndex 1751 lonIndex 2689 elevation 1.977714519950358e+03
+DEM cell: t0 latIndex 1752 lonIndex 2689 elevation 1.812718784255430e+03
+DEM cell: t0 latIndex 1753 lonIndex 2689 elevation 1.752723048560503e+03
+DEM cell: t0 latIndex 1753 lonIndex 2690 elevation 1.771722139852736e+03
+direct location result: latitude 8.108879611499973e-01 longitude 2.136511932240912e-01 elevation 1.806659334316842e+03
diff --git a/src/test/resources/replay/replay-direct-loc-Issue376-02.txt b/src/test/resources/replay/replay-direct-loc-Issue376-02.txt
index 72733be73e6d9a14d90a3cfd1bc53cda01da0b4d..193745fddbfa4d98d78071fc45317320c9394464 100644
--- a/src/test/resources/replay/replay-direct-loc-Issue376-02.txt
+++ b/src/test/resources/replay/replay-direct-loc-Issue376-02.txt
@@ -7,8 +7,8 @@ span: minDate 2018-11-17T09:28:09.75815400000000Z maxDate 2018-11-17T09:28:24.37
transform: index 5248 body r -1.582959385747423e-01 -8.877789928041023e-04 1.557391550098440e-04 -9.873913020806478e-01 Ω -1.314379578439253e-07 1.929883497315641e-09 -7.292103298515672e-05 ΩDot -1.238198063406674e-16 -4.429504278953000e-17 2.220223692809437e-19 spacecraft p -2.031142024066962e+06 2.632378682422574e+06 -6.241283006704280e+06 v 8.397013991525502e+03 -1.122240538848754e+04 -7.476888804772309e+03 a -5.680029219465155e+02 -2.953217064872529e+02 9.484900057803327e+01 r -4.473594211185816e-01 -2.560156449934148e-01 7.879614096264105e-01 3.368120466886735e-01 Ω 1.874199110824172e-03 6.297218887138226e-04 6.941311311658171e-04 ΩDot 2.110863271348145e-05 1.094333236463635e-04 -6.188132051280828e-06
algorithm: DUVENHAGE
ellipsoid: ae 6.378137000000000e+06 f 3.352810664747481e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP
-DEM tile: t0 latMin 7.854054356026650e-01 latStep 1.454441043328608e-05 latRows 6000 lonMin 1.745401974046496e-01 lonStep 1.454441043328608e-05 lonCols 6000
-DEM cell: t0 latIndex 1051 lonIndex 4137 elevation 1.309400956268308e+01
+DEM tile: t0 latMin 7.854054356026650e-01 latStep 1.454441043328608e-05 latRows 1850 lonMin 1.745401974046496e-01 lonStep 1.454441043328608e-05 lonCols 2950
+DEM cell: t0 latIndex 1051 lonIndex 2937 elevation 1.309400956268308e+01
DEM cell: t0 latIndex 1809 lonIndex 653 elevation 3.915338283287048e+03
DEM cell: t0 latIndex 1611 lonIndex 2905 elevation 2.683570229905023e+03
DEM cell: t0 latIndex 1612 lonIndex 2905 elevation 2.659575158110089e+03
@@ -45,4 +45,6 @@ DEM cell: t0 latIndex 1597 lonIndex 2866 elevation 2.091603812329271e+03
DEM cell: t0 latIndex 1598 lonIndex 2866 elevation 2.054608623253123e+03
DEM cell: t0 latIndex 1599 lonIndex 2865 elevation 1.847616058349609e+03
DEM cell: t0 latIndex 1599 lonIndex 2866 elevation 1.838613434176975e+03
-direct location result: latitude 8.086486919600299e-01 longitude 2.162109977595155e-01 elevation 2.040458228825512e+03
+DEM cell: t0 latIndex 1598 lonIndex 2864 elevation 1.985613877612813e+03
+DEM cell: t0 latIndex 1599 lonIndex 2864 elevation 1.872618682522244e+03
+direct location result: latitude 8.086569515781713e-01 longitude 2.161986944259714e-01 elevation 1.912154442728379e+03
diff --git a/src/test/resources/replay/replay-direct-loc-Issue376-03.txt b/src/test/resources/replay/replay-direct-loc-Issue376-03.txt
index b6b1a0b797154d89eed8f235dad16741c1bb6ab7..7853cc5c920c3805fe49cc2e9f9efa6e979c0ad2 100644
--- a/src/test/resources/replay/replay-direct-loc-Issue376-03.txt
+++ b/src/test/resources/replay/replay-direct-loc-Issue376-03.txt
@@ -9,8 +9,8 @@ span: minDate 2018-11-17T09:28:09.75815400000000Z maxDate 2018-11-17T09:28:24.37
transform: index 9366 body r -1.584446506666181e-01 -8.881578177468675e-04 1.564888965877765e-04 -9.873674490087516e-01 Ω -1.314379583538120e-07 1.929883314912744e-09 -7.292103298515580e-05 ΩDot -1.238180701885198e-16 -4.429300681876970e-17 2.220189200053709e-19 spacecraft p -1.997175450486062e+06 2.586441579861389e+06 -6.271423934028421e+06 v 8.113280864301501e+03 -1.114024972785023e+04 -7.189075879755639e+03 a -1.053681313757033e+03 -1.503500666930414e+03 -2.459309668330822e+02 r -4.479168627946637e-01 -2.570042078686272e-01 7.890099484043995e-01 3.328402356700476e-01 Ω 1.817311260304385e-03 6.600167203271428e-04 7.119941113907730e-04 ΩDot 4.061126512029496e-05 1.694535855585867e-04 2.046888666103640e-04
algorithm: DUVENHAGE
ellipsoid: ae 6.378137000000000e+06 f 3.352810664747481e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP
-DEM tile: t0 latMin 7.854054356026650e-01 latStep 1.454441043328608e-05 latRows 6000 lonMin 1.745401974046496e-01 lonStep 1.454441043328608e-05 lonCols 6000
-DEM cell: t0 latIndex 1051 lonIndex 4137 elevation 1.309400956268308e+01
+DEM tile: t0 latMin 7.854054356026650e-01 latStep 1.454441043328608e-05 latRows 1850 lonMin 1.745401974046496e-01 lonStep 1.454441043328608e-05 lonCols 2950
+DEM cell: t0 latIndex 1051 lonIndex 2937 elevation 1.309400956268308e+01
DEM cell: t0 latIndex 1809 lonIndex 653 elevation 3.915338283287048e+03
DEM cell: t0 latIndex 1248 lonIndex 2816 elevation 1.597661494047886e+03
DEM cell: t0 latIndex 1249 lonIndex 2816 elevation 1.603667936647203e+03
@@ -67,7 +67,9 @@ DEM cell: t0 latIndex 1242 lonIndex 2787 elevation 1.053714592147954e+03
DEM cell: t0 latIndex 1243 lonIndex 2787 elevation 1.076721007775370e+03
direct location result: latitude 8.034857669188987e-01 longitude 2.149854849334069e-01 elevation 6.876149051242718e+02
direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
-direct location result: latitude 8.034823539452234e-01 longitude 2.149911720557955e-01 elevation 7.409412497822065e+02
+DEM cell: t0 latIndex 1243 lonIndex 2779 elevation 6.157463116992526e+02
+DEM cell: t0 latIndex 1244 lonIndex 2779 elevation 5.807527198861440e+02
+direct location result: latitude 8.034854772265824e-01 longitude 2.149864448298378e-01 elevation 6.912515480966839e+02
direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
direct location result: latitude 8.034781401708480e-01 longitude 2.149980710325160e-01 elevation 8.070092894686161e+02
direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
diff --git a/src/tutorials/java/fr/cs/examples/AtmosphericRefractionExamples.java b/src/tutorials/java/fr/cs/examples/AtmosphericRefractionExamples.java
index f4c527984df37b0b4fa7759dcda6cb1c106b0217..b4a625b3c8306af631e5d07b8170febf6c177558 100644
--- a/src/tutorials/java/fr/cs/examples/AtmosphericRefractionExamples.java
+++ b/src/tutorials/java/fr/cs/examples/AtmosphericRefractionExamples.java
@@ -13,7 +13,7 @@ import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.stat.descriptive.DescriptiveStatistics;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.frames.Frame;
import org.orekit.frames.FramesFactory;
@@ -52,7 +52,7 @@ public class AtmosphericRefractionExamples {
// Initialize Orekit, assuming an orekit-data folder is in user home directory
File home = new File(System.getProperty("user.home"));
File orekitData = new File(home, "orekit-data");
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(orekitData));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(orekitData));
// Sensor's definition
// ===================
@@ -150,10 +150,17 @@ public class AtmosphericRefractionExamples {
int pixelStep = 100;
int lineStep = 100;
atmosphericRefraction.setGridSteps(pixelStep, lineStep);
+
+ // To compute the inverse location grid with atmospheric refraction, a default margin is available:
+ // atmosphericRefraction.getComputationParameters().getDefaultInverseLocMargin();
+
+ // but can be modified with:
+ // atmosphericRefraction.setInverseLocMargin(margin);
// Build Rugged with atmospheric refraction model
builder.setRefractionCorrection(atmosphericRefraction);
Rugged ruggedWith = builder.build();
+
// Direct location on a line WITHOUT and WITH atmospheric correction
// -----------------------------------------------------------------
diff --git a/src/tutorials/java/fr/cs/examples/DirectLocation.java b/src/tutorials/java/fr/cs/examples/DirectLocation.java
index dbc1d63c99e04d667453158ae7b5742d485a897d..8998fbfe7948ae8fe934aab9ba51c5103fa6ddcf 100644
--- a/src/tutorials/java/fr/cs/examples/DirectLocation.java
+++ b/src/tutorials/java/fr/cs/examples/DirectLocation.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -16,16 +16,16 @@
*/
package fr.cs.examples;
-import org.hipparchus.geometry.euclidean.threed.Rotation;
-import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.hipparchus.util.FastMath;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import org.hipparchus.geometry.euclidean.threed.Rotation;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.frames.Frame;
@@ -40,8 +40,8 @@ import org.orekit.rugged.api.RuggedBuilder;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.LinearLineDatation;
-import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.los.FixedRotation;
+import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.los.TimeDependentLOS;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.TimeScale;
@@ -62,7 +62,7 @@ public class DirectLocation {
// Initialize Orekit, assuming an orekit-data folder is in user home directory
File home = new File(System.getProperty("user.home"));
File orekitData = new File(home, "orekit-data");
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(orekitData));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(orekitData));
// Sensor's definition
// ===================
diff --git a/src/tutorials/java/fr/cs/examples/DirectLocationWithDEM.java b/src/tutorials/java/fr/cs/examples/DirectLocationWithDEM.java
index 48fc8da974a582fff279e7d6b1428837facb2d83..f0b8e391f4b0f6e2c0b9448183b65d9a1e7d9224 100644
--- a/src/tutorials/java/fr/cs/examples/DirectLocationWithDEM.java
+++ b/src/tutorials/java/fr/cs/examples/DirectLocationWithDEM.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -25,7 +25,7 @@ import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.frames.Frame;
@@ -65,7 +65,7 @@ public class DirectLocationWithDEM {
// Initialize Orekit, assuming an orekit-data folder is in user home directory
File home = new File(System.getProperty("user.home"));
File orekitData = new File(home, "orekit-data");
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(orekitData));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(orekitData));
// Sensor's definition
// ===================
diff --git a/src/tutorials/java/fr/cs/examples/InverseLocation.java b/src/tutorials/java/fr/cs/examples/InverseLocation.java
index b03bee91722c232692e9fb8f845ce3cf71440cfc..2b8f5502fb9823b240fd5a69a28eb370c097663c 100644
--- a/src/tutorials/java/fr/cs/examples/InverseLocation.java
+++ b/src/tutorials/java/fr/cs/examples/InverseLocation.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -26,7 +26,7 @@ import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.frames.Frame;
@@ -65,7 +65,7 @@ public class InverseLocation {
// Initialize Orekit, assuming an orekit-data folder is in user home directory
File home = new File(System.getProperty("user.home"));
File orekitData = new File(home, "orekit-data");
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(orekitData));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(orekitData));
// Sensor's definition
// ===================
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/GroundRefining.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/GroundRefining.java
index 0b35215a14785be729de97f0b7d3eaef00c03149..47974d9e576e040c13e6266bb265e069ca0442ed 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/GroundRefining.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/GroundRefining.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -24,11 +24,12 @@ import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.BodyShape;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.forces.gravity.potential.NormalizedSphericalHarmonicsProvider;
import org.orekit.orbits.Orbit;
+import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.api.BodyRotatingFrameId;
import org.orekit.rugged.api.EllipsoidId;
@@ -37,7 +38,6 @@ import org.orekit.rugged.api.Rugged;
import org.orekit.rugged.api.RuggedBuilder;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.AngularDerivativesFilter;
import org.orekit.utils.CartesianDerivativesFilter;
@@ -79,7 +79,7 @@ public class GroundRefining extends Refining {
// ---------------------------------------------------------------------------
File home = new File(System.getProperty("user.home"));
File orekitData = new File(home, "orekit-data");
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(orekitData));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(orekitData));
// Initialize refining context
// ---------------------------
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/InterRefining.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/InterRefining.java
index 5c6516bcc2e4ce1a309b2b1de366f435581610c3..f073d119143d8c90d5251084672d513547c267fd 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/InterRefining.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/InterRefining.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -25,10 +25,11 @@ import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.BodyShape;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DataContext;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
import org.orekit.orbits.Orbit;
+import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.api.BodyRotatingFrameId;
import org.orekit.rugged.api.EllipsoidId;
@@ -37,7 +38,6 @@ import org.orekit.rugged.api.Rugged;
import org.orekit.rugged.api.RuggedBuilder;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.AngularDerivativesFilter;
import org.orekit.utils.CartesianDerivativesFilter;
@@ -87,7 +87,7 @@ public class InterRefining extends Refining {
// ---------------------------------------------------------------------------
File home = new File(System.getProperty("user.home"));
File orekitData = new File(home, "orekit-data");
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(orekitData));
+ DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(orekitData));
// Initialize refining context
// ---------------------------
@@ -305,16 +305,16 @@ public class InterRefining extends Refining {
private InterRefining() {
sensorNameA = "SensorA";
- final double incidenceAngleA = -5.0;
+ final double rollAngleA = -5.0;
final String dateA = "2016-01-01T11:59:50.0";
- pleiadesViewingModelA = new PleiadesViewingModel(sensorNameA, incidenceAngleA, dateA);
+ pleiadesViewingModelA = new PleiadesViewingModel(sensorNameA, rollAngleA, dateA);
sensorNameB = "SensorB";
- final double incidenceAngleB = 0.0;
+ final double rollAngleB = 0.0;
final String dateB = "2016-01-01T12:02:50.0";
- pleiadesViewingModelB = new PleiadesViewingModel(sensorNameB, incidenceAngleB, dateB);
+ pleiadesViewingModelB = new PleiadesViewingModel(sensorNameB, rollAngleB, dateB);
}
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/Refining.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/Refining.java
index 9fe09bae06923963ff98bc283fb33db8c6509be3..f1f09c76175b9d3cd646f4b35b7776af98f89159 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/Refining.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/Refining.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2017 Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/GroundMeasurementGenerator.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/GroundMeasurementGenerator.java
index 18023f41782aa83aed012683f406b23c3f3766c2..c81a54801fe1d41fdacd9e50373d444a9d035c17 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/GroundMeasurementGenerator.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/GroundMeasurementGenerator.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/InterMeasurementGenerator.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/InterMeasurementGenerator.java
index 367dff1f121b498b34f457eaee137000459f6d31..88f5c0a6a24fe0a81a31b5919798ce15d0d38b21 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/InterMeasurementGenerator.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/InterMeasurementGenerator.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Measurable.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Measurable.java
index 36521946d3badf98bfcb93183cce14a3edfb0ce2..c1c3ae0f3f5407dd3c32f31d2dd41b4fb2c8ce2a 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Measurable.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Measurable.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Noise.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Noise.java
index 963acf8067642d33006fdcaca8a7434c9a77b13d..014819e20e1eb414dbbebee315da875092fe00be 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Noise.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Noise.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/DistanceTools.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/DistanceTools.java
index da083fb62ff354e7f2b7c70bd016ea86d14ef1a5..d6eb575bbd5d9e6a38906a081aed9927622ff29f 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/DistanceTools.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/DistanceTools.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/LocalisationMetrics.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/LocalisationMetrics.java
index fd8d05c82e38a435916d69b769bd7af66aaaf226..9a5e8bd4429a715a6381c3ecb48ef616d851972b 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/LocalisationMetrics.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/LocalisationMetrics.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/models/OrbitModel.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/models/OrbitModel.java
index 31fe0895a2e2223fd6f17cfae667ca40911acf38..f1150907df9941ee330f867a01df34ea009a7da9 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/models/OrbitModel.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/models/OrbitModel.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -248,12 +248,12 @@ public class OrbitModel {
propagator.propagate(minDate);
final List<TimeStampedPVCoordinates> list = new ArrayList<TimeStampedPVCoordinates>();
- propagator.setMasterMode(step,
- (currentState, isLast) ->
- list.add(new TimeStampedPVCoordinates(currentState.getDate(),
- currentState.getPVCoordinates().getPosition(),
- currentState.getPVCoordinates().getVelocity(),
- Vector3D.ZERO)));
+ propagator.getMultiplexer().add(step,
+ currentState ->
+ list.add(new TimeStampedPVCoordinates(currentState.getDate(),
+ currentState.getPVCoordinates().getPosition(),
+ currentState.getPVCoordinates().getVelocity(),
+ Vector3D.ZERO)));
propagator.propagate(maxDate);
return list;
@@ -269,12 +269,12 @@ public class OrbitModel {
propagator.setAttitudeProvider(createAttitudeProvider(earth, orbit));
propagator.propagate(minDate);
final List<TimeStampedAngularCoordinates> list = new ArrayList<>();
- propagator.setMasterMode(step,
- (currentState, isLast) ->
- list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
- currentState.getAttitude().getRotation(),
- Vector3D.ZERO,
- Vector3D.ZERO)));
+ propagator.getMultiplexer().add(step,
+ currentState ->
+ list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
+ currentState.getAttitude().getRotation(),
+ Vector3D.ZERO,
+ Vector3D.ZERO)));
propagator.propagate(maxDate);
return list;
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/models/PleiadesViewingModel.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/models/PleiadesViewingModel.java
index 8e21a7851907fc98624c459f9bb6499fd185df04..d6d7a6490df581b940b3ec80f4b9969e93e13711 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/models/PleiadesViewingModel.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/models/PleiadesViewingModel.java
@@ -1,5 +1,5 @@
-/* Copyright 2013-2019 CS Systèmes d'Information
- * Licensed to CS Systèmes d'Information (CS) under one or more
+/* Copyright 2013-2022 CS GROUP
+ * Licensed to CS GROUP (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
@@ -52,7 +52,7 @@ public class PleiadesViewingModel {
private static final int DIMENSION = 40000;
private static final double LINE_PERIOD = 1.e-4;
- private double angle;
+ private double rollAngle;
private LineSensor lineSensor;
private String date;
@@ -62,7 +62,7 @@ public class PleiadesViewingModel {
/** Simple constructor.
* <p>
* initialize PleiadesViewingModel with
- * sensorName="line", incidenceAngle = 0.0, date = "2016-01-01T12:00:00.0"
+ * sensorName="line", rollAngle = 0.0, date = "2016-01-01T12:00:00.0"
* </p>
*/
public PleiadesViewingModel(final String sensorName) {
@@ -72,14 +72,14 @@ public class PleiadesViewingModel {
/** PleiadesViewingModel constructor.
* @param sensorName sensor name
- * @param incidenceAngle incidence angle
+ * @param rollAngle roll angle
* @param referenceDate reference date
*/
- public PleiadesViewingModel(final String sensorName, final double incidenceAngle, final String referenceDate) {
+ public PleiadesViewingModel(final String sensorName, final double rollAngle, final String referenceDate) {
this.sensorName = sensorName;
this.date = referenceDate;
- this.angle = incidenceAngle;
+ this.rollAngle = rollAngle;
this.createLineSensor();
}
@@ -99,9 +99,12 @@ public class PleiadesViewingModel {
/** Build a LOS provider
*/
public TimeDependentLOS buildLOS() {
-
+
+ // Roll angle applied to the LOS
+ // Compute the transformation of vector K (Z axis) through the rotation around I (X axis) with the roll angle
+ // If roll angle = 0: vector center = vector K (Z axis)
final LOSBuilder losBuilder = rawLOS(new Rotation(Vector3D.PLUS_I,
- FastMath.toRadians(this.angle),
+ FastMath.toRadians(this.rollAngle),
RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
Vector3D.PLUS_I, FastMath.toRadians(FOV / 2), DIMENSION);