From 6c1107ad587738c5dec50e867496b8b33902360e Mon Sep 17 00:00:00 2001
From: sohilpandya <sohilpandya@me.com>
Date: Thu, 1 Feb 2018 11:31:58 +0000
Subject: [PATCH] ordering by display name. related to #55

---
 graphql/schema.graphql   | 1 +
 helpers/createDataObj.js | 9 +++++++++
 middleware/graphql.js    | 2 +-
 models/islington.js      | 1 +
 src/components/App.js    | 1 +
 src/components/Map.js    | 4 ----
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/graphql/schema.graphql b/graphql/schema.graphql
index 4ec5315..663dd34 100644
--- a/graphql/schema.graphql
+++ b/graphql/schema.graphql
@@ -3,6 +3,7 @@ type Building {
   street_number: String,
   street_name: String,
   building_name: String,
+  display_name: String,
   postcode: String,
   ward: String,
   conservation_area: String,
diff --git a/helpers/createDataObj.js b/helpers/createDataObj.js
index ebb7510..e038770 100644
--- a/helpers/createDataObj.js
+++ b/helpers/createDataObj.js
@@ -1,10 +1,19 @@
 const createDataObj = (data) => {
   return data.map((item, i) => {
+
+    let display_name;
+    if (item['Lower Case Building Name']) {
+      display_name = item['Lower Case Building Name']
+    } else {
+      display_name = item['Lower Case Street Name'];
+    }
+
     return {
       id: ++i,
       street_number: item['Street Number'],
       street_name: item['Lower Case Street Name'],
       building_name: item['Lower Case Building Name'],
+      display_name: display_name,
       postcode: item['Post Code'],
       ward: item['Ward'],
       conservation_area: item['Conservation Area'],
diff --git a/middleware/graphql.js b/middleware/graphql.js
index 6adc65e..5cb3f8d 100644
--- a/middleware/graphql.js
+++ b/middleware/graphql.js
@@ -9,7 +9,7 @@ const grapqlSchema = buildSchema(
 );
 
 const getBuildings = async () => {
-  return await islington.find().sort({ id: 1 });
+  return await islington.find().sort({ display_name: 1 });
 };
 
 module.exports = graphqlHTTP({
diff --git a/models/islington.js b/models/islington.js
index 650555d..d36bfd7 100644
--- a/models/islington.js
+++ b/models/islington.js
@@ -20,6 +20,7 @@ const islingtonSchema = new Schema({
   street_number: String,
   street_name: String,
   building_name: String,
+  display_name: String,
   postcode: String,
   ward: String,
   conservation_area: String,
diff --git a/src/components/App.js b/src/components/App.js
index 1ee643d..6fadf06 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -145,6 +145,7 @@ const query = gql`
       postcode
       ward
       building_name
+      display_name
       conservation_area
       date_built_actual
       date_built_estimate
diff --git a/src/components/Map.js b/src/components/Map.js
index 8bb5c2a..ce0ac7a 100644
--- a/src/components/Map.js
+++ b/src/components/Map.js
@@ -36,9 +36,6 @@ class Map extends Component {
 
   shouldComponentUpdate(nextProps, prevState) {
     if (nextProps.building.significance && !prevState.selectedBuildingId) {
-      console.log(nextProps.building.id, 'building id nextprop')
-      console.log(nextProps.building.longitude, 'building longitude nextprop')
-      console.log(nextProps.building.latitude, 'building latitude nextprop')
       this.selectedBuilding(nextProps.building.id);
       let longitude = nextProps.building.longitude;
       let latitude = nextProps.building.latitude;
@@ -76,7 +73,6 @@ class Map extends Component {
   }
 
   hoveringItem = (id) => {
-    console.log('hovering in hovering item')
     this.setState({ hovering: !this.state.hovering, id } )
   }