From b21a74a05df15d8f8095b21bd71296ca82057734 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 11 Jun 2019 09:54:50 +0200
Subject: [PATCH] Multi org support for forecast summaries
---
VIPSWeb/static/js/frontpage.js | 4 +++-
VIPSWeb/static/js/frontpageMap.js | 35 ++++++++++++++++---------------
VIPSWeb/templates/settings.js | 2 +-
3 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/VIPSWeb/static/js/frontpage.js b/VIPSWeb/static/js/frontpage.js
index 81eccbc1..9b254614 100755
--- a/VIPSWeb/static/js/frontpage.js
+++ b/VIPSWeb/static/js/frontpage.js
@@ -533,7 +533,9 @@ var cachedPois;
function cacheForecastSummaries()
{
//$.getJSON(settings.vipslogicProtocol + "://" + settings.vipslogicServerName + "/rest/forecastconfigurationsummaries/" + settings.vipsOrganizationId, function( json ) {
- $.getJSON( "/vipslogicproxy/rest/forecastconfigurationsummaries/" + settings.vipsOrganizationId, function( json ) {
+ $.getJSON( "/vipslogicproxy/rest/forecastconfigurationsummaries/" + settings.vipsOrganizationId
+ + (settings.includeOrganizationIds != null ? "?includeOrganizationIds=" + settings.includeOrganizationIds.join(",") : "")
+ , function( json ) {
cachedForecastSummaries = json;
cachePrivateForecastSummaries();
diff --git a/VIPSWeb/static/js/frontpageMap.js b/VIPSWeb/static/js/frontpageMap.js
index 668d29c0..16b15374 100755
--- a/VIPSWeb/static/js/frontpageMap.js
+++ b/VIPSWeb/static/js/frontpageMap.js
@@ -410,8 +410,8 @@ function updateForecastLayers()
//url: settings.vipslogicProtocol + "://" + settings.vipslogicServerName + "/rest/forecastresults/aggregate/" + settings.vipsOrganizationId + "?" + cropCategoryIdStr,
url: "/vipslogicproxy/rest/forecastresults/aggregate/" +
(
- settings.forecastMapOrganizationIds != null && settings.forecastMapOrganizationIds.length > 0 ?
- "orgspan?organizationId=" + settings.forecastMapOrganizationIds.join("&organizationId=") + cropCategoryIdStr
+ settings.includeOrganizationIds != null && settings.includeOrganizationIds.length > 0 ?
+ "orgspan?organizationId=" + settings.includeOrganizationIds.join("&organizationId=") + cropCategoryIdStr
: settings.vipsOrganizationId + "?" + cropCategoryIdStr
)
,
@@ -433,21 +433,22 @@ var renderObservationFeatures = function(){
var geoJSON = {"type":"FeatureCollection","features":[]};
for(var i=0;i<filteredObservations.length;i++)
{
- var observation = filteredObservations[i];
- var obsFeatures = null;
- if(!observation.locationIsPrivate && observation.geoInfo !== null && observation.geoInfo.trim() !== "")
- {
- obsFeatures = JSON.parse(observation.geoInfo).features;
- }
- else
- {
- continue;
- }
-
- for(var j=0; j<obsFeatures.length; j++)
- {
- geoJSON.features.push(obsFeatures[j]);
- }
+ var observation = filteredObservations[i];
+ var obsFeatures = null;
+ if(!observation.locationIsPrivate && observation.geoInfo !== null && observation.geoInfo.trim() !== "")
+ {
+ obsFeatures = JSON.parse(observation.geoInfo).features;
+ }
+ else
+ {
+ continue;
+ }
+
+ for(var j=0; j<obsFeatures.length; j++)
+ {
+ geoJSON.features.push(obsFeatures[j]);
+ }
+
}
var format = new ol.format.GeoJSON();
diff --git a/VIPSWeb/templates/settings.js b/VIPSWeb/templates/settings.js
index ad804db9..611638dd 100755
--- a/VIPSWeb/templates/settings.js
+++ b/VIPSWeb/templates/settings.js
@@ -25,7 +25,7 @@ var settings = {
vipslogicProtocol: "{{settings.VIPSLOGIC_PROTOCOL}}",
vipsCoremanagerServerName : "{{settings.VIPSCOREMANAGER_SERVER_NAME}}",
- forecastMapOrganizationIds: {% if settings.FORECAST_MAP_ORGANIZATION_IDS == None %}null{%else%}{{settings.FORECAST_MAP_ORGANIZATION_IDS}}{%endif%},
+ includeOrganizationIds: {% if settings.INCLUDE_ORGANIZATION_IDS == None %}null{%else%}{{settings.INCLUDE_ORGANIZATION_IDS}}{%endif%},
mapZoomlevel: {{settings.MAP_ZOOMLEVEL}},
--
GitLab