diff --git a/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt b/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt index ea839191a8..ed4eab9965 100644 --- a/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt +++ b/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt @@ -43,7 +43,7 @@ enum class TileRegionPackState(val rawValue: String) { INACTIVE("inactive"), ACTIVE("active"), COMPLETE("complete"), - UNKNOWN("unkown") + UNKNOWN("unknown") } class TileRegionPack(var name: String, var state: TileRegionPackState = TileRegionPackState.UNKNOWN, var progress: TileRegionLoadProgress? = null, var metadata: JSONObject) { var cancelable: Cancelable? = null diff --git a/src/RNMBXModule.ts b/src/RNMBXModule.ts index c27ab324ff..4756b30ada 100644 --- a/src/RNMBXModule.ts +++ b/src/RNMBXModule.ts @@ -10,10 +10,10 @@ interface RNMBXModule { SatelliteStreet: URL; }; OfflinePackDownloadState: { - Inactive: string | number; - Active: string | number; - Complete: string | number; - Unknown?: string | number; + Inactive: string; + Active: string; + Complete: string; + Unknown?: string; }; LineJoin: { Bevel: string | number; diff --git a/src/modules/offline/offlineManager.ts b/src/modules/offline/offlineManager.ts index 79d1935899..74617276b0 100644 --- a/src/modules/offline/offlineManager.ts +++ b/src/modules/offline/offlineManager.ts @@ -22,16 +22,23 @@ export const OfflineModuleEventEmitter = new NativeEventEmitter( MapboxOfflineManager, ); -export type OfflineProgressStatus = { - name: string; - state: number; - percentage: number; - completedResourceSize: number; - completedTileCount: number; - completedResourceCount: number; - requiredResourceCount: number; - completedTileSize: number; -}; +export type OfflineProgressStatus = + | { + name: string; + state: 'invalid' | 'inactive' | 'active' | 'complete' | 'unknown'; + percentage: number; + completedResourceCount: number; + completedResourceSize: number; + erroredResourceCount: number; + loadedResourceSize: number; + loadedResourceCount: number; + requiredResourceCount: number; + } + | { + name: string; + state: 'invalid' | 'inactive' | 'active' | 'complete' | 'unknown'; + percentage: null; + }; export type OfflinePackError = { name: string;