diff --git a/src/components/FacilitiesMap.js b/src/components/FacilitiesMap.js index f5ab9df22048e7fc09e35f9b19a6fdbb1aba30fe..e90e7633d58a1db84e60c659a2d49202abb524af 100644 --- a/src/components/FacilitiesMap.js +++ b/src/components/FacilitiesMap.js @@ -26,7 +26,7 @@ class FacilitiesMap extends React.Component { this.Map = ReactMapboxGl({ accessToken: mapboxToken, - interactive: false, + interactive: interactive, attributionControl: false }); const facilityLocationExists = facility && facility.facility_location && facility.facility_location.campus_region === campusRegion; @@ -42,21 +42,21 @@ class FacilitiesMap extends React.Component { maxBounds: getMaxBounds(campusRegion), campusRegion: campusRegion, zoom: [17], - // center: facilityLocationExists ? facility.facility_location.coordinate_location.coordinates : getCenterOfCampusRegion(campusRegion), + center: facilityLocationExists ? facility.facility_location.coordinate_location.coordinates : getCenterOfCampusRegion(campusRegion), fitBoundsOptions: {}, facilityLocations: [], selectedLocation: null, isLoaded: false }; - if (interactive) { - this.state.center = facilityLocationExists ? facility.facility_location.coordinate_location.coordinates : getCenterOfCampusRegion(campusRegion); - }else{ - setTimeout(() => { - this.setState({ - center: facilityLocationExists ? facility.facility_location.coordinate_location.coordinates : getCenterOfCampusRegion(campusRegion) - }); - }, 500); - } + // if (interactive) { + // this.state.center = facilityLocationExists ? facility.facility_location.coordinate_location.coordinates : getCenterOfCampusRegion(campusRegion); + // }else{ + // setTimeout(() => { + // this.setState({ + // center: facilityLocationExists ? facility.facility_location.coordinate_location.coordinates : getCenterOfCampusRegion(campusRegion) + // }); + // }, 500); + // } } componentWillReceiveProps(nextProps) { @@ -77,12 +77,15 @@ class FacilitiesMap extends React.Component { const facilityLocationExists = facility && facility.facility_location && facility.facility_location.campus_region === campusRegion; - this.setState({ + const newState = { maxBounds: getMaxBounds(campusRegion), campusRegion: campusRegion, center: facilityLocationExists ? facility.facility_location.coordinate_location.coordinates : getCenterOfCampusRegion(campusRegion), zoom: [17] - }); + }; + setTimeout(() => { + this.setState(newState); + }, 100); }; generateLocationArray = (facilities) => {