From b2bf4b88bf02edc1a43d9cf6119bf0bdad33dc45 Mon Sep 17 00:00:00 2001
From: Jiajie Zhu <zhujj04@fb.com>
Date: Fri, 13 Mar 2015 10:30:47 -0700
Subject: [PATCH] [catalyst|madman] fix location observer

---
 Libraries/Geolocation/Geolocation.ios.js    | 6 +++---
 Libraries/Geolocation/RCTLocationObserver.m | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Libraries/Geolocation/Geolocation.ios.js b/Libraries/Geolocation/Geolocation.ios.js
index 1b5719212..0e8015335 100644
--- a/Libraries/Geolocation/Geolocation.ios.js
+++ b/Libraries/Geolocation/Geolocation.ios.js
@@ -6,7 +6,7 @@
 'use strict';
 
 var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
-var RCTLocationObserver = require('NativeModulesDeprecated').RKLocationObserver;
+var RCTLocationObserver = require('NativeModules').RCTLocationObserver;
 
 var invariant = require('invariant');
 var logError = require('logError');
@@ -34,9 +34,9 @@ var Geolocation = {
       'Must provide a valid geo_success callback.'
     );
     RCTLocationObserver.getCurrentPosition(
+      geo_options || {},
       geo_success,
-      geo_error || logError,
-      geo_options || {}
+      geo_error || logError
     );
   },
 
diff --git a/Libraries/Geolocation/RCTLocationObserver.m b/Libraries/Geolocation/RCTLocationObserver.m
index 019653640..c2a2d0ee1 100644
--- a/Libraries/Geolocation/RCTLocationObserver.m
+++ b/Libraries/Geolocation/RCTLocationObserver.m
@@ -180,9 +180,9 @@ static NSDictionary *RCTPositionError(RCTPositionErrorCode code, NSString *msg /
   });
 }
 
-- (void)getCurrentPosition:(RCTResponseSenderBlock)successBlock
-         withErrorCallback:(RCTResponseSenderBlock)errorBlock
-                   options:(NSDictionary *)optionsJSON
+- (void)getCurrentPosition:(NSDictionary *)optionsJSON
+       withSuccessCallback:(RCTResponseSenderBlock)successBlock
+             errorCallback:(RCTResponseSenderBlock)errorBlock
 {
   RCT_EXPORT();