[#902] util/locode: Fix parsing minutes

Convert minutes of received coordinates
to decimal parts of degree, and do not
use decimal part of float as storage for
minutes: "5915N 01806E" is
59.25N 18.10E, not 59°15'N 18°06'E.

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2021-10-08 19:55:40 +03:00 committed by LeL
parent 2f149f95d4
commit 501c78f327
2 changed files with 80 additions and 11 deletions

View file

@ -1,8 +1,8 @@
package locodedb package locodedb
import ( import (
"fmt"
"strconv" "strconv"
"strings"
locodecolumn "github.com/nspcc-dev/neofs-node/pkg/util/locode/column" locodecolumn "github.com/nspcc-dev/neofs-node/pkg/util/locode/column"
) )
@ -40,12 +40,9 @@ func PointFromCoordinates(crd *locodecolumn.Coordinates) (*Point, error) {
cLatDeg := cLat.Degrees() cLatDeg := cLat.Degrees()
cLatMnt := cLat.Minutes() cLatMnt := cLat.Minutes()
lat, err := strconv.ParseFloat(strings.Join([]string{ lat, err := toDecimal(cLatDeg[:], cLatMnt[:])
string(cLatDeg[:]),
string(cLatMnt[:]),
}, "."), 64)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("could not parse latitude: %w", err)
} }
if !cLat.Hemisphere().North() { if !cLat.Hemisphere().North() {
@ -56,12 +53,9 @@ func PointFromCoordinates(crd *locodecolumn.Coordinates) (*Point, error) {
cLngDeg := cLng.Degrees() cLngDeg := cLng.Degrees()
cLngMnt := cLng.Minutes() cLngMnt := cLng.Minutes()
lng, err := strconv.ParseFloat(strings.Join([]string{ lng, err := toDecimal(cLngDeg[:], cLngMnt[:])
string(cLngDeg[:]),
string(cLngMnt[:]),
}, "."), 64)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("could not parse longitude: %w", err)
} }
if !cLng.Hemisphere().East() { if !cLng.Hemisphere().East() {
@ -73,3 +67,27 @@ func PointFromCoordinates(crd *locodecolumn.Coordinates) (*Point, error) {
lng: lng, lng: lng,
}, nil }, nil
} }
func toDecimal(intRaw, minutesRaw []byte) (float64, error) {
integer, err := strconv.ParseFloat(string(intRaw), 64)
if err != nil {
return 0, fmt.Errorf("could not parse integer part: %w", err)
}
decimal, err := minutesToDegrees(minutesRaw)
if err != nil {
return 0, fmt.Errorf("could not parse decimal part: %w", err)
}
return integer + decimal, nil
}
// minutesToDegrees converts minutes to decimal part of a degree
func minutesToDegrees(raw []byte) (float64, error) {
minutes, err := strconv.ParseFloat(string(raw), 64)
if err != nil {
return 0, err
}
return minutes / 60, nil
}

View file

@ -0,0 +1,51 @@
package locodedb
import (
"testing"
locodecolumn "github.com/nspcc-dev/neofs-node/pkg/util/locode/column"
"github.com/stretchr/testify/require"
)
func TestPointFromCoordinates(t *testing.T) {
testCases := []struct {
latGot, longGot string
latWant, longWant float64
}{
{
latGot: "5915N",
longGot: "01806E",
latWant: 59.25,
longWant: 18.10,
},
{
latGot: "1000N",
longGot: "02030E",
latWant: 10.00,
longWant: 20.50,
},
{
latGot: "0145S",
longGot: "03512W",
latWant: -01.75,
longWant: -35.20,
},
}
var (
crd *locodecolumn.Coordinates
point *Point
err error
)
for _, test := range testCases {
crd, err = locodecolumn.CoordinatesFromString(test.latGot + " " + test.longGot)
require.NoError(t, err)
point, err = PointFromCoordinates(crd)
require.NoError(t, err)
require.Equal(t, test.latWant, point.Latitude())
require.Equal(t, test.longWant, point.Longitude())
}
}