Merge pull request #40 from terop/fixes

Do various changes

README.md

@@ -30,15 +30,15 @@ For `radar` datasets `rasterio` is needed. It can be installed with
 This library provides two very simple scripts that list all the available data on
 FMI open data WMS and WFS services.
 
-Create `wms.html` that lists all the availble WMS layers:
+Create `wms.html` that lists all the available WMS layers:
 ```bash
 
 wms_html.py
 ```
 
 The `Layer ID` strings are used to identify WMS (image) datasets. Examples to be added.
 
-Create `wfs.html` that lists all the availble WFS layers:
+Create `wfs.html` that lists all the available WFS layers:
 ```bash
 
 wfs_html.py
@@ -131,7 +131,7 @@ plt.imshow(composite.data[0, :, :])
 plt.show()
 ```
 
-The following attributes are available in the underlaying `Radar` class for all radar data:
+The following attributes are available in the underlying `Radar` class for all radar data:
 
 ```python
 

fmiopendata/grid.py

@@ -23,9 +23,6 @@
 import defusedxml.ElementTree as ET
 import os
 import tempfile
-import sys
-if sys.version_info < (3, 6):
-    from collections import OrderedDict as dict
 
 import numpy as np
 import eccodes

fmiopendata/multipoint.py

@@ -21,9 +21,6 @@
 
 import defusedxml.ElementTree as ET
 import datetime as dt
-import sys
-if sys.version_info < (3, 6):
-    from collections import OrderedDict as dict
 
 import numpy as np
 

fmiopendata/radar.py

@@ -22,9 +22,6 @@
 import datetime as dt
 import defusedxml.ElementTree as ET
 import tempfile
-import sys
-if sys.version_info < (3, 6):
-    from collections import OrderedDict as dict
 
 import rasterio
 import numpy as np

fmiopendata/tests/test_lightning.py

@@ -55,7 +55,7 @@ def test_lightning():
     # The multipoint coverage format
     res2 = download_and_parse("fmi::observations::lightning::multipointcoverage", args=ARGS)
 
-    # The results should be indentical
+    # The results should be identical
     assert np.all(res.latitudes == res2.latitudes)
     assert np.all(res.longitudes == res2.longitudes)
     assert np.all(res.times == res2.times)

fmiopendata/wfs.py

@@ -20,15 +20,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import defusedxml.ElementTree as ET
-import sys
-if sys.version_info < (3, 6):
-    from collections import OrderedDict as dict
 
 from fmiopendata.utils import read_url
 
 
-BASE_URL = "http://opendata.fmi.fi/wfs?service=WFS&request="
-STORED_QUERY_URL = "http://opendata.fmi.fi/wfs?service=WFS&version=2.0.0&request=getFeature&storedquery_id="
+BASE_URL = "https://opendata.fmi.fi/wfs?service=WFS&request="
+STORED_QUERY_URL = "https://opendata.fmi.fi/wfs?service=WFS&version=2.0.0&request=getFeature&storedquery_id="
 
 GML_BEGIN_POSITION = ".//{http://www.opengis.net/gml/3.2}beginPosition"
 GML_DOUBLE_OR_NIL_REASON_TUPLE_LIST = ".//{http://www.opengis.net/gml/3.2}doubleOrNilReasonTupleList"

fmiopendata/wms.py

@@ -21,9 +21,6 @@
 
 import datetime as dt
 import defusedxml.ElementTree as ET
-import sys
-if sys.version_info < (3, 6):
-    from collections import OrderedDict as dict
 
 from fmiopendata.utils import read_url