Pass appConfig through geospatialdata handler and avoid passing globa…

…l variables

handlers/geospatialdata.go

@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/USACE/filestore"
+	"github.com/USACE/mcat-ras/config"
 	ras "github.com/USACE/mcat-ras/tools"
 
 	"github.com/labstack/echo/v4"
@@ -19,17 +19,17 @@ import (
 // @Success 200 {object} interface{}
 // @Failure 500 {object} SimpleResponse
 // @Router /geospatialdata [get]
-func GeospatialData(fs *filestore.FileStore, destinationCRS int) echo.HandlerFunc {
+func GeospatialData(ac *config.APIConfig) echo.HandlerFunc {
 	return func(c echo.Context) error {
 
 		definitionFile := c.QueryParam("definition_file")
 
-		rm, err := ras.NewRasModel(definitionFile, *fs)
+		rm, err := ras.NewRasModel(definitionFile, *ac.FileStore)
 		if err != nil {
 			return c.JSON(http.StatusInternalServerError, SimpleResponse{http.StatusInternalServerError, err.Error()})
 		}
 
-		data, err := rm.GeospatialData(destinationCRS)
+		data, err := rm.GeospatialData(ac.DestinationCRS)
 		if err != nil {
 			return c.JSON(http.StatusInternalServerError, SimpleResponse{http.StatusInternalServerError, err.Error()})
 		}

main.go

@@ -39,7 +39,7 @@ func main() {
 	e.GET("/isgeospatial", handlers.IsGeospatial(appConfig.FileStore))
 	e.GET("/modeltype", handlers.ModelType(appConfig.FileStore))
 	e.GET("/modelversion", handlers.ModelVersion(appConfig.FileStore))
-	e.GET("/geospatialdata", handlers.GeospatialData(appConfig.FileStore, appConfig.DestinationCRS))
+	e.GET("/geospatialdata", handlers.GeospatialData(appConfig))
 
 	e.Logger.Fatal(e.Start(appConfig.Address()))
 }

tools/geospatial.go

@@ -47,11 +47,11 @@ var unitConsistencyMap map[string]string = map[string]string{
 	"SI Units":      "metre"}
 
 // checkUnitConsistency checks that the unit system used by the model and its coordinate reference system are the same
-func checkUnitConsistency(modelUnits string, sourceCRS string, ucMap map[string]string) error {
+func checkUnitConsistency(modelUnits string, sourceCRS string) error {
 	sourceSpRef := gdal.CreateSpatialReference(sourceCRS)
 
 	if crsUnits, ok := sourceSpRef.AttrValue("UNIT", 0); ok {
-		if ucMap[modelUnits] == crsUnits {
+		if unitConsistencyMap[modelUnits] == crsUnits {
 			return nil
 		}
 		return errors.New("The unit system of the model and coordinate reference system are inconsistent")

tools/model.go

@@ -212,7 +212,7 @@ func (rm *RasModel) GeospatialData(destinationCRS int) (GeoData, error) {
 		return gd, errors.New("Cannot extract geospatial data, no valid coordinate reference system")
 	}
 
-	if err := checkUnitConsistency(modelUnits, sourceCRS, unitConsistencyMap); err != nil {
+	if err := checkUnitConsistency(modelUnits, sourceCRS); err != nil {
 		return gd, err
 	}
 

tools/structures.go

@@ -214,7 +214,7 @@ func stringtoFloat(s string) (float64, error) {
 	return 0, nil
 }
 
-func getConduits(line string, single bool, shapeMap map[int]string) (conduits, error) {
+func getConduits(line string, single bool) (conduits, error) {
 	lineData := strings.Split(rightofEquals(line), ",")
 	conduit := conduits{}
 
@@ -235,7 +235,7 @@ func getConduits(line string, single bool, shapeMap map[int]string) (conduits, e
 	if err != nil {
 		return conduit, err
 	}
-	conduit.Shape = shapeMap[shapeID]
+	conduit.Shape = conduitShapes[shapeID]
 
 	rise, err := stringtoFloat(lineData[1])
 	if err != nil {
@@ -264,7 +264,7 @@ func getConduits(line string, single bool, shapeMap map[int]string) (conduits, e
 	return conduit, nil
 }
 
-func getCulvertData(hsSc *bufio.Scanner, i int, lineData []string, shapeMap map[int]string) (culverts, int, error) {
+func getCulvertData(hsSc *bufio.Scanner, i int, lineData []string) (culverts, int, error) {
 	culvert := culverts{}
 
 	station, err := strconv.ParseFloat(strings.TrimSpace(lineData[1]), 64)
@@ -315,15 +315,15 @@ func getCulvertData(hsSc *bufio.Scanner, i int, lineData []string, shapeMap map[
 			culvert.DownLowChord = downHighLowPair[1]
 
 		case strings.HasPrefix(line, "Culvert="):
-			conduit, err := getConduits(line, true, shapeMap)
+			conduit, err := getConduits(line, true)
 			if err != nil {
 				return culvert, i, err
 			}
 			culvert.Conduits = append(culvert.Conduits, conduit)
 			culvert.NumConduits++
 
 		case strings.HasPrefix(line, "Multiple Barrel Culv="):
-			conduit, err := getConduits(line, false, shapeMap)
+			conduit, err := getConduits(line, false)
 			if err != nil {
 				return culvert, i, err
 			}
@@ -437,7 +437,7 @@ func getGates(nextLine string) (gates, error) {
 	return gate, nil
 }
 
-func getWeirData(rm *RasModel, fn string, i int, shapeMap map[int]string) (weirs, error) {
+func getWeirData(rm *RasModel, fn string, i int) (weirs, error) {
 	weir := weirs{}
 
 	f, err := rm.FileStore.GetObject(fn)
@@ -503,7 +503,7 @@ func getWeirData(rm *RasModel, fn string, i int, shapeMap map[int]string) (weirs
 				weir.NumGates++
 
 			case strings.HasPrefix(line, "IW Culv="):
-				conduit, err := getConduits(line, false, shapeMap)
+				conduit, err := getConduits(line, false)
 				if err != nil {
 					return weir, err
 				}
@@ -556,7 +556,7 @@ func getHydraulicStructureData(rm *RasModel, fn string, idx int) (hydraulicStruc
 
 				case 2:
 					var culvert culverts
-					culvert, i, err = getCulvertData(hsSc, i, data, conduitShapes)
+					culvert, i, err = getCulvertData(hsSc, i, data)
 					if err != nil {
 						return structures, err
 					}
@@ -573,7 +573,7 @@ func getHydraulicStructureData(rm *RasModel, fn string, idx int) (hydraulicStruc
 					bData.NumBridges++
 
 				case 5:
-					weir, err := getWeirData(rm, fn, i, conduitShapes)
+					weir, err := getWeirData(rm, fn, i)
 					if err != nil {
 						return structures, err
 					}