@@ -31,19 +31,11 @@ class RNMBXOfflineModule: RCTEventEmitter {
3131 }
3232
3333 lazy var offlineManager : OfflineManager = {
34- #if RNMBX_11
3534 return OfflineManager ( )
36- #else
37- return OfflineManager ( resourceOptions: . init( accessToken: RNMBXModule . accessToken!) )
38- #endif
3935 } ( )
40-
36+
4137 lazy var offlineRegionManager : OfflineRegionManager = {
42- #if RNMBX_11
4338 return OfflineRegionManager ( )
44- #else
45- return OfflineRegionManager ( resourceOptions: . init( accessToken: RNMBXModule . accessToken!) )
46- #endif
4739 } ( )
4840
4941 lazy var tileStore : TileStore = {
@@ -363,7 +355,6 @@ class RNMBXOfflineModule: RCTEventEmitter {
363355
364356 let stylePackLoadOptions = StylePackLoadOptions ( glyphsRasterizationMode: . ideographsRasterizedLocally, metadata: pack. metadata) !
365357
366- #if RNMBX_11
367358 let threadedOfflineManager = OfflineManager ( )
368359 taskGroup. enter ( )
369360 let stylePackTask = threadedOfflineManager. loadStylePack ( for: styleURI, loadOptions: stylePackLoadOptions) { progress in
@@ -391,20 +382,6 @@ class RNMBXOfflineModule: RCTEventEmitter {
391382 )
392383 let tilesetDescriptor = threadedOfflineManager. createTilesetDescriptor ( for: descriptorOptions)
393384 let descriptors = [ tilesetDescriptor]
394- #else
395- let descriptorOptions = TilesetDescriptorOptions (
396- styleURI: styleURI,
397- zoomRange: zoomRange,
398- stylePackOptions: stylePackLoadOptions
399- )
400- let descriptor = self . offlineManager. createTilesetDescriptor ( for: descriptorOptions)
401- let tilesetDescriptorOptions = TilesetDescriptorOptionsForTilesets ( tilesets: pack. tilesets, zoomRange: zoomRange)
402- let tilesetDescriptor = self . offlineManager. createTilesetDescriptorForTilesetDescriptorOptions ( tilesetDescriptorOptions)
403- var descriptors = [ descriptor]
404- if ( !pack. tilesets. isEmpty) {
405- descriptors. append ( tilesetDescriptor)
406- }
407- #endif
408385
409386 let loadOptions = TileRegionLoadOptions (
410387 geometry: bounds, // RNMBXFeatureUtils.geometryToGeometry(bounds),
@@ -452,11 +429,7 @@ class RNMBXOfflineModule: RCTEventEmitter {
452429 self . tileRegionPacks [ id] !. state = downloadError ? . inactive : . complete
453430 }
454431
455- #if RNMBX_11
456432 self . tileRegionPacks [ id] !. cancelables = [ task, stylePackTask]
457- #else
458- self . tileRegionPacks [ id] !. cancelables = [ task]
459- #endif
460433 }
461434
462435 func convertRegionsToJSON( regions: [ TileRegion ] , resolve: @escaping RCTPromiseResolveBlock , rejecter: @escaping RCTPromiseRejectBlock ) {
0 commit comments