Skip to content

Commit 689e8d7

Browse files
committed
use react-native-config
1 parent d0c5444 commit 689e8d7

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

Diff for: src/config.json

-3
This file was deleted.

Diff for: src/frontend/hooks/useMapAvailability.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import MapboxGL from "@react-native-mapbox-gl/maps";
44

55
import api from "../api";
66
import { normalizeStyleURL } from "../lib/mapbox";
7-
import config from "../../config.json";
7+
import { config } from "../lib/config";
88

99
/** URL used for map style when no custom map and user is online */
1010
export const onlineStyleURL = normalizeStyleURL(
1111
MapboxGL.StyleURL.Outdoors + "?" + Date.now(),
12-
config.mapboxAccessToken
12+
config.MAPBOX_ACCESS_TOKEN
1313
);
1414

1515
export type MapAvailability = "unknown" | "available" | "unavailable";

Diff for: src/frontend/lib/config.ts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Config from "react-native-config";
2+
3+
export const config = {
4+
MAPBOX_ACCESS_TOKEN: Config.MAPBOX_ACCESS_TOKEN,
5+
};

Diff for: src/frontend/sharedComponents/Map/MapView.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ import MapboxGL, { Logger } from "@react-native-mapbox-gl/maps";
55
import ScaleBar from "react-native-scale-bar";
66
import CheapRuler from "cheap-ruler";
77
import validateColor from "validate-color";
8-
98
import ConfigContext from "../../context/ConfigContext";
109
import { LocationFollowingIcon, LocationNoFollowIcon } from "../icons";
1110
import IconButton from "../IconButton";
1211
import type { LocationContextType } from "../../context/LocationContext";
1312
import type { ObservationsMap } from "../../context/ObservationsContext";
1413
import { useIsFullyFocused } from "../../hooks/useIsFullyFocused";
1514
import bugsnag from "../../lib/logger";
16-
import config from "../../../config.json";
15+
import { config } from "../../lib/config";
1716
import { OfflineMapLayers } from "../OfflineMapLayers";
1817
import { UserLocation } from "./UserLocation";
1918

@@ -38,7 +37,7 @@ Logger.setLogCallback(log => {
3837
);
3938
});
4039

41-
MapboxGL.setAccessToken(config.mapboxAccessToken);
40+
MapboxGL.setAccessToken(config.MAPBOX_ACCESS_TOKEN);
4241
// Forces Mapbox to always be in connected state, rather than reading system
4342
// connectivity state
4443
MapboxGL.setConnected(true);

0 commit comments

Comments
 (0)