Skip to content
Snippets Groups Projects
Commit 9cc6a346 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Supporting private forecasts on the map

parent b2335157
No related branches found
No related tags found
No related merge requests found
...@@ -703,9 +703,10 @@ function getForecastSummariesForPoi(poiId) ...@@ -703,9 +703,10 @@ function getForecastSummariesForPoi(poiId)
{ {
var retVal = []; var retVal = [];
var selectedCropIds = getSelectedCropIds(); 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) if(forecastSummary.cropOrganismId == null || selectedCropIds.indexOf(forecastSummary.cropOrganismId.organismId) < 0)
{ {
continue; continue;
......
...@@ -414,6 +414,10 @@ function updateForecastLayers() ...@@ -414,6 +414,10 @@ function updateForecastLayers()
"orgspan?organizationId=" + settings.includeOrganizationIds.join("&organizationId=") + cropCategoryIdStr "orgspan?organizationId=" + settings.includeOrganizationIds.join("&organizationId=") + cropCategoryIdStr
: settings.vipsOrganizationId + "?" + cropCategoryIdStr : settings.vipsOrganizationId + "?" + cropCategoryIdStr
) )
+
(
settings.userUuid != null ? "&userUUID=" + settings.userUuid : ""
)
, ,
format: new ol.format.KML(), format: new ol.format.KML(),
projection: ol.proj.get('EPSG:3857') projection: ol.proj.get('EPSG:3857')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment