diff --git a/package.json b/package.json
index 48da6b3..e2bec52 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
"@react-native-community/masked-view": "^0.1.10",
"@react-native-community/push-notification-ios": "^1.1.1",
"@react-native-community/slider": "^3.0.0",
+ "@react-native-mapbox-gl/maps": "^8.1.0-rc.1",
"@react-navigation/bottom-tabs": "^5.3.2",
"@react-navigation/native": "^5.2.2",
"@react-navigation/stack": "^5.2.17",
diff --git a/src/navigation/MainNavigator.js b/src/navigation/MainNavigator.js
index 79aca49..68187c9 100644
--- a/src/navigation/MainNavigator.js
+++ b/src/navigation/MainNavigator.js
@@ -30,6 +30,7 @@ import ClubAboutScreen from "../screens/Amicale/Clubs/ClubAboutScreen";
import ClubDisplayScreen from "../screens/Amicale/Clubs/ClubDisplayScreen";
import {createScreenCollapsibleStack, getWebsiteStack} from "../utils/CollapsibleUtils";
import BugReportScreen from "../screens/Other/FeedbackScreen";
+import MapScreen from "../screens/Services/MapScreen";
const modalTransition = Platform.OS === 'ios' ? TransitionPresets.ModalPresentationIOS : TransitionPresets.ModalSlideFromBottomIOS;
@@ -106,6 +107,13 @@ function MainStackComponent(props: { createTabNavigator: () => React.Node }) {
{getWebsiteStack("available-rooms", MainStack, AvailableRoomScreen, i18n.t('screens.availableRooms'))}
{getWebsiteStack("bib", MainStack, BibScreen, i18n.t('screens.bib'))}
{createScreenCollapsibleStack("self-menu", MainStack, SelfMenuScreen, i18n.t('screens.menuSelf'))}
+
{/* STUDENTS */}
{createScreenCollapsibleStack("proximo", MainStack, ProximoMainScreen, i18n.t('screens.proximo'))}
diff --git a/src/screens/Services/MapScreen.js b/src/screens/Services/MapScreen.js
new file mode 100644
index 0000000..9458ec1
--- /dev/null
+++ b/src/screens/Services/MapScreen.js
@@ -0,0 +1,104 @@
+// @flow
+
+import * as React from 'react';
+import {View} from 'react-native';
+import {withTheme} from 'react-native-paper';
+import {StackNavigationProp} from "@react-navigation/stack";
+import type {CustomTheme} from "../../managers/ThemeManager";
+import MapboxGL from "@react-native-mapbox-gl/maps";
+
+type Props = {
+ navigation: StackNavigationProp,
+ theme: CustomTheme,
+}
+
+type State = {
+ featureCollection: Array