branch develop updated (f4abc306 -> 719819ae)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from f4abc306 :bug: fixes #11190 : Problème de tri sur la colonne id : Force le "ID" en "id" pour permettre le tri (sinon hibernate ne retrouve pas ses petits). new 719819ae :bug: fixes #11199 : distance en mille nautique au lieu de mètres The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 719819aeeef4edc9fa765e1470cd5cd9ff1842ae Author: jcouteau <couteau@codelutin.com> Date: Tue Feb 23 10:58:34 2021 +0100 :bug: fixes #11199 : distance en mille nautique au lieu de mètres Summary of changes: .../echobase/services/service/atlantos/xml/XmlAccousticExport.java | 2 +- .../ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 719819aeeef4edc9fa765e1470cd5cd9ff1842ae Author: jcouteau <couteau@codelutin.com> Date: Tue Feb 23 10:58:34 2021 +0100 :bug: fixes #11199 : distance en mille nautique au lieu de mètres --- .../echobase/services/service/atlantos/xml/XmlAccousticExport.java | 2 +- .../ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java index 1bb738d6..57585e15 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java @@ -351,7 +351,7 @@ public class XmlAccousticExport implements EchoBaseService { Data latitude = dataValues.get("LatitudeStart"); Data longitude = dataValues.get("LongitudeStart"); - xml.create("Distance", position * 1852); + xml.create("Distance", position); xml.create("Time", time != null ? StringUtils.substring(time.getDataValue(), 0, -8) : ""); xml.create("Latitude", diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java index 14dc915a..5d662ede 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java @@ -390,7 +390,7 @@ public class XmlBioticExport implements EchoBaseService { Float endLatitude = operation.getGearHaulingEndLatitude(); Float endLongitude = operation.getGearHaulingEndLongitude(); - int distance = (int) (Math.sqrt(Math.pow(startLatitude - startLatitude, 2) + Math.pow(endLongitude - startLongitude, 2)) * 60 * 1852); + int distance = (int) (Math.sqrt(Math.pow(startLatitude - startLatitude, 2) + Math.pow(endLongitude - startLongitude, 2)) * 60); int netopening = 0; switch (gearCode) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm