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

Merge branch 'develop' of gitlab.nibio.no:VIPS/VIPSWeb into develop

# Conflicts:
#	VIPSWeb/static/js/frontpage.js
parents 2c3afe37 9f49853b
No related branches found
No related tags found
No related merge requests found
......@@ -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();
......
......@@ -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}},
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment