Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Fix LocationListenerImpl instantiation #14

Merged
merged 2 commits into from
Jun 22, 2016
Merged

Fix LocationListenerImpl instantiation #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa8e2c0
Fix LocationListenerImpl instantiation
speigg Apr 29, 2016
ff1bd14
Maintain a reference to the location listener objects.
speigg Apr 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions source/nativescript-geolocation.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import common = require("./nativescript-geolocation-common");
global.moduleMerge(common, exports);

var locationManagers = {};
var locationListeners = {};
var watchId = 0;
var minRangeUpdate = 0; // 0 meters
var defaultGetLocationTimeout = 5 * 60 * 1000; // 5 minutes
Expand Down Expand Up @@ -105,7 +106,7 @@ export class LocationMonitor implements LocationMonitorDef {
return locationFromCLLocation(iosLocation);
}

var locListener = new LocationListenerImpl();
var locListener = LocationListenerImpl.new();
locListener.initWithLocationErrorOptions(null, null, null);
iosLocation = LocationMonitor.createiOSLocationManager(locListener, null).location;
if (iosLocation) {
Expand All @@ -119,17 +120,19 @@ export class LocationMonitor implements LocationMonitorDef {
locationManagers[iosLocManagerId].stopUpdatingLocation();
locationManagers[iosLocManagerId].delegate = null;
delete locationManagers[iosLocManagerId];
delete locationListeners[iosLocManagerId];
}
}

static startLocationMonitoring(options, locListener) {
var iosLocManager = LocationMonitor.createiOSLocationManager(locListener, options);
locationManagers[locListener.id] = iosLocManager;
locationListeners[locListener.id] = locListener;
iosLocManager.startUpdatingLocation();
}

static createListenerWithCallbackAndOptions(successCallback, options) {
var locListener = new LocationListenerImpl();
var locListener = LocationListenerImpl.new();
locListener.initWithLocationErrorOptions(successCallback, null, options);
return locListener;
}
Expand All @@ -140,6 +143,7 @@ export class LocationMonitor implements LocationMonitorDef {
iosLocManager.desiredAccuracy = options ? options.desiredAccuracy : enums.Accuracy.high;
iosLocManager.distanceFilter = options ? options.updateDistance : minRangeUpdate;
locationManagers[locListener.id] = iosLocManager;
locationListeners[locListener.id] = locListener;
return iosLocManager;
}
}
Expand Down Expand Up @@ -178,7 +182,7 @@ export function enableLocationRequest(always?: boolean) {
}

export function watchLocation(successCallback, errorCallback, options) {
var locListener = new LocationListenerImpl();
var locListener = LocationListenerImpl.new();
locListener.initWithLocationErrorOptions(successCallback, errorCallback, options);
try {
var iosLocManager = LocationMonitor.createiOSLocationManager(locListener, options);
Expand Down