diff --git a/Makefile b/Makefile index 40e3ad4..db47e21 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ clean: rm -rf ./bin/* linux: - GOOS=linux GOARCH=amd64 go build -o bin/sjy01-imgproc -ldflags=${COMPILE_LDFLAGS} cmd/*.go + GOOS=linux GOARCH=amd64 go build -o bin/sjy01-imgproc-v2 -ldflags=${COMPILE_LDFLAGS} cmd/*.go release: docker run --rm -v .:/src -v /Users/lan/workspace/sjy01/build/go:/build/go nuknal/gdal38-cv49-builder sh -c "cd /src && make linux" diff --git a/pkg/auxilary/att.go b/pkg/auxilary/att.go index 6cc2761..f292c8e 100644 --- a/pkg/auxilary/att.go +++ b/pkg/auxilary/att.go @@ -112,7 +112,7 @@ func ExtractAttitude(aps []*AuxPlatform) *Attitudes { sec, microsec = ap.UTCTimeSec, ap.Microsecond att := Attitude{ UTCTimestampSec: float64(sec) + float64(ReferenceTime2000) + - float64((microsec))/1e6, + float64(transfromGPSandAttMicrosec(microsec))/1e6, Q0: ap.QuatAttstarQ0, Q1: ap.QuatAttstarQ1, Q2: ap.QuatAttstarQ2, diff --git a/pkg/dem/dem.go b/pkg/dem/dem.go index a50bfd5..95c2b02 100644 --- a/pkg/dem/dem.go +++ b/pkg/dem/dem.go @@ -53,6 +53,8 @@ func (d *Dem1Km) Load() error { d.height = structure.SizeY hDataset.Close() + log.Infof("DEM loaded: %s, %d x %d, wUnit: %.2f, hUnit: %.2f", d.File, d.width, d.height, d.wUnit, d.hUnit) + return nil } diff --git a/pkg/producer/rpc.go b/pkg/producer/rpc.go index bdcdc65..3eec078 100644 --- a/pkg/producer/rpc.go +++ b/pkg/producer/rpc.go @@ -255,6 +255,7 @@ END; func (rpc *RPC) saveRPB(name string) error { log.Infof("save RPC model to %s", name) + os.Remove(name) model := rpc.Output() f, err := os.Create(name) if err != nil { diff --git a/pkg/producer/scenes.go b/pkg/producer/scenes.go index 784d526..0c46df2 100644 --- a/pkg/producer/scenes.go +++ b/pkg/producer/scenes.go @@ -14,6 +14,7 @@ import ( log "github.com/sirupsen/logrus" "gocv.io/x/gocv" "starwiz.cn/sjy01/image-proc/pkg/config" + "starwiz.cn/sjy01/image-proc/pkg/fusion" "starwiz.cn/sjy01/image-proc/pkg/payload" "starwiz.cn/sjy01/image-proc/pkg/rrc" "starwiz.cn/sjy01/image-proc/pkg/utils" @@ -241,7 +242,7 @@ func (r *Registrator) SaveScenesToTiff(panScenes []*Scene, mssScenes []*Scene) e func (r *Registrator) DoScenePansharpen(panScenes []*Scene, mssScenes []*Scene) error { for i := 0; i < len(panScenes); i++ { fusedTiff := strings.Replace(mssScenes[i].Tiff, "MSS", "FUS", -1) - err := GDALPansharpen(panScenes[i].Tiff, mssScenes[i].Tiff, fusedTiff) + err := fusion.Pansharpen(panScenes[i].Tiff, mssScenes[i].Tiff, fusedTiff, fusion.ESRI) if err != nil { return err }