be-components 1.8.9 → 1.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/LocationTracker/LocationStatus.js +3 -3
- package/lib/commonjs/LocationTracker/LocationStatus.js.map +1 -1
- package/lib/commonjs/LocationTracker/api/index.js +31 -7
- package/lib/commonjs/LocationTracker/api/index.js.map +1 -1
- package/lib/module/LocationTracker/LocationStatus.js +3 -3
- package/lib/module/LocationTracker/LocationStatus.js.map +1 -1
- package/lib/module/LocationTracker/api/index.js +31 -7
- package/lib/module/LocationTracker/api/index.js.map +1 -1
- package/lib/typescript/src/LocationTracker/LocationStatus.d.ts +3 -1
- package/lib/typescript/src/LocationTracker/LocationStatus.d.ts.map +1 -1
- package/lib/typescript/src/LocationTracker/api/index.d.ts +3 -3
- package/lib/typescript/src/LocationTracker/api/index.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/LocationTracker/LocationStatus.tsx +5 -4
- package/src/LocationTracker/api/index.tsx +21 -8
|
@@ -36,7 +36,7 @@ const usePlayerLocation = ({
|
|
|
36
36
|
console.log(e);
|
|
37
37
|
}
|
|
38
38
|
};
|
|
39
|
-
const getLocation = async
|
|
39
|
+
const getLocation = async options => {
|
|
40
40
|
if (location.loading) {
|
|
41
41
|
return;
|
|
42
42
|
} //No mashy mashy
|
|
@@ -46,7 +46,7 @@ const usePlayerLocation = ({
|
|
|
46
46
|
});
|
|
47
47
|
try {
|
|
48
48
|
let cached_loc = await _api.LocationApi.getCachedLocation();
|
|
49
|
-
if (cached_loc) {
|
|
49
|
+
if (cached_loc && !options?.no_cache) {
|
|
50
50
|
setLocation(cached_loc);
|
|
51
51
|
setPermission({
|
|
52
52
|
checked: true,
|
|
@@ -102,7 +102,7 @@ const usePlayerLocation = ({
|
|
|
102
102
|
_api.LocationApi.cache_location(new_loc);
|
|
103
103
|
setLocation(new_loc);
|
|
104
104
|
if (generated_address) {
|
|
105
|
-
const player_location = _api.LocationHelpers.genPlayerLocationFromAddress(coordinates, generated_address
|
|
105
|
+
const player_location = _api.LocationHelpers.genPlayerLocationFromAddress(coordinates, generated_address.region, generated_address?.player_address, player_id, distinct_id);
|
|
106
106
|
_api.LocationApi.savePlayerLocation(player_location);
|
|
107
107
|
}
|
|
108
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_api","usePlayerLocation","player_id","distinct_id","location","setLocation","useState","loading","coordinates","address_results","permission","setPermission","checked","useEffect","LocationApi","setEnvironment","checkPermissions","options","getPermission","auto_on_granted","getLocation","e","console","log","cached_loc","getCachedLocation","getPosition","locations","getLocations","last_location","distance","compareLastLocation","anonymous_id","player_location_id","create_datetime","player_address","gen_addy","LocationHelpers","getAddressFromLastLocation","last_loc","region","cache_location","addresses","reverseCoordLookup","latitude","longitude","generated_address","getAddressFromGeoCodeResults","new_loc","player_location","genPlayerLocationFromAddress","savePlayerLocation","error","exports"],"sourceRoot":"../../../src","sources":["LocationTracker/LocationStatus.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AAQO,MAAME,iBAAiB,GAAGA,CAAC;EAAEC,SAAS;EAAEC;AAAmC,CAAC,KAAK;EACpF,MAAM,CAAEC,QAAQ,EAAEC,WAAW,CAAE,GAAG,IAAAC,eAAQ,EASvC;IACCC,OAAO,EAAC,KAAK;IACbC,WAAW,EAAE,CAAC,CAAC;IACfC,eAAe,EAAC;EACpB,CAAC,CAAC;EACF,MAAM,CAAEC,UAAU,EAAEC,aAAa,CAAE,GAAG,IAAAL,eAAQ,EAG3C;IACCM,OAAO,EAAC;EACZ,CAAC,CAAC;EAEF,IAAAC,gBAAS,EAAC,MAAM;IACZC,gBAAW,CAACC,cAAc,CAAC,CAAC;EAChC,CAAC,EAAC,EAAE,CAAC;EAEL,MAAMC,gBAAgB,GAAG,MAAMC,OAAsC,IAAK;IACtE,IAAI;MACD,MAAMP,UAAU,GAAG,MAAMI,gBAAW,CAACI,aAAa,CAAC,CAAC;MACpDP,aAAa,CAAC;QACbC,OAAO,EAAE,IAAI;QACbF,UAAU,EAAEA;MACb,CAAC,CAAC;MACF,IAAGA,UAAU,IAAI,SAAS,IAAIO,OAAO,EAAEE,eAAe,EAAC;QACtDC,WAAW,CAAC,CAAC;MACd;IACH,CAAC,CAAC,OAAOC,CAAC,EAAE;MACRC,OAAO,CAACC,GAAG,CAAC,OAAO,CAAC;MACpBD,OAAO,CAACC,GAAG,CAACF,CAAC,CAAC;IAClB;EAEJ,CAAC;EAED,MAAMD,WAAW,GAAG,
|
|
1
|
+
{"version":3,"names":["_react","require","_api","usePlayerLocation","player_id","distinct_id","location","setLocation","useState","loading","coordinates","address_results","permission","setPermission","checked","useEffect","LocationApi","setEnvironment","checkPermissions","options","getPermission","auto_on_granted","getLocation","e","console","log","cached_loc","getCachedLocation","no_cache","getPosition","locations","getLocations","last_location","distance","compareLastLocation","anonymous_id","player_location_id","create_datetime","player_address","gen_addy","LocationHelpers","getAddressFromLastLocation","last_loc","region","cache_location","addresses","reverseCoordLookup","latitude","longitude","generated_address","getAddressFromGeoCodeResults","new_loc","player_location","genPlayerLocationFromAddress","savePlayerLocation","error","exports"],"sourceRoot":"../../../src","sources":["LocationTracker/LocationStatus.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -124,13 +124,31 @@ const LocationHelpers = exports.LocationHelpers = {
|
|
|
124
124
|
type: 'billing',
|
|
125
125
|
status: 'active'
|
|
126
126
|
};
|
|
127
|
+
|
|
128
|
+
//First try to get the administrative area
|
|
129
|
+
let region = '';
|
|
130
|
+
let location;
|
|
131
|
+
let administrative = addresses.find(r => r.types.includes('administrative_area_level_1'))?.address_components;
|
|
132
|
+
if (administrative) {
|
|
133
|
+
let region_component = administrative.find(a => a.types.includes('administrative_area_level_1'));
|
|
134
|
+
if (region_component) {
|
|
135
|
+
region = region_component.long_name;
|
|
136
|
+
location = locations.find(l => l.label.toLowerCase() == region?.toLowerCase());
|
|
137
|
+
}
|
|
138
|
+
}
|
|
127
139
|
let street_address = addresses.find(r => r.types.includes('premise'))?.address_components;
|
|
128
140
|
if (!street_address) {
|
|
129
|
-
return
|
|
141
|
+
return {
|
|
142
|
+
region,
|
|
143
|
+
location
|
|
144
|
+
};
|
|
130
145
|
}
|
|
131
146
|
street_address = addresses.find(r => r.types.includes('street_address'))?.address_components;
|
|
132
147
|
if (!street_address) {
|
|
133
|
-
return
|
|
148
|
+
return {
|
|
149
|
+
region,
|
|
150
|
+
location
|
|
151
|
+
};
|
|
134
152
|
}
|
|
135
153
|
let street_number_component = street_address.find(sa => sa.types.includes('street_number'));
|
|
136
154
|
let route_component = street_address.find(sa => sa.types.includes('route'));
|
|
@@ -138,17 +156,23 @@ const LocationHelpers = exports.LocationHelpers = {
|
|
|
138
156
|
let state_component = street_address.find(sa => sa.types.includes('administrative_area_level_1'));
|
|
139
157
|
let zip_component = street_address.find(sa => sa.types.includes('postal_code'));
|
|
140
158
|
if (!street_number_component || !route_component || !city_component || !state_component || !zip_component) {
|
|
141
|
-
return
|
|
159
|
+
return {
|
|
160
|
+
region,
|
|
161
|
+
location
|
|
162
|
+
};
|
|
142
163
|
}
|
|
143
164
|
player_address.street = `${street_number_component.long_name} ${route_component.long_name}`;
|
|
144
165
|
player_address.city = city_component.long_name;
|
|
145
166
|
player_address.state = state_component.short_name;
|
|
146
167
|
player_address.zip = zip_component.long_name;
|
|
147
|
-
|
|
168
|
+
if (!region || !location) {
|
|
169
|
+
region = state_component.long_name;
|
|
170
|
+
location = locations.find(l => l.label.toLowerCase() == region?.toLowerCase());
|
|
171
|
+
}
|
|
148
172
|
return {
|
|
149
173
|
player_address,
|
|
150
|
-
region
|
|
151
|
-
location
|
|
174
|
+
region,
|
|
175
|
+
location
|
|
152
176
|
};
|
|
153
177
|
},
|
|
154
178
|
getAddressFromLastLocation: (player_location, locations) => {
|
|
@@ -165,7 +189,7 @@ const LocationHelpers = exports.LocationHelpers = {
|
|
|
165
189
|
location
|
|
166
190
|
};
|
|
167
191
|
},
|
|
168
|
-
genPlayerLocationFromAddress: (coordinates,
|
|
192
|
+
genPlayerLocationFromAddress: (coordinates, region, player_address, player_id, distinct_id) => {
|
|
169
193
|
return {
|
|
170
194
|
player_location_id: '',
|
|
171
195
|
player_id: player_id ?? '0',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_axios","_interopRequireDefault","require","_reactNative","_geolocation","_ApiOverrides","_asyncStorage","_momentMini","e","__esModule","default","LOCATION_API","AUTH_SVC_API","SOCIAL_SVC_API","LocationApi","exports","setEnvironment","endpoints","APIOverrides","getEndpoints","getLocations","resp","axios","get","data","locations","compareLastLocation","player_location","post","distance","last_location","console","log","undefined","savePlayerLocation","getPermission","Platform","OS","navigator","permissions","query","name","state","cache_location","loc","AsyncStorage","setItem","JSON","stringify","cached_at","moment","getCachedLocation","cached_location","getItem","parsed_loc","parse","diff","getPosition","Promise","resolve","reject","Geolocation","getCurrentPosition","position","latitude","coords","longitude","altitude","altitudeAccuracy","speed","accuracy","error","reverseCoordLookup","headers","results","LocationHelpers","getAddressFromGeoCodeResults","addresses","player_address","player_address_id","player_id","street","city","zip","create_datetime","last_update_datetime","country","type","status","
|
|
1
|
+
{"version":3,"names":["_axios","_interopRequireDefault","require","_reactNative","_geolocation","_ApiOverrides","_asyncStorage","_momentMini","e","__esModule","default","LOCATION_API","AUTH_SVC_API","SOCIAL_SVC_API","LocationApi","exports","setEnvironment","endpoints","APIOverrides","getEndpoints","getLocations","resp","axios","get","data","locations","compareLastLocation","player_location","post","distance","last_location","console","log","undefined","savePlayerLocation","getPermission","Platform","OS","navigator","permissions","query","name","state","cache_location","loc","AsyncStorage","setItem","JSON","stringify","cached_at","moment","getCachedLocation","cached_location","getItem","parsed_loc","parse","diff","getPosition","Promise","resolve","reject","Geolocation","getCurrentPosition","position","latitude","coords","longitude","altitude","altitudeAccuracy","speed","accuracy","error","reverseCoordLookup","headers","results","LocationHelpers","getAddressFromGeoCodeResults","addresses","player_address","player_address_id","player_id","street","city","zip","create_datetime","last_update_datetime","country","type","status","region","location","administrative","find","r","types","includes","address_components","region_component","a","long_name","l","label","toLowerCase","street_address","street_number_component","sa","route_component","city_component","state_component","zip_component","short_name","getAddressFromLastLocation","genPlayerLocationFromAddress","coordinates","distinct_id","player_location_id","anonymous_id"],"sourceRoot":"../../../../src","sources":["LocationTracker/api/index.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -30,7 +30,7 @@ export const usePlayerLocation = ({
|
|
|
30
30
|
console.log(e);
|
|
31
31
|
}
|
|
32
32
|
};
|
|
33
|
-
const getLocation = async
|
|
33
|
+
const getLocation = async options => {
|
|
34
34
|
if (location.loading) {
|
|
35
35
|
return;
|
|
36
36
|
} //No mashy mashy
|
|
@@ -40,7 +40,7 @@ export const usePlayerLocation = ({
|
|
|
40
40
|
});
|
|
41
41
|
try {
|
|
42
42
|
let cached_loc = await LocationApi.getCachedLocation();
|
|
43
|
-
if (cached_loc) {
|
|
43
|
+
if (cached_loc && !options?.no_cache) {
|
|
44
44
|
setLocation(cached_loc);
|
|
45
45
|
setPermission({
|
|
46
46
|
checked: true,
|
|
@@ -96,7 +96,7 @@ export const usePlayerLocation = ({
|
|
|
96
96
|
LocationApi.cache_location(new_loc);
|
|
97
97
|
setLocation(new_loc);
|
|
98
98
|
if (generated_address) {
|
|
99
|
-
const player_location = LocationHelpers.genPlayerLocationFromAddress(coordinates, generated_address
|
|
99
|
+
const player_location = LocationHelpers.genPlayerLocationFromAddress(coordinates, generated_address.region, generated_address?.player_address, player_id, distinct_id);
|
|
100
100
|
LocationApi.savePlayerLocation(player_location);
|
|
101
101
|
}
|
|
102
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useEffect","useState","LocationApi","LocationHelpers","usePlayerLocation","player_id","distinct_id","location","setLocation","loading","coordinates","address_results","permission","setPermission","checked","setEnvironment","checkPermissions","options","getPermission","auto_on_granted","getLocation","e","console","log","cached_loc","getCachedLocation","getPosition","locations","getLocations","last_location","distance","compareLastLocation","anonymous_id","player_location_id","create_datetime","player_address","gen_addy","getAddressFromLastLocation","last_loc","region","cache_location","addresses","reverseCoordLookup","latitude","longitude","generated_address","getAddressFromGeoCodeResults","new_loc","player_location","genPlayerLocationFromAddress","savePlayerLocation","error"],"sourceRoot":"../../../src","sources":["LocationTracker/LocationStatus.tsx"],"mappings":"AAAA,SAASA,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC3C,SAASC,WAAW,EAAEC,eAAe,QAAQ,OAAO;AAQpD,OAAO,MAAMC,iBAAiB,GAAGA,CAAC;EAAEC,SAAS;EAAEC;AAAmC,CAAC,KAAK;EACpF,MAAM,CAAEC,QAAQ,EAAEC,WAAW,CAAE,GAAGP,QAAQ,CASvC;IACCQ,OAAO,EAAC,KAAK;IACbC,WAAW,EAAE,CAAC,CAAC;IACfC,eAAe,EAAC;EACpB,CAAC,CAAC;EACF,MAAM,CAAEC,UAAU,EAAEC,aAAa,CAAE,GAAGZ,QAAQ,CAG3C;IACCa,OAAO,EAAC;EACZ,CAAC,CAAC;EAEFd,SAAS,CAAC,MAAM;IACZE,WAAW,CAACa,cAAc,CAAC,CAAC;EAChC,CAAC,EAAC,EAAE,CAAC;EAEL,MAAMC,gBAAgB,GAAG,MAAMC,OAAsC,IAAK;IACtE,IAAI;MACD,MAAML,UAAU,GAAG,MAAMV,WAAW,CAACgB,aAAa,CAAC,CAAC;MACpDL,aAAa,CAAC;QACbC,OAAO,EAAE,IAAI;QACbF,UAAU,EAAEA;MACb,CAAC,CAAC;MACF,IAAGA,UAAU,IAAI,SAAS,IAAIK,OAAO,EAAEE,eAAe,EAAC;QACtDC,WAAW,CAAC,CAAC;MACd;IACH,CAAC,CAAC,OAAOC,CAAC,EAAE;MACRC,OAAO,CAACC,GAAG,CAAC,OAAO,CAAC;MACpBD,OAAO,CAACC,GAAG,CAACF,CAAC,CAAC;IAClB;EAEJ,CAAC;EAED,MAAMD,WAAW,GAAG,
|
|
1
|
+
{"version":3,"names":["useEffect","useState","LocationApi","LocationHelpers","usePlayerLocation","player_id","distinct_id","location","setLocation","loading","coordinates","address_results","permission","setPermission","checked","setEnvironment","checkPermissions","options","getPermission","auto_on_granted","getLocation","e","console","log","cached_loc","getCachedLocation","no_cache","getPosition","locations","getLocations","last_location","distance","compareLastLocation","anonymous_id","player_location_id","create_datetime","player_address","gen_addy","getAddressFromLastLocation","last_loc","region","cache_location","addresses","reverseCoordLookup","latitude","longitude","generated_address","getAddressFromGeoCodeResults","new_loc","player_location","genPlayerLocationFromAddress","savePlayerLocation","error"],"sourceRoot":"../../../src","sources":["LocationTracker/LocationStatus.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -118,13 +118,31 @@ const LocationHelpers = {
|
|
|
118
118
|
type: 'billing',
|
|
119
119
|
status: 'active'
|
|
120
120
|
};
|
|
121
|
+
|
|
122
|
+
//First try to get the administrative area
|
|
123
|
+
let region = '';
|
|
124
|
+
let location;
|
|
125
|
+
let administrative = addresses.find(r => r.types.includes('administrative_area_level_1'))?.address_components;
|
|
126
|
+
if (administrative) {
|
|
127
|
+
let region_component = administrative.find(a => a.types.includes('administrative_area_level_1'));
|
|
128
|
+
if (region_component) {
|
|
129
|
+
region = region_component.long_name;
|
|
130
|
+
location = locations.find(l => l.label.toLowerCase() == region?.toLowerCase());
|
|
131
|
+
}
|
|
132
|
+
}
|
|
121
133
|
let street_address = addresses.find(r => r.types.includes('premise'))?.address_components;
|
|
122
134
|
if (!street_address) {
|
|
123
|
-
return
|
|
135
|
+
return {
|
|
136
|
+
region,
|
|
137
|
+
location
|
|
138
|
+
};
|
|
124
139
|
}
|
|
125
140
|
street_address = addresses.find(r => r.types.includes('street_address'))?.address_components;
|
|
126
141
|
if (!street_address) {
|
|
127
|
-
return
|
|
142
|
+
return {
|
|
143
|
+
region,
|
|
144
|
+
location
|
|
145
|
+
};
|
|
128
146
|
}
|
|
129
147
|
let street_number_component = street_address.find(sa => sa.types.includes('street_number'));
|
|
130
148
|
let route_component = street_address.find(sa => sa.types.includes('route'));
|
|
@@ -132,17 +150,23 @@ const LocationHelpers = {
|
|
|
132
150
|
let state_component = street_address.find(sa => sa.types.includes('administrative_area_level_1'));
|
|
133
151
|
let zip_component = street_address.find(sa => sa.types.includes('postal_code'));
|
|
134
152
|
if (!street_number_component || !route_component || !city_component || !state_component || !zip_component) {
|
|
135
|
-
return
|
|
153
|
+
return {
|
|
154
|
+
region,
|
|
155
|
+
location
|
|
156
|
+
};
|
|
136
157
|
}
|
|
137
158
|
player_address.street = `${street_number_component.long_name} ${route_component.long_name}`;
|
|
138
159
|
player_address.city = city_component.long_name;
|
|
139
160
|
player_address.state = state_component.short_name;
|
|
140
161
|
player_address.zip = zip_component.long_name;
|
|
141
|
-
|
|
162
|
+
if (!region || !location) {
|
|
163
|
+
region = state_component.long_name;
|
|
164
|
+
location = locations.find(l => l.label.toLowerCase() == region?.toLowerCase());
|
|
165
|
+
}
|
|
142
166
|
return {
|
|
143
167
|
player_address,
|
|
144
|
-
region
|
|
145
|
-
location
|
|
168
|
+
region,
|
|
169
|
+
location
|
|
146
170
|
};
|
|
147
171
|
},
|
|
148
172
|
getAddressFromLastLocation: (player_location, locations) => {
|
|
@@ -159,7 +183,7 @@ const LocationHelpers = {
|
|
|
159
183
|
location
|
|
160
184
|
};
|
|
161
185
|
},
|
|
162
|
-
genPlayerLocationFromAddress: (coordinates,
|
|
186
|
+
genPlayerLocationFromAddress: (coordinates, region, player_address, player_id, distinct_id) => {
|
|
163
187
|
return {
|
|
164
188
|
player_location_id: '',
|
|
165
189
|
player_id: player_id ?? '0',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["axios","Platform","Geolocation","APIOverrides","AsyncStorage","moment","LOCATION_API","AUTH_SVC_API","SOCIAL_SVC_API","LocationApi","LocationHelpers","setEnvironment","endpoints","getEndpoints","getLocations","resp","get","data","locations","compareLastLocation","player_location","post","distance","last_location","e","console","log","undefined","savePlayerLocation","getPermission","OS","navigator","permissions","query","name","state","cache_location","loc","setItem","JSON","stringify","cached_at","getCachedLocation","cached_location","getItem","parsed_loc","parse","diff","getPosition","Promise","resolve","reject","getCurrentPosition","position","latitude","coords","longitude","altitude","altitudeAccuracy","speed","accuracy","error","reverseCoordLookup","headers","results","getAddressFromGeoCodeResults","addresses","player_address","player_address_id","player_id","street","city","zip","create_datetime","last_update_datetime","country","type","status","
|
|
1
|
+
{"version":3,"names":["axios","Platform","Geolocation","APIOverrides","AsyncStorage","moment","LOCATION_API","AUTH_SVC_API","SOCIAL_SVC_API","LocationApi","LocationHelpers","setEnvironment","endpoints","getEndpoints","getLocations","resp","get","data","locations","compareLastLocation","player_location","post","distance","last_location","e","console","log","undefined","savePlayerLocation","getPermission","OS","navigator","permissions","query","name","state","cache_location","loc","setItem","JSON","stringify","cached_at","getCachedLocation","cached_location","getItem","parsed_loc","parse","diff","getPosition","Promise","resolve","reject","getCurrentPosition","position","latitude","coords","longitude","altitude","altitudeAccuracy","speed","accuracy","error","reverseCoordLookup","headers","results","getAddressFromGeoCodeResults","addresses","player_address","player_address_id","player_id","street","city","zip","create_datetime","last_update_datetime","country","type","status","region","location","administrative","find","r","types","includes","address_components","region_component","a","long_name","l","label","toLowerCase","street_address","street_number_component","sa","route_component","city_component","state_component","zip_component","short_name","getAddressFromLastLocation","genPlayerLocationFromAddress","coordinates","distinct_id","player_location_id","anonymous_id"],"sourceRoot":"../../../../src","sources":["LocationTracker/api/index.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -18,7 +18,9 @@ export declare const usePlayerLocation: ({ player_id, distinct_id }: UsePlayerLo
|
|
|
18
18
|
region?: string;
|
|
19
19
|
location?: LocationProps;
|
|
20
20
|
};
|
|
21
|
-
getLocation: (
|
|
21
|
+
getLocation: (options?: {
|
|
22
|
+
no_cache?: boolean;
|
|
23
|
+
}) => Promise<void>;
|
|
22
24
|
checkPermissions: (options?: {
|
|
23
25
|
auto_on_granted?: boolean;
|
|
24
26
|
}) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocationStatus.d.ts","sourceRoot":"","sources":["../../../../src/LocationTracker/LocationStatus.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAElE,KAAK,sBAAsB,GAAG;IAC1B,SAAS,CAAC,EAAC,MAAM,CAAC;IAClB,WAAW,CAAC,EAAC,MAAM,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,iBAAiB,+BAA+B,sBAAsB;;iBAgBnE,OAAO;qBACF,SAAS,GAAC,QAAQ,GAAC,QAAQ;;;iBAf/B,OAAO;gBACT,MAAM;qBACD,GAAG;oBACJ,MAAM;yBACD,GAAG,EAAE;yBACL,kBAAkB;iBAC1B,MAAM;mBACJ,aAAa
|
|
1
|
+
{"version":3,"file":"LocationStatus.d.ts","sourceRoot":"","sources":["../../../../src/LocationTracker/LocationStatus.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAElE,KAAK,sBAAsB,GAAG;IAC1B,SAAS,CAAC,EAAC,MAAM,CAAC;IAClB,WAAW,CAAC,EAAC,MAAM,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,iBAAiB,+BAA+B,sBAAsB;;iBAgBnE,OAAO;qBACF,SAAS,GAAC,QAAQ,GAAC,QAAQ;;;iBAf/B,OAAO;gBACT,MAAM;qBACD,GAAG;oBACJ,MAAM;yBACD,GAAG,EAAE;yBACL,kBAAkB;iBAC1B,MAAM;mBACJ,aAAa;;4BAkCQ;QAAE,QAAQ,CAAC,EAAC,OAAO,CAAA;KAAE;iCAjBf;QAAE,eAAe,CAAC,EAAC,OAAO,CAAA;KAAE;CAyFxE,CAAA"}
|
|
@@ -16,15 +16,15 @@ declare const LocationApi: {
|
|
|
16
16
|
};
|
|
17
17
|
declare const LocationHelpers: {
|
|
18
18
|
getAddressFromGeoCodeResults: (addresses: any[], locations: LocationProps[]) => {
|
|
19
|
-
player_address
|
|
19
|
+
player_address?: PlayerAddressProps;
|
|
20
20
|
region: string;
|
|
21
21
|
location?: LocationProps;
|
|
22
|
-
}
|
|
22
|
+
};
|
|
23
23
|
getAddressFromLastLocation: (player_location: PlayerLocationProps, locations: LocationProps[]) => {
|
|
24
24
|
player_address: PlayerAddressProps;
|
|
25
25
|
region: string;
|
|
26
26
|
location?: LocationProps;
|
|
27
27
|
} | undefined;
|
|
28
|
-
genPlayerLocationFromAddress: (coordinates: any,
|
|
28
|
+
genPlayerLocationFromAddress: (coordinates: any, region: string, player_address?: PlayerAddressProps, player_id?: string, distinct_id?: string) => PlayerLocationProps;
|
|
29
29
|
};
|
|
30
30
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/LocationTracker/api/index.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAQ1F,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,CAAA;AAEvC,QAAA,MAAM,WAAW;;;2CAW8B,mBAAmB,KAAE,OAAO,CAAC;QAAE,aAAa,CAAC,EAAC,mBAAmB,CAAC;QAAC,QAAQ,EAAC,MAAM,CAAA;KAAE,CAAC;0CAStF,mBAAmB,KAAE,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;yBAShF,OAAO,CAAC,QAAQ,GAAC,QAAQ,GAAC,SAAS,CAAC;0BAQjC,GAAG,KAAE,OAAO,CAAC,IAAI,CAAC;6BAGjB,OAAO,CAAC,GAAG,CAAC;uBAUlB,OAAO,CAAC,GAAG,CAAC;mCAgBG,MAAM,aAAY,MAAM;CAW/D,CAAA;AAGD,QAAA,MAAM,eAAe;8CACwB,GAAG,EAAE,aAAY,aAAa,EAAE,KAAE;QAAE,cAAc,EAAE,kBAAkB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAC,aAAa,CAAA;KAAE
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/LocationTracker/api/index.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAQ1F,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,CAAA;AAEvC,QAAA,MAAM,WAAW;;;2CAW8B,mBAAmB,KAAE,OAAO,CAAC;QAAE,aAAa,CAAC,EAAC,mBAAmB,CAAC;QAAC,QAAQ,EAAC,MAAM,CAAA;KAAE,CAAC;0CAStF,mBAAmB,KAAE,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;yBAShF,OAAO,CAAC,QAAQ,GAAC,QAAQ,GAAC,SAAS,CAAC;0BAQjC,GAAG,KAAE,OAAO,CAAC,IAAI,CAAC;6BAGjB,OAAO,CAAC,GAAG,CAAC;uBAUlB,OAAO,CAAC,GAAG,CAAC;mCAgBG,MAAM,aAAY,MAAM;CAW/D,CAAA;AAGD,QAAA,MAAM,eAAe;8CACwB,GAAG,EAAE,aAAY,aAAa,EAAE,KAAE;QAAE,cAAc,CAAC,EAAE,kBAAkB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAC,aAAa,CAAA;KAAE;kDAiD9G,mBAAmB,aAAY,aAAa,EAAE,KAAE;QAAE,cAAc,EAAE,kBAAkB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAC,aAAa,CAAA;KAAE,GAAG,SAAS;gDAM5I,GAAG,UAAS,MAAM,mBAAkB,kBAAkB,cAAa,MAAM,gBAAe,MAAM,KAAE,mBAAmB;CAWlK,CAAA"}
|
package/package.json
CHANGED
|
@@ -50,13 +50,13 @@ export const usePlayerLocation = ({ player_id, distinct_id }:UsePlayerLocationPr
|
|
|
50
50
|
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
-
const getLocation = async() => {
|
|
53
|
+
const getLocation = async(options?:{ no_cache?:boolean }) => {
|
|
54
54
|
if(location.loading){ return } //No mashy mashy
|
|
55
55
|
setLocation({ ...location, loading: true })
|
|
56
56
|
try {
|
|
57
57
|
|
|
58
58
|
let cached_loc = await LocationApi.getCachedLocation();
|
|
59
|
-
if(cached_loc){
|
|
59
|
+
if(cached_loc && !options?.no_cache){
|
|
60
60
|
setLocation(cached_loc)
|
|
61
61
|
setPermission({ checked: true, permission: 'granted' });
|
|
62
62
|
} else {
|
|
@@ -70,6 +70,7 @@ export const usePlayerLocation = ({ player_id, distinct_id }:UsePlayerLocationPr
|
|
|
70
70
|
//OK! First we are going to try and compare to the players last location
|
|
71
71
|
//If the user is within a mile, then we will use their last one for this
|
|
72
72
|
const { last_location, distance } = await LocationApi.compareLastLocation({ anonymous_id:distinct_id, player_id: player_id ?? '0', coordinates:coordinates, player_location_id: '', create_datetime: '' })
|
|
73
|
+
|
|
73
74
|
if(last_location && last_location.player_address && distance < 5){
|
|
74
75
|
const gen_addy = LocationHelpers.getAddressFromLastLocation(last_location, locations);
|
|
75
76
|
if(gen_addy){
|
|
@@ -85,7 +86,7 @@ export const usePlayerLocation = ({ player_id, distinct_id }:UsePlayerLocationPr
|
|
|
85
86
|
return setLocation(last_loc)
|
|
86
87
|
}
|
|
87
88
|
}
|
|
88
|
-
|
|
89
|
+
|
|
89
90
|
//Shoot! Couldnt get it - lets now get a new one!
|
|
90
91
|
const addresses = await LocationApi.reverseCoordLookup(coordinates.latitude, coordinates.longitude);
|
|
91
92
|
const generated_address = LocationHelpers.getAddressFromGeoCodeResults(addresses, locations);
|
|
@@ -101,7 +102,7 @@ export const usePlayerLocation = ({ player_id, distinct_id }:UsePlayerLocationPr
|
|
|
101
102
|
LocationApi.cache_location(new_loc)
|
|
102
103
|
setLocation(new_loc)
|
|
103
104
|
if(generated_address){
|
|
104
|
-
const player_location = LocationHelpers.genPlayerLocationFromAddress(coordinates, generated_address
|
|
105
|
+
const player_location = LocationHelpers.genPlayerLocationFromAddress(coordinates, generated_address.region, generated_address?.player_address, player_id, distinct_id)
|
|
105
106
|
LocationApi.savePlayerLocation(player_location)
|
|
106
107
|
}
|
|
107
108
|
}
|
|
@@ -94,7 +94,7 @@ const LocationApi = {
|
|
|
94
94
|
|
|
95
95
|
|
|
96
96
|
const LocationHelpers = {
|
|
97
|
-
getAddressFromGeoCodeResults: (addresses:any[], locations:LocationProps[]):{ player_address
|
|
97
|
+
getAddressFromGeoCodeResults: (addresses:any[], locations:LocationProps[]):{ player_address?: PlayerAddressProps, region: string, location?:LocationProps } => {
|
|
98
98
|
let player_address:PlayerAddressProps = {
|
|
99
99
|
player_address_id: '',
|
|
100
100
|
player_id: '',
|
|
@@ -108,10 +108,21 @@ const LocationHelpers = {
|
|
|
108
108
|
status: 'active'
|
|
109
109
|
}
|
|
110
110
|
|
|
111
|
+
//First try to get the administrative area
|
|
112
|
+
let region = '';
|
|
113
|
+
let location:LocationProps | undefined
|
|
114
|
+
let administrative = addresses.find(r => r.types.includes('administrative_area_level_1'))?.address_components;
|
|
115
|
+
if(administrative){
|
|
116
|
+
let region_component = administrative.find((a:any) => a.types.includes('administrative_area_level_1'));
|
|
117
|
+
if(region_component){
|
|
118
|
+
region = region_component.long_name
|
|
119
|
+
location = locations.find(l => l.label.toLowerCase() == region?.toLowerCase())
|
|
120
|
+
}
|
|
121
|
+
}
|
|
111
122
|
let street_address = addresses.find(r => r.types.includes('premise'))?.address_components
|
|
112
|
-
if(!street_address){ return
|
|
123
|
+
if(!street_address){ return { region, location } }
|
|
113
124
|
street_address = addresses.find(r => r.types.includes('street_address'))?.address_components
|
|
114
|
-
if(!street_address){ return
|
|
125
|
+
if(!street_address){ return { region, location } }
|
|
115
126
|
|
|
116
127
|
let street_number_component = street_address.find((sa:any) => sa.types.includes('street_number'))
|
|
117
128
|
let route_component = street_address.find((sa:any) => sa.types.includes('route'))
|
|
@@ -119,16 +130,18 @@ const LocationHelpers = {
|
|
|
119
130
|
let state_component = street_address.find((sa:any) => sa.types.includes('administrative_area_level_1'))
|
|
120
131
|
let zip_component = street_address.find((sa:any) => sa.types.includes('postal_code'))
|
|
121
132
|
|
|
122
|
-
if(!street_number_component || !route_component || !city_component || !state_component || !zip_component){ return
|
|
133
|
+
if(!street_number_component || !route_component || !city_component || !state_component || !zip_component){ return { region, location } }
|
|
123
134
|
|
|
124
135
|
player_address.street = `${street_number_component.long_name} ${route_component.long_name}`
|
|
125
136
|
player_address.city = city_component.long_name
|
|
126
137
|
player_address.state = state_component.short_name
|
|
127
138
|
player_address.zip = zip_component.long_name
|
|
128
|
-
|
|
129
|
-
const my_location = locations.find(l => l.value == state_component.short_name)
|
|
130
139
|
|
|
131
|
-
|
|
140
|
+
if(!region || !location){
|
|
141
|
+
region = state_component.long_name
|
|
142
|
+
location = locations.find(l => l.label.toLowerCase() == region?.toLowerCase())
|
|
143
|
+
}
|
|
144
|
+
return { player_address, region, location }
|
|
132
145
|
},
|
|
133
146
|
getAddressFromLastLocation: (player_location:PlayerLocationProps, locations:LocationProps[]):{ player_address: PlayerAddressProps, region: string, location?:LocationProps } | undefined => {
|
|
134
147
|
if(!player_location.player_address || !player_location.region){ return undefined }
|
|
@@ -136,7 +149,7 @@ const LocationHelpers = {
|
|
|
136
149
|
if(!location){ return undefined }
|
|
137
150
|
return { player_address: player_location.player_address, region: player_location.region, location }
|
|
138
151
|
},
|
|
139
|
-
genPlayerLocationFromAddress: (coordinates: any,
|
|
152
|
+
genPlayerLocationFromAddress: (coordinates: any, region:string, player_address?:PlayerAddressProps, player_id?:string, distinct_id?:string):PlayerLocationProps => {
|
|
140
153
|
return {
|
|
141
154
|
player_location_id: '',
|
|
142
155
|
player_id:player_id ?? '0',
|