Added JSON Metadata Output and Automatic Reprojection / Map Drawing

ImageProcessor/GOESABI.go

@@ -28,7 +28,7 @@ func ProcessGOESABI(ip *ImageProcessor, filename string, xh *XRIT.Header) {
 
 	if ms.Done() {
 		SLog.Info("Got all segments for %s", name)
-		err, outname := ImageTools.DumpMultiSegment(ms, ip.mapDrawer, false)
+		err, outname := ImageTools.DumpMultiSegment(ms, ip.GetMapDrawer(), ip.reproject)
 		if err != nil {
 			SLog.Error("Error dumping Multi Segment Image %s: %s", name, err)
 		}

ImageProcessor/ImageProcessor.go

@@ -17,15 +17,43 @@ type ImageProcessor struct {
 	sync.Mutex
 	MultiSegmentCache map[string]*Structs.MultiSegmentImage
 	mapDrawer         *MapDrawer.MapDrawer
+	reproject         bool
+	drawmap           bool
 }
 
 func MakeImageProcessor() *ImageProcessor {
 	return &ImageProcessor{
 		MultiSegmentCache: make(map[string]*Structs.MultiSegmentImage),
 		mapDrawer:         ImageData.GetDefaultMapDrawer(),
+		reproject:         false,
+		drawmap:           false,
 	}
 }
 
+func (ip *ImageProcessor) SetDrawMap(drawMap bool) {
+	ip.drawmap = drawMap
+}
+
+func (ip *ImageProcessor) SetReproject(reproject bool) {
+	ip.reproject = reproject
+}
+
+func (ip *ImageProcessor) GetDrawMap() bool {
+	return ip.drawmap
+}
+
+func (ip *ImageProcessor) GetReproject() bool {
+	return ip.reproject
+}
+
+func (ip *ImageProcessor) GetMapDrawer() *MapDrawer.MapDrawer {
+	if ip.drawmap {
+		return ip.mapDrawer
+	}
+
+	return nil
+}
+
 func (ip *ImageProcessor) ProcessImage(filename string) {
 	ip.Lock()
 	defer ip.Unlock()

ImageProcessor/ImageTools/MultiSegmentDump.go

@@ -1,6 +1,7 @@
 package ImageTools
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/opensatelliteproject/SatHelperApp/ImageProcessor/MapDrawer"
 	"github.com/opensatelliteproject/SatHelperApp/ImageProcessor/Projector"
@@ -112,5 +113,17 @@ func DumpMultiSegment(msi *Structs.MultiSegmentImage, mapDrawer *MapDrawer.MapDr
 		return err, ""
 	}
 
+	meta, err := json.MarshalIndent(msi.FirstSegmentHeader, "", "   ")
+
+	if err != nil {
+		SLog.Error("Cannot generate JSON for metadata file: %s", err)
+	} else {
+		metaName := path.Join(folder, msi.Name+".json")
+		err := ioutil.WriteFile(metaName, meta, os.ModePerm)
+		if err != nil {
+			SLog.Error("Cannot write Meta file %s: %s", metaName, err)
+		}
+	}
+
 	return nil, newFilename
 }

Models/Config.go

@@ -68,6 +68,8 @@ type DirectDemuxerConfig struct {
 	TemporaryFolder        string
 	PurgeFilesAfterProcess bool
 	SkipVCID               []int
+	ReprojectImages        bool
+	DrawMap                bool
 }
 
 type AppConfig struct {

README.md

@@ -15,7 +15,7 @@ Building
 That's a standard go project. Make sure you have `libSatHelper` and `libairspy` installed and run:
 
 ```bash
-go get github.com/OpenSatelliteProject/SatHelperApp
+go get github.com/OpenSatelliteProject/SatHelperApp/cmd/SatHelperApp
 ```
 
 It will be installed into your `${GOPATH}/bin`. If you have it it on your path, just run `SatHelperApp` 

ccsds/FileAssembler.go

@@ -40,6 +40,14 @@ func (fa *FileAssembler) SetOutputFolder(folder string) {
 	fa.outFolder = folder
 }
 
+func (fa *FileAssembler) SetDrawMap(drawMap bool) {
+	fa.ip.SetDrawMap(drawMap)
+}
+
+func (fa *FileAssembler) SetReprojectImages(reproject bool) {
+	fa.ip.SetReproject(reproject)
+}
+
 func (fa *FileAssembler) PutMSDU(msdu *MSDU) {
 	if msdu.Sequence == SequenceFirstSegment || msdu.Sequence == SequenceSingleData {
 		if fa.msduCache[msdu.APID] != nil {

cmd/SatHelperApp/Config.go

@@ -14,7 +14,7 @@ import (
 	"os"
 )
 
-var configFile = flag.String("config", "", "write cpu profile to file")
+var configFile = flag.String("config", "", "Configuration File (defaults to $HOME/SatHelperApp/SatHelperApp.cfg)")
 var finalConfigFilePath string
 
 func LoadDefaults(save bool) {
@@ -68,6 +68,8 @@ func LoadDefaults(save bool) {
 	DSP.CurrentConfig.DirectDemuxer.TemporaryFolder = "tmp"
 	DSP.CurrentConfig.DirectDemuxer.PurgeFilesAfterProcess = false
 	DSP.CurrentConfig.DirectDemuxer.SkipVCID = make([]int, 0)
+	DSP.CurrentConfig.DirectDemuxer.DrawMap = false
+	DSP.CurrentConfig.DirectDemuxer.ReprojectImages = false
 
 	if save {
 		SaveConfig()