@@ -1045,7 +1045,7 @@ def vectors_async(self, *, get_query_payload=False,
10451045 if self .id is None :
10461046 raise ValueError ("'id' parameter not set. Query aborted." )
10471047 elif isinstance (self .id , dict ):
1048- commandline = f "g:{ self . id [ ' lon' ] } ,{ self . id [ ' lat' ] } ,{ self . id [ ' elevation' ] } @{ self . id [ ' body' ] } "
1048+ commandline = "g:{lon},{lat},{elevation}@{body}" . format ( ** self . id )
10491049 else :
10501050 commandline = str (self .id )
10511051 if self .location is None :
@@ -1144,7 +1144,7 @@ def vectors_async(self, *, get_query_payload=False,
11441144 @staticmethod
11451145 def _prep_loc_dict (loc_dict , attr_name ):
11461146 """prepare coord specification dict for 'location' or 'id'"""
1147- if {'lat' , 'lon' , 'elevation' } - set ( loc_dict .keys ()) != set ():
1147+ if {'lat' , 'lon' , 'elevation' } - loc_dict .keys ():
11481148 raise ValueError (
11491149 f"dict values for '{ attr_name } ' must contain 'lat', 'lon', "
11501150 "'elevation' (and optionally 'body')"
@@ -1221,10 +1221,7 @@ def _parse_result(self, response, verbose=None):
12211221 "Date__(UT)__HR:MN" in line ):
12221222 headerline = str (line ).split (',' )
12231223 headerline [2 ] = 'solar_presence'
1224- if 'Earth' in centername :
1225- headerline [3 ] = 'lunar_presence'
1226- else :
1227- headerline [3 ] = 'interfering_body'
1224+ headerline [3 ] = "lunar_presence" if "Earth" in centername else "interfering_body"
12281225 headerline [- 1 ] = '_dump'
12291226 if isinstance (self .id , dict ) or str (self .id ).startswith ('g:' ):
12301227 headerline [4 ] = 'nearside_flag'
0 commit comments