Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rex Dri
Rex Dri
Commits
a3ad5631
Unverified
Commit
a3ad5631
authored
Apr 25, 2020
by
Gautier D
Committed by
Florent Chehab
May 03, 2020
Browse files
refacto(frontend): modify campus and city in MainMap
parent
0268d12e
Changes
3
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
a3ad5631
...
...
@@ -14,3 +14,4 @@ database.db-journal
.idea
npm-debug.log
.env
.history
frontend/src/components/map/MainMap.jsx
View file @
a3ad5631
...
...
@@ -15,25 +15,21 @@ const MAIN_MAP_ID = uuid();
function
MainMap
()
{
const
[
listUnivSel
]
=
useSelectedUniversities
();
const
mainCampuses
Selection
=
useMemo
(()
=>
{
const
univ
Selection
=
useMemo
(()
=>
{
const
out
=
[];
const
mainCampus
es
=
UniversityService
.
get
MainCampus
es
();
const
universiti
es
=
UniversityService
.
get
Universiti
es
();
mainCampuses
.
forEach
(
campus
=>
{
const
univ
=
UniversityService
.
getUniversityById
(
campus
.
university
);
if
(
campus
&&
univ
)
{
const
{
city
,
country
}
=
UniversityService
.
getUnivCityAndCountry
(
univ
.
id
);
universities
.
forEach
(
university
=>
{
const
univ
=
UniversityService
.
getUniversityById
(
university
.
id
);
if
(
univ
)
{
out
.
push
({
univName
:
univ
.
name
,
univLogoUrl
:
univ
.
logo
,
cityName
:
city
.
name
,
countryName
:
country
.
name
,
lat
:
parseFloat
(
campus
.
lat
),
lon
:
parseFloat
(
campus
.
lon
),
cityName
:
univ
.
city
,
countryName
:
univ
.
country
,
lat
:
parseFloat
(
univ
.
main_
campus
_
lat
),
lon
:
parseFloat
(
univ
.
main_
campus
_
lon
),
univId
:
univ
.
id
,
selected
:
listUnivSel
===
null
||
...
...
@@ -46,7 +42,7 @@ function MainMap() {
},
[
listUnivSel
]);
// create all the markers
return
<
BaseMap
id
=
{
MAIN_MAP_ID
}
campuses
=
{
mainCampuses
Selection
}
/>;
return
<
BaseMap
id
=
{
MAIN_MAP_ID
}
universities
=
{
univ
Selection
}
/>;
}
MainMap
.
propTypes
=
{};
...
...
frontend/src/services/data/UniversityService.js
View file @
a3ad5631
...
...
@@ -98,9 +98,9 @@ class UniversityService {
* @returns {object} Object with city and country instance of the university (main campus)
*/
getUnivCityAndCountry
(
univId
)
{
const
univ
MainCampus
=
this
.
get
CampusForUniv
Id
(
univId
);
const
city
=
CityService
.
getCityForCityId
(
univMainCampus
.
city
)
;
const
country
=
CountryService
.
getCountryForCountryId
(
city
.
country
)
;
const
univ
=
this
.
get
UniversityBy
Id
(
univId
);
const
city
=
univ
.
city
;
const
country
=
univ
.
country
;
return
{
city
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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