Allow MultiPolygon emission masks

spatialmodel · Oct 14, 2020 · 4313cb7 · 4313cb7
1 parent 8ec7140
commit 4313cb7
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 15 deletions.
diff --git a/inmaputil/config.go b/inmaputil/config.go
@@ -340,7 +340,16 @@ func parseMask(maskGeoJSONFile string) (geom.Polygon, error) {
 		if err != nil {
 			return nil, fmt.Errorf("decoding EmissionMaskGEOJSON: %w", err)
 		}
-		mask = j.(geom.Polygon)
+		switch msk := j.(type) {
+		case geom.Polygon:
+			mask = msk
+		case geom.MultiPolygon:
+			for _, p := range msk {
+				mask = append(mask, p...)
+			}
+		default:
+			return nil, fmt.Errorf("invalid emission mask geometry type %T", j)
+		}
 	}
 	return mask, nil
 }
diff --git a/inmaputil/config_test.go b/inmaputil/config_test.go
@@ -28,18 +28,40 @@ import (
 )
 
 func TestParseMask(t *testing.T) {
-	f, err := os.Create("tmp_mask.json")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Remove("tmp_mask.json")
-	fmt.Fprint(f, `{"type": "Polygon","coordinates": [ [ [1, 1], [1, 1], [1, 1], [1, 1] ] ] }`)
-	mask, err := parseMask("tmp_mask.json")
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := geom.Polygon{geom.Path{geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}}}
-	if !reflect.DeepEqual(mask, want) {
-		t.Errorf("%v != %v", mask, want)
-	}
+	t.Run("polygon", func(t *testing.T) {
+		f, err := os.Create("tmp_mask.json")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove("tmp_mask.json")
+		fmt.Fprint(f, `{"type": "Polygon","coordinates": [ [ [1, 1], [1, 1], [1, 1], [1, 1] ] ] }`)
+		mask, err := parseMask("tmp_mask.json")
+		if err != nil {
+			t.Fatal(err)
+		}
+		want := geom.Polygon{geom.Path{geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}}}
+		if !reflect.DeepEqual(mask, want) {
+			t.Errorf("%v != %v", mask, want)
+		}
+	})
+	t.Run("multipolygon", func(t *testing.T) {
+		f, err := os.Create("tmp_mask.json")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove("tmp_mask.json")
+		fmt.Fprint(f, `{"type": "MultiPolygon","coordinates": [ [ [ [1, 1], [1, 1], [1, 1], [1, 1] ] ], [ [ [1, 1], [1, 1], [1, 1], [1, 1] ] ] ] }`)
+		mask, err := parseMask("tmp_mask.json")
+		if err != nil {
+			t.Fatal(err)
+		}
+		want := geom.Polygon{
+			geom.Path{geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}},
+			geom.Path{geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}, geom.Point{X: 1, Y: 1}},
+		}
+		if !reflect.DeepEqual(mask, want) {
+			t.Errorf("%v != %v", mask, want)
+		}
+	})
+
 }