Added code changes for treemap data (#208)

* Added code changes for treemap data * Remove unused import * Reverted to original hibenate connection parameters
biodiv-platform · Nov 11, 2024 · 4a24c64 · 4a24c64
1 parent 3377bdd
commit 4a24c64
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/com/strandls/observation/pojo/MapAggregationStatsResponse.java b/src/main/java/com/strandls/observation/pojo/MapAggregationStatsResponse.java
@@ -12,6 +12,7 @@ public class MapAggregationStatsResponse {
 	private Map<String, List<Map<String, Object>>> countPerDay;
 	private Map<String, List<Map<String, Object>>> groupObservedOn;
 	private List<Map<String, Object>> groupTraits;
+	private Map<String, Long> groupTaxon;
 
 	public Map<String, Long> getTotalCounts() {
 		return totalCounts;
@@ -69,4 +70,12 @@ public void setGroupUniqueSpecies(Map<String, Long> groupUniqueSpecies) {
 		this.groupUniqueSpecies = groupUniqueSpecies;
 	}
 
+	public Map<String, Long> getGroupTaxon() {
+		return groupTaxon;
+	}
+
+	public void setGroupTaxon(Map<String, Long> taxonAgg) {
+		this.groupTaxon = taxonAgg;
+	}
+
 }
diff --git a/src/main/java/com/strandls/observation/service/Impl/ObservationListServiceImpl.java b/src/main/java/com/strandls/observation/service/Impl/ObservationListServiceImpl.java
@@ -597,7 +597,7 @@ public MapAggregationStatsResponse mapAggregateStats(String index, String type,
 
 		Map<String, AggregationResponse> mapAggStatsResponse = new HashMap<String, AggregationResponse>();
 
-		int totalLatch = 6;
+		int totalLatch = 7;
 
 //		latch count down
 		CountDownLatch latch = new CountDownLatch(totalLatch);
@@ -614,6 +614,9 @@ public MapAggregationStatsResponse mapAggregateStats(String index, String type,
 		getAggregateLatch(index, type, "group_by_traits", geoAggregationField, mapSearchQuery, mapAggStatsResponse,
 				latch, null, geoShapeFilterField);
 
+		getAggregateLatch(index, type, "group_by_taxon", geoAggregationField, mapSearchQuery, mapAggStatsResponse,
+				latch, null, geoShapeFilterField);
+
 		// for top Uploaders
 
 		if (user != null && !user.isEmpty()) {
@@ -715,6 +718,8 @@ public MapAggregationStatsResponse mapAggregateStats(String index, String type,
 
 		aggregationStatsResponse.setGroupObservedOn(groupByMonth);
 
+		Map<String, Long> taxonAgg = getAggregationValue(mapAggStatsResponse.get("group_by_taxon"));
+		aggregationStatsResponse.setGroupTaxon(taxonAgg);
 		Map<String, Long> traitsAgg = getAggregationValue(mapAggStatsResponse.get("group_by_traits"));
 		int traitsIndex = 0;
 		List<Map<String, Object>> groupByTraits = new ArrayList<>();