From 1401b8237bd4845c5ac421995dbfc7e501104f67 Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Thu, 17 Oct 2024 08:16:12 -0700
Subject: [PATCH 01/16] integrate geo model, first steps

---
 .../VisionCameraPluginInatVision.m            | 432 +++++++++++++-----
 1 file changed, 309 insertions(+), 123 deletions(-)

diff --git a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
index 158432f..902593f 100644
--- a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
+++ b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
@@ -6,157 +6,343 @@
 @import UIKit;
 @import Vision;
 @import CoreML;
+@import Accelerate;
 
 #import "VCPTaxonomy.h"
 #import "VCPPrediction.h"
 
+@class VCPGeoModel;
+
 @interface VisionCameraPluginInatVisionPlugin : FrameProcessorPlugin
 
-+ (VCPTaxonomy*) taxonomyWithTaxonomyFile:(NSString*)taxonomyPath;
-+ (VNCoreMLModel*) visionModelWithModelFile:(NSString*)modelPath;
++ (VCPTaxonomy *) taxonomyWithTaxonomyFile:(NSString *)taxonomyPath;
++ (VNCoreMLModel *)visionModelWithModelFile:(NSString *)modelPath;
++ (VCPGeoModel *)geoModelWithModelFile:(NSString *)geoModelPath;
+
+@end
+
+@interface VCPGeoModel: NSObject
+
+- (instancetype)initWithModelPath:(NSString *)modelPath;
+- (MLMultiArray *)predictionsForLat:(float)latitude lng:(float)longitude elevation:(float)elevation;
+
+@property MLModel *geoModel;
 
 @end
 
+
 @implementation VisionCameraPluginInatVisionPlugin
 
-+ (VCPTaxonomy*) taxonomyWithTaxonomyFile:(NSString*)taxonomyPath {
-  static VCPTaxonomy* taxonomy = nil;
-  if (taxonomy == nil) {
-    taxonomy = [[VCPTaxonomy alloc] initWithTaxonomyFile:taxonomyPath];
-  }
-  return taxonomy;
++ (VCPTaxonomy *)taxonomyWithTaxonomyFile:(NSString *)taxonomyPath {
+    static VCPTaxonomy *taxonomy = nil;
+    if (taxonomy == nil) {
+        taxonomy = [[VCPTaxonomy alloc] initWithTaxonomyFile:taxonomyPath];
+    }
+    return taxonomy;
 }
 
-+ (VNCoreMLModel*) visionModelWithModelFile:(NSString*)modelPath {
-  static VNCoreMLModel* visionModel = nil;
-  if (visionModel == nil) {
-    // Setup vision
-    NSURL *modelUrl = [NSURL fileURLWithPath:modelPath];
-    if (!modelUrl) {
-      // TODO: handle this error
-      // [self.delegate classifierError:@"no file for optimized model"];
-      NSLog(@"no file for optimized model");
-      return nil;
++ (VCPGeoModel *)geoModelWithModelFile:(NSString *)modelPath {
+    static VCPGeoModel *geoModel = nil;
+    
+    if (geoModel == nil) {
+        geoModel = [[VCPGeoModel alloc] initWithModelPath:modelPath];
     }
+    
+    return geoModel;
+}
 
-    NSError *loadError = nil;
-    MLModel *model = [MLModel modelWithContentsOfURL:modelUrl
-                                                error:&loadError];
-    if (loadError) {
-      NSString *errString = [NSString stringWithFormat:@"error loading model: %@",
-                                loadError.localizedDescription];
-      NSLog(@"%@", errString);
-      // TODO: handle this error
-      // [self.delegate classifierError:errString];
-      return nil;
-    }
-    if (!model) {
-      // TODO: handle this error
-      // [self.delegate classifierError:@"unable to make model"];
-      NSLog(@"unable to make model");
-      return nil;
++ (VNCoreMLModel *)visionModelWithModelFile:(NSString *)modelPath {
+    static VNCoreMLModel *visionModel = nil;
+    if (visionModel == nil) {
+        // Setup vision
+        //NSURL *modelUrl = [NSURL fileURLWithPath:modelPath];
+        NSURL *modelUrl = [[NSBundle mainBundle] URLForResource:@"cvmodel" withExtension:@"mlmodelc"];
+        if (!modelUrl) {
+            // TODO: handle this error
+            // [self.delegate classifierError:@"no file for optimized model"];
+            NSLog(@"no file for optimized model");
+            return nil;
+        }
+        
+        NSError *loadError = nil;
+        MLModel *model = [MLModel modelWithContentsOfURL:modelUrl
+                                                   error:&loadError];
+        if (loadError) {
+            NSString *errString = [NSString stringWithFormat:@"error loading model: %@",
+                                   loadError.localizedDescription];
+            NSLog(@"vision model mlmodel load error: %@", errString);
+            // TODO: handle this error
+            // [self.delegate classifierError:errString];
+            return nil;
+        } else {
+            NSLog(@"no error produced while loading vision model");
+        }
+        
+        if (!model) {
+            // TODO: handle this error
+            // [self.delegate classifierError:@"unable to make model"];
+            NSLog(@"unable to make vision mlmodel");
+            return nil;
+        }
+        
+        NSError *modelError = nil;
+        visionModel = [VNCoreMLModel modelForMLModel:model
+                                               error:&modelError];
+        if (modelError) {
+            NSString *errString = [NSString stringWithFormat:@"error making vision model: %@",
+                                   modelError.localizedDescription];
+            // [self.delegate classifierError:errString];
+            NSLog(@"vision model vncoreml load error %@", errString);
+            return nil;
+        }
+        if (!visionModel) {
+            // [self.delegate classifierError:@"unable to make vision model"];
+            NSLog(@"unable to make vision model vncoreml");
+            return nil;
+        }
     }
+    
+    return visionModel;
+}
 
-    NSError *modelError = nil;
-    visionModel = [VNCoreMLModel modelForMLModel:model
-                                              error:&modelError];
-    if (modelError) {
-        NSString *errString = [NSString stringWithFormat:@"error making vision model: %@",
-                                modelError.localizedDescription];
-        // [self.delegate classifierError:errString];
-        NSLog(@"%@", errString);
+- (instancetype)initWithProxy:(VisionCameraProxyHolder*)proxy
+                  withOptions:(NSDictionary* _Nullable)options {
+    self = [super initWithProxy:proxy withOptions:options];
+    return self;
+}
+
+- (MLMultiArray *)combineVisionScores:(MLMultiArray *)visionScores with:(MLMultiArray *)geoScores error:(NSError **)error {
+    // Ensure both arrays have the same shape
+    if (![visionScores.shape isEqualToArray:geoScores.shape]) {
+        if (error) {
+            *error = [NSError errorWithDomain:@"MLMultiArrayErrorDomain"
+                                         code:1
+                                     userInfo:@{NSLocalizedDescriptionKey: @"Arrays must have the same shape"}];
+        }
         return nil;
     }
-    if (!visionModel) {
-        // [self.delegate classifierError:@"unable to make vision model"];
-        NSLog(@"unable to make vision model");
+    
+    // Create a result MLMultiArray with the same shape as the input arrays
+    MLMultiArray *combinedArray = [[MLMultiArray alloc] initWithShape:visionScores.shape
+                                                             dataType:MLMultiArrayDataTypeDouble
+                                                                error:error];
+    if (!combinedArray) {
         return nil;
     }
-  }
-  return visionModel;
+    
+    // Get the data pointers
+    double *visionData = (double *)visionScores.dataPointer;
+    double *geoData = (double *)geoScores.dataPointer;
+    double *combinedData = (double *)combinedArray.dataPointer;
+
+    // Get the number of elements
+    NSInteger count = visionScores.count;
+
+    // Perform element-wise multiplication using vDSP_vmul
+    vDSP_vmulD(visionData, 1, geoData, 1, combinedData, 1, count);
+        
+    return combinedArray;
 }
 
-- (instancetype)initWithProxy:(VisionCameraProxyHolder*)proxy
-                  withOptions:(NSDictionary* _Nullable)options {
-  self = [super initWithProxy:proxy withOptions:options];
-  return self;
+- (MLMultiArray *)normalizeMultiArray:(MLMultiArray *)mlArray error:(NSError **)error {
+    NSInteger count = mlArray.count;
+    double *mlData = (double *)mlArray.dataPointer;
+    
+    double sum = 0.0;
+    vDSP_sveD(mlData, 1, &sum, count);
+    
+    // Normalize by dividing each element by the sum
+    if (sum != 0) {
+        vDSP_vsdivD(mlData, 1, &sum, mlData, 1, count);
+    } else {
+        if (error) {
+            *error = [NSError errorWithDomain:@"MLMultiArrayErrorDomain"
+                                         code:2
+                                     userInfo:@{NSLocalizedDescriptionKey: @"Sum of elements is zero, normalization not possible."}];
+        }
+        return nil;
+    }
+
+    return mlArray;
 }
 
 - (id)callback:(Frame*)frame withArguments:(NSDictionary*)arguments {
-  // Start timestamp
-  NSDate *startDate = [NSDate date];
-
-  // Log arguments
-  NSLog(@"inatVision arguments: %@", arguments);
-  // Destructure version out of options
-  NSString* version = arguments[@"version"];
-  // Destructure model path out of options
-  NSString* modelPath = arguments[@"modelPath"];
-  // Destructure taxonomy path out of options
-  NSString* taxonomyPath = arguments[@"taxonomyPath"];
-
-  CMSampleBufferRef buffer = frame.buffer;
-  UIImageOrientation orientation = frame.orientation;
-
-  CVImageBufferRef pixelBuffer = CMSampleBufferGetImageBuffer(buffer);
-  if (!pixelBuffer) {
-      NSLog(@"unable to get pixel buffer");
-      return nil;
-  }
-
-  // Setup taxonomy
-  VCPTaxonomy *taxonomy = [VisionCameraPluginInatVisionPlugin taxonomyWithTaxonomyFile:taxonomyPath];
-
-  // Setup vision model
-  VNCoreMLModel *visionModel = [VisionCameraPluginInatVisionPlugin visionModelWithModelFile:modelPath];
-
-  // Setup top branches
-  NSMutableArray *topBranches = [NSMutableArray array];
-  VNRequestCompletionHandler recognitionHandler = ^(VNRequest * _Nonnull request, NSError * _Nullable error) {
-    VNCoreMLFeatureValueObservation *firstResult = request.results.firstObject;
-    MLFeatureValue *firstFV = firstResult.featureValue;
-    MLMultiArray *mm = firstFV.multiArrayValue;
-
-    NSArray *bestBranch = [taxonomy inflateTopBranchFromClassification:mm];
-    // add this to the end of the recent top branches array
-    [topBranches addObject:bestBranch];
-  };
-
-  VNCoreMLRequest *objectRecognition = [[VNCoreMLRequest alloc] initWithModel:visionModel
-                                                            completionHandler:recognitionHandler];
-  objectRecognition.imageCropAndScaleOption = VNImageCropAndScaleOptionCenterCrop;
-  NSArray *requests = @[objectRecognition];
-
-  VNImageRequestHandler *handler = [[VNImageRequestHandler alloc] initWithCVPixelBuffer:pixelBuffer
-                                                                            orientation:orientation
-                                                                                options:@{}];
-  NSError *requestError = nil;
-  [handler performRequests:requests
-                      error:&requestError];
-  if (requestError) {
-      NSString *errString = [NSString stringWithFormat:@"got a request error: %@",
-                              requestError.localizedDescription];
-      NSLog(@"%@", errString);
-      return nil;
-  }
-
-  // convert the VCPPredictions in the bestRecentBranch into dicts
-  NSMutableArray *bestBranchAsDict = [NSMutableArray array];
-  for (VCPPrediction *prediction in topBranches.firstObject) {
-      [bestBranchAsDict addObject:[prediction asDict]];
-  }
-
-  // Create a new dictionary with the bestBranchAsDict under the key "predictions"
-  NSDictionary *response = [NSDictionary dictionary];
-  response = @{@"predictions": bestBranchAsDict};
-
-  // End timestamp
-  NSTimeInterval timeElapsed = [[NSDate date] timeIntervalSinceDate:startDate];
-  NSLog(@"inatVision took %f seconds", timeElapsed);
-
-  return response;
+    // Start timestamp
+    NSDate *startDate = [NSDate date];
+
+    MLMultiArray *geoModelPreds = nil;
+    if ([arguments objectForKey:@"latitude"]
+        && [arguments objectForKey:@"longitude"]
+        && [arguments objectForKey:@"elevation"]
+        && [arguments objectForKey:@"geoModelPath"])
+    {
+        NSString *geoModelPath = arguments[@"geoModelPath"];
+        VCPGeoModel *geoModel = [VisionCameraPluginInatVisionPlugin geoModelWithModelFile:geoModelPath];
+        geoModelPreds = [geoModel predictionsForLat:[[arguments objectForKey:@"latitude"] floatValue]
+                                                lng:[[arguments objectForKey:@"longitude"] floatValue]
+                                          elevation:[[arguments objectForKey:@"elevation"] floatValue]];
+    } else {
+        NSLog(@"not doing anything geo related.");
+    }
+    
+    NSLog(@"got %ld geo model scores", geoModelPreds.count);
+
+    // Log arguments
+    NSLog(@"inatVision arguments: %@", arguments);
+    // Destructure version out of options
+    NSString* version = arguments[@"version"];
+    // Destructure model path out of options
+    NSString* modelPath = arguments[@"modelPath"];
+    // Destructure taxonomy path out of options
+    NSString* taxonomyPath = arguments[@"taxonomyPath"];
+    
+    CMSampleBufferRef buffer = frame.buffer;
+    UIImageOrientation orientation = frame.orientation;
+    
+    CVImageBufferRef pixelBuffer = CMSampleBufferGetImageBuffer(buffer);
+    if (!pixelBuffer) {
+        NSLog(@"unable to get pixel buffer");
+        return nil;
+    }
+    
+    // Setup taxonomy
+    VCPTaxonomy *taxonomy = [VisionCameraPluginInatVisionPlugin taxonomyWithTaxonomyFile:taxonomyPath];
+    
+    // Setup vision model
+    VNCoreMLModel *visionModel = [VisionCameraPluginInatVisionPlugin visionModelWithModelFile:modelPath];
+    
+    // Setup top branches
+    NSMutableArray *topBranches = [NSMutableArray array];
+    VNRequestCompletionHandler recognitionHandler = ^(VNRequest * _Nonnull request, NSError * _Nullable error) {
+        VNCoreMLFeatureValueObservation *firstResult = request.results.firstObject;
+        MLFeatureValue *firstFV = firstResult.featureValue;
+        MLMultiArray *visionScores = firstFV.multiArrayValue;
+        
+        MLMultiArray *mm = nil;
+        if (geoModelPreds != nil) {
+            NSError *err = nil;
+            mm = [self combineVisionScores:visionScores with:geoModelPreds error:&err];
+            mm = [self normalizeMultiArray:mm error:&err];
+        } else {
+            mm = visionScores;
+        }
+        
+        NSArray *bestBranch = [taxonomy inflateTopBranchFromClassification:mm];
+        // add this to the end of the recent top branches array
+        [topBranches addObject:bestBranch];
+    };
+    
+    VNCoreMLRequest *objectRecognition = [[VNCoreMLRequest alloc] initWithModel:visionModel
+                                                              completionHandler:recognitionHandler];
+    objectRecognition.imageCropAndScaleOption = VNImageCropAndScaleOptionCenterCrop;
+    NSArray *requests = @[objectRecognition];
+    
+    VNImageRequestHandler *handler = [[VNImageRequestHandler alloc] initWithCVPixelBuffer:pixelBuffer
+                                                                              orientation:orientation
+                                                                                  options:@{}];
+    NSError *requestError = nil;
+    [handler performRequests:requests
+                       error:&requestError];
+    if (requestError) {
+        NSString *errString = [NSString stringWithFormat:@"got a request error: %@",
+                               requestError.localizedDescription];
+        NSLog(@"%@", errString);
+        return nil;
+    }
+    
+    // convert the VCPPredictions in the bestRecentBranch into dicts
+    NSMutableArray *bestBranchAsDict = [NSMutableArray array];
+    for (VCPPrediction *prediction in topBranches.firstObject) {
+        [bestBranchAsDict addObject:[prediction asDict]];
+    }
+    
+    // Create a new dictionary with the bestBranchAsDict under the key "predictions"
+    NSDictionary *response = [NSDictionary dictionary];
+    response = @{@"predictions": bestBranchAsDict};
+    
+    // End timestamp
+    NSTimeInterval timeElapsed = [[NSDate date] timeIntervalSinceDate:startDate];
+    NSLog(@"inatVision took %f seconds", timeElapsed);
+    
+    return response;
 }
 
 VISION_EXPORT_FRAME_PROCESSOR(VisionCameraPluginInatVisionPlugin, inatVision)
 
 @end
+
+
+
+
+@implementation VCPGeoModel
+
+- (instancetype _Nullable)initWithModelPath:(NSString *)modelPath {
+    if (self = [super init]) {
+        NSURL *geoModelUrl = [NSURL fileURLWithPath:modelPath];
+        if (!geoModelUrl) {
+            NSLog(@"no file for geo model");
+            return nil;
+        }
+        
+        NSError *loadError = nil;
+        self.geoModel = [MLModel modelWithContentsOfURL:geoModelUrl error:&loadError];
+        if (loadError) {
+            NSString *errString = [NSString stringWithFormat:@"error loading model: %@",
+                                   loadError.localizedDescription];
+            NSLog(@"%@", errString);
+            return nil;
+        }
+        if (!self.geoModel) {
+            NSLog(@"unable to make geo model");
+            return nil;
+        }
+    }
+    
+    return self;
+}
+
+- (NSArray *)normAndEncodeLat:(float)latitude lng:(float)longitude elevation:(float)elevation {
+    float normLat = latitude / 90.0;
+    float normLng = longitude / 180.0;
+    float normElev = 0.0;
+    if (elevation > 0) {
+        normElev = elevation / 5705.63;
+    } else {
+        normElev = elevation / 32768.0;
+    }
+    float a = sin(M_PI * normLng);
+    float b = sin(M_PI * normLat);
+    float c = cos(M_PI * normLng);
+    float d = cos(M_PI * normLat);
+    
+    return @[ @(a), @(b), @(c), @(d), @(normElev) ];
+}
+
+- (MLMultiArray *)predictionsForLat:(float)latitude lng:(float)longitude elevation:(float)elevation {
+    NSArray *geoModelInputs = [self normAndEncodeLat:latitude
+                                                 lng:longitude
+                                           elevation:elevation];
+    
+    NSError *err = nil;
+    MLMultiArray *mlInputs = [[MLMultiArray alloc] initWithShape:@[@1, @5]
+                                                        dataType:MLMultiArrayDataTypeDouble
+                                                           error:&err];
+    for (int i = 0; i < 5; i++) {
+        mlInputs[i] = geoModelInputs[i];
+    }
+    MLFeatureValue *fv = [MLFeatureValue featureValueWithMultiArray:mlInputs];
+    
+    NSError *fpError = nil;
+    NSDictionary *fpDict = @{ @"input_1": fv };
+    MLDictionaryFeatureProvider *fp = [[MLDictionaryFeatureProvider alloc] initWithDictionary:fpDict
+                                                                                        error:&fpError];
+    
+    NSError *predError = nil;
+    id <MLFeatureProvider> results = [self.geoModel predictionFromFeatures:fp error:&predError];
+    MLFeatureValue *result = [results featureValueForName:@"Identity"];
+    MLMultiArray *geoModelScores = result.multiArrayValue;
+    
+    return geoModelScores;
+}
+
+@end

From ee817b086bd616cebfc8682fc4548228f7968dab Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Sat, 19 Oct 2024 11:51:16 -0700
Subject: [PATCH 02/16] refactor vision component into its own class

---
 example/src/App.tsx                           |   2 +-
 ios/Classifier/VCPVisionModel.h               |  31 +++++
 ios/Classifier/VCPVisionModel.m               |  82 ++++++++++++
 .../project.pbxproj                           |   6 +
 .../VisionCameraPluginInatVision.m            | 123 ++++--------------
 5 files changed, 147 insertions(+), 97 deletions(-)
 create mode 100644 ios/Classifier/VCPVisionModel.h
 create mode 100644 ios/Classifier/VCPVisionModel.m

diff --git a/example/src/App.tsx b/example/src/App.tsx
index a00978c..e516b74 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -296,7 +296,7 @@ export default function App(): React.JSX.Element {
           isActive={true}
           frameProcessor={frameProcessor}
           enableZoomGesture
-          pixelFormat={'yuv'}
+          pixelFormat={'rgb'}
           resizeMode="contain"
           enableFpsGraph={true}
           photoQualityBalance="quality"
diff --git a/ios/Classifier/VCPVisionModel.h b/ios/Classifier/VCPVisionModel.h
new file mode 100644
index 0000000..968940b
--- /dev/null
+++ b/ios/Classifier/VCPVisionModel.h
@@ -0,0 +1,31 @@
+//
+//  VCPVisionModel.h
+//  VisionCameraPluginInatVision
+//
+//  Created by Alex Shepard on 10/18/24.
+//  Copyright © 2024 Facebook. All rights reserved.
+//
+
+@import CoreML;
+@import Vision;
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VCPVisionModel : NSObject
+
+- (instancetype _Nullable)initWithModelPath:(NSString *)modelPath;
+- (MLMultiArray * _Nullable)visionPredictionsFor:(CVPixelBufferRef)pixBuf orientation:(UIImageOrientation)orient;
+
+@property MLModel *cvModel;
+@property VNCoreMLModel *visionModel;
+
+@property VNCoreMLRequest *classification;
+@property NSArray *requests;
+
+@property MLMultiArray *recentVisionScores;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/ios/Classifier/VCPVisionModel.m b/ios/Classifier/VCPVisionModel.m
new file mode 100644
index 0000000..b07d0cc
--- /dev/null
+++ b/ios/Classifier/VCPVisionModel.m
@@ -0,0 +1,82 @@
+//
+//  VCPVisionModel.m
+//  VisionCameraPluginInatVision
+//
+//  Created by Alex Shepard on 10/18/24.
+//  Copyright © 2024 Facebook. All rights reserved.
+//
+
+#import "VCPVisionModel.h"
+
+@implementation VCPVisionModel
+
+- (instancetype _Nullable)initWithModelPath:(NSString *)modelPath {
+    if (self = [super init]) {
+        NSURL *visionModelUrl = [NSURL fileURLWithPath:modelPath];
+        if (!visionModelUrl) {
+            NSLog(@"no file for vision model");
+            return nil;
+        }
+        
+        NSError *loadError = nil;
+        self.cvModel = [MLModel modelWithContentsOfURL:visionModelUrl error:&loadError];
+        if (loadError) {
+            NSString *errString = [NSString stringWithFormat:@"error loading cv model: %@",
+                                   loadError.localizedDescription];
+            NSLog(@"%@", errString);
+            return nil;
+        }
+        if (!self.cvModel) {
+            NSLog(@"unable to make cv model");
+            return nil;
+        }
+        
+        NSError *modelError = nil;
+        self.visionModel = [VNCoreMLModel modelForMLModel:self.cvModel
+                                               error:&modelError];
+
+        __weak typeof(self) weakSelf = self;
+        VNRequestCompletionHandler recognitionHandler = ^(VNRequest * _Nonnull request, NSError * _Nullable error) {
+            
+            VNCoreMLFeatureValueObservation *firstResult = request.results.firstObject;
+            MLFeatureValue *firstFV = firstResult.featureValue;
+            weakSelf.recentVisionScores = firstFV.multiArrayValue;
+        };
+        
+        self.classification = [[VNCoreMLRequest alloc] initWithModel:self.visionModel
+                                                   completionHandler:recognitionHandler];
+        self.classification.imageCropAndScaleOption = VNImageCropAndScaleOptionCenterCrop;
+        self.requests = @[ self.classification ];
+    }
+    
+    return self;
+}
+
+- (MLMultiArray * _Nullable)visionPredictionsFor:(CVPixelBufferRef)pixBuf orientation:(UIImageOrientation)orient  {
+    CGImagePropertyOrientation cgOrient = [self cgOrientationFor:orient];
+    VNImageRequestHandler *handler = [[VNImageRequestHandler alloc] initWithCVPixelBuffer:pixBuf
+                                                                              orientation:cgOrient
+                                                                                  options:@{}];
+
+    NSError *requestError = nil;
+    [handler performRequests:self.requests
+                       error:&requestError];
+    
+    return self.recentVisionScores;
+}
+
+- (CGImagePropertyOrientation)cgOrientationFor:(UIImageOrientation)uiOrientation {
+    switch (uiOrientation) {
+        case UIImageOrientationUp: return kCGImagePropertyOrientationUp;
+        case UIImageOrientationDown: return kCGImagePropertyOrientationDown;
+        case UIImageOrientationLeft: return kCGImagePropertyOrientationLeft;
+        case UIImageOrientationRight: return kCGImagePropertyOrientationRight;
+        case UIImageOrientationUpMirrored: return kCGImagePropertyOrientationUpMirrored;
+        case UIImageOrientationDownMirrored: return kCGImagePropertyOrientationDownMirrored;
+        case UIImageOrientationLeftMirrored: return kCGImagePropertyOrientationLeftMirrored;
+        case UIImageOrientationRightMirrored: return kCGImagePropertyOrientationRightMirrored;
+    }
+}
+
+@end
+
diff --git a/ios/VisionCameraPluginInatVision.xcodeproj/project.pbxproj b/ios/VisionCameraPluginInatVision.xcodeproj/project.pbxproj
index 29b649e..976ea7f 100644
--- a/ios/VisionCameraPluginInatVision.xcodeproj/project.pbxproj
+++ b/ios/VisionCameraPluginInatVision.xcodeproj/project.pbxproj
@@ -13,6 +13,7 @@
 		8F3C41832A4AFF5B008FBC67 /* VCPClassifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F3C417C2A4AFF5B008FBC67 /* VCPClassifier.m */; };
 		8F3C41842A4AFF5B008FBC67 /* VCPTaxonomy.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F3C41802A4AFF5B008FBC67 /* VCPTaxonomy.m */; };
 		8F3C41852A4AFF5B008FBC67 /* VCPPrediction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F3C41812A4AFF5B008FBC67 /* VCPPrediction.m */; };
+		FA5FF9642CC3182D00BA8E22 /* VCPVisionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = FA5FF9632CC3182D00BA8E22 /* VCPVisionModel.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -39,6 +40,8 @@
 		8F3C417F2A4AFF5B008FBC67 /* VCPTaxonomy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VCPTaxonomy.h; sourceTree = "<group>"; };
 		8F3C41802A4AFF5B008FBC67 /* VCPTaxonomy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VCPTaxonomy.m; sourceTree = "<group>"; };
 		8F3C41812A4AFF5B008FBC67 /* VCPPrediction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VCPPrediction.m; sourceTree = "<group>"; };
+		FA5FF9622CC3182D00BA8E22 /* VCPVisionModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VCPVisionModel.h; sourceTree = "<group>"; };
+		FA5FF9632CC3182D00BA8E22 /* VCPVisionModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VCPVisionModel.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -89,6 +92,8 @@
 				8F3C41812A4AFF5B008FBC67 /* VCPPrediction.m */,
 				8F3C417F2A4AFF5B008FBC67 /* VCPTaxonomy.h */,
 				8F3C41802A4AFF5B008FBC67 /* VCPTaxonomy.m */,
+				FA5FF9622CC3182D00BA8E22 /* VCPVisionModel.h */,
+				FA5FF9632CC3182D00BA8E22 /* VCPVisionModel.m */,
 			);
 			path = Classifier;
 			sourceTree = "<group>";
@@ -154,6 +159,7 @@
 				8F3C41832A4AFF5B008FBC67 /* VCPClassifier.m in Sources */,
 				1DB58401D995067FF278746C /* VisionCameraPluginInatVision.m in Sources */,
 				8F3C41842A4AFF5B008FBC67 /* VCPTaxonomy.m in Sources */,
+				FA5FF9642CC3182D00BA8E22 /* VCPVisionModel.m in Sources */,
 				8F3C41822A4AFF5B008FBC67 /* VCPNode.m in Sources */,
 				8F2D62CB2B1B9DD500412573 /* VisionCameraPluginInatVisionModule.m in Sources */,
 			);
diff --git a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
index 902593f..bcf9371 100644
--- a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
+++ b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
@@ -7,17 +7,19 @@
 @import Vision;
 @import CoreML;
 @import Accelerate;
+@import CoreGraphics;
 
 #import "VCPTaxonomy.h"
 #import "VCPPrediction.h"
 
 @class VCPGeoModel;
+#import "VCPVisionModel.h"
 
 @interface VisionCameraPluginInatVisionPlugin : FrameProcessorPlugin
 
 + (VCPTaxonomy *) taxonomyWithTaxonomyFile:(NSString *)taxonomyPath;
-+ (VNCoreMLModel *)visionModelWithModelFile:(NSString *)modelPath;
 + (VCPGeoModel *)geoModelWithModelFile:(NSString *)geoModelPath;
++ (VCPVisionModel *)visionModelWithModelFile:(NSString *)modelPath;
 
 @end
 
@@ -51,58 +53,14 @@ + (VCPGeoModel *)geoModelWithModelFile:(NSString *)modelPath {
     return geoModel;
 }
 
-+ (VNCoreMLModel *)visionModelWithModelFile:(NSString *)modelPath {
-    static VNCoreMLModel *visionModel = nil;
-    if (visionModel == nil) {
-        // Setup vision
-        //NSURL *modelUrl = [NSURL fileURLWithPath:modelPath];
-        NSURL *modelUrl = [[NSBundle mainBundle] URLForResource:@"cvmodel" withExtension:@"mlmodelc"];
-        if (!modelUrl) {
-            // TODO: handle this error
-            // [self.delegate classifierError:@"no file for optimized model"];
-            NSLog(@"no file for optimized model");
-            return nil;
-        }
-        
-        NSError *loadError = nil;
-        MLModel *model = [MLModel modelWithContentsOfURL:modelUrl
-                                                   error:&loadError];
-        if (loadError) {
-            NSString *errString = [NSString stringWithFormat:@"error loading model: %@",
-                                   loadError.localizedDescription];
-            NSLog(@"vision model mlmodel load error: %@", errString);
-            // TODO: handle this error
-            // [self.delegate classifierError:errString];
-            return nil;
-        } else {
-            NSLog(@"no error produced while loading vision model");
-        }
-        
-        if (!model) {
-            // TODO: handle this error
-            // [self.delegate classifierError:@"unable to make model"];
-            NSLog(@"unable to make vision mlmodel");
-            return nil;
-        }
-        
-        NSError *modelError = nil;
-        visionModel = [VNCoreMLModel modelForMLModel:model
-                                               error:&modelError];
-        if (modelError) {
-            NSString *errString = [NSString stringWithFormat:@"error making vision model: %@",
-                                   modelError.localizedDescription];
-            // [self.delegate classifierError:errString];
-            NSLog(@"vision model vncoreml load error %@", errString);
-            return nil;
-        }
-        if (!visionModel) {
-            // [self.delegate classifierError:@"unable to make vision model"];
-            NSLog(@"unable to make vision model vncoreml");
-            return nil;
-        }
++ (VCPVisionModel *)visionModelWithModelFile:(NSString *)modelPath {
+    static VCPVisionModel *cvModel = nil;
+    
+    if (cvModel == nil) {
+        cvModel = [[VCPVisionModel alloc] initWithModelPath:modelPath];
     }
     
-    return visionModel;
+    return cvModel;
 }
 
 - (instancetype)initWithProxy:(VisionCameraProxyHolder*)proxy
@@ -197,58 +155,31 @@ - (id)callback:(Frame*)frame withArguments:(NSDictionary*)arguments {
     NSString* taxonomyPath = arguments[@"taxonomyPath"];
     
     CMSampleBufferRef buffer = frame.buffer;
+    CVImageBufferRef pixelBuffer = CMSampleBufferGetImageBuffer(buffer);
     UIImageOrientation orientation = frame.orientation;
     
-    CVImageBufferRef pixelBuffer = CMSampleBufferGetImageBuffer(buffer);
-    if (!pixelBuffer) {
-        NSLog(@"unable to get pixel buffer");
-        return nil;
+    VCPVisionModel *cvModel = [VisionCameraPluginInatVisionPlugin visionModelWithModelFile:modelPath];
+    MLMultiArray *visionScores = [cvModel visionPredictionsFor:pixelBuffer orientation:orientation];
+    
+    MLMultiArray *results = nil;
+    
+
+    if (geoModelPreds != nil) {
+        NSError *err = nil;
+        results = [self combineVisionScores:visionScores with:geoModelPreds error:&err];
+        results = [self normalizeMultiArray:results error:&err];
+    } else {
+        results = visionScores;
     }
+
     
     // Setup taxonomy
     VCPTaxonomy *taxonomy = [VisionCameraPluginInatVisionPlugin taxonomyWithTaxonomyFile:taxonomyPath];
-    
-    // Setup vision model
-    VNCoreMLModel *visionModel = [VisionCameraPluginInatVisionPlugin visionModelWithModelFile:modelPath];
-    
-    // Setup top branches
+
     NSMutableArray *topBranches = [NSMutableArray array];
-    VNRequestCompletionHandler recognitionHandler = ^(VNRequest * _Nonnull request, NSError * _Nullable error) {
-        VNCoreMLFeatureValueObservation *firstResult = request.results.firstObject;
-        MLFeatureValue *firstFV = firstResult.featureValue;
-        MLMultiArray *visionScores = firstFV.multiArrayValue;
-        
-        MLMultiArray *mm = nil;
-        if (geoModelPreds != nil) {
-            NSError *err = nil;
-            mm = [self combineVisionScores:visionScores with:geoModelPreds error:&err];
-            mm = [self normalizeMultiArray:mm error:&err];
-        } else {
-            mm = visionScores;
-        }
-        
-        NSArray *bestBranch = [taxonomy inflateTopBranchFromClassification:mm];
-        // add this to the end of the recent top branches array
-        [topBranches addObject:bestBranch];
-    };
-    
-    VNCoreMLRequest *objectRecognition = [[VNCoreMLRequest alloc] initWithModel:visionModel
-                                                              completionHandler:recognitionHandler];
-    objectRecognition.imageCropAndScaleOption = VNImageCropAndScaleOptionCenterCrop;
-    NSArray *requests = @[objectRecognition];
-    
-    VNImageRequestHandler *handler = [[VNImageRequestHandler alloc] initWithCVPixelBuffer:pixelBuffer
-                                                                              orientation:orientation
-                                                                                  options:@{}];
-    NSError *requestError = nil;
-    [handler performRequests:requests
-                       error:&requestError];
-    if (requestError) {
-        NSString *errString = [NSString stringWithFormat:@"got a request error: %@",
-                               requestError.localizedDescription];
-        NSLog(@"%@", errString);
-        return nil;
-    }
+    NSArray *bestBranch = [taxonomy inflateTopBranchFromClassification:results];
+    // add this to the end of the recent top branches array
+    [topBranches addObject:bestBranch];
     
     // convert the VCPPredictions in the bestRecentBranch into dicts
     NSMutableArray *bestBranchAsDict = [NSMutableArray array];

From e872ec5cb3e33f1a19ee83566f80fbf60fd9dd8b Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Sat, 19 Oct 2024 11:52:53 -0700
Subject: [PATCH 03/16] clean up errors

---
 .../VisionCameraPluginInatVision.m            | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
index bcf9371..9b1ef5c 100644
--- a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
+++ b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
@@ -72,11 +72,12 @@ - (instancetype)initWithProxy:(VisionCameraProxyHolder*)proxy
 - (MLMultiArray *)combineVisionScores:(MLMultiArray *)visionScores with:(MLMultiArray *)geoScores error:(NSError **)error {
     // Ensure both arrays have the same shape
     if (![visionScores.shape isEqualToArray:geoScores.shape]) {
-        if (error) {
-            *error = [NSError errorWithDomain:@"MLMultiArrayErrorDomain"
-                                         code:1
-                                     userInfo:@{NSLocalizedDescriptionKey: @"Arrays must have the same shape"}];
-        }
+        NSDictionary *userInfo = @{
+            NSLocalizedDescriptionKey: @"Arrays must have the same shape",
+        };
+        *error = [NSError errorWithDomain:@"MLMultiArrayErrorDomain"
+                                     code:1
+                                 userInfo:userInfo];
         return nil;
     }
     
@@ -85,6 +86,12 @@ - (MLMultiArray *)combineVisionScores:(MLMultiArray *)visionScores with:(MLMulti
                                                              dataType:MLMultiArrayDataTypeDouble
                                                                 error:error];
     if (!combinedArray) {
+        NSDictionary *userInfo = @{
+            NSLocalizedDescriptionKey: @"Failed to make combined array",
+        };
+        *error = [NSError errorWithDomain:@"MLMultiArrayErrorDomain"
+                                     code:2
+                                 userInfo:userInfo];
         return nil;
     }
     
@@ -113,11 +120,12 @@ - (MLMultiArray *)normalizeMultiArray:(MLMultiArray *)mlArray error:(NSError **)
     if (sum != 0) {
         vDSP_vsdivD(mlData, 1, &sum, mlData, 1, count);
     } else {
-        if (error) {
-            *error = [NSError errorWithDomain:@"MLMultiArrayErrorDomain"
-                                         code:2
-                                     userInfo:@{NSLocalizedDescriptionKey: @"Sum of elements is zero, normalization not possible."}];
-        }
+        NSDictionary *userInfo = @{
+            NSLocalizedDescriptionKey: @"Sum of elements is zero, normalization not possible."
+        };
+        *error = [NSError errorWithDomain:@"MLMultiArrayErrorDomain"
+                                     code:3
+                                 userInfo:userInfo];
         return nil;
     }
 

From 5702e470a7f52fbcf9946ae008a5cdfed49193b7 Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Sat, 19 Oct 2024 11:53:43 -0700
Subject: [PATCH 04/16] make this combine method nullable

so we can put something in error and return nil
---
 ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
index 9b1ef5c..daf1b2b 100644
--- a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
+++ b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
@@ -69,7 +69,7 @@ - (instancetype)initWithProxy:(VisionCameraProxyHolder*)proxy
     return self;
 }
 
-- (MLMultiArray *)combineVisionScores:(MLMultiArray *)visionScores with:(MLMultiArray *)geoScores error:(NSError **)error {
+- (MLMultiArray * _Nullable)combineVisionScores:(MLMultiArray *)visionScores with:(MLMultiArray *)geoScores error:(NSError **)error {
     // Ensure both arrays have the same shape
     if (![visionScores.shape isEqualToArray:geoScores.shape]) {
         NSDictionary *userInfo = @{

From f6f4888b96cfe1d4cc14d60d31190de570c09373 Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Sat, 19 Oct 2024 11:55:09 -0700
Subject: [PATCH 05/16] convert all DSP ops to float

---
 .../VisionCameraPluginInatVision.m            | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
index daf1b2b..42747cc 100644
--- a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
+++ b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
@@ -83,7 +83,7 @@ - (MLMultiArray * _Nullable)combineVisionScores:(MLMultiArray *)visionScores wit
     
     // Create a result MLMultiArray with the same shape as the input arrays
     MLMultiArray *combinedArray = [[MLMultiArray alloc] initWithShape:visionScores.shape
-                                                             dataType:MLMultiArrayDataTypeDouble
+                                                             dataType:MLMultiArrayDataTypeFloat32
                                                                 error:error];
     if (!combinedArray) {
         NSDictionary *userInfo = @{
@@ -96,29 +96,28 @@ - (MLMultiArray * _Nullable)combineVisionScores:(MLMultiArray *)visionScores wit
     }
     
     // Get the data pointers
-    double *visionData = (double *)visionScores.dataPointer;
-    double *geoData = (double *)geoScores.dataPointer;
-    double *combinedData = (double *)combinedArray.dataPointer;
-
+    float *visionData = (float *)visionScores.dataPointer;
+    float *geoData = (float *)geoScores.dataPointer;
+    float *combinedData = (float *)combinedArray.dataPointer;
+    
     // Get the number of elements
     NSInteger count = visionScores.count;
-
+    
     // Perform element-wise multiplication using vDSP_vmul
-    vDSP_vmulD(visionData, 1, geoData, 1, combinedData, 1, count);
-        
+    vDSP_vmul(visionData, 1, geoData, 1, combinedData, 1, count);
+    
     return combinedArray;
 }
 
 - (MLMultiArray *)normalizeMultiArray:(MLMultiArray *)mlArray error:(NSError **)error {
     NSInteger count = mlArray.count;
-    double *mlData = (double *)mlArray.dataPointer;
+    float *mlData = (float *)mlArray.dataPointer;
     
-    double sum = 0.0;
-    vDSP_sveD(mlData, 1, &sum, count);
+    float sum = 0.0;
+    vDSP_sve(mlData, 1, &sum, count);
     
-    // Normalize by dividing each element by the sum
     if (sum != 0) {
-        vDSP_vsdivD(mlData, 1, &sum, mlData, 1, count);
+        vDSP_vsdiv(mlData, 1, &sum, mlData, 1, count);
     } else {
         NSDictionary *userInfo = @{
             NSLocalizedDescriptionKey: @"Sum of elements is zero, normalization not possible."

From 9d85ca1d5e53d6e73e874abf952ff422c41e5e01 Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Sat, 19 Oct 2024 11:55:54 -0700
Subject: [PATCH 06/16] apply a cutoff before taxonomy cutoff

from 550ms per frame to 120ms per frame on my iPhone 13 pro
---
 ios/Classifier/VCPTaxonomy.m | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/ios/Classifier/VCPTaxonomy.m b/ios/Classifier/VCPTaxonomy.m
index 2cbd9d0..c2e20e8 100644
--- a/ios/Classifier/VCPTaxonomy.m
+++ b/ios/Classifier/VCPTaxonomy.m
@@ -16,6 +16,7 @@ @interface VCPTaxonomy ()
 // this is a convenience array for testing
 @property NSArray *leaves;
 @property VCPNode *life;
+@property float taxonomyRollupCutoff;
 @end
 
 @implementation VCPTaxonomy
@@ -83,6 +84,8 @@ - (instancetype)initWithTaxonomyFile:(NSString *)taxaFile {
                 [self.life addChild:node];
             }
         }
+        
+        self.taxonomyRollupCutoff = 0.01;   
     }
 
     return self;
@@ -133,32 +136,33 @@ - (VCPPrediction *)inflateTopPredictionFromClassification:(MLMultiArray *)classi
 // following
 // https://github.com/inaturalist/inatVisionAPI/blob/multiclass/inferrers/multi_class_inferrer.py#L136
 - (NSDictionary *)aggregateScores:(MLMultiArray *)classification currentNode:(VCPNode *)node {
-    if (node.children.count > 0) {
-        // we'll populate this and return it
-        NSMutableDictionary *allScores = [NSMutableDictionary dictionary];
-
-        for (VCPNode *child in node.children) {
-            NSDictionary *childScores = [self aggregateScores:classification currentNode:child];
-            [allScores addEntriesFromDictionary:childScores];
-        }
+    NSMutableDictionary *allScores = [NSMutableDictionary dictionary];
 
+    if (node.children.count > 0) {
         float thisScore = 0.0f;
         for (VCPNode *child in node.children) {
-            thisScore += [allScores[child.taxonId] floatValue];
+            NSDictionary *childScores = [self aggregateScores:classification currentNode:child];
+            NSNumber *childScore = childScores[child.taxonId];
+            
+            if ([childScore floatValue] > self.taxonomyRollupCutoff) {
+                [allScores addEntriesFromDictionary:childScores];
+                thisScore += [childScore floatValue];
+            }
         }
-
         allScores[node.taxonId] = @(thisScore);
 
-        return [NSDictionary dictionaryWithDictionary:allScores];
     } else {
         // base case, no children
         NSAssert(node.leafId, @"node with taxonId %@ has no children but also has no leafId", node.taxonId);
         NSNumber *leafScore = [classification objectAtIndexedSubscript:node.leafId.integerValue];
         NSAssert(leafScore, @"node with leafId %@ has no score", node.leafId);
-        return @{
-            node.taxonId: leafScore
-        };
+        
+        if ([leafScore floatValue] > self.taxonomyRollupCutoff) {
+            allScores[node.taxonId] = leafScore;
+        }
     }
+    
+    return [allScores copy];
 }
 
 - (NSDictionary *)aggregateScores:(MLMultiArray *)classification {

From 032bb0f228fdd4115fada54b73be4dfe9c73c712 Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Sat, 19 Oct 2024 12:04:04 -0700
Subject: [PATCH 07/16] refactor geo model into its own class

add geo model result caching (saves about 5ms per frame)
---
 example/src/App.tsx                           |  34 ++++++
 ios/Classifier/VCPGeoModel.h                  |  24 ++++
 ios/Classifier/VCPGeoModel.m                  | 111 ++++++++++++++++++
 .../project.pbxproj                           |   6 +
 .../VisionCameraPluginInatVision.m            | 103 ++--------------
 src/index.tsx                                 |   6 +
 6 files changed, 189 insertions(+), 95 deletions(-)
 create mode 100644 ios/Classifier/VCPGeoModel.h
 create mode 100644 ios/Classifier/VCPGeoModel.m

diff --git a/example/src/App.tsx b/example/src/App.tsx
index e516b74..586275d 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -29,12 +29,17 @@ const modelFilenameAndroid = 'small_inception_tf1.tflite';
 const taxonomyFilenameAndroid = 'small_export_tax.csv';
 const modelFilenameIOS = 'small_inception_tf1.mlmodelc';
 const taxonomyFilenameIOS = 'small_export_tax.json';
+const geoModelFilenameIOS = 'small_geomodel.mlmodelc';
 const modelVersion = '1.0';
 
 const modelPath =
   Platform.OS === 'ios'
     ? `${RNFS.DocumentDirectoryPath}/${modelFilenameIOS}`
     : `${RNFS.DocumentDirectoryPath}/${modelFilenameAndroid}`;
+const geoModelPath =
+  Platform.OS === 'ios'
+    ? `${RNFS.DocumentDirectoryPath}/${geoModelFilenameIOS}`
+    : `${RNFS.DocumentDirectoryPath}/${modelFilenameAndroid}`;
 const taxonomyPath =
   Platform.OS === 'ios'
     ? `${RNFS.DocumentDirectoryPath}/${taxonomyFilenameIOS}`
@@ -49,6 +54,7 @@ export default function App(): React.JSX.Element {
     undefined
   );
   const [negativeFilter, setNegativeFilter] = useState(false);
+  const [useGeoModel, setUseGeoModel] = useState(false);
 
   enum VIEW_STATUS {
     NONE,
@@ -66,6 +72,10 @@ export default function App(): React.JSX.Element {
     setNegativeFilter(!negativeFilter);
   };
 
+  const toggleUseGeoModel = () => {
+    setUseGeoModel(!useGeoModel);
+  };
+
   const changeFilterByTaxonId = () => {
     if (!filterByTaxonId) {
       setFilterByTaxonId('47126');
@@ -110,6 +120,16 @@ export default function App(): React.JSX.Element {
         .catch((error) => {
           console.log(`error moving model file`, error);
         });
+      RNFS.copyFile(
+        `${RNFS.MainBundlePath}/${geoModelFilenameIOS}`,
+        `${RNFS.DocumentDirectoryPath}/${geoModelFilenameIOS}`
+      )
+        .then((result) => {
+          console.log(`moved geo model file from`, result);
+        })
+        .catch((error) => {
+          console.log(`error moving geo model file`, error);
+        });
       RNFS.copyFile(
         `${RNFS.MainBundlePath}/${taxonomyFilenameIOS}`,
         `${RNFS.DocumentDirectoryPath}/${taxonomyFilenameIOS}`
@@ -147,6 +167,11 @@ export default function App(): React.JSX.Element {
         'worklet';
         try {
           const timeBefore = new Date().getTime();
+
+          const latitude = 37.28889;
+          const longitude = -121.94415;
+          const elevation = 15.0;
+
           const cvResult: InatVision.Result = InatVision.inatVision(frame, {
             version: modelVersion,
             modelPath,
@@ -156,6 +181,11 @@ export default function App(): React.JSX.Element {
             negativeFilter,
             numStoredResults: 4,
             cropRatio: 0.9,
+            latitude,
+            longitude,
+            elevation,
+            geoModelPath,
+            useGeoModel,
           });
           const timeAfter = new Date().getTime();
           console.log('time taken ms: ', timeAfter - timeBefore);
@@ -316,6 +346,10 @@ export default function App(): React.JSX.Element {
             onPress={() => setViewStatus(VIEW_STATUS.NONE)}
             title="Close"
           />
+          <Button
+            onPress={toggleUseGeoModel}
+            title={useGeoModel ? 'Disable Geo Model' : 'Enable Geo Model'}
+          />
         </View>
       </View>
     ) : (
diff --git a/ios/Classifier/VCPGeoModel.h b/ios/Classifier/VCPGeoModel.h
new file mode 100644
index 0000000..da1213a
--- /dev/null
+++ b/ios/Classifier/VCPGeoModel.h
@@ -0,0 +1,24 @@
+//
+//  VCPGeoModel.h
+//  VisionCameraPluginInatVision
+//
+//  Created by Alex Shepard on 10/18/24.
+//  Copyright © 2024 Facebook. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+@import CoreML;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VCPGeoModel : NSObject
+
+- (instancetype _Nullable)initWithModelPath:(NSString *)modelPath;
+- (MLMultiArray *)predictionsForLat:(float)latitude lng:(float)longitude elevation:(float)elevation;
+
+@property MLModel *geoModel;
+@property float locationChangeThreshold;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/ios/Classifier/VCPGeoModel.m b/ios/Classifier/VCPGeoModel.m
new file mode 100644
index 0000000..42ea06c
--- /dev/null
+++ b/ios/Classifier/VCPGeoModel.m
@@ -0,0 +1,111 @@
+//
+//  VCPGeoModel.m
+//  VisionCameraPluginInatVision
+//
+//  Created by Alex Shepard on 10/18/24.
+//  Copyright © 2024 Facebook. All rights reserved.
+//
+
+#import "VCPGeoModel.h"
+
+@interface VCPGeoModel ()
+
+@property (nonatomic, strong) MLMultiArray *cachedGeoResult;
+@property (nonatomic) float cachedLatitude;
+@property (nonatomic) float cachedLongitude;
+@property (nonatomic) float cachedElevation;
+
+
+@end
+
+@implementation VCPGeoModel
+
+- (instancetype _Nullable)initWithModelPath:(NSString *)modelPath {
+    if (self = [super init]) {
+        NSURL *geoModelUrl = [NSURL fileURLWithPath:modelPath];
+        if (!geoModelUrl) {
+            NSLog(@"no file for geo model");
+            return nil;
+        }
+        
+        NSError *loadError = nil;
+        self.geoModel = [MLModel modelWithContentsOfURL:geoModelUrl error:&loadError];
+        if (loadError) {
+            NSString *errString = [NSString stringWithFormat:@"error loading geo model: %@",
+                                   loadError.localizedDescription];
+            NSLog(@"%@", errString);
+            return nil;
+        }
+        if (!self.geoModel) {
+            NSLog(@"unable to make geo model");
+            return nil;
+        }
+        
+        // default location change threshold
+        self.locationChangeThreshold = -0.001;
+
+    }
+    
+    return self;
+}
+
+- (NSArray *)normAndEncodeLat:(float)latitude lng:(float)longitude elevation:(float)elevation {
+    float normLat = latitude / 90.0;
+    float normLng = longitude / 180.0;
+    float normElev = 0.0;
+    if (elevation > 0) {
+        normElev = elevation / 5705.63;
+    } else {
+        normElev = elevation / 32768.0;
+    }
+    float a = sin(M_PI * normLng);
+    float b = sin(M_PI * normLat);
+    float c = cos(M_PI * normLng);
+    float d = cos(M_PI * normLat);
+    
+    return @[ @(a), @(b), @(c), @(d), @(normElev) ];
+}
+
+- (MLMultiArray *)predictionsForLat:(float)latitude lng:(float)longitude elevation:(float)elevation {
+    if (!self.cachedGeoResult ||
+        fabs(latitude - self.cachedLatitude) > self.locationChangeThreshold ||
+        fabs(longitude - self.cachedLongitude) > self.locationChangeThreshold ||
+        fabs(elevation - self.cachedElevation) > self.locationChangeThreshold)
+    {        
+        self.cachedGeoResult = [self geoModelPredictionsForLat:latitude lng:longitude elevation:elevation];
+        self.cachedLatitude = latitude;
+        self.cachedLongitude = longitude;
+        self.cachedElevation = elevation;
+    }
+
+    return self.cachedGeoResult;
+}
+
+- (MLMultiArray *)geoModelPredictionsForLat:(float)latitude lng:(float)longitude elevation:(float)elevation {
+    NSArray *geoModelInputs = [self normAndEncodeLat:latitude
+                                                 lng:longitude
+                                           elevation:elevation];
+    
+    NSError *err = nil;
+    MLMultiArray *mlInputs = [[MLMultiArray alloc] initWithShape:@[@1, @5]
+                                                        dataType:MLMultiArrayDataTypeDouble
+                                                           error:&err];
+    for (int i = 0; i < 5; i++) {
+        mlInputs[i] = geoModelInputs[i];
+    }
+    MLFeatureValue *fv = [MLFeatureValue featureValueWithMultiArray:mlInputs];
+    
+    NSError *fpError = nil;
+    NSDictionary *fpDict = @{ @"input_1": fv };
+    MLDictionaryFeatureProvider *fp = [[MLDictionaryFeatureProvider alloc] initWithDictionary:fpDict
+                                                                                        error:&fpError];
+    
+    NSError *predError = nil;
+    id <MLFeatureProvider> results = [self.geoModel predictionFromFeatures:fp error:&predError];
+    MLFeatureValue *result = [results featureValueForName:@"Identity"];
+    MLMultiArray *geoModelScores = result.multiArrayValue;
+        
+    return geoModelScores;
+}
+
+@end
diff --git a/ios/VisionCameraPluginInatVision.xcodeproj/project.pbxproj b/ios/VisionCameraPluginInatVision.xcodeproj/project.pbxproj
index 976ea7f..5fc7c68 100644
--- a/ios/VisionCameraPluginInatVision.xcodeproj/project.pbxproj
+++ b/ios/VisionCameraPluginInatVision.xcodeproj/project.pbxproj
@@ -13,6 +13,7 @@
 		8F3C41832A4AFF5B008FBC67 /* VCPClassifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F3C417C2A4AFF5B008FBC67 /* VCPClassifier.m */; };
 		8F3C41842A4AFF5B008FBC67 /* VCPTaxonomy.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F3C41802A4AFF5B008FBC67 /* VCPTaxonomy.m */; };
 		8F3C41852A4AFF5B008FBC67 /* VCPPrediction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F3C41812A4AFF5B008FBC67 /* VCPPrediction.m */; };
+		FA5FF9612CC317E400BA8E22 /* VCPGeoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = FA5FF9602CC317E400BA8E22 /* VCPGeoModel.m */; };
 		FA5FF9642CC3182D00BA8E22 /* VCPVisionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = FA5FF9632CC3182D00BA8E22 /* VCPVisionModel.m */; };
 /* End PBXBuildFile section */
 
@@ -40,6 +41,8 @@
 		8F3C417F2A4AFF5B008FBC67 /* VCPTaxonomy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VCPTaxonomy.h; sourceTree = "<group>"; };
 		8F3C41802A4AFF5B008FBC67 /* VCPTaxonomy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VCPTaxonomy.m; sourceTree = "<group>"; };
 		8F3C41812A4AFF5B008FBC67 /* VCPPrediction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VCPPrediction.m; sourceTree = "<group>"; };
+		FA5FF95F2CC317E400BA8E22 /* VCPGeoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VCPGeoModel.h; sourceTree = "<group>"; };
+		FA5FF9602CC317E400BA8E22 /* VCPGeoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VCPGeoModel.m; sourceTree = "<group>"; };
 		FA5FF9622CC3182D00BA8E22 /* VCPVisionModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VCPVisionModel.h; sourceTree = "<group>"; };
 		FA5FF9632CC3182D00BA8E22 /* VCPVisionModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VCPVisionModel.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -92,6 +95,8 @@
 				8F3C41812A4AFF5B008FBC67 /* VCPPrediction.m */,
 				8F3C417F2A4AFF5B008FBC67 /* VCPTaxonomy.h */,
 				8F3C41802A4AFF5B008FBC67 /* VCPTaxonomy.m */,
+				FA5FF95F2CC317E400BA8E22 /* VCPGeoModel.h */,
+				FA5FF9602CC317E400BA8E22 /* VCPGeoModel.m */,
 				FA5FF9622CC3182D00BA8E22 /* VCPVisionModel.h */,
 				FA5FF9632CC3182D00BA8E22 /* VCPVisionModel.m */,
 			);
@@ -158,6 +163,7 @@
 				8F3C41852A4AFF5B008FBC67 /* VCPPrediction.m in Sources */,
 				8F3C41832A4AFF5B008FBC67 /* VCPClassifier.m in Sources */,
 				1DB58401D995067FF278746C /* VisionCameraPluginInatVision.m in Sources */,
+				FA5FF9612CC317E400BA8E22 /* VCPGeoModel.m in Sources */,
 				8F3C41842A4AFF5B008FBC67 /* VCPTaxonomy.m in Sources */,
 				FA5FF9642CC3182D00BA8E22 /* VCPVisionModel.m in Sources */,
 				8F3C41822A4AFF5B008FBC67 /* VCPNode.m in Sources */,
diff --git a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
index 42747cc..c742c0f 100644
--- a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
+++ b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
@@ -11,8 +11,7 @@
 
 #import "VCPTaxonomy.h"
 #import "VCPPrediction.h"
-
-@class VCPGeoModel;
+#import "VCPGeoModel.h"
 #import "VCPVisionModel.h"
 
 @interface VisionCameraPluginInatVisionPlugin : FrameProcessorPlugin
@@ -23,16 +22,6 @@ + (VCPVisionModel *)visionModelWithModelFile:(NSString *)modelPath;
 
 @end
 
-@interface VCPGeoModel: NSObject
-
-- (instancetype)initWithModelPath:(NSString *)modelPath;
-- (MLMultiArray *)predictionsForLat:(float)latitude lng:(float)longitude elevation:(float)elevation;
-
-@property MLModel *geoModel;
-
-@end
-
-
 @implementation VisionCameraPluginInatVisionPlugin
 
 + (VCPTaxonomy *)taxonomyWithTaxonomyFile:(NSString *)taxonomyPath {
@@ -136,13 +125,14 @@ - (id)callback:(Frame*)frame withArguments:(NSDictionary*)arguments {
     NSDate *startDate = [NSDate date];
 
     MLMultiArray *geoModelPreds = nil;
-    if ([arguments objectForKey:@"latitude"]
-        && [arguments objectForKey:@"longitude"]
-        && [arguments objectForKey:@"elevation"]
-        && [arguments objectForKey:@"geoModelPath"])
+    if ([arguments objectForKey:@"useGeoModel"] &&
+        [[arguments objectForKey:@"useGeoModel"] boolValue] &&
+        [arguments objectForKey:@"latitude"] &&
+        [arguments objectForKey:@"longitude"] &&
+        [arguments objectForKey:@"elevation"] &&
+        [arguments objectForKey:@"geoModelPath"])
     {
-        NSString *geoModelPath = arguments[@"geoModelPath"];
-        VCPGeoModel *geoModel = [VisionCameraPluginInatVisionPlugin geoModelWithModelFile:geoModelPath];
+        VCPGeoModel *geoModel = [VisionCameraPluginInatVisionPlugin geoModelWithModelFile:arguments[@"geoModelPath"]];
         geoModelPreds = [geoModel predictionsForLat:[[arguments objectForKey:@"latitude"] floatValue]
                                                 lng:[[arguments objectForKey:@"longitude"] floatValue]
                                           elevation:[[arguments objectForKey:@"elevation"] floatValue]];
@@ -150,8 +140,6 @@ - (id)callback:(Frame*)frame withArguments:(NSDictionary*)arguments {
         NSLog(@"not doing anything geo related.");
     }
     
-    NSLog(@"got %ld geo model scores", geoModelPreds.count);
-
     // Log arguments
     NSLog(@"inatVision arguments: %@", arguments);
     // Destructure version out of options
@@ -209,78 +197,3 @@ - (id)callback:(Frame*)frame withArguments:(NSDictionary*)arguments {
 
 @end
 
-
-
-
-@implementation VCPGeoModel
-
-- (instancetype _Nullable)initWithModelPath:(NSString *)modelPath {
-    if (self = [super init]) {
-        NSURL *geoModelUrl = [NSURL fileURLWithPath:modelPath];
-        if (!geoModelUrl) {
-            NSLog(@"no file for geo model");
-            return nil;
-        }
-        
-        NSError *loadError = nil;
-        self.geoModel = [MLModel modelWithContentsOfURL:geoModelUrl error:&loadError];
-        if (loadError) {
-            NSString *errString = [NSString stringWithFormat:@"error loading model: %@",
-                                   loadError.localizedDescription];
-            NSLog(@"%@", errString);
-            return nil;
-        }
-        if (!self.geoModel) {
-            NSLog(@"unable to make geo model");
-            return nil;
-        }
-    }
-    
-    return self;
-}
-
-- (NSArray *)normAndEncodeLat:(float)latitude lng:(float)longitude elevation:(float)elevation {
-    float normLat = latitude / 90.0;
-    float normLng = longitude / 180.0;
-    float normElev = 0.0;
-    if (elevation > 0) {
-        normElev = elevation / 5705.63;
-    } else {
-        normElev = elevation / 32768.0;
-    }
-    float a = sin(M_PI * normLng);
-    float b = sin(M_PI * normLat);
-    float c = cos(M_PI * normLng);
-    float d = cos(M_PI * normLat);
-    
-    return @[ @(a), @(b), @(c), @(d), @(normElev) ];
-}
-
-- (MLMultiArray *)predictionsForLat:(float)latitude lng:(float)longitude elevation:(float)elevation {
-    NSArray *geoModelInputs = [self normAndEncodeLat:latitude
-                                                 lng:longitude
-                                           elevation:elevation];
-    
-    NSError *err = nil;
-    MLMultiArray *mlInputs = [[MLMultiArray alloc] initWithShape:@[@1, @5]
-                                                        dataType:MLMultiArrayDataTypeDouble
-                                                           error:&err];
-    for (int i = 0; i < 5; i++) {
-        mlInputs[i] = geoModelInputs[i];
-    }
-    MLFeatureValue *fv = [MLFeatureValue featureValueWithMultiArray:mlInputs];
-    
-    NSError *fpError = nil;
-    NSDictionary *fpDict = @{ @"input_1": fv };
-    MLDictionaryFeatureProvider *fp = [[MLDictionaryFeatureProvider alloc] initWithDictionary:fpDict
-                                                                                        error:&fpError];
-    
-    NSError *predError = nil;
-    id <MLFeatureProvider> results = [self.geoModel predictionFromFeatures:fp error:&predError];
-    MLFeatureValue *result = [results featureValueForName:@"Identity"];
-    MLMultiArray *geoModelScores = result.multiArrayValue;
-    
-    return geoModelScores;
-}
-
-@end
diff --git a/src/index.tsx b/src/index.tsx
index 276f053..0e16ca9 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -339,6 +339,12 @@ interface Options {
    * As a fraction of 1. E.g. 0.8 will crop the center 80% of the frame before sending it to the cv model.
    */
   cropRatio?: number;
+
+  useGeoModel?: boolean;
+  latitude?: number;
+  longitude?: number;
+  elevation?: number;
+  geoModelPath?: string;
 }
 
 /**

From 4c39ccd84247ae4db28004fa8c7fef80905e5a10 Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Sat, 19 Oct 2024 12:10:08 -0700
Subject: [PATCH 08/16] fix copyright statements

LOL. did xcode pick this and autocomplete it from some other RN module?
---
 ios/Classifier/VCPGeoModel.h    | 2 +-
 ios/Classifier/VCPGeoModel.m    | 2 +-
 ios/Classifier/VCPVisionModel.h | 2 +-
 ios/Classifier/VCPVisionModel.m | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ios/Classifier/VCPGeoModel.h b/ios/Classifier/VCPGeoModel.h
index da1213a..edaab55 100644
--- a/ios/Classifier/VCPGeoModel.h
+++ b/ios/Classifier/VCPGeoModel.h
@@ -3,7 +3,7 @@
 //  VisionCameraPluginInatVision
 //
 //  Created by Alex Shepard on 10/18/24.
-//  Copyright © 2024 Facebook. All rights reserved.
+//  Copyright © 2024 iNaturalist. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
diff --git a/ios/Classifier/VCPGeoModel.m b/ios/Classifier/VCPGeoModel.m
index 42ea06c..d84c5ba 100644
--- a/ios/Classifier/VCPGeoModel.m
+++ b/ios/Classifier/VCPGeoModel.m
@@ -3,7 +3,7 @@
 //  VisionCameraPluginInatVision
 //
 //  Created by Alex Shepard on 10/18/24.
-//  Copyright © 2024 Facebook. All rights reserved.
+//  Copyright © 2024 iNaturalist. All rights reserved.
 //
 
 #import "VCPGeoModel.h"
diff --git a/ios/Classifier/VCPVisionModel.h b/ios/Classifier/VCPVisionModel.h
index 968940b..9778ee8 100644
--- a/ios/Classifier/VCPVisionModel.h
+++ b/ios/Classifier/VCPVisionModel.h
@@ -3,7 +3,7 @@
 //  VisionCameraPluginInatVision
 //
 //  Created by Alex Shepard on 10/18/24.
-//  Copyright © 2024 Facebook. All rights reserved.
+//  Copyright © 2024 iNaturalist. All rights reserved.
 //
 
 @import CoreML;
diff --git a/ios/Classifier/VCPVisionModel.m b/ios/Classifier/VCPVisionModel.m
index b07d0cc..1049475 100644
--- a/ios/Classifier/VCPVisionModel.m
+++ b/ios/Classifier/VCPVisionModel.m
@@ -3,7 +3,7 @@
 //  VisionCameraPluginInatVision
 //
 //  Created by Alex Shepard on 10/18/24.
-//  Copyright © 2024 Facebook. All rights reserved.
+//  Copyright © 2024 iNaturalist. All rights reserved.
 //
 
 #import "VCPVisionModel.h"

From 5a9ac1e7e5ff3298175a2afdd7590077d1b5414d Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Thu, 24 Oct 2024 13:01:52 -0700
Subject: [PATCH 09/16] don't need to cache and re-serve recent scores

we can use the results object on our request after
the handler has finished performing the request.
---
 ios/Classifier/VCPVisionModel.h |  2 --
 ios/Classifier/VCPVisionModel.m | 23 +++++++++--------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/ios/Classifier/VCPVisionModel.h b/ios/Classifier/VCPVisionModel.h
index 9778ee8..e0ebd52 100644
--- a/ios/Classifier/VCPVisionModel.h
+++ b/ios/Classifier/VCPVisionModel.h
@@ -24,8 +24,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property VNCoreMLRequest *classification;
 @property NSArray *requests;
 
-@property MLMultiArray *recentVisionScores;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/ios/Classifier/VCPVisionModel.m b/ios/Classifier/VCPVisionModel.m
index 1049475..dc317b3 100644
--- a/ios/Classifier/VCPVisionModel.m
+++ b/ios/Classifier/VCPVisionModel.m
@@ -30,21 +30,12 @@ - (instancetype _Nullable)initWithModelPath:(NSString *)modelPath {
             NSLog(@"unable to make cv model");
             return nil;
         }
-        
+      
         NSError *modelError = nil;
         self.visionModel = [VNCoreMLModel modelForMLModel:self.cvModel
-                                               error:&modelError];
-
-        __weak typeof(self) weakSelf = self;
-        VNRequestCompletionHandler recognitionHandler = ^(VNRequest * _Nonnull request, NSError * _Nullable error) {
-            
-            VNCoreMLFeatureValueObservation *firstResult = request.results.firstObject;
-            MLFeatureValue *firstFV = firstResult.featureValue;
-            weakSelf.recentVisionScores = firstFV.multiArrayValue;
-        };
+                                                    error:&modelError];
         
-        self.classification = [[VNCoreMLRequest alloc] initWithModel:self.visionModel
-                                                   completionHandler:recognitionHandler];
+        self.classification = [[VNCoreMLRequest alloc] initWithModel:self.visionModel];
         self.classification.imageCropAndScaleOption = VNImageCropAndScaleOptionCenterCrop;
         self.requests = @[ self.classification ];
     }
@@ -57,12 +48,16 @@ - (MLMultiArray * _Nullable)visionPredictionsFor:(CVPixelBufferRef)pixBuf orient
     VNImageRequestHandler *handler = [[VNImageRequestHandler alloc] initWithCVPixelBuffer:pixBuf
                                                                               orientation:cgOrient
                                                                                   options:@{}];
-
+    
     NSError *requestError = nil;
     [handler performRequests:self.requests
                        error:&requestError];
     
-    return self.recentVisionScores;
+    VNCoreMLRequest *request = self.requests.firstObject;
+    VNCoreMLFeatureValueObservation *firstResult = request.results.firstObject;
+    MLFeatureValue *firstFV = firstResult.featureValue;
+    
+    return firstFV.multiArrayValue;
 }
 
 - (CGImagePropertyOrientation)cgOrientationFor:(UIImageOrientation)uiOrientation {

From 760d3ab09f3c993d795a5738f1190667520ebab4 Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Thu, 24 Oct 2024 13:06:58 -0700
Subject: [PATCH 10/16] return vision telemtry to caller

---
 .../VisionCameraPluginInatVision.m                     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
index c742c0f..eda02d2 100644
--- a/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
+++ b/ios/VisionCameraPluginInatVision/VisionCameraPluginInatVision.m
@@ -182,13 +182,17 @@ - (id)callback:(Frame*)frame withArguments:(NSDictionary*)arguments {
         [bestBranchAsDict addObject:[prediction asDict]];
     }
     
+    NSTimeInterval timeElapsed = [[NSDate date] timeIntervalSinceDate:startDate];
+    NSLog(@"inatVision took %f seconds", timeElapsed);
+
     // Create a new dictionary with the bestBranchAsDict under the key "predictions"
     NSDictionary *response = [NSDictionary dictionary];
-    response = @{@"predictions": bestBranchAsDict};
+    response = @{
+        @"predictions": bestBranchAsDict,
+        @"timeElapsed": @(timeElapsed),
+    };
     
     // End timestamp
-    NSTimeInterval timeElapsed = [[NSDate date] timeIntervalSinceDate:startDate];
-    NSLog(@"inatVision took %f seconds", timeElapsed);
     
     return response;
 }

From 5a9a0bb12313cd7e707ce3d252d17e30cbe696bb Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Fri, 25 Oct 2024 08:00:58 -0700
Subject: [PATCH 11/16] document geo modelinput normalization

---
 ios/Classifier/VCPGeoModel.m | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ios/Classifier/VCPGeoModel.m b/ios/Classifier/VCPGeoModel.m
index d84c5ba..3df30de 100644
--- a/ios/Classifier/VCPGeoModel.m
+++ b/ios/Classifier/VCPGeoModel.m
@@ -49,6 +49,10 @@ - (instancetype _Nullable)initWithModelPath:(NSString *)modelPath {
     return self;
 }
 
+/*
+ * iNat geo model input normalization documented here:
+ * https://github.com/inaturalist/inatGeoModelTraining/tree/main#input-normalization
+ */
 - (NSArray *)normAndEncodeLat:(float)latitude lng:(float)longitude elevation:(float)elevation {
     float normLat = latitude / 90.0;
     float normLng = longitude / 180.0;

From ad7287ee40da1879d8d014878a72e6383ec63a7f Mon Sep 17 00:00:00 2001
From: Alex Shepard <alex@meatfreezer.com>
Date: Fri, 25 Oct 2024 08:03:33 -0700
Subject: [PATCH 12/16] remove 404 documentation link

---
 ios/Classifier/VCPTaxonomy.m | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ios/Classifier/VCPTaxonomy.m b/ios/Classifier/VCPTaxonomy.m
index c2e20e8..2cf6174 100644
--- a/ios/Classifier/VCPTaxonomy.m
+++ b/ios/Classifier/VCPTaxonomy.m
@@ -133,8 +133,6 @@ - (VCPPrediction *)inflateTopPredictionFromClassification:(MLMultiArray *)classi
     return nil;
 }
 
-// following
-// https://github.com/inaturalist/inatVisionAPI/blob/multiclass/inferrers/multi_class_inferrer.py#L136
 - (NSDictionary *)aggregateScores:(MLMultiArray *)classification currentNode:(VCPNode *)node {
     NSMutableDictionary *allScores = [NSMutableDictionary dictionary];
 

From 69220a5e56d8bdbb69ed4e25590d1e683012b81f Mon Sep 17 00:00:00 2001
From: Johannes Klein <johannes.t.klein@gmail.com>
Date: Wed, 20 Nov 2024 15:12:50 +0100
Subject: [PATCH 13/16] Add doc comments

---
 src/index.tsx | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/index.tsx b/src/index.tsx
index 0e16ca9..b4cdec1 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -299,7 +299,7 @@ interface Options {
    */
   version: string;
   /**
-   * The path to the model file.
+   * The path to the computer vision model file.
    */
   modelPath: string;
   /**
@@ -339,11 +339,30 @@ interface Options {
    * As a fraction of 1. E.g. 0.8 will crop the center 80% of the frame before sending it to the cv model.
    */
   cropRatio?: number;
-
+  /**
+   *
+   * Whether to use the geo model.
+   */
   useGeoModel?: boolean;
+  /**
+   *
+   * The latitude of the location.
+   */
   latitude?: number;
+  /**
+   *
+   * The longitude of the location.
+   */
   longitude?: number;
+  /**
+   *
+   * The elevation of the location.
+   */
   elevation?: number;
+  /**
+   *
+   * The path to the geo model file.
+   */
   geoModelPath?: string;
 }
 

From 013f339013ef0c957c4768787c8744b4044c3970 Mon Sep 17 00:00:00 2001
From: Johannes Klein <johannes.t.klein@gmail.com>
Date: Wed, 20 Nov 2024 15:48:12 +0100
Subject: [PATCH 14/16] Use wrong file on purpose for Android

---
 example/src/App.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/example/src/App.tsx b/example/src/App.tsx
index 586275d..67eb412 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -27,6 +27,7 @@ import * as InatVision from 'vision-camera-plugin-inatvision';
 
 const modelFilenameAndroid = 'small_inception_tf1.tflite';
 const taxonomyFilenameAndroid = 'small_export_tax.csv';
+const geoModelFilenameAndroid = 'not_implemented';
 const modelFilenameIOS = 'small_inception_tf1.mlmodelc';
 const taxonomyFilenameIOS = 'small_export_tax.json';
 const geoModelFilenameIOS = 'small_geomodel.mlmodelc';
@@ -39,7 +40,7 @@ const modelPath =
 const geoModelPath =
   Platform.OS === 'ios'
     ? `${RNFS.DocumentDirectoryPath}/${geoModelFilenameIOS}`
-    : `${RNFS.DocumentDirectoryPath}/${modelFilenameAndroid}`;
+    : `${RNFS.DocumentDirectoryPath}/${geoModelFilenameAndroid}`;
 const taxonomyPath =
   Platform.OS === 'ios'
     ? `${RNFS.DocumentDirectoryPath}/${taxonomyFilenameIOS}`

From 24ffcd9d1ca96420b4c052c342bf476bdd3521f0 Mon Sep 17 00:00:00 2001
From: Johannes Klein <johannes.t.klein@gmail.com>
Date: Wed, 20 Nov 2024 16:03:16 +0100
Subject: [PATCH 15/16] Revert to use yuv format

---
 example/src/App.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/src/App.tsx b/example/src/App.tsx
index d82de82..34a42c3 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -328,7 +328,7 @@ export default function App(): React.JSX.Element {
           isActive={true}
           frameProcessor={frameProcessor}
           enableZoomGesture
-          pixelFormat={'rgb'}
+          pixelFormat={'yuv'}
           resizeMode="contain"
           enableFpsGraph={true}
           photoQualityBalance="quality"

From da1f75d7f37ae1f08d69836a6bc4c53bbc2a095a Mon Sep 17 00:00:00 2001
From: Johannes Klein <johannes.t.klein@gmail.com>
Date: Wed, 20 Nov 2024 16:05:55 +0100
Subject: [PATCH 16/16] Add missing hook dependency

---
 example/src/App.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/example/src/App.tsx b/example/src/App.tsx
index 34a42c3..e8f68f7 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -198,7 +198,13 @@ export default function App(): React.JSX.Element {
         }
       });
     },
-    [confidenceThreshold, filterByTaxonId, negativeFilter, handleResults]
+    [
+      confidenceThreshold,
+      filterByTaxonId,
+      negativeFilter,
+      handleResults,
+      useGeoModel,
+    ]
   );
 
   function selectImage() {