@@ -351,6 +351,21 @@ export class MeasurementService {
351351 ndtVersion : measurement . ndt_version ,
352352 source : measurement . source ,
353353 created_at : measurement . created_at ,
354+ elapsed_time_download : measurement . elapsed_time_download ,
355+ elapsed_time_upload : measurement . elapsed_time_upload ,
356+ download_rtt_variance : measurement . download_rtt_variance ,
357+ connection_is_mobile : measurement . connection_is_mobile ,
358+ connection_is_satellite : measurement . connection_is_satellite ,
359+ client_ip_address : measurement . client_ip_address ,
360+ client_city : clientInfo ?. client_city ,
361+ client_region : clientInfo ?. client_region ,
362+ client_country : clientInfo ?. client_country ,
363+ client_geolocation : clientInfo ?. client_geolocation ,
364+ client_timezone : clientInfo ?. client_timezone ,
365+ asn_number : measurement . asn_number ,
366+ asn_name : measurement . asn_name ,
367+ asn_network_type : measurement . asn_network_type ,
368+ asn_network_route : measurement . asn_network_route ,
354369 } ;
355370 // if (isSuperUser) {
356371 filterMeasurementData [ 'UUID' ] = measurement . uuid ;
@@ -466,11 +481,12 @@ export class MeasurementService {
466481 const getField = < T = any > ( lower : string , upper : string ) : T | undefined =>
467482 ( client as any ) [ lower ] ?? ( client as any ) [ upper ] ;
468483
484+ const latitude = getField < number > ( 'latitude' , 'Latitude' ) ;
485+ const longitude = getField < number > ( 'longitude' , 'Longitude' ) ;
469486 const geoLoc =
470487 getField < string > ( 'loc' , 'Loc' ) ??
471- ( typeof getField < number > ( 'latitude' , 'Latitude' ) === 'number' &&
472- typeof getField < number > ( 'longitude' , 'Longitude' ) === 'number'
473- ? `${ getField < number > ( 'latitude' , 'Latitude' ) } ,${ getField < number > ( 'longitude' , 'Longitude' ) } `
488+ ( typeof latitude === 'number' && typeof longitude === 'number'
489+ ? `${ latitude } ,${ longitude } `
474490 : undefined ) ;
475491
476492 return {
0 commit comments