Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
whats-open-web
Commits
8107785c
Commit
8107785c
authored
Sep 17, 2018
by
Mattias J Duffy
Browse files
more mapbox improvements
parent
d27c70f2
Pipeline
#2923
passed with stages
in 1 minute and 45 seconds
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
src/components/FacilitiesMap.js
View file @
8107785c
...
...
@@ -26,7 +26,7 @@ class FacilitiesMap extends React.Component {
this
.
Map
=
ReactMapboxGl
({
accessToken
:
mapboxToken
,
interactive
:
fals
e
,
interactive
:
interactiv
e
,
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
.
set
State
(
{
const
new
State
=
{
maxBounds
:
getMaxBounds
(
campusRegion
),
campusRegion
:
campusRegion
,
center
:
facilityLocationExists
?
facility
.
facility_location
.
coordinate_location
.
coordinates
:
getCenterOfCampusRegion
(
campusRegion
),
zoom
:
[
17
]
});
};
setTimeout
(()
=>
{
this
.
setState
(
newState
);
},
100
);
};
generateLocationArray
=
(
facilities
)
=>
{
...
...
Mattias J Duffy
@mduffy8
mentioned in commit
8c4cd88b
·
Sep 18, 2018
mentioned in commit
8c4cd88b
mentioned in commit 8c4cd88bbe064f8f4200ac8887d71aac2f1cbaf2
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment