diff --git a/VIPSWeb/static/js/frontpageMap.js b/VIPSWeb/static/js/frontpageMap.js
index 668d29c0bd7247d9323b079b2a98ec3a1b0ce0b6..16b1537481d5de767a74ff0806747f04ea6e2a6a 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 ad804db9dafb8e555f4e6ce0e7ae59d27a27cc00..611638dd658c17665d63bc2d3cd5107eaf1bfe92 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}},
diff --git a/forecasts/models.py b/forecasts/models.py
index 42b2a96cab7beb4e6fcfe80be392babbc3adf05b..d9cd618c4b31289e77ac9bdec42ad6b8c3ce38c8 100755
--- a/forecasts/models.py
+++ b/forecasts/models.py
@@ -230,24 +230,34 @@ class ForecastConfiguration:
for crop_organism_id in crop_organism_ids:
crop_organism_id_paramstring += "&cropOrganismId=%s" % crop_organism_id
- print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
- settings.VIPSLOGIC_PROTOCOL,
- settings.VIPSLOGIC_SERVER_NAME,
- settings.VIPS_ORGANIZATION_ID,
- season,
- season,
- crop_organism_id_paramstring
- )
-
- request_result = requests.get("%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
- settings.VIPSLOGIC_PROTOCOL,
- settings.VIPSLOGIC_SERVER_NAME,
- settings.VIPS_ORGANIZATION_ID,
- season,
- season,
- crop_organism_id_paramstring
- )
- )
+ request_result = None
+ if settings.INCLUDE_ORGANIZATION_IDS == None:
+ print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
+ settings.VIPSLOGIC_PROTOCOL,
+ settings.VIPSLOGIC_SERVER_NAME,
+ settings.VIPS_ORGANIZATION_ID,
+ season,
+ season,
+ crop_organism_id_paramstring
+ )
+
+ request_result = requests.get("%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
+ settings.VIPSLOGIC_PROTOCOL,
+ settings.VIPSLOGIC_SERVER_NAME,
+ settings.VIPS_ORGANIZATION_ID,
+ season,
+ season,
+ crop_organism_id_paramstring
+ )
+ )
+ else:
+ request_result = requests.get("%s://%s/rest/forecastconfigurationsincludeorgs/%s?includeOrganizationIds=%s" % (
+ settings.VIPSLOGIC_PROTOCOL,
+ settings.VIPSLOGIC_SERVER_NAME,
+ settings.VIPS_ORGANIZATION_ID,
+ ",".join(str(x) for x in settings.INCLUDE_ORGANIZATION_IDS)
+ )
+ )
return request_result
@staticmethod