Commit d1b1a23d authored by Luc Maisonobe's avatar Luc Maisonobe
Browse files

Merge branch 'develop' into dsst-od

Conflicts:
	pom.xml
	src/main/java/org/orekit/errors/OrekitMessages.java
	src/main/java/org/orekit/estimation/leastsquares/Model.java
	src/main/java/org/orekit/estimation/sequential/Model.java
	src/main/java/org/orekit/models/earth/DiscreteTroposphericModel.java
	src/main/java/org/orekit/models/earth/EstimatedTroposphericModel.java
	src/main/java/org/orekit/models/earth/GlobalMappingFunctionModel.java
	src/main/java/org/orekit/models/earth/MappingFunction.java
	src/main/java/org/orekit/models/earth/MariniMurrayModel.java
	src/main/java/org/orekit/models/earth/MendesPavlisModel.java
	src/main/java/org/orekit/models/earth/TroposphericModel.java
	src/main/java/org/orekit/models/earth/ViennaOneModel.java
	src/main/resources/assets/org/orekit/localization/OrekitMessages_da.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_de.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_el.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_en.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_es.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_fr.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_gl.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_it.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_no.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_ro.utf8
	src/test/java/org/orekit/errors/OrekitMessagesTest.java
	src/test/java/org/orekit/estimation/leastsquares/ModelTest.java
	src/test/java/org/orekit/estimation/sequential/ModelTest.java
	src/test/java/org/orekit/models/earth/EstimatedTroposphericModelTest.java
	src/test/java/org/orekit/models/earth/GlobalMappingFunctionModelTest.java
	src/test/java/org/orekit/models/earth/MendesPavlisModelTest.java
	src/test/java/org/orekit/models/earth/ViennaOneModelTest.java
parents 77056927 d59b314f
OREKIT
Copyright 2002-2018 CS Systèmes d'Information
Copyright 2002-2019 CS Systèmes d'Information
This product includes software developed by
CS Systèmes d'Information (http://www.c-s.fr/)
......
......@@ -2,7 +2,7 @@
<project name="orekit" default="jar" basedir=".">
<property name="project.version" value="9.3-SNAPSHOT" />
<property name="project.version" value="9.4-SNAPSHOT" />
<property name="src.dir" location="src" />
<property name="main.src.dir" value="${src.dir}/main/java" />
......@@ -18,7 +18,7 @@
<property name="lib.dir" location="lib" />
<property name="hipparchus.version" value="1.3" />
<property name="hipparchus.version" value="1.4" />
<property name="hipparchus.core.jar" value="hipparchus-core-${hipparchus.version}.jar" />
<property name="hipparchus.geometry.jar" value="hipparchus-geometry-${hipparchus.version}.jar" />
<property name="hipparchus.ode.jar" value="hipparchus-ode-${hipparchus.version}.jar" />
......@@ -35,7 +35,7 @@
<property name="hamcrest.maven.path" value="org/hamcrest" />
<property name="maven.repository" value="http://repo1.maven.org/maven2" />
<property name="copyright" value="2002-2018 CS Syst&#232;mes d&#039;Information" />
<property name="copyright" value="2002-2019 CS Syst&#232;mes d&#039;Information" />
<available file="${lib.dir}/${hipparchus.core.jar}" property="libs.present" />
......
......@@ -5,7 +5,7 @@
<groupId>org.orekit</groupId>
<artifactId>orekit</artifactId>
<packaging>jar</packaging>
<version>9.3-SNAPSHOT</version>
<version>9.4-SNAPSHOT</version>
<name>ORbit Extrapolation KIT</name>
<url>http://www.orekit.org/</url>
......@@ -20,31 +20,32 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<orekit.findbugs-maven-plugin.version>3.0.4</orekit.findbugs-maven-plugin.version>
<orekit.jacoco-maven-plugin.version>0.7.9</orekit.jacoco-maven-plugin.version>
<orekit.maven-assembly-plugin.version>3.0.0</orekit.maven-assembly-plugin.version>
<orekit.maven-bundle-plugin.version>3.3.0</orekit.maven-bundle-plugin.version>
<orekit.spotbugs-maven-plugin.version>3.1.7</orekit.spotbugs-maven-plugin.version>
<orekit.jacoco-maven-plugin.version>0.8.2</orekit.jacoco-maven-plugin.version>
<orekit.maven-assembly-plugin.version>3.1.0</orekit.maven-assembly-plugin.version>
<orekit.maven-bundle-plugin.version>4.1.0</orekit.maven-bundle-plugin.version>
<orekit.maven-changes-plugin.version>2.12.1</orekit.maven-changes-plugin.version>
<orekit.maven-checkstyle-plugin.version>2.17</orekit.maven-checkstyle-plugin.version>
<orekit.checkstyle.version>8.10</orekit.checkstyle.version>
<orekit.maven-clean-plugin.version>3.0.0</orekit.maven-clean-plugin.version>
<orekit.maven-compiler-plugin.version>3.6.1</orekit.maven-compiler-plugin.version>
<orekit.maven-javadoc-plugin.version>2.10.4</orekit.maven-javadoc-plugin.version>
<orekit.maven-jar-plugin.version>3.0.2</orekit.maven-jar-plugin.version>
<orekit.maven-jxr-plugin.version>2.5</orekit.maven-jxr-plugin.version>
<orekit.maven-checkstyle-plugin.version>3.0.0</orekit.maven-checkstyle-plugin.version>
<orekit.checkstyle.version>8.14</orekit.checkstyle.version>
<orekit.maven-clean-plugin.version>3.1.0</orekit.maven-clean-plugin.version>
<orekit.maven-compiler-plugin.version>3.8.0</orekit.maven-compiler-plugin.version>
<orekit.maven-javadoc-plugin.version>3.0.1</orekit.maven-javadoc-plugin.version>
<orekit.maven-jar-plugin.version>3.1.0</orekit.maven-jar-plugin.version>
<orekit.maven-jxr-plugin.version>3.0.0</orekit.maven-jxr-plugin.version>
<orekit.plantuml-maven-plugin.version>1.2</orekit.plantuml-maven-plugin.version>
<orekit.plantuml.version>1.2017.15</orekit.plantuml.version>
<orekit.maven-project-info-reports-plugin.version>2.9</orekit.maven-project-info-reports-plugin.version>
<orekit.maven-resources-plugin.version>3.0.2</orekit.maven-resources-plugin.version>
<orekit.maven-site-plugin.version>3.6</orekit.maven-site-plugin.version>
<orekit.plantuml.version>1.2018.12</orekit.plantuml.version>
<orekit.maven-project-info-reports-plugin.version>3.0.0</orekit.maven-project-info-reports-plugin.version>
<orekit.maven-resources-plugin.version>3.1.0</orekit.maven-resources-plugin.version>
<orekit.maven-site-plugin.version>3.7.1</orekit.maven-site-plugin.version>
<orekit.maven-source-plugin.version>3.0.1</orekit.maven-source-plugin.version>
<orekit.maven-surefire-plugin.version>2.20</orekit.maven-surefire-plugin.version>
<orekit.maven-surefire-report-plugin.version>2.20</orekit.maven-surefire-report-plugin.version>
<orekit.maven-surefire-plugin.version>2.22.1</orekit.maven-surefire-plugin.version>
<orekit.maven-surefire-report-plugin.version>2.22.1</orekit.maven-surefire-report-plugin.version>
<orekit.mockito-core.version>2.23.0</orekit.mockito-core.version>
<orekit.jgit.buildnumber.version>1.2.10</orekit.jgit.buildnumber.version>
<orekit.build-helper-maven-plugin.version>3.0.0</orekit.build-helper-maven-plugin.version>
<orekit.nexus-staging-maven-plugin.version>1.6.8</orekit.nexus-staging-maven-plugin.version>
<orekit.maven-gpg-plugin.version>1.6</orekit.maven-gpg-plugin.version>
<orekit.maven-install-plugin.version>2.5.2</orekit.maven-install-plugin.version>
<orekit.maven-install-plugin.version>3.0.0-M1</orekit.maven-install-plugin.version>
<orekit.hipparchus.version>1.4</orekit.hipparchus.version>
<orekit.junit.version>4.12</orekit.junit.version>
<orekit.compiler.source>1.8</orekit.compiler.source>
......@@ -174,6 +175,9 @@
<contributor>
<name>Espen Bj&#248;rntvedt</name>
</contributor>
<contributor>
<name>Bryan Cazabonne</name>
</contributor>
<contributor>
<name>Paul Cefola</name>
</contributor>
......@@ -235,7 +239,7 @@
<scm>
<connection>scm:git:https://gitlab.orekit.org/orekit/orekit.git</connection>
<developerConnection>scm:git:ssh://git@gitlab.orekit.org:orekit/orekit.git</developerConnection>
<developerConnection>scm:git:ssh://git@gitlab.orekit.org/orekit/orekit.git</developerConnection>
<url>https://gitlab.orekit.org/orekit/orekit/tree/master</url>
</scm>
......@@ -244,29 +248,6 @@
<url>https://gitlab.orekit.org/orekit/orekit/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>Orekit announces mailing list</name>
<subscribe>https://www.orekit.org/wws/subscribe/orekit-announces</subscribe>
<unsubscribe>https://www.orekit.org/wws/signoff/orekit-announces</unsubscribe>
<archive>https://www.orekit.org/wws/arc/orekit-announces</archive>
</mailingList>
<mailingList>
<name>Orekit users mailing list</name>
<subscribe>https://www.orekit.org/wws/subscribe/orekit-users</subscribe>
<unsubscribe>https://www.orekit.org/wws/signoff/orekit-users</unsubscribe>
<post>orekit-users@orekit.org</post>
<archive>https://www.orekit.org/wws/arc/orekit-users</archive>
</mailingList>
<mailingList>
<name>Orekit developers mailing list</name>
<subscribe>https://www.orekit.org/wws/subscribe/orekit-developers</subscribe>
<unsubscribe>https://www.orekit.org/wws/signoff/orekit-developers</unsubscribe>
<post>orekit-developers@orekit.org</post>
<archive>https://www.orekit.org/wws/arc/orekit-developers</archive>
</mailingList>
</mailingLists>
<dependencies>
<dependency>
<groupId>org.hipparchus</groupId>
......@@ -317,7 +298,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.7.0</version>
<version>${orekit.mockito-core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
......@@ -431,6 +412,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${orekit.maven-javadoc-plugin.version}</version>
<configuration>
<overview>${basedir}/src/main/java/org/orekit/overview.html</overview>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Syst&egrave;mes d&apos;information</a>. All rights reserved.]]></bottom>
<links>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
<link>https://www.hipparchus.org/apidocs/</link>
</links>
<source>${orekit.compiler.source}</source>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
......@@ -592,13 +582,13 @@
<version>${orekit.maven-project-info-reports-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${orekit.findbugs-maven-plugin.version}</version>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${orekit.spotbugs-maven-plugin.version}</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
<excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
<excludeFilterFile>${basedir}/spotbugs-exclude-filter.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin>
......@@ -660,9 +650,10 @@
<overview>${basedir}/src/main/java/org/orekit/overview.html</overview>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Syst&egrave;mes d&apos;information</a>. All rights reserved.]]></bottom>
<links>
<link>http://docs.oracle.com/javase/8/docs/api/</link>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
<link>https://www.hipparchus.org/apidocs/</link>
</links>
<source>${orekit.compiler.source}</source>
</configuration>
<reportSets>
<reportSet>
......
<?xml version="1.0"?>
<!--
This file contains some false positive bugs detected by findbugs. Their
This file contains some false positive bugs detected by spotbugs. Their
false positive nature has been analyzed individually and they have been
put here to instruct findbugs it must ignore them.
put here to instruct spotbugs it must ignore them.
-->
<FindBugsFilter>
......@@ -54,7 +54,7 @@
<Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
</Match>
<!-- the following are in fact false positives from findbugs -->
<!-- the following are in fact false positives from SpotBugs -->
<!-- their occurrence depends on the java compiler used -->
<Match>
<Class name="~.*\.EcksteinHechlerPropagator$"/>
......@@ -128,7 +128,7 @@
<Bug pattern="CNT_ROUGH_CONSTANT_VALUE" />
</Match>
<!-- The following is a false positive from findbugs -->
<!-- The following is a false positive from SpotBugs -->
<Match>
<Class name="~.*\.IntegratedEphemeris\$LocalProvider$"/>
<Method name="getAdditionalState" />
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2018 CS Systèmes d'Information
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
......
' Copyright 2002-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
' (the "License"); you may not use this file except in compliance with
' the License. You may obtain a copy of the License at
'
' http://www.apache.org/licenses/LICENSE-2.0
'
' Unless required by applicable law or agreed to in writing, software
' distributed under the License is distributed on an "AS IS" BASIS,
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
' See the License for the specific language governing permissions and
' limitations under the License.
@startuml
skinparam svek true
skinparam ClassBackgroundColor #F3EFEB/CCC9C5
skinparam ClassArrowColor #691616
skinparam ClassBorderColor #691616
skinparam NoteBackgroundColor #F3EFEB
skinparam NoteBorderColor #691616
skinparam NoteFontColor #691616
skinparam ClassFontSize 11
skinparam PackageFontSize 12
package org.orekit.gnss #ECEBD8 {
enum SatelliteSystem {
+GPS
+GLONASS
+GALILEO
+BEIDOU
+QZSS
+IRNSS
+SBAS
+MIXED
}
enum Frequency {
+G01
+G02
+...
+E01
+E07
+...
+S05
}
SatelliteSystem "1" <--* Frequency
package antenna #DDEBD8 {
enum SatelliteType {
+BEIDOU_2G
+BEIDOU_2I
+...
+QZSS_2G
}
class AntexLoader {
+List<ReceiverAntenna> getReceiversAntennas()
+List<TimeSpanMap<SatelliteAntenna>> getSatellitesAntennas()
+TimeSpanMap<SatelliteAntenna> findSatelliteAntenna(satelliteSystem, prnNumber)
}
class Antenna {
+Vector3D getEccentricities(frequency)
+double getPhaseCenterVariation(frequency, direction)
}
class ReceiverAntenna {
+String getSerialNumber()
}
class SatelliteAntenna {
+SatelliteSystem getSatelliteSystem()
+int getPrnNumber()
+SatelliteType getSatelliteType()
+AbsoluteDate getValidFrom()
+AbsoluteDate getValidUntil()
}
class FrequencyPattern {
+Vector3D getEccentricities()
+double getPhaseCenterVariation(direction)
}
interface PhaseCenterVariationFunction {
+double value(polarAngle, azimuthAngle)
}
FrequencyPattern "1" <--* PhaseCenterVariationFunction
Frequency "*" <-left-* Antenna
Antenna *-right-> "*" FrequencyPattern
SatelliteAntenna ..|> Antenna
ReceiverAntenna ..|> Antenna
SatelliteSystem "1" <--* SatelliteAntenna
SatelliteType "1" <--* SatelliteAntenna
AntexLoader *--> "*" SatelliteAntenna
AntexLoader *--> "*" ReceiverAntenna
}
}
@enduml
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment