aep: Log error message for missing input shape

spatialmodel · Nov 12, 2019 · 261c68e · 261c68e
1 parent 0e457f0
commit 261c68e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/emissions/aep/inventory.go b/emissions/aep/inventory.go
@@ -22,6 +22,7 @@ import (
 	"encoding/gob"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"strconv"
 	"strings"
@@ -397,7 +398,9 @@ func (e *EmissionsReader) ReadFiles(files []*InventoryFile, f RecFilter) ([]Reco
 	for _, r := range records {
 		if ar, ok := r.(sourceDataLocationer); ok {
 			if err := e.sourceDataLocator.Locate(ar.getSourceDataLocation()); err != nil {
-				return nil, nil, err
+				log.Println(err)
+				continue // Drop records we can't find a location for.
+				// return nil, nil, err
 			}
 		}
 		recordList[i] = r

diff --git a/emissions/aep/sourcedata.go b/emissions/aep/sourcedata.go
@@ -146,8 +146,11 @@ func (sdl *sourceDataLocator) Locate(sd *SourceDataLocation) error {
 			return err
 		}
 	}
-	sd.location = sdl.inputShapes[srgSpec][sd.FIPS]
-	return nil
+	if l, ok := sdl.inputShapes[srgSpec][sd.FIPS]; ok {
+		sd.location = l
+		return nil
+	}
+	return fmt.Errorf("aep: missing input shape for spatial surrogate %s%s FIPS %s", srgSpec.region(), srgSpec.code(), sd.FIPS)
 }
 
 // Location returns the polygon representing the location of emissions.