fix ranking for india (#659)

datacommonsorg · Nov 3, 2021 · 13f1c4a · 13f1c4a
1 parent 3af9291
commit 13f1c4a
Show file tree

Hide file tree

Showing 4 changed files with 18,703 additions and 1 deletion.
diff --git a/internal/server/ranking.go b/internal/server/ranking.go
@@ -65,7 +65,8 @@ var StatsRanking = map[RankKey]int{
 	{"NASA_NEXGDDP_StatVarSeriesAggr", "*", "P1M"}:  0, // IPCC
 
 	{"NASA_WetBulbComputation_Aggregation", "NASA_Mean_HadGEM2-AO", "*"}: 0, // Wet bulb year aggregation
-	{"NASA_WetBulbComputation", "NASA_Mean_HadGEM2-AO", "*"}:             1, // Wet bulb
+	{"NASA_WetBulbComputation_Aggregation", "*", "*"}:                    1, // Wet bulb year aggregation
+	{"NASA_WetBulbComputation", "NASA_Mean_HadGEM2-AO", "*"}:             2, // Wet bulb
 }
 
 // BaseRank is the base ranking score for sources. If a source is prefered, it

diff --git a/internal/server/ranking_test.go b/internal/server/ranking_test.go
@@ -87,10 +87,12 @@ func TestSeriesByRank(t *testing.T) {
 			[]*pb.SourceSeries{
 				{ImportName: "NASA_WetBulbComputation", MeasurementMethod: "NASA_Mean_CCSM4", ObservationPeriod: "P1Y"},
 				{ImportName: "NASA_WetBulbComputation", MeasurementMethod: "NASA_Mean_HadGEM2-AO", ObservationPeriod: "P1Y"},
+				{ImportName: "NASA_WetBulbComputation_Aggregation", MeasurementMethod: "NASA_Mean_ACCESS1-0", ObservationPeriod: "P78Y"},
 				{ImportName: "NASA_WetBulbComputation_Aggregation", MeasurementMethod: "NASA_Mean_HadGEM2-AO", ObservationPeriod: "P78Y"},
 			},
 			[]*pb.SourceSeries{
 				{ImportName: "NASA_WetBulbComputation_Aggregation", MeasurementMethod: "NASA_Mean_HadGEM2-AO", ObservationPeriod: "P78Y"},
+				{ImportName: "NASA_WetBulbComputation_Aggregation", MeasurementMethod: "NASA_Mean_ACCESS1-0", ObservationPeriod: "P78Y"},
 				{ImportName: "NASA_WetBulbComputation", MeasurementMethod: "NASA_Mean_HadGEM2-AO", ObservationPeriod: "P1Y"},
 				{ImportName: "NASA_WetBulbComputation", MeasurementMethod: "NASA_Mean_CCSM4", ObservationPeriod: "P1Y"},
 			},

diff --git a/test/integration/get_stat_set_within_place_test.go b/test/integration/get_stat_set_within_place_test.go
@@ -101,6 +101,13 @@ func TestGetStatSetWithinPlace(t *testing.T) {
 			[]string{"Count_Person"},
 			"world_pop.json",
 		},
+		{
+			"country/USA",
+			"County",
+			"",
+			[]string{"NumberOfMonths_WetBulbTemperature_35COrMore_RCP45_MinRelativeHumidity"},
+			"wet_bulb.json",
+		},
 	} {
 		resp, err := client.GetStatSetWithinPlace(ctx, &pb.GetStatSetWithinPlaceRequest{
 			ParentPlace: c.parentPlace,