From 9cc6a3466fb268cad8eaeaef0d0f049aab15dd89 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 18 Mar 2020 14:18:17 +0100
Subject: [PATCH] Supporting private forecasts on the map

---
 VIPSWeb/static/js/frontpage.js    | 5 +++--
 VIPSWeb/static/js/frontpageMap.js | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/VIPSWeb/static/js/frontpage.js b/VIPSWeb/static/js/frontpage.js
index 4824d32a..79d08d07 100755
--- a/VIPSWeb/static/js/frontpage.js
+++ b/VIPSWeb/static/js/frontpage.js
@@ -703,9 +703,10 @@ function getForecastSummariesForPoi(poiId)
 {
 	var retVal = [];
 	var selectedCropIds = getSelectedCropIds();
-	for(var i in cachedForecastSummaries)
+	var allForecastSummaries = cachedForecastSummaries.concat(cachedPrivateForecastSummaries);
+	for(var i in allForecastSummaries)
 	{
-		var forecastSummary = cachedForecastSummaries[i];
+		var forecastSummary = allForecastSummaries[i];
 		if(forecastSummary.cropOrganismId == null || selectedCropIds.indexOf(forecastSummary.cropOrganismId.organismId) < 0)
 		{
 			continue;
diff --git a/VIPSWeb/static/js/frontpageMap.js b/VIPSWeb/static/js/frontpageMap.js
index 16b15374..7265fec7 100755
--- a/VIPSWeb/static/js/frontpageMap.js
+++ b/VIPSWeb/static/js/frontpageMap.js
@@ -414,6 +414,10 @@ function updateForecastLayers()
 						"orgspan?organizationId=" + settings.includeOrganizationIds.join("&organizationId=") + cropCategoryIdStr
 						: settings.vipsOrganizationId + "?" + cropCategoryIdStr
 				) 
+				+ 
+				(
+						settings.userUuid != null ? "&userUUID=" + settings.userUuid : ""
+				)
 				,
 			format: new ol.format.KML(),
 			projection: ol.proj.get('EPSG:3857')
-- 
GitLab