fix merge conflict

hackoregon · Apr 19, 2019 · eaef75c · eaef75c
2 parents 63f1ace + cc9e5e2
commit eaef75c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/civic_sandbox/meta.py b/civic_sandbox/meta.py
@@ -171,7 +171,7 @@
 'attributes': {
   'primary': {
     'field': 'description',
-    'name': 'Demolitions Data from 2000 to 2018',
+    'name': 'Demolition Description',
   },
   'secondary': {
     'field': None,
@@ -344,12 +344,12 @@
 population_meta = {
 'attributes': {
   'primary': {
-    'field': 'total_population',
-    'name': 'Total Population',
+    'field': 'pc_owner_occupied_housing_units',
+    'name': 'Percent of Owner Occupied Households',
     'visualization': {
-      'type': 'ComparisonBar',
-      'comparison_value':'10000000',
-      'comparison_name':'Average Total Population',
+      'type': 'PercentDonut',
+      'comparison_value':'null',
+      'comparison_name':'null',
     },
   },
   'secondary': {
@@ -397,7 +397,7 @@
 'attributes': {
   'primary': {
     'field': 'pc_householders_living_alone',
-    'name': 'Householders Living Alone',
+    'name': 'Percent of Householders Living Alone',
     'visualization': {
       'type': 'PercentDonut',
       'comparison_value': None,
@@ -516,7 +516,7 @@
 bg_pctrenter_occupied_meta = {
 'attributes': {
   'primary': {
-    'field': 'pctrenter_occupied_households',
+    'field': 'pctrenter_occupied',
     'name': 'Percent Renter Occupied Households',
     'visualization': {
       'type': 'PercentDonut',

diff --git a/civic_sandbox/views.py b/civic_sandbox/views.py
@@ -181,8 +181,8 @@
   serializer_class=LivingAloneSerializer,
   multi_geom_class=MultiPolygon,
   geom_field='geom',
-  attributes =population_meta['attributes'],
-  dates=population_meta['dates'], 
+  attributes =living_alone_meta['attributes'],
+  dates=living_alone_meta['dates'], 
   )
 
 income = sandbox_view_factory(