feat: Fix URL configs

VIPSWeb/local_settings_sample.py

@@ -128,7 +128,7 @@ INCLUDE_ORGANIZATION_IDS =[1,2,3,4,5]
 # Use this if you want to override and show icons for stations belonging to several organizations
 #FORECAST_MAP_ORGANIZATION_IDS =[1,6]
 # The server hostname used for VIPSCoreManager
-VIPSCOREMANAGER_SERVER_NAME = "vipscoremanager"
+VIPSCOREMANAGER_SERVER_NAME = "http://vipscoremanager"
 # Local path to self signed certificate of VIPSCoreManager. 
 # Set to none if using certificate signed by a CA
 #VIPSCOREMANAGER_SSLCERT_PATH ="/path/to/myselfsignedcertificate.crt"

forecasts/models.py

@@ -437,27 +437,27 @@ class Model:
     def get_model(model_id):
         cur_language = translation.get_language()
         local_name = Model.get_local_name_for_model(model_id)
-        description = requests.get("http://%s/models/%s/description/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id, cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
-        warning_status_interpretation = requests.get("http://%s/models/%s/warningstatusinterpretation/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id, cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
-        usage = requests.get("http://%s/models/%s/usage/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id, cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
-        sample_config = requests.get("http://%s/models/%s/sampleconfig" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
+        description = requests.get("%s/models/%s/description/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id, cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
+        warning_status_interpretation = requests.get("%s/models/%s/warningstatusinterpretation/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id, cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
+        usage = requests.get("%s/models/%s/usage/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id, cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
+        sample_config = requests.get("%s/models/%s/sampleconfig" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
         return Model(model_id, local_name, description, warning_status_interpretation, usage, sample_config)
     
     @staticmethod
     def get_local_name_for_model(model_id):
         cur_language = translation.get_language()
-        return requests.get("http://%s/models/%s/name/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id, cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
+        return requests.get("%s/models/%s/name/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id, cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
     
     @staticmethod
     def get_local_warning_status_interpretation_for_model(model_id):
         cur_language = translation.get_language()
-        return requests.get("http://%s/models/%s/warningstatusinterpretation/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id, cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
+        return requests.get("%s/models/%s/warningstatusinterpretation/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME, model_id, cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH).text
     
     
     @staticmethod
     def get_models_local_names():
         cur_language = translation.get_language()
-        model_ids = requests.get("http://%s/models/json/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME,cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH)
+        model_ids = requests.get("%s/models/json/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME,cur_language), verify=settings.VIPSCOREMANAGER_SSLCERT_PATH)
         #print("http://%s/models/json/%s" % (settings.VIPSCOREMANAGER_SERVER_NAME,cur_language))
         #print(model_ids.text)
         return model_ids

fusarium/static/fusarium/js/oatFloweringModelForm.js

@@ -39,18 +39,16 @@ var detailURL = null;
 var DEBUG = true;
 
 // Settings for VIPS forecasting system
-//var serverUri = settings.vipsCoremanagerServerName;
-var serverUri = "https://coremanager.vips.nibio.no";
-//var serverUri = "http://vipscoremanager";
+var serverUri = settings.vipsCoremanagerServerName;
 var runUri= serverUri + "/models/OATFLOWERM/run"; 
 var coreUserName = "";
 var corePass = "";
 
 // Location of weather data source NOT USED
-//var weatherDataBaseUri = "https://lmt.nibio.no/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
-//var weatherDataBaseUri = "http://agrometbase-local/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
-const LMTServicesBaseUri = "https://lmt.nibio.no/services/";
-const OpenMeteoBaseUri = "https://weather.vips.nibio.no/rest/grid/openmeteo/"
+//const LMTServicesBaseUri = settings.LMT_SERVICES_URL;
+//const OpenMeteoBaseUri = "https://weather.vips.nibio.no/rest/grid/openmeteo/"
+
+
 // Setting current time
 var now = moment();
 //var now = moment("2014-07-04");
@@ -63,10 +61,11 @@ var now = moment();
  */
 var oatForm = function(options)
 {
+
 	// Get options, validate
 	this.target = options.target;
 	this.weatherStations = options.weatherStations;
-	coreUsername = options.coreUserName;
+	coreUserName = options.coreUserName;
 	corePass = options.corePass;
 	//console.log(options.now);
 	now = options.now != undefined ? moment(options.now) : now;
@@ -83,7 +82,7 @@ var oatForm = function(options)
 	// Then, add weather stations
 	for(i in this.weatherStations)
 	{
-		var option = new Option(this.weatherStations[i].name,this.weatherStations[i].weatherstation_id);
+		var option = new Option(this.weatherStations[i].name,this.weatherStations[i].weatherstationId);
 		theForm.weatherStationId.options[theForm.weatherStationId.options.length]=option;
 	}
 };
@@ -91,8 +90,9 @@ var oatForm = function(options)
 /**
  * Start the chain of functions that run the model
  */
-var submitForm = function()
+var submitForm = function(LMTServicesBaseUri, OpenMeteoBaseUri)
 {
+
 	// TODO: Validate input
 	// Date of sowing format
 	if(!getDateOfSowing().isValid())
@@ -126,21 +126,21 @@ var submitForm = function()
 	document.getElementById("errorMsg").style.display="none";
 
 	// Start chain of async functions
-	createConfig();
+	createConfig(LMTServicesBaseUri, OpenMeteoBaseUri);
 
 }
 
 /**
  * Creates the configuration for weather data. Moves on to running model after data returns
  */
-const createConfig = async function(){
+const createConfig = async function(LMTServicesBaseUri, OpenMeteoBaseUri){
 	
 	
 	const theForm = document.getElementById(theFormId);
 	const weatherStationId = theForm.weatherStationId.options[theForm.weatherStationId.selectedIndex].value;
 	const dateOfSowing = getDateOfSowing();
 	
-	const normalDataRequestUri = LMTServicesBaseUri + "rest/vips/getdata/grovfornormal?" + 
+	const normalDataRequestUri = LMTServicesBaseUri + "/rest/vips/getdata/grovfornormal?" + 
 		"elementMeasurementTypes[]=TM&timeZone=Europe/Oslo" + 
 		"&weatherStationId=" + weatherStationId +
 		"&startDate=" + now.format("YYYY-MM-DD") +
@@ -164,13 +164,12 @@ const createConfig = async function(){
 	normalData.sort(sortWeatherData)
 
 	const measuredDataRequestUri = document.getElementById("coordinates").checked? 
-	OpenMeteoBaseUri + "?longitude=" + document.getElementById("longitude").value +
-		"&elementMeasurementTypes[]=TM&logIntervalId=2" +
-		"&latitude=" + document.getElementById("latitude").value + 
+	OpenMeteoBaseUri.replace("%s", document.getElementById("longitude").value + "_" + document.getElementById("latitude").value) + 
+		"?elementMeasurementTypes[]=TM&logIntervalId=2" +
 		"&timeZone=Europe/Oslo" + 
 		"&startDate=" + dateOfSowing.format("YYYY-MM-DD") +
 		"&endDate=" + moment(now).add(10, "days").format("YYYY-MM-DD") 
-	: LMTServicesBaseUri + "rest/vips/getdata/forecastfallback?"+
+	: LMTServicesBaseUri + "/rest/vips/getdata/forecastfallback?"+
 		"elementMeasurementTypes[]=TM&logInterval=1d" +
 		"&weatherStationId=" + weatherStationId +
 		"&timeZone=Europe/Oslo" + 

fusarium/templates/fusarium/oat_flowering.html

@@ -83,7 +83,7 @@
 					</fieldset>
 				
 				<div class="form-group">
-					<button type="button" class="btn btn-primary" onclick="submitForm();storeUserSettings();">Beregn</button>
+					<button type="button" class="btn btn-primary" onclick="prepareSubmit();storeUserSettings();">Beregn</button>
 				</div>
 					
 					
@@ -119,6 +119,7 @@
     const userSettingsRadios = ["weatherdataType"];
 	window.weatherStations = [];
 	window.weatherStationIds = [];
+	let gridDataURL = undefined;
 
 	const inputLatitudeElement = document.getElementById("latitude");
     const inputLongitudeElement = document.getElementById("longitude");
@@ -127,9 +128,14 @@
 
 		let userSettings = getLocalSettings(getNameSpaced("{{ form_id }}",userSettingsFields.concat(userSettingsRadios)), false);
 
+		fetch("{{ settings.VIPSLOGIC_PROTOCOL }}://{{ settings.VIPSLOGIC_SERVER_NAME }}/rest/organization/{{ settings.VIPS_ORGANIZATION_ID }}")
+        .then(response => response.json())
+        .then(organizationJson => {
+			gridDataURL = organizationJson.defaultGridWeatherStationDataSource.datafetchUriExpression;
+		});
         
 
-		fetch("https://lmt.nibio.no/agrometbase/export/getNormalDataStationsJSON.php")
+		fetch("{{ settings.LMT_SERVICES_URL }}/rest/weatherstation/weatherstations/normaldata")
 		.then(response => {
 			if(response.ok)
 			{
@@ -190,6 +196,11 @@
 		});
 	};
 
+	window.prepareSubmit = function(){
+		console.info("GET URLS");
+		submitForm("{{ settings.LMT_SERVICES_URL }}", gridDataURL);
+	}
+
 	window.displayCoordinatesInput = function () {
         document.getElementById("coordinates").checked = true;
 		document.getElementById('input-coordinates').style.display="block";
@@ -265,7 +276,7 @@
     }
 
     window.openPoiMap = () => {
-		fetch("https://lmt.nibio.no/services/rest/weatherstation/ipmdecisions", {
+		fetch("{{ settings.LMT_SERVICES_URL }}/rest/weatherstation/ipmdecisions", {
                 method: 'GET'
             })
             .then(response => response.json())