Update to https and test

Author: fre171csiro

pybomwater/bom_water.py

@@ -27,8 +27,8 @@ class Action:
     def __init__(self):
         pass
 
-    # GetDescribeSensor = 'http://www.bom.gov.au/waterdata/services?service=SOS&version=2.0&request=DescribeSensor'
-    GetCapabilities = 'http://www.bom.gov.au/waterdata/services?service=SOS&version=2.0&request=GetCapabilities'
+    # GetDescribeSensor = 'https://www.bom.gov.au/waterdata/services?service=SOS&version=2.0&request=DescribeSensor'
+    GetCapabilities = 'https://www.bom.gov.au/waterdata/services?service=SOS&version=2.0&request=GetCapabilities'
     GetDataAvailability = "http://www.opengis.net/def/serviceOperation/sos/daRetrieval/2.0/GetDataAvailability"
     GetObservation = "http://www.opengis.net/def/serviceOperation/sos/core/2.0/GetObservation"
     GetFeatureOfInterest = "http://www.opengis.net/def/serviceOperation/sos/foiRetrieval/2.0/GetFeatureOfInterest"
@@ -224,15 +224,15 @@ def build_payload(self, action, feature=None, prop=None, proced=None, begin=None
 
     # def request(self, action, feature=None, prop=None, proced=None, begin=None, end=None, lower_corner=None,
     #             upper_corner=None):
-    #     endpoint = f"http://www.bom.gov.au/waterdata/services?service=SOS&version=2.0&request={os.path.basename(action)}"
+    #     endpoint = f"https://www.bom.gov.au/waterdata/services?service=SOS&version=2.0&request={os.path.basename(action)}"
     #     payload = self.build_payload(action, feature, prop, proced, begin, end, lower_corner, upper_corner)
     #     if action == Action.GetCapabilities:
     #         return requests.get(action)
     #     return requests.post(endpoint, payload)
 
     def request(self, action, feature=None, prop=None, proced=None, begin=None, end=None, lower_corner=None, upper_corner=None):
         try:
-            endpoint = f"http://www.bom.gov.au/waterdata/services?service=SOS&version=2.0&request={os.path.basename(action)}"
+            endpoint = f"https://www.bom.gov.au/waterdata/services?service=SOS&version=2.0&request={os.path.basename(action)}"
             payload = self.build_payload(action, feature, prop, proced, begin, end, lower_corner, upper_corner)
             if action == Action.GetCapabilities:
                 response = requests.get(action)

test/test_core.py

@@ -79,11 +79,9 @@ def test_get_feature_of_interest(self):
         '''Get Feature of interest test'''
         _bm = bm.BomWater()
         '''Todo: Need a small bounding box with known stations contained'''
-        response = _bm.request(_bm.actions.GetFeatureOfInterest,
-                                   "http://bom.gov.au/waterdata/services/stations/GW036501.2.2")
+        response = _bm.request(_bm.actions.GetFeatureOfInterest, "http://bom.gov.au/waterdata/services/stations/GW036501.2.2")
         test_json = _bm.xml_to_json(response.text)#, f'test_GetFeatureOfInterest.json')
-        features = test_json['soap12:Envelope']['soap12:Body']['sos:GetFeatureOfInterestResponse'][
-            'sos:featureMember']
+        features = test_json['soap12:Envelope']['soap12:Body']['sos:GetFeatureOfInterestResponse']['sos:featureMember']
         long_statioId = features['wml2:MonitoringPoint']['gml:identifier']['#text']
         if os.path.basename(long_statioId) == 'GW036501.2.2':
             assert True, "Test GetFeatureOfInterest passed"