diff --git a/cache.py b/cache.py index cb722ab7..2e81fba1 100644 --- a/cache.py +++ b/cache.py @@ -312,12 +312,36 @@ def getItemByNameIndex(cur): REE[O0] | \BDOCK\b | \BTERMINAL\b | - \bKIOO\b | + \bKID?[O0] | \b[O3]E\b | \bANDRA[O3]E\b | \bAN[O3]RADE\b | - \bAN[O3]RA[O3]E\b -)\b''', flags=re.X) + \bAN[O3]RA[O3]E\b | + VVELL\b | + [O0]IRAC\b | + \bVV | + \b[O0]ER?\b | + \b[O0]RAKE | + HAR[O0]T\b | + \b[O0]ARK | + \b[O0]DAM | + [O0]EPOT | + \bMERE[O0] | + \b[O0]ENN?IS | + \bBRAN[o0] | + W[O0]{3} | + GO(D[O0]|[O0]D|[O0][O])ARD | + GO[DO0]{2}AR[O0] | + ORBRAL\b | + \bJOR[O0]A | + \bST[O0]ART | + \bQUIMPY | + \bVAR[O0]E | + EN[^T]?ERPRISE | + EN..ERPRISE | + \bMUR[O0]O | + \bBAR[O0]E +)''', flags=re.X) def checkForOcrDerp(tdenv, systemName, stationName): @@ -387,6 +411,10 @@ def changeStation(matches): tdenv.DEBUG0("NEW STATION: {}", facility) + if checkForOcrDerp(tdenv, systemName, stationName): + stationID = DELETED + return + # Make sure it's valid. try: stationID = stationByName[facility] @@ -394,9 +422,6 @@ def changeStation(matches): stationID = -1 if stationID < 0: - if checkForOcrDerp(tdenv, systemName, stationName): - stationID = DELETED - return corrected = True try: correctName = corrections.systems[systemName] diff --git a/commands/shipvendor_cmd.py b/commands/shipvendor_cmd.py index d479213c..c8cd3cde 100644 --- a/commands/shipvendor_cmd.py +++ b/commands/shipvendor_cmd.py @@ -9,7 +9,6 @@ # Original by Dirk Wilhelm import csvexport -import difflib import re import sys diff --git a/corrections.py b/corrections.py index 48923ffb..bee7f023 100644 --- a/corrections.py +++ b/corrections.py @@ -17,6 +17,24 @@ } stations = { + "ANINOHANU/BAROEEN HANGER": DELETED, + "ANLAVE/SURIPARK" : DELETED, + "ARTEMIS/BURCKHAROT STATION": DELETED, + "BD-02 4304/BRANOENSTEIN ENTERPRISE": DELETED, + "ERLIK/REYNOLOS TERMINAL": DELETED, + "FUTHORC/ACQUIREO TASTE ORBITAL": DELETED, + "G 165-13/NAODODOUR PLATFORM": DELETED, + "HATMEHING/HEVEI.IUS TERMINAL": DELETED, + "HATMEHING/HEVEIIUS TERMINAL": DELETED, + "HIP 69913/KONORATYEV OUTPOST": DELETED, + "LHS 1453/SAAVEORA PORT": DELETED, + "LHS 3447/WORLIOGE TERMINAL": DELETED, + "LUGH/BALANOIN GATEWAY": DELETED, + "NARASIMHA/MENOEL SURVEY": DELETED, + "OSSITO/STOART MINES": DELETED, + "SORBAGO/CARROLLSURVEY": DELETED, + "THUNDERBIRD/QUIMPY PORT": DELETED, + "VEROANDI/VAROEMAN GATEWAY": DELETED, "171 G. AQUARII/ELCANO OOCK": "Elcano Dock", "21 DRACO/ROBERTS PORT": DELETED, "37 XI BOOTIS/SCHIRRA PLANT": "Schirba Plant", @@ -117,6 +135,7 @@ "MISISTURE/GELFANO DOCK": "Gelfand Dock", "MISISTURE/GELFANO OOCK": "Gelfand Dock", "MOKOSH/LUBEN ORBITAL": "Lubin Orbital", + "NLTT 49528/OCONNORLANQNG": "O'Connor Landing", "NLTT 49528/O‹CONNOR LANDING": "O'Connor Landing", "OCSHODHIS/LLOYD OOCK": "Lloyd Dock", "ONGKAMPAN/PATTERSON STATION:274": "Patterson Station", diff --git a/data/System.csv b/data/System.csv index 5606965b..889a313e 100644 --- a/data/System.csv +++ b/data/System.csv @@ -379,6 +379,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified '9 AURIGAE',-32.75,10.5,-78.5625,'Gamma','2014-11-27 11:33:44' '9 CETI',-18.9375,-65.3125,-3.28125,'Gamma','2014-11-27 11:33:44' '9 G. CARINAE',108.65625,-48.65625,-17.90625,'Gamma','2014-11-27 11:33:44' +'9 GAMMA TRIANGULI',-60.875,-47.96875,-81.34375,'Release 1.00-EDStar','2015-01-21 16:31:59' '9 IOTA PISCIS AUSTRINI',-30.125,-156.8125,127.34375,'Gamma','2014-11-27 11:33:44' '9 OMEGA OPHIUCHI',9.3125,49.9375,160.78125,'Gamma','2014-11-27 11:33:44' '9 OMICRON VIRGINIS',59.375,152.03125,2.0,'Gamma','2014-11-27 11:33:44' @@ -859,6 +860,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALRAI SECTOR KM-V B2-5',9.21875,25.375,71.4375,'Release 1.00-EDStar','2014-12-26 03:33:25' 'ALRAI SECTOR LC-V B2-4',-54.875,-15.34375,55.46875,'Release 1.00-EDStar','2014-11-25 19:32:00' 'ALRAI SECTOR LS-T B3-6',-56.6875,15.46875,77.59375,'Release 1.00-EDStar','2015-01-03 03:48:13' +'ALRAI SECTOR MC-V B2-5',-28.40625,-15.5625,57.3125,'Release 1.00-EDStar','2015-01-22 02:58:05' 'ALRAI SECTOR MS-T B3-1',-36.03125,21.53125,92.71875,'Release 1.00-EDStar','2015-01-09 00:09:24' 'ALRAI SECTOR MS-T B3-5',-32.5,23.40625,94.96875,'Release 1.00-EDStar','2014-12-24 07:02:18' 'ALRAI SECTOR NC-V B2-5',-15.84375,-20.5,66.4375,'Release 1.00-EDStar','2015-01-15 17:57:31' @@ -872,6 +874,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALRAI SECTOR QC-V A2-3',-32.5625,-28.125,30.125,'Release 1.00-EDStar','2015-01-05 09:11:41' 'ALRAI SECTOR QC-V A2-5',-32.59375,-28.59375,28.15625,'Release 1.00-EDStar','2015-01-05 09:20:51' 'ALRAI SECTOR QT-R B4-2',-75.1875,0.625,105.96875,'Release 1.00-EDStar','2015-01-03 09:40:48' +'ALRAI SECTOR QT-R B4-7',-80.28125,-1.375,96.9375,'Release 1.00-EDStar','2015-01-22 21:23:32' 'ALRAI SECTOR TI-T A3-4',-36.875,-27.0625,42.1875,'Release 1.00-EDStar','2014-12-27 12:12:14' 'ALRAI SECTOR TO-R A4-1',-76.96875,-25.28125,50.125,'Release 1.00-EDStar','2015-01-17 13:52:01' 'ALRAI SECTOR UI-T A3-0',-33.125,-25.0625,43.21875,'Release 1.00-EDStar','2015-01-19 09:52:53' @@ -1401,6 +1404,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ARIETIS SECTOR BA-Z B0',-60.75,-83.46875,-200.3125,'Release 1.00-EDStar','2014-12-02 00:10:00' 'ARIETIS SECTOR CQ-Y C11',-75.3125,-84.90625,-172.75,'Release 1.00-EDStar','2014-12-18 04:52:30' 'ARIETIS SECTOR CQ-Y C14',-81.75,-82.59375,-178.625,'Release 1.00-EDStar','2014-12-18 04:48:07' +'ARIETIS SECTOR DG-X C1-14',-59.59375,-4.03125,-110.75,'Release 1.00-EDStar','2015-01-21 22:57:44' 'ARIETIS SECTOR DL-Y D102',-101.625,-98.375,-129.625,'Gamma','2014-11-27 11:33:44' 'ARIETIS SECTOR DL-Y D81',-76.75,-60.0625,-179.75,'Gamma','2014-11-27 11:33:44' 'ARIETIS SECTOR DQ-Y C19',-52.46875,-87.09375,-167.6875,'Release 1.00-EDStar','2014-12-02 00:47:27' @@ -1415,6 +1419,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ARIETIS SECTOR GG-Y D79',-53.96875,-109.96875,-164.59375,'Gamma','2014-11-27 11:33:44' 'ARIETIS SECTOR GW-W C1-16',-69.40625,-77.96875,-131.9375,'Gamma','2014-11-27 11:33:44' 'ARIETIS SECTOR IR-W C1-13',-103.28125,-132.15625,-130.0,'Gamma','2014-11-27 11:33:44' +'ARIETIS SECTOR JS-S B4-5',-50.53125,-2.09375,-118.15625,'Release 1.00-EDStar','2015-01-21 22:37:20' 'ARIETIS SECTOR KJ-F A12-1',-72.9375,-39.34375,-89.8125,'Release 1.00-EDStar','2014-12-08 10:47:02' 'ARIETIS SECTOR KJ-F A12-2',-73.15625,-41.5,-89.40625,'Release 1.00-EDStar','2014-12-08 10:55:31' 'ARIETIS SECTOR LC-V C2-18',-39.90625,-96.5,-100.21875,'Gamma','2014-11-27 11:33:44' @@ -1470,6 +1475,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ARNGIN',97.5,-114.78125,40.375,'Gamma','2014-11-27 11:33:44' 'AROUCA',104.96875,-6.53125,-4.40625,'Gamma','2014-11-27 11:33:44' 'ARQUE',66.5,38.0625,61.125,'Gamma','2014-11-27 11:33:44' +'ARRAKIS',-70.9375,53.6875,9.6875,'Release 1.00-EDStar','2015-01-20 22:00:07' 'ARRO KOP',100.3125,38.71875,94.0625,'Gamma','2014-11-27 11:33:44' 'ARRO NA',117.46875,19.8125,-4.78125,'Gamma','2014-11-27 11:33:44' 'ARRO NAGA',49.375,6.1875,33.09375,'Gamma','2014-11-27 11:33:44' @@ -2125,6 +2131,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'BD+21 1952',41.03125,71.03125,-82.46875,'Gamma','2014-11-27 11:33:44' 'BD+21 3769',-92.6875,5.125,60.84375,'Release 1.00-EDStar','2014-12-30 17:34:36' 'BD+21 55',-75.53125,-70.53125,-39.28125,'Gamma','2014-11-27 11:33:44' +'BD+21 652',-2.59375,-11.1875,-35.375,'Release 1.00-EDStar','2015-01-21 00:01:35' 'BD+22 2271',31.4375,94.40625,-39.8125,'Gamma','2014-11-27 11:33:44' 'BD+22 2632',-4.90625,88.4375,22.53125,'Gamma','2014-11-27 11:33:44' 'BD+22 2742',-17.875,75.65625,33.40625,'Gamma','2014-11-27 11:33:44' @@ -2242,6 +2249,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'BD-01 1707',72.875,14.40625,-89.125,'Gamma','2014-11-27 11:33:44' 'BD-01 2518',125.9375,9.4375,49.53125,'Gamma','2014-11-27 11:33:44' 'BD-01 2784',23.84375,57.78125,23.71875,'Beta3','2014-11-01 06:36:37' +'BD-01 3474',-29.75,6.1875,56.09375,'Release 1.00-EDStar','2015-01-20 21:43:20' 'BD-01 3500',-29.5625,3.59375,52.90625,'Gamma','2014-11-27 11:33:44' 'BD-02 4304',-30.75,38.15625,94.6875,'Gamma','2014-11-27 11:33:44' 'BD-02 5286',-65.5,-40.125,69.09375,'Gamma','2014-11-27 11:33:44' @@ -3373,6 +3381,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CEPHEI SECTOR EG-X B1-4',-73.96875,55.53125,-54.71875,'Release 1.00-EDStar','2014-11-27 19:48:44' 'CEPHEI SECTOR EG-Y C13',-152.5,13.59375,-49.5625,'Beta3-Inferred','2014-11-20 06:37:20' 'CEPHEI SECTOR EG-Y C18',-148.5625,14.75,-49.9375,'Beta3-Inferred','2014-11-20 06:31:17' +'CEPHEI SECTOR EL-Y B3',-109.34375,-4.46875,-67.1875,'Release 1.00-EDStar','2015-01-22 22:20:27' 'CEPHEI SECTOR EL-Y C20',-71.78125,43.9375,-51.4375,'Release 1.00-EDStar','2014-11-27 17:17:58' 'CEPHEI SECTOR FG-Y C13',-112.40625,5.875,-36.96875,'Release 1.00-EDStar','2015-01-09 19:31:26' 'CEPHEI SECTOR FG-Y C30',-141.125,-1.8125,-53.8125,'Beta3','2014-11-27 11:33:44' @@ -3449,8 +3458,12 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CETI SECTOR DL-X B1-3',30.0625,-89.34375,-52.65625,'Release 1.00-EDStar','2015-01-11 08:05:54' 'CETI SECTOR FB-X B1-1',-20.5,-142.3125,-61.53125,'Release 1.00-EDStar','2015-01-09 16:29:47' 'CETI SECTOR FB-X B1-2',-12.375,-133.03125,-52.84375,'Release 1.00-EDStar','2015-01-09 17:08:19' +'CETI SECTOR FB-X C1-24',38.09375,-100.625,-22.875,'Release 1.00-EDStar','2015-01-21 08:32:01' 'CETI SECTOR KX-T B3-2',4.15625,-94.6875,-11.875,'Release 1.00-EDStar','2015-01-15 17:25:07' +'CETI SECTOR MX-T B3-2',47.78125,-103.875,-20.09375,'Release 1.00-EDStar','2015-01-21 09:35:05' 'CETI SECTOR OC-V B2-0',46.0625,-145.84375,-35.25,'Release 1.00-EDStar','2014-12-08 21:51:40' +'CETI SECTOR OS-T B3-2',44.84375,-105.625,-22.65625,'Release 1.00-EDStar','2015-01-20 21:18:59' +'CETI SECTOR WO-A C24',0.03125,-77.8125,-68.78125,'Release 1.00-EDStar','2015-01-20 23:04:10' 'CETI SECTOR XJ-A D109',8.96875,-73.28125,-56.875,'Release 1.00-EDStar','2015-01-17 08:20:14' 'CETI SECTOR YJ-A C15',-8.1875,-118.9375,-101.0625,'Release 1.00-EDStar','2015-01-12 19:55:18' 'CEUT',126.1875,-101.125,67.5625,'Gamma','2014-11-27 11:33:44' @@ -3924,6 +3937,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR DV-O C6-12',156.9375,-41.71875,-90.34375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR DV-O C6-5',159.4375,-50.9375,-85.5,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR DX-J C9-15',-176.875,39.96875,33.59375,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR EA-Y B14-2',25.40625,-245.84375,-28.34375,'Release 1.00-EDStar','2015-01-22 04:34:42' 'COL 285 SECTOR EC-R B19-3',24.5,-62.96875,66.84375,'Release 1.00-EDStar','2015-01-14 16:36:43' 'COL 285 SECTOR EM-I B11-1',34.6875,96.84375,-117.78125,'Release 1.00-EDStar','2015-01-17 10:52:50' 'COL 285 SECTOR EM-L C8-22',-57.71875,7.875,-6.5,'Release 1.00-EDStar','2014-11-29 11:38:21' @@ -3990,6 +4004,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR JB-U B17-5',157.03125,-118.125,25.875,'Release 1.00-EDStar','2014-12-21 01:17:05' 'COL 285 SECTOR JC-U D3-69',18.6875,156.25,-62.6875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR JD-T A33-0',46.03125,-34.84375,6.96875,'Release 1.00-EDStar','2014-12-06 23:06:34' +'COL 285 SECTOR JG-W B15-1',46.625,-252.8125,-9.90625,'Release 1.00-EDStar','2015-01-22 01:57:12' 'COL 285 SECTOR JL-V B16-0',156.59375,-161.5625,14.71875,'Release 1.00-EDStar','2014-12-31 09:41:00' 'COL 285 SECTOR JS-U A32-0',69.5,-41.875,2.65625,'Release 1.00-EDStar','2015-01-07 19:41:23' 'COL 285 SECTOR JT-G C11-14',-103.0,109.3125,109.375,'Gamma','2014-11-27 11:33:44' @@ -4055,6 +4070,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR MX-U A32-1',122.4375,-30.46875,2.34375,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR MX-U A32-2',116.21875,-30.375,2.25,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR NB-U B4-5',75.6875,21.625,-262.34375,'Release 1.00-EDStar','2014-12-04 01:09:41' +'COL 285 SECTOR NE-R A34-0',27.1875,-42.65625,17.625,'Release 1.00-EDStar','2015-01-20 10:47:19' 'COL 285 SECTOR NE-R A34-3',30.65625,-39.03125,16.125,'Release 1.00-EDStar','2014-12-28 17:25:55' 'COL 285 SECTOR NF-T B18-4',-155.875,-20.8125,46.21875,'Release 1.00-EDStar','2015-01-02 19:14:46' 'COL 285 SECTOR NP-C B14-5',-157.5625,46.3125,-54.5625,'Beta3-Inferred','2014-11-17 23:43:12' @@ -4101,6 +4117,8 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR PD-T A33-3',110.03125,-32.625,13.65625,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR PD-T A33-4',109.78125,-33.875,13.03125,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR PI-T D3-97',-130.34375,-170.0,-102.0625,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR PN-R B18-2',53.125,-198.34375,51.96875,'Release 1.00-EDStar','2015-01-20 22:38:26' +'COL 285 SECTOR PN-R B18-3',47.625,-202.5,47.71875,'Release 1.00-EDStar','2015-01-20 22:16:19' 'COL 285 SECTOR PO-H C10-27',-104.125,-101.40625,68.90625,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR PS-U A32-0',126.65625,-43.34375,-4.15625,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR PS-U A32-1',132.5,-40.3125,-3.59375,'Gamma-Inferred','2014-11-29 06:45:17' @@ -4119,6 +4137,9 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR QJ-Q D5-74',-167.53125,88.28125,66.0,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR QJ-Q D5-75',-170.46875,94.4375,77.03125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR QJ-Q D5-93',-176.25,81.4375,124.875,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR QN-R B18-0',61.375,-199.15625,49.5625,'Release 1.00-EDStar','2015-01-20 23:56:35' +'COL 285 SECTOR QN-R B18-2',68.125,-204.1875,42.25,'Release 1.00-EDStar','2015-01-21 00:24:25' +'COL 285 SECTOR QN-R B18-4',69.25,-204.4375,46.46875,'Release 1.00-EDStar','2015-01-21 00:03:03' 'COL 285 SECTOR QN-T D3-116',157.15625,-76.15625,-72.5625,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR QO-G C11-17',103.53125,68.96875,126.25,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR QP-G A40-3',83.90625,-40.71875,84.84375,'Release 1.00-EDStar','2015-01-13 22:14:50' @@ -4192,6 +4213,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR TK-E C12-9',-93.78125,-4.75,164.375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR TO-H C10-12',83.78125,-67.90625,84.84375,'Release 1.00-EDStar','2015-01-13 22:34:00' 'COL 285 SECTOR TO-P C6-12',60.25,127.5,-89.21875,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR TT-P B19-2',45.28125,-197.125,56.09375,'Release 1.00-EDStar','2015-01-20 03:55:45' 'COL 285 SECTOR TT-P B19-3',46.4375,-195.4375,59.84375,'Release 1.00-EDStar','2015-01-20 03:33:54' 'COL 285 SECTOR TT-P B19-4',42.6875,-191.25,60.21875,'Release 1.00-EDStar','2015-01-20 02:28:07' 'COL 285 SECTOR TU-E C12-16',78.625,72.59375,168.9375,'Gamma','2014-11-27 11:33:44' @@ -4207,9 +4229,12 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR UL-R B19-2',-104.625,-11.28125,55.9375,'Release 1.00-EDStar','2015-01-09 12:38:39' 'COL 285 SECTOR UL-R B19-3',-102.0625,-11.15625,58.5625,'Release 1.00-EDStar','2015-01-09 12:54:26' 'COL 285 SECTOR UP-N C7-13',-137.53125,83.75,-25.34375,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR UT-I C9-15',48.5625,-203.34375,50.6875,'Release 1.00-EDStar','2015-01-20 22:00:26' 'COL 285 SECTOR UT-I C9-2',28.40625,-211.0625,18.53125,'Release 1.00-EDStar','2015-01-09 19:54:54' 'COL 285 SECTOR UT-I C9-3',23.96875,-212.21875,22.15625,'Release 1.00-EDStar','2015-01-09 19:48:21' 'COL 285 SECTOR UT-I C9-8',34.71875,-213.84375,25.3125,'Release 1.00-EDStar','2015-01-09 20:00:21' +'COL 285 SECTOR UT-P B19-0',59.15625,-201.21875,57.375,'Release 1.00-EDStar','2015-01-20 23:43:07' +'COL 285 SECTOR UT-P B19-1',61.3125,-200.84375,61.75,'Release 1.00-EDStar','2015-01-20 22:59:09' 'COL 285 SECTOR UT-R D4-81',143.25,-32.59375,21.46875,'Release 1.00-EDStar','2014-12-31 10:29:12' 'COL 285 SECTOR UT-R D4-83',153.09375,-85.375,29.8125,'Release 1.00-EDStar','2014-12-31 10:16:31' 'COL 285 SECTOR UY-M A9-1',-98.84375,-32.96875,-245.53125,'Release 1.00-EDStar','2014-12-06 09:30:02' @@ -4224,16 +4249,23 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR VG-I B24-0',-43.34375,-62.71875,155.375,'Release 1.00-EDStar','2015-01-11 07:31:22' 'COL 285 SECTOR VK-E C12-24',-3.21875,-20.25,169.09375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR VM-O B21-3',-109.0625,44.71875,98.03125,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR VO-Y B14-2',-25.09375,-200.59375,-43.125,'Release 1.00-EDStar','2015-01-23 03:09:51' 'COL 285 SECTOR VP-E C12-23',76.90625,36.0625,161.375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR VP-O D6-87',-136.75,57.09375,192.15625,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR VP-O D6-89',-76.1875,86.71875,211.46875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR VP-O D6-91',-118.6875,104.125,202.03125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR VP-O D6-99',-88.34375,75.78125,204.0,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR VT-I C9-2',73.1875,-213.6875,26.8125,'Release 1.00-EDStar','2015-01-22 00:52:54' +'COL 285 SECTOR VT-I C9-4',67.65625,-222.65625,23.75,'Release 1.00-EDStar','2015-01-22 01:00:35' 'COL 285 SECTOR VY-M A9-0',-91.9375,-33.15625,-248.5625,'Release 1.00-EDStar','2014-12-06 08:42:06' 'COL 285 SECTOR VZ-P D5-102',-122.0625,-71.15625,110.59375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR WA-K B23-7',72.34375,-59.78125,145.65625,'Release 1.00-EDStar','2014-12-24 07:22:00' 'COL 285 SECTOR WE-Q D5-140',156.3125,32.78125,104.0,'Release 1.00-EDStar','2014-12-27 15:37:23' 'COL 285 SECTOR WE-Q D5-147',141.4375,-15.53125,62.6875,'Release 1.00-EDStar','2014-12-11 22:48:52' +'COL 285 SECTOR WO-Y B14-0',-19.71875,-203.90625,-40.46875,'Release 1.00-EDStar','2015-01-23 03:56:43' +'COL 285 SECTOR WO-Y B14-1',-24.90625,-200.125,-43.46875,'Release 1.00-EDStar','2015-01-23 03:04:41' +'COL 285 SECTOR WO-Y B14-2',-19.15625,-199.34375,-40.625,'Release 1.00-EDStar','2015-01-23 02:33:47' +'COL 285 SECTOR WO-Y B14-3',-22.09375,-195.28125,-44.125,'Release 1.00-EDStar','2015-01-23 03:22:54' 'COL 285 SECTOR WP-O D6-93',-62.3125,92.59375,182.1875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR WW-L A37-3',-1.34375,-41.5,48.65625,'Release 1.00-EDStar','2015-01-09 22:01:33' 'COL 285 SECTOR XE-L A10-0',-112.09375,-30.375,-239.40625,'Release 1.00-EDStar','2014-12-06 08:42:06' @@ -4256,6 +4288,8 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR YE-L A10-1',-99.90625,-25.5,-244.40625,'Release 1.00-EDStar','2014-12-06 08:42:06' 'COL 285 SECTOR YE-L A10-2',-104.53125,-30.0,-235.53125,'Release 1.00-EDStar','2014-12-06 09:07:44' 'COL 285 SECTOR YF-N C7-31',-142.75,-5.75,-56.625,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR YJ-Y B14-1',-17.59375,-212.46875,-40.75,'Release 1.00-EDStar','2015-01-23 04:37:20' +'COL 285 SECTOR YJ-Y B14-3',-18.25,-214.0625,-41.53125,'Release 1.00-EDStar','2015-01-23 04:50:14' 'COL 285 SECTOR YK-O D6-125',-9.65625,19.46875,205.3125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR YK-O D6-132',-24.0,32.0625,164.84375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR YK-O D6-138',2.5625,-1.0,197.3125,'Gamma','2014-11-27 11:33:44' @@ -4289,6 +4323,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR ZK-O D6-85',42.90625,-12.59375,200.78125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR ZK-O D6-97',91.25,-17.0625,176.0,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR ZX-F B12-4',-322.34375,34.53125,-95.71875,'Beta3-Inferred','2014-11-20 12:04:16' +'COL 285 SECTOR ZZ-G C10-10',63.5,-199.0625,60.78125,'Release 1.00-EDStar','2015-01-20 23:23:06' 'COL 285 SYSTEM MV-F B11-0',145.59375,-173.5625,-122.59375,'Release 1.00-EDStar','2014-12-26 05:29:26' 'COL 285 SYSTEM MV-F B11-1',142.09375,-177.6875,-119.53125,'Release 1.00-EDStar','2014-12-26 05:24:58' 'COL 285 SYSTEM MV-F B11-4',144.21875,-178.46875,-121.25,'Release 1.00-EDStar','2014-12-26 05:27:19' @@ -4368,7 +4403,9 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CORE SYS SECTOR DQ-P A5-0',24.75,-37.34375,7.625,'Gamma-Inferred','2014-12-08 06:11:52' 'CORE SYS SECTOR DV-P A5-1',37.78125,-31.6875,7.6875,'Release 1.00-EDStar','2014-12-06 07:56:40' 'CORE SYS SECTOR EB-0 A6-0',11.53125,-26.6875,20.5,'Release 1.00-EDStar','2014-12-23 23:55:48' +'CORE SYS SECTOR EB-O A6-1',13.46875,-32.65625,16.3125,'Release 1.00-EDStar','2015-01-20 10:36:34' 'CORE SYS SECTOR EB-O A6-2',12.625,-32.625,16.875,'Gamma-Inferred','2014-12-08 06:17:40' +'CORE SYS SECTOR EB-O A6-3',9.34375,-33.90625,16.03125,'Release 1.00-EDStar','2015-01-20 10:32:21' 'CORE SYS SECTOR EH-M A7-6',-30.25,-27.625,26.625,'Release 1.00-EDStar','2015-01-05 09:32:53' 'CORE SYS SECTOR FB-O A6-3',21.78125,-27.9375,16.875,'Release 1.00-EDStar','2014-12-22 10:17:35' 'CORE SYS SECTOR FW-N A6-1',0.09375,-41.03125,22.9375,'Release 1.00-EDStar','2014-12-06 16:49:39' @@ -4377,6 +4414,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CORE SYS SECTOR HH-M A7-2',-0.15625,-29.15625,27.28125,'Release 1.00-EDStar','2014-12-26 22:02:32' 'CORE SYS SECTOR HH-M A7-3',-3.625,-33.5625,30.59375,'Release 1.00-EDStar','2015-01-07 21:29:47' 'CORE SYS SECTOR HW-N A6-0',19.1875,-40.21875,17.40625,'Release 1.00-EDStar','2015-01-06 20:48:51' +'CORE SYS SECTOR HW-N A6-1',21.875,-40.15625,17.21875,'Release 1.00-EDStar','2015-01-20 10:43:53' 'CORE SYS SECTOR IR-W C1-25',16.53125,-13.75,22.5,'Release 1.00-EDStar','2014-12-23 23:40:25' 'CORE SYS SECTOR IR-W C1-29',26.21875,6.3125,35.5625,'Release 1.00-EDStar','2014-11-30 22:56:30' 'CORE SYS SECTOR MC-V B2-7',22.5,-5.625,13.28125,'Release 1.00-EDStar','2014-12-06 09:30:02' @@ -4400,6 +4438,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CORE SYS SECTOR WJ-R A4-1',-11.21875,-43.5,-2.8125,'Release 1.00-EDStar','2015-01-04 19:22:48' 'CORE SYS SECTOR YJ-R A4-1',5.4375,-40.71875,-4.0,'Release 1.00-EDStar','2014-12-06 20:26:47' 'CORE SYS SECTOR YO-R A4-1',27.3125,-31.15625,-0.84375,'Release 1.00-EDStar','2015-01-12 14:31:45' +'CORE SYS SECTOR ZU-P A5-1',-0.25,-27.15625,13.375,'Release 1.00-EDStar','2015-01-20 10:24:40' 'CORIABOG',-55.53125,-61.34375,69.0625,'Gamma','2014-11-27 11:33:44' 'CORIAN GUIT',-162.9375,25.125,72.53125,'Gamma','2014-11-27 11:33:44' 'CORIAT',46.6875,-226.0,71.0,'Gamma','2014-11-27 11:33:44' @@ -4486,6 +4525,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CRUCIS SECTOR CL-Y D152',46.9375,13.34375,57.5625,'Release 1.00-EDStar','2014-11-30 22:51:31' 'CRUCIS SECTOR CL-Y D157',61.03125,21.40625,75.21875,'Release 1.00-EDStar','2014-12-21 00:52:04' 'CRUCIS SECTOR CQ-Y C26',110.1875,21.84375,41.0,'Release 1.00-EDStar','2014-12-26 01:12:46' +'CRUCIS SECTOR CV-Y B6',106.5,1.53125,12.53125,'Release 1.00-EDStar','2014-12-09 08:56:33' 'CRUCIS SECTOR CW-V B2-4',74.34375,56.1875,37.84375,'Release 1.00-EDStar','2014-12-26 01:12:46' 'CRUCIS SECTOR DB-X B1-6',50.0625,7.25,26.9375,'Gamma-Inferred','2014-11-29 06:45:17' 'CRUCIS SECTOR DL-Y C16',69.21875,-9.0625,46.78125,'Gamma-Inferred','2014-12-07 11:42:50' @@ -6451,6 +6491,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HACHIMR',44.5625,66.34375,-130.625,'Gamma','2014-11-27 11:33:44' 'HADAD',9.875,57.84375,20.59375,'Beta3','2014-11-01 06:36:37' 'HAEDUWONG',58.8125,66.4375,65.625,'Gamma','2014-11-27 11:33:44' +'HAGA',-8.90625,-69.75,-63.90625,'Release 1.00-EDStar','2015-01-20 23:04:10' 'HAGALAZ',-50.59375,45.15625,11.09375,'Beta3','2014-11-01 06:36:37' 'HAGHOLE',-5.875,0.90625,23.84375,'Gamma','2014-11-27 11:33:44' 'HAGR',41.65625,0.0625,83.625,'Gamma','2014-11-27 11:33:44' @@ -6967,6 +7008,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 105740',-51.90625,-113.875,105.59375,'Gamma','2014-11-27 11:33:44' 'HIP 105773',-193.5,-39.375,25.78125,'Gamma','2014-11-27 11:33:44' 'HIP 10579',22.875,-176.71875,-63.28125,'Gamma','2014-11-27 11:33:44' +'HIP 1058',35.84375,-203.84375,52.21875,'Release 1.00-EDStar','2015-01-20 22:10:14' 'HIP 105821',-27.9375,-109.0,101.65625,'Gamma','2014-11-27 11:33:44' 'HIP 10584',-4.1875,-139.8125,-71.25,'Gamma','2014-11-27 11:33:44' 'HIP 105849',-199.40625,47.65625,-57.96875,'Beta3-Inferred','2014-11-09 21:06:05' @@ -7811,6 +7853,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 18322',-4.40625,-63.3125,-110.375,'Gamma','2014-11-27 11:33:44' 'HIP 18327',-12.8125,-61.46875,-121.4375,'Gamma','2014-11-27 11:33:44' 'HIP 18339',45.46875,-111.28125,-106.375,'Gamma','2014-11-27 11:33:44' +'HIP 18366',-62.84375,-1.1875,-106.5,'Release 1.00-EDStar','2015-01-21 23:02:55' 'HIP 18387',131.09375,-120.71875,19.8125,'Gamma','2014-11-27 11:33:44' 'HIP 18402',119.34375,-139.6875,-31.34375,'Gamma','2014-11-27 11:33:44' 'HIP 18427',125.21875,-136.125,-16.03125,'Gamma','2014-11-27 11:33:44' @@ -8036,6 +8079,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 22295',155.0625,-104.65625,67.84375,'Gamma','2014-11-27 11:33:44' 'HIP 22296',46.28125,-76.40625,-148.21875,'Gamma','2014-11-27 11:33:44' 'HIP 223',-71.5625,-118.5,-13.28125,'Gamma','2014-11-27 11:33:44' +'HIP 22319',38.8125,-68.0,-140.21875,'Release 1.00-EDStar','2015-01-21 12:32:51' 'HIP 22320',111.40625,-113.8125,-96.59375,'Gamma','2014-11-27 11:33:44' 'HIP 22350',-1.5,-41.9375,-162.75,'Gamma','2014-11-27 11:33:44' 'HIP 22373',86.96875,-88.21875,-74.3125,'Gamma','2014-11-27 11:33:44' @@ -8692,6 +8736,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 48095',133.40625,-44.15625,55.25,'Gamma','2014-11-27 11:33:44' 'HIP 48125',120.9375,46.84375,-20.78125,'Gamma','2014-11-27 11:33:44' 'HIP 48141',132.84375,29.96875,-5.21875,'Gamma','2014-11-27 11:33:44' +'HIP 4815',-18.28125,-206.9375,-25.0,'Release 1.00-EDStar','2015-01-23 05:36:36' 'HIP 48165',77.25,96.09375,-67.03125,'Gamma','2014-11-27 11:33:44' 'HIP 48248',50.90625,135.03125,-101.59375,'Gamma','2014-11-27 11:33:44' 'HIP 48365',113.65625,100.1875,-62.6875,'Gamma','2014-11-27 11:33:44' @@ -9087,6 +9132,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 63831',103.875,86.40625,78.78125,'Gamma','2014-11-27 11:33:44' 'HIP 63835',225.875,4.90625,157.59375,'Release 1.00-EDStar','2014-12-20 21:28:24' 'HIP 63862',127.21875,32.28125,91.15625,'Gamma','2014-11-27 11:33:44' +'HIP 6391',-25.875,-195.1875,-50.84375,'Release 1.00-EDStar','2015-01-23 03:18:35' 'HIP 64006',115.03125,77.875,87.375,'Gamma','2014-11-27 11:33:44' 'HIP 64059',0.9375,121.0,11.375,'Gamma','2014-11-27 11:33:44' 'HIP 6407',-64.9375,-158.28125,-74.3125,'Gamma','2014-11-27 11:33:44' @@ -10164,6 +10210,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HR 1613',54.3125,-68.0625,-136.375,'Gamma','2014-11-27 11:33:44' 'HR 1621',108.375,-105.90625,-127.34375,'Gamma','2014-11-27 11:33:44' 'HR 1645',113.1875,-104.0,-111.25,'Gamma','2014-11-27 11:33:44' +'HR 1685',55.625,-58.9375,-129.34375,'Release 1.00-EDStar','2015-01-21 12:18:26' 'HR 17',-87.40625,-45.1875,-39.03125,'Gamma','2014-11-27 11:33:44' 'HR 1710',130.09375,-115.6875,-179.875,'Release 1.00-EDStar','2014-12-17 22:15:38' 'HR 1717',55.75,-55.71875,-131.125,'Gamma','2014-11-27 11:33:44' @@ -10315,6 +10362,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HR 6189',-16.5625,51.1875,119.0625,'Gamma','2014-11-27 11:33:44' 'HR 6201',-39.0625,73.625,135.96875,'Gamma','2014-11-27 11:33:44' 'HR 6202',1.28125,38.75,131.53125,'Gamma','2014-11-27 11:33:44' +'HR 6237',-67.15625,55.34375,5.21875,'Release 1.00-EDStar','2015-01-20 22:10:32' 'HR 6269',26.25,80.03125,64.53125,'Gamma','2014-11-27 11:33:44' 'HR 6284',-9.5,36.875,131.625,'Gamma','2014-11-27 11:33:44' 'HR 6297',72.40625,-23.65625,150.84375,'Gamma','2014-11-27 11:33:44' @@ -10603,6 +10651,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HYADES SECTOR FB-X D1-95',95.71875,25.03125,-171.4375,'Gamma','2014-11-27 11:33:44' 'HYADES SECTOR FR-M B7-1',2.53125,-119.71875,-122.625,'Release 1.00-EDStar','2015-01-12 19:08:03' 'HYADES SECTOR FW-V C2-5',87.125,17.0625,-171.15625,'Release 1.00-EDStar','2014-12-02 00:06:24' +'HYADES SECTOR GW-M B7-5',66.625,-94.375,-116.03125,'Release 1.00-EDStar','2015-01-20 10:09:13' 'HYADES SECTOR GW-W D1-83',86.03125,-67.46875,-177.9375,'Gamma','2014-11-27 11:33:44' 'HYADES SECTOR GX-R B5-2',20.125,62.625,-146.9375,'Gamma','2014-11-27 11:33:44' 'HYADES SECTOR HR-V C2-14',94.03125,-4.46875,-172.4375,'Gamma','2014-11-27 11:33:44' @@ -10666,6 +10715,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HYADES SECTOR SF-U A4-2',-98.875,-40.78125,-229.375,'Release 1.00-EDStar','2014-12-06 08:42:07' 'HYADES SECTOR SU-N B7-4',-19.15625,4.21875,-122.0625,'Release 1.00-EDStar','2015-01-13 21:20:22' 'HYADES SECTOR SZ-N B7-2',29.84375,34.625,-119.34375,'Release 1.00-EDStar','2015-01-17 16:38:16' +'HYADES SECTOR TA-M B8-2',-72.96875,0.09375,-98.5,'Release 1.00-EDStar','2015-01-21 23:11:03' 'HYADES SECTOR TF-U A4-0',-92.71875,-35.5625,-232.15625,'Release 1.00-EDStar','2014-12-06 08:42:07' 'HYADES SECTOR TF-U A4-1',-90.8125,-37.84375,-233.625,'Release 1.00-EDStar','2014-12-06 08:42:07' 'HYADES SECTOR TF-U A4-2',-89.9375,-40.34375,-233.90625,'Release 1.00-EDStar','2014-12-06 09:30:02' @@ -10682,14 +10732,17 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HYADES SECTOR XF-M B8-3',39.65625,21.40625,-97.09375,'Release 1.00-EDStar','2014-12-06 16:04:24' 'HYADES SECTOR YA-M B8-1',34.46875,1.03125,-102.0,'Release 1.00-EDStar','2014-12-06 13:02:18' 'HYADES SECTOR YU-Y D102',-90.625,-22.5625,-240.59375,'Release 1.00-EDStar','2014-12-06 09:07:45' +'HYADES SECTOR ZU-O B6-2',37.125,-74.8125,-132.90625,'Release 1.00-EDStar','2015-01-21 12:46:42' 'HYADUM I',-1.40625,-63.6875,-148.46875,'Release 1.00-EDStar','2015-01-06 20:28:56' 'HYADUM II',-4.0625,-56.8125,-144.84375,'Release 1.00-EDStar','2015-01-05 20:50:53' 'HYDRAE SECTOR AA-A D104',56.03125,46.8125,46.40625,'Release 1.00-EDStar','2014-11-30 22:51:32' 'HYDRAE SECTOR BQ-Y B5',50.5,72.65625,29.09375,'Release 1.00-EDStar','2014-12-20 20:50:22' 'HYDRAE SECTOR CQ-Y B4',62.8125,64.40625,26.25,'Release 1.00-EDStar','2014-12-20 20:50:10' 'HYDRAE SECTOR DW-V B2-2',84.53125,143.59375,66.9375,'Gamma','2014-11-27 11:33:44' +'HYDRAE SECTOR EW-W B1-4',28.625,68.625,49.4375,'Release 1.00-EDStar','2015-01-21 22:14:27' 'HYDRAE SECTOR IR-W B1-2',58.9375,45.46875,35.375,'Gamma-Inferred','2014-11-29 06:45:17' 'HYDRAE SECTOR IR-W C1-16',131.21875,78.84375,59.9375,'Gamma','2014-11-27 11:33:44' +'HYDRAE SECTOR JC-V B2-0',47.375,71.34375,58.5625,'Release 1.00-EDStar','2015-01-21 22:18:30' 'HYDRAE SECTOR JC-V B2-2',48.6875,60.9375,73.625,'Release 1.00-EDStar','2015-01-04 18:32:14' 'HYDRAE SECTOR KC-V B2-3',60.4375,58.5625,70.8125,'Release 1.00-EDStar','2014-11-25 17:48:31' 'HYDRAE SECTOR KM-W B1-4',74.6875,32.46875,44.40625,'Gamma-Inferred','2014-11-29 06:45:17' @@ -10756,8 +10809,10 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ICZ BQ-Y D111',58.28125,-92.09375,23.71875,'Release 1.00-EDStar','2014-12-22 23:13:24' 'ICZ BQ-Y D113',16.15625,-97.9375,21.21875,'Release 1.00-EDStar','2015-01-01 18:33:53' 'ICZ CB-W B2-2',45.28125,-76.78125,26.96875,'Release 1.00-EDStar','2015-01-11 10:03:14' +'ICZ CB-W B2-3',38.8125,-76.3125,29.09375,'Release 1.00-EDStar','2015-01-20 14:06:35' 'ICZ CB-W B2-5',43.34375,-84.78125,25.1875,'Release 1.00-EDStar','2014-12-22 23:09:57' 'ICZ CB-W B2-6',44.8125,-82.53125,24.09375,'Release 1.00-EDStar','2015-01-03 05:37:47' +'ICZ CL-X B1-5',38.84375,-106.28125,8.78125,'Release 1.00-EDStar','2015-01-20 16:13:59' 'ICZ CQ-X B1-3',89.28125,-102.1875,3.25,'Release 1.00-EDStar','2015-01-04 20:34:46' 'ICZ CV-Y C24',102.5,-83.0,-2.40625,'Release 1.00-EDStar','2015-01-11 05:29:49' 'ICZ CW-V B2-0',4.6875,-93.09375,19.21875,'Release 1.00-EDStar','2015-01-01 16:45:16' @@ -10792,6 +10847,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ICZ FW-V B2-1',63.5,-97.75,22.0,'Release 1.00-EDStar','2014-12-31 03:04:36' 'ICZ FW-V B2-2',61.375,-90.28125,26.21875,'Release 1.00-EDStar','2015-01-08 19:18:31' 'ICZ FW-V B2-4',73.6875,-87.28125,21.6875,'Release 1.00-EDStar','2015-01-09 19:29:31' +'ICZ FW-V B2-7',67.875,-94.53125,25.65625,'Release 1.00-EDStar','2015-01-21 10:09:39' 'ICZ GB-W B2-0',119.21875,-84.5625,19.71875,'Gamma-Inferred','2014-12-12 12:55:57' 'ICZ GB-X C1-27',104.28125,-71.9375,20.75,'Gamma-Inferred','2014-12-12 12:51:55' 'ICZ GG-Y C14',17.875,-190.15625,10.90625,'Release 1.00-EDStar','2015-01-09 13:50:50' @@ -10800,6 +10856,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ICZ GR-V B2-5',43.84375,-116.625,29.84375,'Release 1.00-EDStar','2015-01-02 12:21:38' 'ICZ GW-V B2-4',87.0625,-103.40625,15.0625,'Release 1.00-EDStar','2015-01-03 05:26:19' 'ICZ HR-V B2-1',71.75,-116.5625,29.84375,'Release 1.00-EDStar','2014-12-28 06:50:51' +'ICZ HR-V B2-5',65.6875,-118.125,16.625,'Release 1.00-EDStar','2015-01-21 10:06:45' 'ICZ HW-W B1-0',17.5625,-181.375,-2.3125,'Release 1.00-EDStar','2015-01-09 12:45:54' 'ICZ HW-W B1-1',16.34375,-180.03125,0.125,'Release 1.00-EDStar','2015-01-09 12:35:38' 'ICZ HW-W B1-4',21.21875,-176.65625,-0.65625,'Release 1.00-EDStar','2015-01-09 13:24:58' @@ -10831,6 +10888,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ICZ PN-T B3-3',65.5625,-145.625,37.28125,'Release 1.00-EDStar','2015-01-02 16:21:34' 'ICZ PS-U B2',25.46875,-206.03125,16.09375,'Release 1.00-EDStar','2015-01-11 11:38:20' 'ICZ TU-O B6-5',26.53125,-91.625,97.1875,'Release 1.00-EDStar','2015-01-12 13:00:02' +'ICZ UD-T B3-4',79.15625,-202.125,41.65625,'Release 1.00-EDStar','2015-01-21 22:16:13' 'ICZ WK-O B6-5',11.8125,-134.96875,95.0,'Release 1.00-EDStar','2015-01-12 12:50:51' 'ICZ ZU-X B1-5',72.3125,-82.8125,1.0,'Release 1.00-EDStar','2015-01-07 18:29:25' 'ICZ ZZ-X B1-3',101.78125,-63.28125,-3.59375,'Release 1.00-EDStar','2015-01-11 05:22:28' @@ -11218,6 +11276,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'JASTREB SECTOR CL-Y C21',-50.0625,8.375,-41.78125,'Release 1.00-EDStar','2015-01-07 16:02:43' 'JASTREB SECTOR GR-W C1-27',-36.8125,9.5,-10.0625,'Release 1.00-EDStar','2015-01-13 01:56:57' 'JASTREB SECTOR PT-R B4-7',-32.15625,6.15625,1.90625,'Release 1.00-EDStar','2014-11-29 12:14:49' +'JASTREB SECTOR PT-R B4-8',-32.25,7.0625,2.5,'Release 1.00-EDStar','2015-01-21 00:23:58' 'JATA',-67.78125,58.3125,-28.8125,'Beta3-Inferred','2014-11-19 09:23:28' 'JATANA',-99.9375,56.3125,-142.75,'Gamma','2014-11-27 11:33:44' 'JATANTHET',57.09375,-44.875,-116.90625,'Gamma','2014-11-27 11:33:44' @@ -12620,6 +12679,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LALANDE 13427',-11.90625,24.65625,-59.53125,'Release 1.00-EDStar','2015-01-19 13:23:59' 'LALANDE 13942',-8.21875,22.46875,-49.625,'Gamma','2014-11-27 11:33:44' 'LALANDE 14146',77.875,-0.3125,-71.0,'Gamma','2014-11-27 11:33:44' +'LALANDE 15290',15.53125,42.46875,-83.65625,'Release 1.00-EDStar','2015-01-19 08:26:41' 'LALANDE 15394',23.6875,26.25,-57.46875,'Gamma','2014-11-27 11:33:44' 'LALANDE 15547',25.46875,32.125,-65.625,'Gamma','2014-11-27 11:33:44' 'LALANDE 16904',-31.46875,80.0,-97.8125,'Gamma','2014-11-27 11:33:44' @@ -12681,6 +12741,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LAMBDA HOROLOGII',93.6875,-129.125,22.1875,'Gamma','2014-11-27 11:33:44' 'LAMBDA HYDRI',130.9375,-143.03125,85.15625,'Gamma','2014-11-27 11:33:44' 'LAMBDA MUSCAE',113.09375,-10.875,57.0625,'Gamma','2014-11-27 11:33:44' +'LAMBDA SERPENTIS',-7.90625,27.21875,27.5625,'Release 1.00-EDStar','2015-01-21 22:04:39' 'LAMBDA-1 TUCANAE',116.65625,-153.15625,74.46875,'Gamma','2014-11-27 11:33:44' 'LAMBDA-2 FORNACIS',28.8125,-76.75,-18.75,'Gamma','2014-11-27 11:33:44' 'LAMBDA-2 PHOENICIS',31.15625,-106.21875,25.46875,'Gamma','2014-11-27 11:33:44' @@ -12927,6 +12988,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LFT 185',0.96875,-59.3125,-24.96875,'Release 1.00-EDStar','2015-01-08 19:16:06' 'LFT 19',-56.28125,7.875,-32.28125,'Beta2-Inferred','2014-10-21 17:16:31' 'LFT 214',-37.65625,-2.78125,-39.125,'Gamma','2014-11-27 11:33:44' +'LFT 215',-13.25,-17.09375,-23.4375,'Release 1.00-EDStar','2014-12-15 16:47:00' 'LFT 238',37.5625,-83.4375,-22.875,'Release 1.00-EDStar','2015-01-07 19:43:54' 'LFT 269',-52.3125,3.875,-62.4375,'Gamma','2014-11-27 11:33:44' 'LFT 300',-16.9375,-27.21875,-59.9375,'Gamma','2014-11-27 11:33:44' @@ -13048,6 +13110,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LHS 157',16.875,-45.0625,-11.28125,'Release 1.00-EDStar','2015-01-07 22:19:49' 'LHS 1573',-15.09375,-24.21875,-53.28125,'Gamma','2014-11-27 11:33:44' 'LHS 1590',19.4375,-57.21875,-51.78125,'Gamma','2014-11-27 11:33:44' +'LHS 1593',-0.53125,-23.09375,-33.8125,'Release 1.00-EDStar','2015-01-21 00:10:59' 'LHS 1596',-38.5625,14.40625,-38.21875,'Beta3-Inferred','2014-11-11 22:10:51' 'LHS 1599',10.8125,-69.1875,-88.0,'Gamma','2014-11-27 11:33:44' 'LHS 160',24.46875,-28.53125,5.59375,'Gamma','2014-11-27 11:33:44' @@ -13723,6 +13786,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LP 462-19',-32.875,-25.75,-2.59375,'Gamma','2014-11-27 11:33:44' 'LP 465-14',75.75,26.03125,5.15625,'Beta3','2014-11-01 06:36:37' 'LP 466-235',-38.0,-52.84375,-31.09375,'Gamma','2014-11-27 11:33:44' +'LP 467-16',-14.40625,-20.28125,-12.09375,'Release 1.00-EDStar','2014-12-15 16:04:50' 'LP 470-30',-25.125,-55.0,-57.84375,'Gamma','2014-11-27 11:33:44' 'LP 470-65',82.9375,39.5625,41.1875,'Gamma','2014-11-27 11:33:44' 'LP 476-207',18.6875,-32.8125,-97.5,'Gamma','2014-11-27 11:33:44' @@ -13895,6 +13959,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LTT 10462',-46.71875,-46.25,-40.34375,'Gamma','2014-11-27 11:33:44' 'LTT 10482',-61.1875,23.59375,-42.0,'Beta2','2014-12-02 00:58:41' 'LTT 10533',-76.9375,34.65625,-52.875,'Beta2-Inferred','2014-10-21 17:16:31' +'LTT 10624',-54.34375,-43.03125,-58.78125,'Release 1.00-EDStar','2015-01-20 16:28:50' 'LTT 1069',50.28125,-116.90625,0.09375,'Release 1.00-EDStar','2014-12-20 17:34:48' 'LTT 10787',-30.65625,-39.59375,-48.0625,'Gamma','2014-11-27 11:33:44' 'LTT 10823',-24.5,-81.15625,-70.09375,'Gamma','2014-11-27 11:33:44' @@ -14362,6 +14427,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LWEN',-50.34375,-28.3125,87.53125,'Gamma','2014-11-27 11:33:44' 'LWENA',141.78125,-148.4375,-3.625,'Gamma','2014-11-27 11:33:44' 'LWENDECHT',94.0625,-255.21875,53.375,'Gamma','2014-11-27 11:33:44' +'LYLIS HELIG',2.375,-16.4375,-30.09375,'Release 1.00-EDStar','2015-01-21 00:07:36' 'LYNCIS SECTOR CL-Y D67',-99.625,80.25,-107.4375,'Gamma','2014-11-27 11:33:44' 'LYNCIS SECTOR CQ-Y C15',-56.40625,87.46875,-178.0625,'Gamma','2014-11-27 11:33:44' 'LYNCIS SECTOR DL-Y C10',-93.46875,16.96875,-167.4375,'Gamma','2014-11-27 11:33:44' @@ -14372,9 +14438,11 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LYNCIS SECTOR HR-W C1-13',-79.09375,31.5625,-117.46875,'Gamma','2014-11-27 11:33:44' 'LYNCIS SECTOR HR-W C1-16',-90.625,37.375,-113.25,'Gamma','2014-11-27 11:33:44' 'LYNCIS SECTOR HR-W C1-6',-80.03125,35.90625,-133.78125,'Gamma','2014-11-27 11:33:44' +'LYNCIS SECTOR JM-W D1-143',-49.71875,24.3125,-90.28125,'Release 1.00-EDStar','2015-01-20 21:46:39' 'LYNCIS SECTOR JR-W C1-15',-16.9375,25.34375,-135.03125,'Gamma','2014-11-27 11:33:44' 'LYNCIS SECTOR XZ-P B5-1',-29.90625,72.03125,-89.3125,'Release 1.00-EDStar','2015-01-18 16:08:41' 'LYNCIS SECTOR YZ-P B5-1',-19.96875,74.84375,-95.8125,'Release 1.00-EDStar','2015-01-18 15:59:26' +'LYNCIS SECTOR ZE-R B4-4',-37.03125,14.0,-113.78125,'Release 1.00-EDStar','2015-01-20 22:18:06' 'LYONESSE',39.625,-117.625,5.15625,'Release 1.00-EDStar','2014-12-03 14:07:11' 'LZ URSAE MAJORIS',-17.875,70.9375,-42.375,'Gamma','2014-11-27 11:33:44' 'LíFTHRUTI',70.15625,-143.625,123.15625,'Gamma','2014-11-27 11:33:44' @@ -15978,7 +16046,6 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'NJULANS',139.96875,-171.5,46.46875,'Gamma','2014-11-27 11:33:44' 'NJULNGAN',-38.875,-42.8125,-90.875,'Gamma','2014-11-27 11:33:44' 'NJUNDJI',95.84375,86.65625,-26.84375,'Gamma','2014-11-27 11:33:44' -'NJUNG',73.1875,-213.6875,26.8125,'Gamma','2014-11-27 11:33:44' 'NJUNGA',91.46875,-32.1875,-79.5625,'Gamma','2014-11-27 11:33:44' 'NJUNGUM',134.59375,-21.5625,1.15625,'Gamma','2014-11-27 11:33:44' 'NJUNMIN',-55.6875,-23.90625,-51.84375,'Gamma','2014-11-27 11:33:44' @@ -16083,6 +16150,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'NLTT 9032',-6.625,-80.625,-66.65625,'Gamma','2014-11-27 11:33:44' 'NLTT 9447',32.625,-96.75,-41.5,'Gamma','2014-11-27 11:33:44' 'NLTT 9949',45.53125,-53.9375,5.5625,'Gamma','2014-11-27 11:33:44' +'NN 3009',16.1875,-37.8125,15.8125,'Release 1.00-EDStar','2015-01-20 10:39:36' 'NN 3062',-62.8125,-145.71875,-37.6875,'Gamma','2014-11-27 11:33:44' 'NN 3365',-18.46875,11.5625,-80.3125,'Gamma','2014-11-27 11:33:44' 'NN 3709',30.75,29.4375,11.3125,'Release 1.00-EDStar','2014-12-03 03:24:39' @@ -18466,11 +18534,14 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'SHUI WEI SECTOR AQ-P B5-2',55.75,-165.09375,67.8125,'Release 1.00-EDStar','2015-01-11 19:22:29' 'SHUI WEI SECTOR BQ-Y D102',16.0,-69.5,24.03125,'Release 1.00-EDStar','2015-01-03 06:08:11' 'SHUI WEI SECTOR BQ-Y D93',54.875,-74.1875,46.84375,'Release 1.00-EDStar','2014-12-31 04:49:23' +'SHUI WEI SECTOR CL-X B1-0',56.0625,-104.65625,-21.90625,'Release 1.00-EDStar','2015-01-21 09:38:36' 'SHUI WEI SECTOR FH-U B3-1',50.53125,-51.25,31.5625,'Gamma-Inferred','2014-12-12 12:41:35' +'SHUI WEI SECTOR FH-U B3-5',39.09375,-61.4375,25.09375,'Release 1.00-EDStar','2015-01-20 13:57:55' 'SHUI WEI SECTOR FW-W D1-122',58.96875,-64.28125,69.0625,'Release 1.00-EDStar','2015-01-12 19:06:26' 'SHUI WEI SECTOR GH-U B3-3',57.09375,-58.53125,33.53125,'Release 1.00-EDStar','2014-12-30 11:39:11' 'SHUI WEI SECTOR GH-U B3-5',57.46875,-65.0,31.59375,'Release 1.00-EDStar','2014-12-30 11:34:20' 'SHUI WEI SECTOR GM-V C2-14',63.0625,-63.0,59.25,'Release 1.00-EDStar','2015-01-12 19:03:07' +'SHUI WEI SECTOR HC-U B3-1',35.09375,-69.75,32.25,'Release 1.00-EDStar','2015-01-20 14:02:37' 'SHUI WEI SECTOR HH-V C2-21',47.3125,-75.4375,60.5,'Release 1.00-EDStar','2015-01-13 19:48:53' 'SHUI WEI SECTOR HW-W C1-24',128.96875,-124.25,15.9375,'Release 1.00-EDStar','2014-12-16 12:39:11' 'SHUI WEI SECTOR JW-W B1-0',80.375,-164.53125,-23.0,'Release 1.00-EDStar','2014-12-08 20:57:04' @@ -18772,6 +18843,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'STKM 1-1767',-81.4375,-35.09375,79.34375,'Gamma','2014-11-27 11:33:44' 'STKM 1-1968',-67.90625,-54.46875,25.84375,'Release 1.00-EDStar','2015-01-09 04:31:36' 'STKM 1-2166',-50.3125,-63.8125,-6.96875,'Gamma','2014-11-27 11:33:44' +'STKM 1-367',-6.875,-49.125,-64.75,'Release 1.00-EDStar','2015-01-23 04:18:43' 'STKM 1-383',-3.0625,-60.71875,-80.03125,'Gamma','2014-11-27 11:33:44' 'STKM 1-442',31.96875,-55.6875,-40.40625,'Gamma','2014-11-27 11:33:44' 'STKM 1-478',-0.5625,-50.21875,-108.375,'Gamma','2014-11-27 11:33:44' @@ -18937,6 +19009,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'SYNUEFE EC-L C24-1',119.75,-261.5,-17.65625,'Gamma','2014-11-27 11:33:44' 'SYNUEFE ET-O D7-30',171.90625,-98.3125,-356.03125,'Release 1.00-EDStar','2014-12-17 23:14:31' 'SYNUEFE ET-O D7-31',168.125,-90.84375,-371.1875,'Release 1.00-EDStar','2014-12-17 23:18:25' +'SYNUEFE FE-W B48-0',38.5,-259.84375,-19.875,'Release 1.00-EDStar','2015-01-22 03:41:43' 'SYNUEFE FZ-D D13-103',198.75,-152.96875,126.625,'Gamma','2014-11-27 11:33:44' 'SYNUEFE FZ-D D13-108',204.75,-143.90625,133.1875,'Gamma','2014-11-27 11:33:44' 'SYNUEFE FZ-D D13-46',233.78125,-136.75,68.625,'Gamma','2014-11-27 11:33:44' @@ -19048,6 +19121,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'TALEO',-0.40625,58.34375,-100.46875,'Gamma','2014-11-27 11:33:44' 'TALIESIN',-2.9375,22.1875,-25.28125,'Beta3','2014-11-01 06:36:37' 'TALITHA',-5.125,31.28125,-35.125,'Beta3','2014-11-01 06:36:37' +'TALTA',5.59375,-5.125,10.34375,'Release 1.00-EDStar','2015-01-13 00:55:35' 'TALUKANA',119.84375,80.75,23.1875,'Gamma','2014-11-27 11:33:44' 'TAMA',-29.9375,-45.65625,10.34375,'Gamma','2014-11-27 11:33:44' 'TAMALHIKAS',43.1875,-12.15625,-77.4375,'Gamma','2014-11-27 11:33:44' diff --git a/edscupdate.py b/edscupdate.py index def1061c..addd01d2 100644 --- a/edscupdate.py +++ b/edscupdate.py @@ -31,11 +31,35 @@ import tradedb import math import misc.edsc +import os import re import sys from tkinter import Tk +class UsageError(Exception): + pass + + +def get_cmdr(tdb): + try: + return os.environ['CMDR'] + except KeyError: + pass + + if 'SHLVL' not in os.environ and platform.system() == 'Windows': + how = 'set CMDR="yourname"' + else: + how = 'export CMDR="yourname"' + + raise UsageError( + "No 'CMDR' variable set.\n" + "You can set an environment variable by typing:\n" + " "+how+"\n" + "at the command/shell prompt." + ) + + r = Tk() r.withdraw() @@ -46,6 +70,8 @@ tdb = tradedb.TradeDB() date = tdb.query("SELECT MAX(modified) FROM System").fetchone()[0] +cmdr = get_cmdr(tdb) + startSys = tdb.lookupPlace(sys.argv[1]) ox, oy, oz = startSys.posX, startSys.posY, startSys.posZ @@ -65,9 +91,11 @@ data = edsq.fetch() ignore = [ + 'ADAM NAPAT', 'AN SEXSTANS', 'ALRAI SECTOR EL-Y C3-1', 'ALRAI SECTOR OI-T B3-6 A', # No 'A' at the end + 'COL 285 SECTOR ZJ-Y B140-1', 'CORE SYS SECTOR HH-V B2-7', 'CRU7CIS SECTOR EQ-Y B2', 'CRUCIS SECTO GB-X B1-0', @@ -87,6 +115,7 @@ 'ROSS 41 A', 'SCORPII SECTOR KB-X A1-01', # should be SCORPII SECTOR KB-X A1-0 'WISE 0410+ 1502', # should be WISE 0410+1502 + 'WISE 2200-3628', 'WOLF 851 A', 'ZAGARAS', ] @@ -129,6 +158,9 @@ def ischange(sysinfo): ] print("{} changes".format(len(systems))) +if len(systems) > 0: + print("At the prompt enter y, n or q. Default is n") + with open("new.systems.csv", "w") as output: try: for sysinfo in systems: @@ -162,16 +194,27 @@ def ischange(sysinfo): name, x, y, z, mname, mx, my, mz ), file=sys.stderr) + distance = float("{:.2f}".format(dist(x, y, z))) paste(name.lower()) prompt = "'{}'".format(name) - prompt += " ({:.2f}ly)".format(dist(x, y, z)) + prompt += " ({:.2f}ly)".format(distance) - ok = input(prompt+": y, n or q (default 'n')? ".format(name)) + ok = input(prompt+"? ".format(name)) if ok.lower() == 'q': break if ok.lower() == 'y': print("'{}',{},{},{},'Release 1.00-EDStar','{}'".format( name, x, y, z, created, ), file=output) + print("Submitting distance") + sub = misc.edsc.StarSubmission( + star=name.upper(), + commander=cmdr, + distances={startSys.name(): distance}, + ) + r = sub.submit() + misc.edsc.annotate_submission_response(r) + print() except KeyboardInterrupt: print("^C") + diff --git a/misc/derp-sentinel.py b/misc/derp-sentinel.py new file mode 100644 index 00000000..dd3d09fb --- /dev/null +++ b/misc/derp-sentinel.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python + +import tradedb +tdb = tradedb.TradeDB() + +names = set() + +for sys in tdb.systemByID.values(): + for stn in sys.stations: + names.add(stn.name().upper()) + +mutators = { + 'D': [ 'O', '0', ], + 'W': [ 'VV', ], + 'R': [ 'IT' ], +} + +def mutate(text, pos): + for i in range(pos, len(text)): + char = text[i] + if char not in mutators: + continue + bef, aft = text[:i], text[i+1:] + for mutant in mutators[char]: + t2 = bef + mutant + aft + yield t2 + yield from mutate(str(t2), i+len(mutant)) + +for name in names: + for mutant in mutate(name, 0): + if mutant in names: + print("{} <-> {}".format(name, mutant)) + diff --git a/misc/edsc.py b/misc/edsc.py index fad0ad4e..a3d5e845 100755 --- a/misc/edsc.py +++ b/misc/edsc.py @@ -2,6 +2,7 @@ from __future__ import absolute_import, with_statement, print_function, division, unicode_literals +from collections import defaultdict from urllib.parse import urlencode from urllib.request import Request, urlopen @@ -138,6 +139,50 @@ def submit(self): raise SubmissionError("Invalid server response: " + resp) +def annotate_submission_response(r): + if not isinstance(r, dict) or 'status' not in r: + print("Unknown EDSC response: {}".format(r)) + return + status = r['status'] + result = status['input'][0]['status'] + if result['statusnum'] != 0: + print("*** {} (#{})".format(result['msg'], result['statusnum'])) + systems = defaultdict(list) + for sysEnt in status['system']: + sysName = sysEnt['system'].upper() + systems[sysName] += [ + "{} (#{})".format( + sysEnt['status']['msg'], + sysEnt['status']['statusnum'], + ) + ] + for triEnt in status['trilat']: + sysName = triEnt['system'].upper() + triStatus = triEnt['status'] + triStatusNum = triStatus['statusnum'] + if triStatusNum == 401: + coord = triEnt['coord'] + msg = "Position [{},{},{}]".format( + coord['x'], coord['y'], coord['z'] + ) + else: + msg = "{} (#{})".format(triStatus['msg'], triStatusNum) + if not msg in systems[sysName]: + systems[sysName].append(msg) + for sys, vals in systems.items(): + print("{}: {}.".format(sys, '. '.join(vals))) + for distEnt in status['dist']: + lhsName = distEnt['system1'].upper() + rhsName = distEnt['system2'].upper() + print("{}->{}: {} (#{}). Dist={}".format( + lhsName, rhsName, + distEnt['status']['msg'], + distEnt['status']['statusnum'], + distEnt['dist'], + + )) + + if __name__ == "__main__": edsq = StarQuery(test=False, confidence=0) data = edsq.fetch() @@ -153,4 +198,3 @@ def submit(self): for sysinfo in systems: print(sysinfo['id'], sysinfo['name'], sysinfo['coord'], sysinfo['createdate']) - diff --git a/submit-distances.py b/submit-distances.py index 03afd7d0..be0dc66b 100644 --- a/submit-distances.py +++ b/submit-distances.py @@ -25,7 +25,7 @@ import sys import tradedb -from misc.edsc import StarSubmission +from misc.edsc import StarSubmission, annotate_submission_response from tkinter import Tk try: @@ -354,13 +354,16 @@ def main(): ) resp = sub.submit() - status = resp['status']['input'][0]['status'] - if status['statusnum'] == 0: - print(status['msg']) - else: - print("ERROR: {} ({})".format( - status['msg'], status['statusnum'], - )) + try: + annotate_submission_response(resp) + except: + status = resp['status']['input'][0]['status'] + if status['statusnum'] == 0: + print(status['msg']) + else: + print("ERROR: {} ({})".format( + status['msg'], status['statusnum'], + )) if __name__ == "__main__":