diff --git a/VIPSWeb/static/js/frontpage.js b/VIPSWeb/static/js/frontpage.js index 4824d32ada511b06f1eef1327563b30afcb39c19..79d08d07d63e8b326322c1beecfbfc63e8afa567 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 16b1537481d5de767a74ff0806747f04ea6e2a6a..7265fec76d446ecfe5091ec8ec2aea9f09ebad9a 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')