Skip to content

Commit c203191

Browse files
committed
Add requiredTileCount
1 parent 2d0f7ea commit c203191

3 files changed

Lines changed: 17 additions & 14 deletions

File tree

android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModuleLegacy.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,7 @@ class RNMBXOfflineModuleLegacy(private val mReactContext: ReactApplicationContex
536536
putInt("completedTileSize", status.completedTileSize.toInt())
537537
putInt("completedTileCount", status.completedTileCount.toInt())
538538
putInt("requiredResourceCount", status.requiredResourceCount.toInt())
539+
putInt("requiredTileCount", status.requiredTileCount.toInt())
539540

540541
metadata?.let {
541542
putMap("metadata", metadata.toReadableMap())

ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.swift

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class TimeoutHandler {
77
private var timeoutDuration: TimeInterval
88
private weak var timer: Timer?
99
private let onTimeout: (String, TimeInterval) -> Void
10-
10+
1111
init(name: String,
1212
timeoutDuration: TimeInterval = 1 * 30,
1313
delegate: AnyObject? = nil,
@@ -17,7 +17,7 @@ class TimeoutHandler {
1717
self.timeoutDuration = timeoutDuration
1818
self.onTimeout = onTimeout
1919
}
20-
20+
2121
func startTimer(){
2222
cancelTimer()
2323

@@ -26,22 +26,22 @@ class TimeoutHandler {
2626
self.onTimeout(self.name, self.timeoutDuration)
2727
}
2828
}
29-
29+
3030
func cancelTimer(){
3131
timer?.invalidate()
3232
timer = nil
3333
}
34-
34+
3535
func start() {
3636
print("TimeoutHandler start.")
3737
startTimer()
3838
}
39-
39+
4040
func reset() {
4141
print("TimeoutHandler reset.")
4242
startTimer()
4343
}
44-
44+
4545
func cancel() {
4646
print("TimeoutHandler cancel.")
4747
cancelTimer()
@@ -55,7 +55,7 @@ class RNMBXOfflineModuleLegacy: RCTEventEmitter {
5555
var hasListeners = false
5656
private var offlineRegion: OfflineRegion!
5757
private var defaultTimeoutDuration: TimeInterval = 1 * 30
58-
58+
5959
enum Callbacks : String {
6060
case error = "MapboOfflineRegionError"
6161
case progress = "MapboxOfflineRegionProgress"
@@ -259,24 +259,24 @@ func getRegionByName(name: String, offlineRegions: [OfflineRegion]) -> OfflineRe
259259
private func startLoading(for region: OfflineRegion, name: String) {
260260
let timeoutHandler = TimeoutHandler(name: name, timeoutDuration: self.defaultTimeoutDuration) { [weak self] timeoutName, timeoutDuration in
261261
guard let self = self else { return }
262-
262+
263263
let timeoutError = OfflineRegionError(
264264
type: .other,
265265
message: "Offline region download timed out after \(timeoutDuration) seconds",
266266
isFatal: true,
267267
retryAfter: nil
268268
)
269-
269+
270270
region.setOfflineRegionDownloadStateFor(.inactive)
271271
self.offlinePackDidReceiveError(name: timeoutName, error: timeoutError)
272272
}
273-
273+
274274
let observer = OfflineRegionExampleObserver(
275275
name: name,
276276
statusChanged: { [weak self] (status) in
277277
guard let self = self else { return }
278278
timeoutHandler.reset()
279-
279+
280280
let sentences = [
281281
"Downloaded \(status.completedResourceCount)/\(status.requiredResourceCount) resources and \(status.completedResourceSize) bytes.",
282282
"Required resource count is \(status.requiredResourceCountIsPrecise ? "precise" : "a lower bound").",
@@ -331,7 +331,7 @@ func getRegionByName(name: String, offlineRegions: [OfflineRegion]) -> OfflineRe
331331
)
332332

333333
timeoutHandler.start()
334-
334+
335335
offlineRegion = region
336336
offlineRegion.setOfflineRegionObserverFor(observer)
337337
offlineRegion.setOfflineRegionDownloadStateFor(.active)
@@ -597,7 +597,7 @@ func getPackStatus(_ name: String,
597597
print("setTimeout \(seconds)");
598598
self.defaultTimeoutDuration = seconds.doubleValue
599599
}
600-
600+
601601
func _sendEvent(_ name:String, event: RNMBXEvent) {
602602
if !hasListeners {
603603
return
@@ -617,7 +617,8 @@ func getPackStatus(_ name: String,
617617
"completedResourceSize": status.completedResourceSize,
618618
"completedTileSize": status.completedTileSize,
619619
"completedTileCount": status.completedTileCount,
620-
"requiredResourceCount": status.requiredResourceCount
620+
"requiredResourceCount": status.requiredResourceCount,
621+
"requiredTileCount": status.requiredResourceCount
621622
]
622623

623624
if let metadata = metadata {

src/modules/offline/OfflinePackLegacy.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ type OfflinePackStatus = {
1313
completedTileSize: number;
1414
completedTileCount: number;
1515
requiredResourceCount: number;
16+
requiredTileCount: number;
1617
};
1718

1819
class OfflinePackLegacy {

0 commit comments

Comments
 (0)