From efd824cc8a737c3808ce617756e720ab5b013466 Mon Sep 17 00:00:00 2001 From: nuknal Date: Mon, 20 May 2024 11:08:24 +0800 Subject: [PATCH] aux --- Makefile | 4 +- aux/orbit.go | 1 - calculator/proj.go | 24 ++++++ cmd/extract.go | 58 +++++++++++---- cmd/parse.go | 10 ++- {aux => extract}/attitude.go | 2 +- extract/aux.go | 76 +++++++++++++++---- extract/aux_platform.go | 12 ++- aux/aux.go => extract/calculator.go | 10 +-- extract/orbit.go | 1 + extract/util.go | 51 +++++++++++++ extract/writer.go | 19 +++-- go.mod | 24 +++--- go.sum | 109 ++++++++++++++++++++++++---- 14 files changed, 332 insertions(+), 69 deletions(-) delete mode 100644 aux/orbit.go create mode 100644 calculator/proj.go rename {aux => extract}/attitude.go (92%) rename aux/aux.go => extract/calculator.go (90%) create mode 100644 extract/orbit.go create mode 100644 extract/util.go diff --git a/Makefile b/Makefile index 417c108..8306afd 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ export DATE := $(shell date +%Y%m%d-%H:%M:%S) export COMPILE_LDFLAGS='-s -w -X "main.BuildDate=${DATE}" ' out: - env CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o bin/sjy01-preprocessing-darwin-arm64 -ldflags=${COMPILE_LDFLAGS} *.go - env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/sjy01-preprocessing -ldflags=${COMPILE_LDFLAGS} *.go + GOOS=darwin GOARCH=arm64 go build -o bin/sjy01-preprocessing-darwin-arm64 -ldflags=${COMPILE_LDFLAGS} *.go + # GOOS=linux GOARCH=amd64 go build -o bin/sjy01-preprocessing -ldflags=${COMPILE_LDFLAGS} *.go clean: rm -rf ./bin/* \ No newline at end of file diff --git a/aux/orbit.go b/aux/orbit.go deleted file mode 100644 index 2ef1d9f..0000000 --- a/aux/orbit.go +++ /dev/null @@ -1 +0,0 @@ -package aux diff --git a/calculator/proj.go b/calculator/proj.go new file mode 100644 index 0000000..69d8dfc --- /dev/null +++ b/calculator/proj.go @@ -0,0 +1,24 @@ +package calculator + +import "github.com/twpayne/go-proj/v10" + +func J2000ToLngLat(x, y, z float64) []float64 { + var lng, lat float64 + return []float64{lng, lat} +} + +func WGS84XYZtoLngLat(x, y, z float64) []float64 { + var lng, lat float64 + pj, err := proj.NewCRSToCRS("EPSG:3857", "EPSG:4326", nil) + if err != nil { + panic(err) + } + coor := proj.NewCoord(x, y, z, 0) + coor, err = pj.Forward(coor) + if err != nil { + panic(err) + } + lng = coor.X() + lat = coor.Y() + return []float64{lng, lat} +} diff --git a/cmd/extract.go b/cmd/extract.go index 0fbdadb..ade2cab 100644 --- a/cmd/extract.go +++ b/cmd/extract.go @@ -9,6 +9,7 @@ import ( var ( dataId string + batch bool ) var extractCmd = &cobra.Command{ @@ -16,18 +17,31 @@ var extractCmd = &cobra.Command{ Short: "Extract data from raw data files", Long: `Extract data from raw data files`, Run: func(cmd *cobra.Command, args []string) { - params := extract.Params{ - InputData: fmt.Sprintf("demo/data/%s.dat", dataId), - OutputPath: "demo/output", - TempPath: "demo/temp", - DataId: dataId, - Satellite: "SJY01", - } - p := extract.NewExtractor(¶ms) - aos, _ := p.ExtractAosData() - dats, _ := p.ExtractOriginalImageData(aos) - for i, d := range dats { - p.SeprateAuxAndImgData(d, i) + + if batch { + ps := params() + for _, p := range ps { + e := extract.NewExtractor(p) + aos, _ := e.ExtractAosData() + dats, _ := e.ExtractOriginalImageData(aos) + for i, d := range dats { + e.SeprateAuxAndImgData(d, i) + } + } + } else { + p := &extract.Params{ + InputData: fmt.Sprintf("demo/data/%s.dat", dataId), + OutputPath: fmt.Sprintf("demo/output/%s", dataId), + TempPath: fmt.Sprintf("demo/temp/%s", dataId), + DataId: dataId, + Satellite: "SJY01", + } + e := extract.NewExtractor(p) + aos, _ := e.ExtractAosData() + dats, _ := e.ExtractOriginalImageData(aos) + for i, d := range dats { + e.SeprateAuxAndImgData(d, i) + } } }, } @@ -35,5 +49,23 @@ var extractCmd = &cobra.Command{ func init() { rootCmd.AddCommand(extractCmd) - extractCmd.Flags().StringVarP(&dataId, "data-id", "d", "051513", "051513") + extractCmd.Flags().StringVarP(&dataId, "data-id", "d", "051622", "051622") + extractCmd.Flags().BoolVarP(&batch, "batch", "b", false, "true | false") +} + +func params() []*extract.Params { + var params []*extract.Params + datas := []string{"051513", "051522", "051613", "051622", + "051712", "051721", "051821", "051823", "051921", "051922", "Q051723"} + for _, d := range datas { + params = append(params, &extract.Params{ + InputData: fmt.Sprintf("demo/data/%s.dat", d), + OutputPath: fmt.Sprintf("demo/output/%s", d), + TempPath: fmt.Sprintf("demo/temp/%s", d), + DataId: d, + Satellite: "SJY01", + }) + } + + return params } diff --git a/cmd/parse.go b/cmd/parse.go index 41811aa..1e31bf4 100644 --- a/cmd/parse.go +++ b/cmd/parse.go @@ -3,6 +3,7 @@ package cmd import ( "fmt" + "github.com/sirupsen/logrus" "github.com/spf13/cobra" "starwiz.cn/sjy01/preprocessing/extract" ) @@ -20,11 +21,14 @@ var parseCmd = &cobra.Command{ DataId: "051513", Satellite: "SJY01", } - p := extract.NewExtractor(¶ms) + e := extract.NewExtractor(¶ms) // p.ParseAuxPlatformWithHead("demo/ref/辅助数据.dat") fmt.Println("Reference Time: 2000-01-01 12:00:00 UTC, seconds:", extract.Time2000UTCSec()) - p.ParseAuxPlatform("demo/output/SJY01_051622_S96_PLAT.AUX") - p.ParseAuxEBox("demo/output/SJY01_051622_S96_EB.AUX") + _, err := e.ParseAuxPlatform("demo/output/051622/SJY01_PMS_20240516_101236_051622_096.AUX") + if err != nil { + logrus.Error(err) + } + // p.ParseAuxEBox("demo/output/SJY01_PMS_20240516_101236_051622_096_EB.AUX") }, } diff --git a/aux/attitude.go b/extract/attitude.go similarity index 92% rename from aux/attitude.go rename to extract/attitude.go index 4d07cc3..0cc19c1 100644 --- a/aux/attitude.go +++ b/extract/attitude.go @@ -1,4 +1,4 @@ -package aux +package extract /* 将欧拉角 (yaw, pitch, roll) 转换为旋转矩阵 diff --git a/extract/aux.go b/extract/aux.go index ae48cfc..37d8b85 100644 --- a/extract/aux.go +++ b/extract/aux.go @@ -142,6 +142,9 @@ func (e *Extractor) SeprateAuxAndImgData(dataFile string, segmentIndex int) erro var afh AuxFrameHead msdata := make([][]byte, 4) + var header []byte + var ebAux []byte + var platAux []byte for i := 0; i < dataLen; { if i+4 > dataLen { @@ -182,11 +185,17 @@ func (e *Extractor) SeprateAuxAndImgData(dataFile string, segmentIndex int) erro break } + auxTime := binary.BigEndian.Uint32(data[i+32 : i+36]) + if math.Abs(float64(auxTime)-float64(afh.TimeSec)) < 30 { + header = append(header, data[i:i+24]...) + } // 存储辅助数据到临时文件 dataIndex := i + 24 - lw.ws[EB_AUX].w.Write(data[dataIndex : dataIndex+8]) // 8字节焦面电箱辅助数据 + // lw.ws[EB_AUX].w.Write(data[dataIndex : dataIndex+8]) // 8字节焦面电箱辅助数据 + ebAux = append(ebAux, data[dataIndex:dataIndex+8]...) dataIndex += 8 - lw.ws[PLAT_AUX].w.Write(data[dataIndex : dataIndex+32]) // 32字节中心机辅助数据 + // lw.ws[PLAT_AUX].w.Write(data[dataIndex : dataIndex+32]) // 32字节中心机辅助数据 + platAux = append(platAux, data[dataIndex:dataIndex+32]...) dataIndex += 32 // 存储图像数据到临时文件 - 以 ENVI BSQ 格式存储,同时提供 HDR 描述文件 @@ -221,15 +230,41 @@ func (e *Extractor) SeprateAuxAndImgData(dataFile string, segmentIndex int) erro i = dataIndex // 完成一行数据解析 } - var bands = 0 - for i := 0; i < 4; i++ { - if len(msdata[i]) > 0 { - log.Println("write mss data of band B", i+1) - _, err := write16bPixelLittleEndian(lw.ws[MSS_RAW].w, msdata[i]) - if err != nil { - log.Error("write mss data error:", err.Error()) - } - bands += 1 + // var bands = 0 + // for i := 0; i < 4; i++ { + // if len(msdata[i]) > 0 { + // log.Println("write mss data of band B", i+1) + // _, err := write16bPixelLittleEndian(lw.ws[MSS_RAW].w, msdata[i]) + // if err != nil { + // log.Error("write mss data error:", err.Error()) + // } + // bands += 1 + // } + // } + + if len(msdata[0]) != len(msdata[1]) || len(msdata[2]) != len(msdata[3]) { + log.Error("mss data of bands B1-B4 are not equal") + return errors.New("mss data of bands B1-B4 are not equal") + } + + mssRowLen := 1192 * 4 + for i := 0; i < len(msdata[0]); i += mssRowLen { + var err error + _, err = write16bPixelLittleEndian(lw.ws[MSS_RAW].w, msdata[0][i:i+mssRowLen]) + if err != nil { + log.Error("write mss 1 data error:", err.Error()) + } + _, err = write16bPixelLittleEndian(lw.ws[MSS_RAW].w, msdata[1][i:i+mssRowLen]) + if err != nil { + log.Error("write mss 2 data error:", err.Error()) + } + _, err = write16bPixelLittleEndian(lw.ws[MSS_RAW].w, msdata[2][i:i+mssRowLen]) + if err != nil { + log.Error("write mss 3 data error:", err.Error()) + } + _, err = write16bPixelLittleEndian(lw.ws[MSS_RAW].w, msdata[3][i:i+mssRowLen]) + if err != nil { + log.Error("write mss 4 data error:", err.Error()) } } @@ -238,16 +273,29 @@ func (e *Extractor) SeprateAuxAndImgData(dataFile string, segmentIndex int) erro lw.ws[PAN_HDR].w.Write([]byte(panEnviHdr.String())) mssEnviHdr.Lines = mssEnviHdr.Lines / 4 // 多光谱波段分别在 4 行中传输 - mssEnviHdr.Samples = 2384 - mssEnviHdr.Bands = bands + mssEnviHdr.Samples = 2384 * 4 + mssEnviHdr.Bands = 1 lw.ws[MSS_HDR].w.Write([]byte(mssEnviHdr.String())) + // 帧头+辅助数据 + if len(header)/24 < len(ebAux)/128 || len(ebAux)/128 != len(platAux)/512 { + fmt.Println("aux data length:", len(header)/24, len(ebAux)/128, len(platAux)/512) + return errors.New("aux data length is not equal") + } + + auxRows := len(header) / 24 + for i := 0; i < auxRows; i++ { + lw.ws[AUX].w.Write(header[i*24 : (i+1)*24]) + lw.ws[AUX].w.Write(ebAux[i*128 : (i+1)*128]) + lw.ws[AUX].w.Write(platAux[i*512 : (i+1)*512]) + } + return nil } func (e *Extractor) quanlityAnalysis(data []byte) { // 数据质量分析 - fimg, _ := os.Create("demo/temp/" + e.params.DataId + "_aux_img.txt") + fimg, _ := os.Create("demo/temp/" + e.params.DataId + "/aux.txt") defer fimg.Close() fimg.WriteString("字节数 帧头流水号 文件号 帧头时间 中心辅助数据前4字节(行33-36)\n") diff --git a/extract/aux_platform.go b/extract/aux_platform.go index 39c9c1f..5a7a108 100644 --- a/extract/aux_platform.go +++ b/extract/aux_platform.go @@ -346,14 +346,22 @@ func (e *Extractor) ParseAuxPlatform(auxfile string) ([]*AuxPlatform, error) { } var aps []*AuxPlatform - for i := 0; i < len(data); i += AuxPlatformFrmSize { + for i := 0; i < len(data); i += 24 + 128 + 512 { ap := AuxPlatform{} - if err := ap.Parse(data[i : i+AuxPlatformFrmSize]); err != nil { + if err := ap.Parse(data[i+24+128 : i+24+128+512]); err != nil { return nil, err } aps = append(aps, &ap) ap.Print() + // Calculate( + // Vector3{ap.J2000Pos_X, ap.J2000Pos_Y, ap.J2000Pos_Y}, + // Vector3{ap.J2000Vel_X, ap.J2000Vel_Y, ap.J2000Vel_Z}, + // Quaternion{ap.SS1_Q1, ap.SS1_Q2, ap.SS1_Q3, ap.SS1_Q4}, + // ) + + // pp.Println(calculator.WGS84XYZtoLngLat(ap.W84PosX, ap.W84PosY, ap.W84PosZ)) + // pp.Println(calculator.WGS84XYZtoLngLat(ap.WGS84PosX, ap.WGS84PosY, ap.WGS84PosZ)) break diff --git a/aux/aux.go b/extract/calculator.go similarity index 90% rename from aux/aux.go rename to extract/calculator.go index ab23db7..0f5bb0f 100644 --- a/aux/aux.go +++ b/extract/calculator.go @@ -1,4 +1,4 @@ -package aux +package extract import ( "fmt" @@ -88,11 +88,11 @@ func calculateImagePosition(roll, pitch, yaw float64, quat Quaternion, satellite return lat, lon } -func Calculate() { +func Calculate(satellitePos, satelliteVel Vector3, quat Quaternion) { // 假设一些已知数据 - satellitePos := Vector3{x: 7000e3, y: 0, z: 0} // 假设一个简单的地心坐标位置 - satelliteVel := Vector3{x: 0, y: 7.5e3, z: 0} // 假设一个简单的速度 - quat := Quaternion{w: 0.7071, x: 0.7071, y: 0, z: 0} // 假设一个简单的四元数 + // satellitePos := Vector3{x: 7000e3, y: 0, z: 0} // 假设一个简单的地心坐标位置 + // satelliteVel := Vector3{x: 0, y: 7.5e3, z: 0} // 假设一个简单的速度 + // quat := Quaternion{w: 0.7071, x: 0.7071, y: 0, z: 0} // 假设一个简单的四元数 roll := 0.0 pitch := 0.0 yaw := 0.0 diff --git a/extract/orbit.go b/extract/orbit.go new file mode 100644 index 0000000..7e3d3b9 --- /dev/null +++ b/extract/orbit.go @@ -0,0 +1 @@ +package extract diff --git a/extract/util.go b/extract/util.go new file mode 100644 index 0000000..aad0bc8 --- /dev/null +++ b/extract/util.go @@ -0,0 +1,51 @@ +package extract + +import ( + "bytes" + "encoding/binary" +) + +// int32ToBigEndian converts an int32 to a big-endian byte array. +func int32ToBigEndian(num int32) ([]byte, error) { + buf := new(bytes.Buffer) + err := binary.Write(buf, binary.BigEndian, num) + if err != nil { + return nil, err + } + return buf.Bytes(), nil +} + +// bigEndianToInt32 converts a big-endian byte array to an int32. +func bigEndianToInt32(data []byte) int32 { + var num int32 + buf := bytes.NewReader(data) + err := binary.Read(buf, binary.BigEndian, &num) + if err != nil { + return 0 + } + return num +} + +// bigEndianToInt24 converts a big-endian 3-byte array to an int32 (simulating int24). +func bigEndianToInt24(data []byte) int32 { + if len(data) != 3 { + return 0 + } + num := int32(data[0])<<16 | int32(data[1])<<8 | int32(data[2]) + // Adjust for negative values + if num&0x800000 != 0 { + num |= ^0xFFFFFF + } + return num +} + +// bigEndianToInt16 converts a big-endian byte array to an int16. +func bigEndianToInt16(data []byte) int16 { + var num int16 + buf := bytes.NewReader(data) + err := binary.Read(buf, binary.BigEndian, &num) + if err != nil { + return 0 + } + return num +} diff --git a/extract/writer.go b/extract/writer.go index 8723b5d..0da51c3 100644 --- a/extract/writer.go +++ b/extract/writer.go @@ -5,13 +5,15 @@ import ( "io" "os" "path/filepath" + "strings" "github.com/sirupsen/logrus" ) const ( - EB_AUX = "EB.AUX" - PLAT_AUX = "PLAT.AUX" + AUX = ".AUX" + EB_AUX = ".EB.AUX" + PLAT_AUX = ".PLAT.AUX" PAN_RAW = "PAN.RAW" MSS_RAW = "MSS.RAW" PAN_HDR = "PAN.HDR" @@ -32,8 +34,8 @@ type L0Writer struct { func newL0Writer(outputDir, name string) *L0Writer { var err error - suffix := []string{EB_AUX, PLAT_AUX, PAN_RAW, MSS_RAW, PAN_HDR, MSS_HDR} - + suffix := []string{AUX, PAN_RAW, MSS_RAW, PAN_HDR, MSS_HDR} + nameEles := strings.Split(name, "_") lw := &L0Writer{ ws: make(map[string]*l0w), mssStoredType: MSS_ALL_IN_ONE, @@ -41,7 +43,14 @@ func newL0Writer(outputDir, name string) *L0Writer { for _, s := range suffix { w := &l0w{} - w.name = filepath.Join(outputDir, name+"_"+s) + fname := name + s + if s == MSS_HDR || s == MSS_RAW || s == PAN_HDR || s == PAN_RAW { + eles := strings.Split(s, ".") + nameEles[1] = eles[0] + fname = strings.Join(nameEles, "_") + "." + eles[1] + } + + w.name = filepath.Join(outputDir, fname) w.f, err = os.OpenFile(w.name, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0777) if err != nil { logrus.Panic("create file failed: ", w.name, err) diff --git a/go.mod b/go.mod index 0330b24..62e673d 100644 --- a/go.mod +++ b/go.mod @@ -1,32 +1,36 @@ module starwiz.cn/sjy01/preprocessing -go 1.19 +go 1.21 -require github.com/k0kubun/pp v3.0.1+incompatible +toolchain go1.21.0 + +require github.com/twpayne/go-proj/v10 v10.2.0 require ( + github.com/jonboulle/clockwork v0.4.0 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect + github.com/onsi/ginkgo v1.16.5 // indirect + github.com/onsi/gomega v1.33.1 // indirect golang.org/x/crypto v0.23.0 // indirect + golang.org/x/net v0.25.0 // indirect golang.org/x/term v0.20.0 // indirect golang.org/x/text v0.15.0 // indirect ) require ( - github.com/duke-git/lancet/v2 v2.3.0 // indirect + github.com/duke-git/lancet/v2 v2.3.1 github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/k0kubun/pp/v3 v3.2.0 - github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect + github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/lestrrat-go/strftime v1.0.6 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 - github.com/sirupsen/logrus v1.9.3 // indirect - github.com/spf13/cobra v1.8.0 // indirect + github.com/sirupsen/logrus v1.9.3 + github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 // indirect - github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasttemplate v1.2.2 // indirect github.com/x-cray/logrus-prefixed-formatter v0.5.2 - golang.org/x/exp v0.0.0-20221208152030-732eee02a75a // indirect + golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/sys v0.20.0 // indirect ) diff --git a/go.sum b/go.sum index f958757..d1e3425 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,39 @@ +github.com/alecthomas/assert/v2 v2.8.0 h1:8b0foWfS2dH6MltxQMPvWdSGN1wE4K1vyab9PGW4qgE= +github.com/alecthomas/assert/v2 v2.8.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= +github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/duke-git/lancet/v2 v2.3.0 h1:Ztie0qOnC4QgGYYqmpmQxbxkPcm54kqFXj1bwhiV8zg= -github.com/duke-git/lancet/v2 v2.3.0/go.mod h1:zGa2R4xswg6EG9I6WnyubDbFO/+A/RROxIbXcwryTsc= +github.com/duke-git/lancet/v2 v2.3.1 h1:cYZHQp57CZKP41EFkV/7TGbUrmhjaPMI5vi3Q+9KJNo= +github.com/duke-git/lancet/v2 v2.3.1/go.mod h1:zGa2R4xswg6EG9I6WnyubDbFO/+A/RROxIbXcwryTsc= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40= -github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= github.com/k0kubun/pp/v3 v3.2.0 h1:h33hNTZ9nVFNP3u2Fsgz8JXiF5JINoZfFq4SvKJwNcs= github.com/k0kubun/pp/v3 v3.2.0/go.mod h1:ODtJQbQcIRfAD3N+theGCV1m/CBxweERz2dapdz1EwA= +github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is= github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4= github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA= @@ -16,12 +41,25 @@ github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205Ah github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo= github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM= @@ -34,27 +72,72 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= -github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/twpayne/go-proj/v10 v10.2.0 h1:EurvRTcUMqsiARMhcF0KDvBjKZeCzJqAPQ0WAbrDFdQ= +github.com/twpayne/go-proj/v10 v10.2.0/go.mod h1:BU5zbXY6XmKenoyf+DbIg7joKlKTJM2rEssPMPJZYjY= github.com/x-cray/logrus-prefixed-formatter v0.5.2 h1:00txxvfBM9muc0jiLIEAkAcIMJzfthRT6usrui8uGmg= github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/exp v0.0.0-20221208152030-732eee02a75a h1:4iLhBPcpqFmylhnkbY3W0ONLUYYkDAW9xMFLfxgsvCw= -golang.org/x/exp v0.0.0-20221208152030-732eee02a75a/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=