Adding more properties to the platform request

Author: “Malcolm

platform/darwin/src/MLNPluginProtocolHandler.h

@@ -2,10 +2,47 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+typedef enum {
+    MLNPluginProtocolHandlerResourceKindUnknown,
+    MLNPluginProtocolHandlerResourceKindStyle,
+    MLNPluginProtocolHandlerResourceKindSource,
+    MLNPluginProtocolHandlerResourceKindTile,
+    MLNPluginProtocolHandlerResourceKindGlyphs,
+    MLNPluginProtocolHandlerResourceKindSpriteImage,
+    MLNPluginProtocolHandlerResourceKindSpriteJSON,
+    MLNPluginProtocolHandlerResourceKindImage
+} MLNPluginProtocolHandlerResourceKind;
+
+typedef enum {
+    MLNPluginProtocolHandlerResourceLoadingMethodUnknown,
+    MLNPluginProtocolHandlerResourceLoadingMethodCacheOnly,
+    MLNPluginProtocolHandlerResourceLoadingMethodNetworkOnly,
+    MLNPluginProtocolHandlerResourceLoadingMethodAll
+} MLNPluginProtocolHandlerResourceLoadingMethod;
+
+// TODO: Might make sense to add this to it's own file
+@interface MLNTileData : NSObject
+
+// Optional Tile Data
+@property NSString *tileURLTemplate;
+@property int tilePixelRatio;
+@property int tileX;
+@property int tileY;
+@property int tileZoom;
+
+@end
+
 @interface MLNPluginProtocolHandlerResource : NSObject
 
+@property MLNPluginProtocolHandlerResourceKind resourceKind;
+
+@property MLNPluginProtocolHandlerResourceLoadingMethod loadingMethod;
+
 @property NSString *resourceURL;
 
+// This is optional
+@property MLNTileData * __nullable tileData;
+
 @end
 
 @interface MLNPluginProtocolHandlerResponse : NSObject

platform/darwin/src/MLNPluginProtocolHandler.mm

@@ -21,3 +21,6 @@ @implementation MLNPluginProtocolHandlerResource
 
 @implementation MLNPluginProtocolHandlerResponse
 @end
+
+@implementation MLNTileData
+@end

platform/ios/src/MLNMapView.mm

@@ -7808,7 +7808,71 @@ -(void)addPluginLayerType:(Class)pluginLayerClass {
 - (MLNPluginProtocolHandlerResource *)resourceFromCoreResource:(const mbgl::Resource &)resource {
 
     MLNPluginProtocolHandlerResource *tempResult = [[MLNPluginProtocolHandlerResource alloc] init];
+    
+    // The URL of the request
     tempResult.resourceURL = [NSString stringWithUTF8String:resource.url.c_str()];
+    
+    // The kind of request
+    switch (resource.kind) {
+        case mbgl::Resource::Kind::Style:
+            tempResult.resourceKind = MLNPluginProtocolHandlerResourceKindStyle;
+            break;
+        case mbgl::Resource::Kind::Source:
+            tempResult.resourceKind = MLNPluginProtocolHandlerResourceKindSource;
+            break;
+        case mbgl::Resource::Kind::Tile:
+            tempResult.resourceKind = MLNPluginProtocolHandlerResourceKindTile;
+            break;
+        case mbgl::Resource::Kind::Glyphs:
+            tempResult.resourceKind = MLNPluginProtocolHandlerResourceKindGlyphs;
+            break;
+        case mbgl::Resource::Kind::SpriteImage:
+            tempResult.resourceKind = MLNPluginProtocolHandlerResourceKindSpriteImage;
+            break;
+        case mbgl::Resource::Kind::Image:
+            tempResult.resourceKind = MLNPluginProtocolHandlerResourceKindImage;
+            break;
+        case mbgl::Resource::Kind::SpriteJSON:
+            tempResult.resourceKind = MLNPluginProtocolHandlerResourceKindSpriteJSON;
+            break;
+        default:
+            tempResult.resourceKind = MLNPluginProtocolHandlerResourceKindUnknown;
+            break;
+    }
+    
+    // The loading method
+    if (resource.loadingMethod == mbgl::Resource::LoadingMethod::CacheOnly) {
+        tempResult.loadingMethod = MLNPluginProtocolHandlerResourceLoadingMethodCacheOnly;
+    } else if (resource.loadingMethod == mbgl::Resource::LoadingMethod::NetworkOnly) {
+        tempResult.loadingMethod = MLNPluginProtocolHandlerResourceLoadingMethodNetworkOnly;
+    } else if (resource.loadingMethod == mbgl::Resource::LoadingMethod::All) {
+        tempResult.loadingMethod = MLNPluginProtocolHandlerResourceLoadingMethodAll;
+    }
+    
+    if (resource.tileData) {
+        auto td = *resource.tileData;
+        MLNTileData *tileData = [[MLNTileData alloc] init];
+        tileData.tileURLTemplate = [NSString stringWithUTF8String:td.urlTemplate.c_str()];
+        tileData.tilePixelRatio = td.pixelRatio;
+        tileData.tileX = td.x;
+        tileData.tileY = td.y;
+        tileData.tileZoom = td.z;
+        tempResult.tileData = tileData;
+    }
+    
+    // TODO: Figure out which other properties from resource should be passed along here
+/*
+    Usage usage{Usage::Online};
+    Priority priority{Priority::Regular};
+    std::optional<std::pair<uint64_t, uint64_t>> dataRange = std::nullopt;
+    std::optional<Timestamp> priorModified = std::nullopt;
+    std::optional<Timestamp> priorExpires = std::nullopt;
+    std::optional<std::string> priorEtag = std::nullopt;
+    std::shared_ptr<const std::string> priorData;
+    Duration minimumUpdateInterval{Duration::zero()};
+    StoragePolicy storagePolicy{StoragePolicy::Permanent};
+    */
+    
     return tempResult;
 
 }
@@ -7840,6 +7904,8 @@ - (void)addPluginProtocolHandler:(Class)pluginProtocolHandlerClass {
         if (strongHandler) {
 
             MLNPluginProtocolHandlerResource *res = [weakSelf resourceFromCoreResource:resource];
+            
+            // TODO: Figure out what other fields in response need to be passed back from requestResource
             MLNPluginProtocolHandlerResponse *response = [strongHandler requestResource:res];
             if (response.data) {
                 tempResult.data = std::make_shared<std::string>((const char*)[response.data bytes],