diff --git a/buildings/reference_data/topo50.py b/buildings/reference_data/topo50.py index 926d5abe..49b79be1 100644 --- a/buildings/reference_data/topo50.py +++ b/buildings/reference_data/topo50.py @@ -29,7 +29,6 @@ "protected_areas_polygons", ] -# URI = "srsname='EPSG:2193' typename='data.linz.govt.nz:layer-{0}-changeset' url=\"https://data.linz.govt.nz/services;key={1}/wfs/layer-{0}-changeset?viewparams=from:{2};to:{3}{4}\"" URI = "https://data.linz.govt.nz/services;key={1}/wfs/layer-{0}-changeset?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&typeNames=layer-{0}-changeset&viewparams=from:{2};to:{3}{4}&SRSNAME=EPSG:2193&outputFormat=json" diff --git a/buildings/tests/gui/test_setup_reference_data.py b/buildings/tests/gui/test_setup_reference_data.py index 5bf44144..42679b72 100644 --- a/buildings/tests/gui/test_setup_reference_data.py +++ b/buildings/tests/gui/test_setup_reference_data.py @@ -45,6 +45,7 @@ def test_disabled_on_start(self): """Test ui options disabled on opening as there is a current dataset""" self.assertFalse(self.reference_frame.grbx_topo.isEnabled()) self.assertFalse(self.reference_frame.grbx_admin.isEnabled()) + self.assertFalse(self.reference_frame.grbx_other.isEnabled()) self.assertFalse(self.reference_frame.chbx_canals.isEnabled()) self.assertFalse(self.reference_frame.chbx_lagoons.isEnabled()) self.assertFalse(self.reference_frame.chbx_lakes.isEnabled()) @@ -55,6 +56,7 @@ def test_disabled_on_start(self): self.assertFalse(self.reference_frame.chbx_ta.isEnabled()) self.assertFalse(self.reference_frame.btn_update.isEnabled()) self.assertTrue(self.reference_frame.btn_exit.isEnabled()) + self.assertTrue(self.reference_frame.btn_status.isEnabled()) def test_groupbx_check(self): """Check changing of group boxes changes the correct checkboxes""" @@ -86,3 +88,15 @@ def test_groupbx_check(self): self.reference_frame.grbx_admin.setChecked(False) self.assertFalse(self.reference_frame.chbx_suburbs.isChecked()) self.assertFalse(self.reference_frame.chbx_ta.isChecked()) + self.reference_frame.grbx_other.setChecked(True) + self.assertTrue(self.reference_frame.chbx_imagery.isChecked()) + self.assertFalse(self.reference_frame.chbx_suburbs.isChecked()) + self.assertFalse(self.reference_frame.chbx_ta.isChecked()) + self.assertFalse(self.reference_frame.chbx_canals.isChecked()) + self.assertFalse(self.reference_frame.chbx_lagoons.isChecked()) + self.assertFalse(self.reference_frame.chbx_lakes.isChecked()) + self.assertFalse(self.reference_frame.chbx_ponds.isChecked()) + self.assertFalse(self.reference_frame.chbx_rivers.isChecked()) + self.assertFalse(self.reference_frame.chbx_swamps.isChecked()) + self.reference_frame.grbx_other.setChecked(False) + self.assertFalse(self.reference_frame.chbx_imagery.isChecked())