|
-
+
${ sortedTable[rowKey][column] }
${ sortedTable[rowKey][column] }
diff --git a/hub/tests/test_import_areas.py b/hub/tests/test_import_areas.py
index 303ac7896..424b12583 100644
--- a/hub/tests/test_import_areas.py
+++ b/hub/tests/test_import_areas.py
@@ -7,17 +7,9 @@
from utils.mapit import MapIt
-class ImportAreasTestCase(TestCase):
- quiet_parameter: bool = False
-
- @mock.patch.object(MapIt, "areas_of_type")
- @mock.patch.object(MapIt, "area_geometry")
- def test_import(self, mapit_geom, mapit_areas):
- mapit_geom.return_value = {
- "type": "Polygon",
- "coordinates": [[1, 2], [2, 1]],
- }
- mapit_areas.return_value = [
+def mock_areas_of_type(types):
+ if "WMC" in types:
+ return [
{
"id": 1,
"codes": {"gss": "E10000001", "unit_id": "1"},
@@ -33,6 +25,22 @@ def test_import(self, mapit_geom, mapit_areas):
"type": "WMC",
},
]
+
+ return []
+
+
+class ImportAreasTestCase(TestCase):
+ quiet_parameter: bool = False
+
+ @mock.patch.object(MapIt, "areas_of_type")
+ @mock.patch.object(MapIt, "area_geometry")
+ def test_import(self, mapit_geom, mapit_areas):
+ mapit_geom.return_value = {
+ "type": "Polygon",
+ "coordinates": [[1, 2], [2, 1]],
+ }
+ mapit_areas.side_effect = mock_areas_of_type
+
call_command("import_areas", quiet=self.quiet_parameter)
areas = Area.objects.all()
diff --git a/hub/tests/test_views.py b/hub/tests/test_views.py
index 96d93c9a0..fedfa4018 100644
--- a/hub/tests/test_views.py
+++ b/hub/tests/test_views.py
@@ -51,13 +51,13 @@ def test_explore_datasets_json_page(self):
self.assertEqual(response.status_code, 200)
datasets = response.json()
- self.assertEqual(11, len(datasets))
+ self.assertEqual(12, len(datasets))
self.client.logout()
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
datasets = response.json()
- self.assertEqual(4, len(datasets))
+ self.assertEqual(5, len(datasets))
def test_explore_view_with_many_to_one(self):
url = f"{reverse('explore_csv')}?mp_appg_membership__exact=MadeUpAPPG"
diff --git a/hub/views/area.py b/hub/views/area.py
index 0167111d3..4654e5349 100644
--- a/hub/views/area.py
+++ b/hub/views/area.py
@@ -192,7 +192,12 @@ def get_context_data(self, **kwargs):
):
if context["overlap_constituencies"][0].get("unchanged", False):
context["overlap_unchanged"] = True
- context["area_type"] = str(self.object.area_type)
+ area_type = self.object.area_type
+ context["area_type"] = area_type.code
+ context["is_westminster_cons"] = True
+ if area_type.area_type != "Westminster Constituency":
+ context["is_westminster_cons"] = False
+
if context["area_type"] == "WMC23":
context["PPCs"] = [
{
diff --git a/hub/views/explore.py b/hub/views/explore.py
index 8d8ff2fb9..a0273df6b 100644
--- a/hub/views/explore.py
+++ b/hub/views/explore.py
@@ -155,6 +155,21 @@ def render_to_response(self, context, **response_kwargs):
}
)
+ datasets.append(
+ {
+ "scope": "public",
+ "is_featured": False,
+ "is_favourite": False,
+ "is_filterable": False,
+ "is_shadable": False,
+ "category": "place",
+ "name": "gss",
+ "title": "Council GSS code",
+ "source_label": "Data from mySociety.",
+ "areas_available": ["DIS", "STC"],
+ }
+ )
+
return JsonResponse(list(datasets), safe=False)
@@ -205,7 +220,10 @@ class ExploreGeometryCachedJSON(ExploreGeometryJSON):
class ExploreJSON(FilterMixin, TemplateView):
def render_to_response(self, context, **response_kwargs):
geom = []
- areas = self.data(as_dict=True, mp_name=True)
+ mp_name = True
+ if self.area_type().area_type != "Westminster Constituency":
+ mp_name = False
+ areas = self.data(as_dict=True, mp_name=mp_name)
shader_areas = [a["area"] for a in areas.values()]
shader = self.shader()
colours = {}
|