Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
f355d479
Commit
f355d479
authored
Mar 31, 2021
by
Cédric Traizet
Committed by
Julien Osman
Mar 31, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
REFAC: use itk::Point instead of individual coordinates in Orbit parameters
parent
3af52e5d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
19 deletions
+18
-19
Modules/Core/Metadata/include/otbSARMetadata.h
Modules/Core/Metadata/include/otbSARMetadata.h
+6
-6
Modules/Core/Metadata/src/otbCosmoImageMetadataInterface.cxx
Modules/Core/Metadata/src/otbCosmoImageMetadataInterface.cxx
+6
-7
Modules/Core/Metadata/src/otbSentinel1ImageMetadataInterface.cxx
.../Core/Metadata/src/otbSentinel1ImageMetadataInterface.cxx
+6
-6
No files found.
Modules/Core/Metadata/include/otbSARMetadata.h
View file @
f355d479
...
...
@@ -29,6 +29,8 @@
#include <vector>
#include <sstream>
#include "itkPoint.h"
namespace
otb
{
...
...
@@ -103,16 +105,14 @@ struct OTBMetadata_EXPORT SARNoise
*/
struct
OTBMetadata_EXPORT
Orbit
{
using
PointType
=
itk
::
Point
<
double
,
3
>
;
/** Timestamp at which orbit state vectors apply */
MetaData
::
Time
time
;
/** Position vector */
double
posX
;
double
posY
;
double
posZ
;
PointType
position
;
/** Velocity vector */
double
velX
;
double
velY
;
double
velZ
;
PointType
velocity
;
};
/** \struct SARParam
...
...
Modules/Core/Metadata/src/otbCosmoImageMetadataInterface.cxx
View file @
f355d479
...
...
@@ -334,14 +334,13 @@ std::vector<Orbit> CosmoImageMetadataInterface::getOrbits(const MetadataSupplier
orbit
.
time
=
time
;
orbit
.
posX
=
std
::
stod
(
vECEF_sat_pos
[
i
*
3
+
0
])
;
orbit
.
posY
=
std
::
stod
(
vECEF_sat_pos
[
i
*
3
+
1
])
;
orbit
.
posZ
=
std
::
stod
(
vECEF_sat_pos
[
i
*
3
+
2
])
;
orbit
.
velX
=
std
::
stod
(
vECEF_sat_vel
[
i
*
3
+
0
])
;
orbit
.
velY
=
std
::
stod
(
vECEF_sat_vel
[
i
*
3
+
1
])
;
orbit
.
velZ
=
std
::
stod
(
vECEF_sat_vel
[
i
*
3
+
2
])
;
orbit
.
position
[
0
]
=
std
::
stod
(
vECEF_sat_pos
[
i
*
3
+
0
])
;
orbit
.
position
[
1
]
=
std
::
stod
(
vECEF_sat_pos
[
i
*
3
+
1
])
;
orbit
.
position
[
2
]
=
std
::
stod
(
vECEF_sat_pos
[
i
*
3
+
2
])
;
orbit
.
velocity
[
0
]
=
std
::
stod
(
vECEF_sat_vel
[
i
*
3
+
0
])
;
orbit
.
velocity
[
1
]
=
std
::
stod
(
vECEF_sat_vel
[
i
*
3
+
1
])
;
orbit
.
velocity
[
0
]
=
std
::
stod
(
vECEF_sat_vel
[
i
*
3
+
2
])
;
orbitVector
.
push_back
(
orbit
);
}
...
...
Modules/Core/Metadata/src/otbSentinel1ImageMetadataInterface.cxx
View file @
f355d479
...
...
@@ -415,12 +415,12 @@ std::vector<Orbit> Sentinel1ImageMetadataInterface::GetOrbits(const XMLMetadataS
std
::
string
path_root
=
"product.generalAnnotation.orbitList.orbit_"
+
oss
.
str
();
Orbit
orbit
;
std
::
istringstream
(
xmlMS
.
GetAs
<
std
::
string
>
(
path_root
+
".time"
))
>>
orbit
.
time
;
orbit
.
pos
X
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".position.x"
);
orbit
.
pos
Y
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".position.y"
);
orbit
.
pos
Z
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".position.z"
);
orbit
.
vel
X
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".velocity.x"
);
orbit
.
vel
Y
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".velocity.y"
);
orbit
.
vel
Z
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".velocity.z"
);
orbit
.
pos
ition
[
0
]
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".position.x"
);
orbit
.
pos
ition
[
1
]
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".position.y"
);
orbit
.
pos
ition
[
2
]
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".position.z"
);
orbit
.
vel
ocity
[
0
]
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".velocity.x"
);
orbit
.
vel
ocity
[
1
]
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".velocity.y"
);
orbit
.
vel
ocity
[
2
]
=
xmlMS
.
GetAs
<
double
>
(
path_root
+
".velocity.z"
);
orbitVector
.
push_back
(
orbit
);
}
return
orbitVector
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment