+
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 } )
}
diff --git a/src/components/Markers.js b/src/components/Markers.js
index 2567b07..1a2ca7f 100644
--- a/src/components/Markers.js
+++ b/src/components/Markers.js
@@ -11,28 +11,27 @@ const Markers = ({
buildings = [], handleBuildingDetails, hoveringItem, selectedBuilding,
goToViewport, hovering, id, selectedBuildingId
}) => {
-const allMarkers = buildings.length > 0 && buildings.map((buildingObj, i) => {
- let counter = ++i;
+const allMarkers = buildings.length > 0 && buildings.map((buildingObj, i) => {
return (
{
- hoveringItem(counter);
+ hoveringItem(buildingObj.id);
}}
onClick={() => {
- selectedBuilding(counter);
+ selectedBuilding(buildingObj.id);
handleBuildingDetails(buildingObj);
let longitude = buildingObj.longitude;
let latitude = buildingObj.latitude;
goToViewport({longitude, latitude});
}}
onTouchStart={() => {
- selectedBuilding(counter);
+ selectedBuilding(buildingObj.id);
handleBuildingDetails(buildingObj);
let longitude = buildingObj.longitude;
let latitude = buildingObj.latitude;
@@ -44,7 +43,7 @@ const allMarkers = buildings.length > 0 && buildings.map((buildingObj, i) => {
>
{
- (hovering && id === counter) || selectedBuildingId === counter ? :
+ (hovering && buildingObj.id === id) || buildingObj.id === selectedBuildingId ? :
}
diff --git a/src/components/Nav.js b/src/components/Nav.js
index 1ba47be..166d473 100644
--- a/src/components/Nav.js
+++ b/src/components/Nav.js
@@ -12,7 +12,7 @@ const Nav = ({ handleIsHomePage, handleIsAboutPage, isAbout }) => {
{ handleIsAboutPage()} }
+ className="ma0 primary pointer pt1 pl1 pr3 b underline f4-l" onClick = { () => { handleIsAboutPage()} }
> { isAbout ? 'Home' : 'About' }
);