Legacy compatibility

forecasts/models.py

@@ -61,7 +61,7 @@ class ForecastResult:
         auth_param = ""
         if user_uuid != None:
             auth_param = "?userUUID=%s" % user_uuid
-        requestResult = requests.get("http://%s/rest/forecastresults/%s/%s%s" % (settings.VIPSLOGIC_SERVER_NAME,forecast_configuration_id, latest_days, auth_param))
+        requestResult = requests.get("%s://%s/rest/forecastresults/%s/%s%s" % (settings.VIPSLOGIC_PROTOCOL, settings.VIPSLOGIC_SERVER_NAME,forecast_configuration_id, latest_days, auth_param))
         return requestResult.json()
     
     @staticmethod
@@ -228,7 +228,8 @@ class ForecastConfiguration:
             for crop_organism_id in crop_organism_ids:
                 crop_organism_id_paramstring += "&cropOrganismId=%s" % crop_organism_id
             
-        request_result = requests.get("http://%s/rest/organizationforecastconfigurations/%s?%s" % (
+        request_result = requests.get("%s://%s/rest/organizationforecastconfigurations/%s?%s" % (
+                                                                              settings.VIPSLOGIC_PROTOCOL,
                                                                               settings.VIPSLOGIC_SERVER_NAME, 
                                                                               settings.VIPS_ORGANIZATION_ID,
                                                                               crop_organism_id_paramstring
@@ -241,7 +242,7 @@ class ForecastConfiguration:
         if user_uuid == None:
             return []
         forecasts = []
-        request_result = requests.get("http://%s/rest/forecastconfigurations/private/%s" % (settings.VIPSLOGIC_SERVER_NAME, user_uuid))
+        request_result = requests.get("%s://%s/rest/forecastconfigurations/private/%s" % (settings.VIPSLOGIC_PROTOCOL, settings.VIPSLOGIC_SERVER_NAME, user_uuid))
         if request_result.status_code != 200:
             return None
         for item in request_result.json():
@@ -262,7 +263,7 @@ class ForecastConfiguration:
         auth_param = ""
         if user_uuid != None:
             auth_param = "?userUUID=%s" % user_uuid
-        requestResult = requests.get("http://%s/rest/forecastconfigurations/%s%s" % (settings.VIPSLOGIC_SERVER_NAME, forecast_configuration_id, auth_param))
+        requestResult = requests.get("%s://%s/rest/forecastconfigurations/%s%s" % (settings.VIPSLOGIC_PROTOCOL, settings.VIPSLOGIC_SERVER_NAME, forecast_configuration_id, auth_param))
         try:
             return requestResult.json()
         except ValueError:
@@ -293,7 +294,8 @@ class ForecastConfiguration:
                 crop_organism_id_paramstring += "&cropOrganismId=%s" % crop_organism_id
         """
             
-        request_result = requests.get("http://%s/rest/forecastconfigurationsummaries/%s" % (
+        request_result = requests.get("%s://%s/rest/forecastconfigurationsummaries/%s" % (
+                                                                              settings.VIPSLOGIC_PROTOCOL,
                                                                               settings.VIPSLOGIC_SERVER_NAME, 
                                                                               settings.VIPS_ORGANIZATION_ID
                                                                               )
@@ -333,6 +335,10 @@ class PointOfInterest:
             self.longitude = coordinate[0]
             self.latitude = coordinate[1]
             self.altitude = coordinate[2]
+        else: # Keeping legacy compatibility
+            self.longitude = dictionary.get("longitude", None)
+            self.latitude = dictionary.get("latitude", None)
+            self.altitude = dictionary.get("altitude", None)
         countrycode_dict = dictionary.get("countryCode", None)
         if countrycode_dict != None:
             self.countryCode = countrycode_dict.get("countryCode", None)