GTC-2824 Deal with case of Invalid rows in raster gadm optimization.

In the case of Invalid rows, we don't move the gadm out of the feature
id, so we need to deal with FeatureId that still has gadm.

src/main/scala/org/globalforestwatch/summarystats/gfwpro_dashboard/GfwProDashboardDF.scala

@@ -2,7 +2,7 @@ package org.globalforestwatch.summarystats.gfwpro_dashboard
 
 import org.apache.spark.rdd.RDD
 import org.apache.spark.sql.{DataFrame, SparkSession}
-import org.globalforestwatch.features.{FeatureId, GfwProFeatureId}
+import org.globalforestwatch.features.{FeatureId, GfwProFeatureId, CombinedFeatureId, GadmFeatureId}
 import org.globalforestwatch.summarystats._
 import cats.data.Validated.{Valid, Invalid}
 import org.apache.spark.sql.functions.expr
@@ -19,6 +19,10 @@ object GfwProDashboardDF extends SummaryDF {
     val rowId: FeatureId => RowId = {
       case proId: GfwProFeatureId =>
         RowId(proId.listId, proId.locationId.toString)
+      // The following case is to deal with Invalid rows, which have not had the gadm
+      // information moved out of the feature id.
+      case CombinedFeatureId(proId: GfwProFeatureId, _) =>
+        RowId(proId.listId, proId.locationId.toString)
       case _ =>
         throw new IllegalArgumentException("Not a CombinedFeatureId[GfwProFeatureId, GadmFeatureId]")
     }