diff --git a/.gitignore b/.gitignore index 62bc3f42..1a9e5472 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ data/TradeDangerous.db data/TradeDangerous.db-journal data/TradeDangerous.prices data/*.stamp +data/extra-stars.txt *.prices *.suo *.pyperf diff --git a/CHANGES.txt b/CHANGES.txt index 5c0b780f..d9a78b32 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,11 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014 ============================================================================== [wip] +. (kfsone) '--ls-max' will now also unknown (0) distances, +. (kfsone) Added '--max-routes' for setting an absolute max on how many + of the top routes we use after the first hop, +. (kfsone) Added 'submit-distances' tool for submitting EDStarCoordinator + star data. . (kfsone) Added '--prune-score' and '--prune-hops' to run; these let you discard routes that are under-performing early on which can make calculating longer runs more efficient. @@ -10,7 +15,10 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014 . (kfsone) "run" and TradeCalc are much smarter about which hops they will consider when using --max-age, --blackmarket, etc. (big perf win) - +. (kfsone) Renamed "misc/edstarquery.py" to "misc/edsc.py" + - Added misc.edsc.StarSubmission + - Renamed misc.edsc.EDStarQuery to misc.edsc.StarQuery + - Changed "submit-distances" to use "StarSubmission" v6.7.0 Jan 17 2015 . (kfsone) ".prices" import automatically creates local placeholders diff --git a/commands/run_cmd.py b/commands/run_cmd.py index d5458bed..249364e7 100644 --- a/commands/run_cmd.py +++ b/commands/run_cmd.py @@ -145,6 +145,15 @@ metavar='N', type=int, ), + ParseArgument('--max-routes', + help='At the end of each hop, limit the number of routes ' + 'that continue to the next round to the top N ' + 'highest scoring', + default=0, + metavar='N', + type=int, + dest='maxRoutes', + ), ParseArgument('--checklist', help='Provide a checklist flow for the route.', action='store_true', @@ -403,7 +412,7 @@ def checkStationSuitability(cmdenv, station, src=None): )) return False mls = cmdenv.maxLs - if mls and station.lsFromStar > mls: + if mls and (station.lsFromStar <= 0 or station.lsFromStar > mls): if src and src != "--from": raise CommandLineError( "{} station {} does not meet max-ls " @@ -415,7 +424,7 @@ def checkStationSuitability(cmdenv, station, src=None): if maxAge and station.dataAge > maxAge: if src and src != "--from": raise CommandLineError( - "{} station {} does not meet --max-age " + "{} station {} does not meet --age " "requirement.".format( src, station.name(), )) @@ -425,8 +434,6 @@ def checkStationSuitability(cmdenv, station, src=None): def filterStationSet(src, cmdenv, stnSet): if not stnSet: return stnSet - bm, mps = cmdenv.blackMarket, cmdenv.maxPadSize - mls = cmdenv.maxLs for place in stnSet: if not isinstance(place, Station): continue @@ -613,8 +620,8 @@ def validateRunArguments(tdb, cmdenv): if cmdenv.pruneScores and cmdenv.pruneHops: if cmdenv.pruneScores > 100: raise CommandLineError("--prune-score value percentage exceed 100.") - if cmdenv.pruneHops < 3: - raise CommandLineError("--prune-hops must 3 or more.") + if cmdenv.pruneHops < 2: + raise CommandLineError("--prune-hops must 2 or more.") else: cmdenv.pruneScores = cmdenv.pruneHops = 0 @@ -710,6 +717,9 @@ def run(results, cmdenv, tdb): elif len(viaSet) > cmdenv.adhocHops: restrictTo = viaSet + if cmdenv.maxRoutes and hopNo >= 1: + routes = routes[:cmdenv.maxRoutes] + if pruneMod and hopNo + 1 >= cmdenv.pruneHops and len(routes) > 10: routes.sort() bestScore, worstScore = routes[0].score, routes[-1].score @@ -717,10 +727,10 @@ def run(results, cmdenv, tdb): oldLen = len(routes) while routes[-1].score < threshold: routes.pop() - cmdenv.NOTE("Pruned {} routes", oldLen - len(routes)) + cmdenv.NOTE("Pruned {} origins", oldLen - len(routes)) if cmdenv.progress: - print("* Hop {:3n}: {:.>10n} routes".format(hopNo+1, len(routes))) + print("* Hop {:3n}: {:.>10n} origins".format(hopNo+1, len(routes))) elif cmdenv.debug: cmdenv.DEBUG0("Hop {}...", hopNo+1) diff --git a/corrections.py b/corrections.py index 8824e3a7..41189a9c 100644 --- a/corrections.py +++ b/corrections.py @@ -17,6 +17,7 @@ } stations = { + "171 G. AQUARII/ELCANO OOCK": "Elcano Dock", "21 DRACO/ROBERTS PORT": DELETED, "37 XI BOOTIS/SCHIRRA PLANT": "Schirba Plant", "51 AQUILAE/COKEHUB": "Coke Hub", @@ -46,11 +47,11 @@ "GCRV 4654/HERZEFELD LANDING": "Herzfeld Landing", "GROOMBRIDGE 1618/FRANKUN RING": "Franklin Ring", "HDS 1879/HEDIN ORBITAL": DELETED, + "HIP 110483/VALIGURSKY ORBITAE": "Valigursky Orbital", "HIP 4907/EDISON PLATFORM": DELETED, "HR 5451/MACDONALO HUB": "MacDonald Hub", "HR 5451/MACOONALD HUB": "MacDonald Hub", "HR 5451/MACOONALO HUB": "MacDonald Hub", - "HIP 110483/VALIGURSKY ORBITAE": "Valigursky Orbital", "JAWOLA/SUTCLIFFEPLATFORM": "Sutcliffe Platform", "KANOS/LEE STATION": DELETED, "LEESTI/GEORGELUCAS": "George Lucas", @@ -79,6 +80,9 @@ "ORERVE/WATSON SATION": "Watson Station", "PANGLUYA/BRADBURYWORKS": "Bradbury Works", "PERENDI/SHEPHERD INSTALLATION": DELETED, + "PRIVA/DUGAN OOCK": "Dugan Dock", + "PRIVA/OUGAN DOCK": "Dugan Dock", + "PRIVA/OUGAN OOCK": "Dugan Dock", "RAHU/LEBEDEV BEACON": DELETED, "RHO CANCRI/HAMILTON R,SERVE": "Hamilton Reserve", "RHO CANCRI/HAMILTON R�SERVE": "Hamilton Reserve", diff --git a/data/ShipVendor.csv b/data/ShipVendor.csv index 7ac30458..2180d96b 100644 --- a/data/ShipVendor.csv +++ b/data/ShipVendor.csv @@ -612,6 +612,12 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id 'THIANSI','Worlidge Port','Type 6' 'THIANSI','Worlidge Port','Type 9' 'THIANSI','Worlidge Port','Viper' +'THIIN','Euler Orbital','Asp' +'THIIN','Euler Orbital','Eagle' +'THIIN','Euler Orbital','Hauler' +'THIIN','Euler Orbital','Sidewinder' +'THIIN','Euler Orbital','Type 6' +'THIIN','Euler Orbital','Type 7' 'VOLKHAB','Vernadsky Dock','Adder' 'VOLKHAB','Vernadsky Dock','Anaconda' 'VOLKHAB','Vernadsky Dock','Asp' diff --git a/data/Station.csv b/data/Station.csv index f9461c44..c2109717 100644 --- a/data/Station.csv +++ b/data/Station.csv @@ -9,6 +9,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size '12 PERSEI','Wundt Terminal',0,'?','?' '13 ORIONIS','Scott Port',0,'?','?' '13 ORIONIS','Underwood Port',0,'?','?' +'132 G. AQUARII','Chretien Ring',0,'?','?' '15 GEMINORUM','Artsebarsky Dock',2250,'?','M' '15 GEMINORUM','Ericsson Port',1846,'?','M' '15 GEMINORUM','Gantt Station',1123,'?','L' @@ -18,6 +19,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size '16 CYGNI','Northrop Port',0,'?','L' '16 CYGNI','Payette Market',0,'?','L' '16 CYGNI','Siemens Orbital',0,'?','L' +'171 G. AQUARII','Elcano Dock',0,'?','?' '19 PHI-2 CETI','Baturin Gateway',11055,'N','M' '19 PHI-2 CETI','Borisenko Gateway',10767,'N','L' '19 PHI-2 CETI','Crick City',1127,'Y','L' @@ -58,14 +60,20 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size '37 LIBRAE','Roosa Market',1680,'?','?' '37 XI BOOTIS','Bresnik Terminal',10731,'Y','L' '37 XI BOOTIS','Schirba Plant',0,'?','?' +'39 SERPENTIS','Lindsey Orbital',0,'?','?' +'39 SERPENTIS','Rushd Ring',0,'?','?' '39 TAURI','Porta',991,'Y','L' '41 GAMMA SERPENTIS','Abe Landing',0,'?','?' +'41 GAMMA SERPENTIS','Bolotov Port',0,'?','?' +'41 GAMMA SERPENTIS','Kidman Settlement',0,'?','?' '44 B OPHIUCHI','Feustel Gateway',239,'Y','L' '44 CHI DRACONIS','Lawson Camp',0,'?','?' '47 CETI','Glushko Station',600000,'?','L' '47 CETI','Kaufmanis Hub',600000,'?','L' '47 URSAE MAJORIS','Avdeyev Beacon',0,'?','?' '49 D ORIONIS','Bell Station',0,'?','?' +'51 AQUILAE','Bose Orbital',0,'?','?' +'51 AQUILAE','Coke Hub',0,'?','?' '51 AQUILAE','Serebrov Station',0,'?','?' '51 AQUILAE','Thirsk Station',0,'?','?' '54 G. ANTLIA','Boas Orbital',0,'?','?' @@ -102,11 +110,15 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size '78 URSAE MAJORIS','Teller Terminal',659,'?','M' '78 URSAE MAJORIS','Townshend Hub',13102,'Y','L' '8 ALPHA-1 LIBRA','Hire Hub',5944,'Y','L' +'85 PEGASI','Borman Terminal',0,'?','?' +'85 PEGASI','Buckland Gateway',0,'?','?' '9 CETI','Fanning Vision',2900,'N','L' 'AASGANANU','Houssay Ring',0,'?','?' 'AASGANANU','Lovelace City',0,'?','?' 'AASGANANU','Sturckow Platform',0,'?','?' +'ABASSES','Morrow Vision',0,'?','?' 'ABROGO','Laing Hub',0,'?','?' +'ABUKUNIN','Olsen Horizons',0,'?','?' 'ABUKUNIN','Reilly Hub',171,'Y','?' 'AC +26 37030','Culbertson Port',1497,'Y','L' 'AC +26 37030','Kimbrough Settlement',1497,'?','M' @@ -180,6 +192,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'AGASTANI','Vesalius Terminal',0,'?','L' 'AGASTJA','Leiber Port',1640,'N','M' 'AGASTJA','Ziemianski Ring',930,'Y','L' +'AGATAVUN','Grandin Plant',0,'?','?' 'AGWE','Cassidy Platform',1712,'N','M' 'AGWE','Hutton Dock',1731,'N','M' 'AGWE','Sadi Carnot City',11812,'Y','L' @@ -229,6 +242,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ALFHEIM','Gernsback Orbital',2044,'?','M' 'ALFHEIM','Grant Terminal',51956,'?','L' 'ALFHEIM','Panshin Enterprise',1571,'?','M' +'ALGORAB','Fremion Dock',0,'?','?' 'ALGREIT','Smith Exchange',0,'?','?' 'ALICARL','Birdseye Port',0,'?','L' 'ALICARL','Parise Ring',0,'?','L' @@ -251,6 +265,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ALIT','Rosse Terminal',104,'N','M' 'ALIT','Webb Port',194,'N','M' 'ALLOWAIR','Skripochka Survey',0,'?','?' +'ALLOWAIR','Underwood Survey',0,'?','?' 'ALPHA CENTAURI','Al-Din Prospect',0,'?','M' 'ALPHA CENTAURI','Hutton Orbital',6937920,'?','M' 'ALPHA FORNACIS','Bennet Port',224,'Y','L' @@ -360,6 +375,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'APURA','Harris Dock',0,'?','?' 'ARABHA','Leibniz Relay',0,'?','?' 'ARABHA','Morgan Colony',0,'?','?' +'ARACENTE','Bahcall Settlement',0,'?','?' 'ARAKAPAJO','Stephan Port',1226,'Y','?' 'ARANGORII','Kaku Terminal',448706,'Y','L' 'ARANGORII','Leibniz Orbital',0,'?','?' @@ -391,8 +407,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ARQUE','Baird Gateway',591,'Y','L' 'ARRO NAGA','Gillekens Gateway',36085,'Y','L' 'ARTEMIS','Burckhardt Station',180,'?','M' +'ARTEMIS','Burckharot Station',0,'?','?' 'ARTEMIS','Freeholm',2445,'?','M' 'ARTEMIS','Laphrian Shipyard',240,'?','L' +'ARTH','Midgeley Dock',0,'?','?' 'ARUAGEA','Hornby Colony',14482,'?','?' 'ARUGH','Petlyakov Ring',174,'?','L' 'ARUGH','Walotsky Terminal',92.2,'?','L' @@ -409,7 +427,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ASVIENSES','Okuni City',0,'?','?' 'ASVIENSES','Sato City',0,'?','?' 'ASVIENSES','Valz Dock',0,'?','?' +'ATAGAT','Glashow City',0,'?','?' 'ATATA','Zahn Enterprise',0,'?','?' +'ATFERO','Tisserand Ring',0,'?','?' 'ATFERO','Watson Terminal',0,'?','?' 'ATHENA','Darboux Orbital',7392,'?','L' 'ATHENA','Escobar City',2979,'?','?' @@ -461,6 +481,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'B2 CARINAE','Mechain Vision',37895,'?','L' 'B2 CARINAE','Muller Orbital',37282,'?','L' 'B2 CARINAE','Secchi Hub',37896,'?','M' +'BA BHUTI','Lockhart Station',0,'?','?' 'BA NARI','De Seversky Plant',0,'?','?' 'BAGA','Binet Enterprise',0,'N','M' 'BAGA','Goeschke Enterprise',0,'N','L' @@ -482,6 +503,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'BAKARA','Arzachel Colony',21,'?','M' 'BAKER','White Rose',0,'?','?' 'BAKER','Wylie Dock',0,'?','?' +'BALAJI','Bellamy Dock',0,'?','?' 'BALATU','Haise Dock',2400,'Y','L' 'BALATU','Parker Enterprise',0,'?','?' 'BALDUK','Cantor Terminal',0,'?','?' @@ -502,6 +524,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'BANDIZEL','Hahn Orbital',409,'?','L' 'BANDIZEL','Hubble Hub',1188,'?','M' 'BANDIZEL','Ryananski City',709,'?','M' +'BANEMU','Henize Station',0,'?','?' +'BANEMU','Ostwald Colony',0,'?','?' 'BANKI','Parsons Vista',531869,'?','?' 'BARAMAT','Kludze Hub',0,'?','?' 'BARAMAT','Merritt Platform',0,'?','?' @@ -514,6 +538,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'BATJAN','Smith Landing',72,'N','L' 'BAUDUS','Agnesi City',0,'?','?' 'BAVAPRI','Walotsky Sanctuary',24,'N','M' +'BAVARINGONI','Chandler Platform',0,'?','?' 'BD+01 3657','Ham Settlement',251,'?','?' 'BD+01 3657','Sacco Base',350,'?','?' 'BD+03 1552','Bailey Station',0,'?','?' @@ -601,7 +626,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'BD-02 4304','Fabian Dock',0,'N','M' 'BD-02 4304','Gell-Mann Dock',154,'Y','L' 'BD-02 4304','Newton Dock',8221,'Y','L' +'BD-02 4304','Newton Oock',0,'?','?' 'BD-10 4011','Sinclair Station',1179,'Y','L' +'BD-10 5238','Weyn Port',0,'?','?' 'BD-11 4280','Mitchell City',1781,'Y','L' 'BD-11 4932','Morukov Station',0,'?','?' 'BD-22 3573','Bohm Terminal',59,'Y','L' @@ -678,17 +705,20 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'BHUTAS','Ohm Platform',2147,'Y','M' 'BIAMOANA','Artyukhin Port',0,'?','M' 'BIAMOANA','Shargin Landing',0,'?','M' +'BIDJA','Foucault Colony',0,'?','?' 'BIELONTI','Ahmed Dock',0,'?','?' 'BIELTANI','Marshburn Enterprise',0,'?','?' 'BILFROST','Godwin Hub',0,'?','?' 'BINBARA','Curie Gateway',447,'Y','M' 'BINBARA','Lamarck Gateway',444,'N','L' +'BISHAMUNI','Bear Landing',0,'?','?' 'BITJALA','Walker Dock',0,'?','?' 'BITJALA','Wedge Terminal',103,'Y','L' 'BJORTII','Vavrova Station',0,'N','?' 'BLATA','Gurragchaa Holdings',0,'?','?' 'BLATA','Nowak Landing',0,'?','?' 'BLATA','Sinclair Orbital',0,'?','?' +'BLODER','Szebehely Station',0,'?','?' 'BLODES','Linenger Station',0,'?','?' 'BOBADZIHOZO','Barr Refinery',404,'N','M' 'BOBADZIHOZO','Bolkow Colony',577,'N','M' @@ -705,13 +735,15 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'BORASETANI','Hodgson Vision',0,'?','?' 'BORASETANI','Katzenstein Terminal',227,'?','L' 'BORR','Armstrong City',0,'?','?' +'BOTA ILI','Ashby Dock',1408,'?','M' +'BOTA ILI','Lister Colony',1114,'?','M' 'BR PISCIUM','Trevithick Orbital',0,'?','?' 'BRAGPURA','Eyharts Plant',57,'N','?' 'BRAGUROM DU','Comino Station',0,'?','?' 'BRAHMA','Banks Landing',0,'?','?' 'BRAMAN','Pinzon''s Exile',0,'?','M' -'BRANGLAL','Gibson Horizons',0,'?','?' -'BRANGLAL','Skripochka Gateway',0,'?','?' +'BRANGLAL','Gibson Horizons',0,'?','M' +'BRANGLAL','Skripochka Gateway',847,'N','L' 'BRANI','Akiyama Market',46,'Y','L' 'BRANI','Barsanti Enterprise',32,'N','L' 'BRANI','Hadfield Port',14,'N','M' @@ -752,6 +784,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'BUNUVIVIA','Ellison Enterprise',1028,'Y','L' 'BUNUVIVIA','Greenland City',1444,'Y','M' 'BW PHOENIX','Barnwell Stop',0,'?','?' +'BYEL TAN','Barcelo Refinery',0,'?','?' 'BZ CETI','Coleman Ring',0,'?','?' 'CADUBI','Leydenfrost Hub',0,'?','?' 'CADUPI','Grunsfeld Station',0,'?','?' @@ -782,6 +815,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'CALOR','Julian Hub',21,'Y','L' 'CALOR','Papin Terminal',37,'N','M' 'CAMA','Jacquard Gateway',0,'?','?' +'CANTJARISNI','Cochrane Enterprise',0,'?','?' 'CAPH','MacLaurin Terminal',1279,'Y','L' 'CARACENI','Fairbairn Gateway',21,'N','M' 'CARACENI','Kerr Enterprise',21,'Y','L' @@ -819,6 +853,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'CD-35 9019','Scobee Terminal',544,'?','L' 'CD-35 9019','Wright City',332,'?','L' 'CD-37 641','Ball Dock',0,'?','?' +'CD-37 641','Lagrange City',0,'?','?' 'CD-39 3269','Fiennes Gateway',0,'?','?' 'CD-40 395','Merritt Dock',0,'?','?' 'CD-40 395','Oort Port',0,'?','?' @@ -833,6 +868,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'CD-54 471','Cochrane Platform',0,'?','M' 'CD-54 471','Kramski-Putter',506,'Y','L' 'CD-58 538','Hornby Station',0,'?','?' +'CD-60 278','Chacornac''s Progress',0,'?','?' 'CD-62 136','Apianus Dock',139,'?','L' 'CD-62 136','Duque Gateway',139,'?','L' 'CD-62 1454','Baille City',0,'?','?' @@ -874,6 +910,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'CERNO','Kanwar Enterprise',0,'?','L' 'CERNOBOG','Kirkwood Vision',0,'?','?' 'CF 464','Bartini Enterprise',0,'?','?' +'CH''IANG FEI','Ejeta Enterprise',0,'?','?' +'CH''IANG FEI','Fisher Hub',0,'?','?' +'CH''IANG FEI','Leopold Settlement',0,'?','?' 'CH''IN YANG','Dumont Terminal',0,'?','?' 'CH''UANGA','Barr City',3524,'Y','L' 'CHAAC','Antonio de Andrade',0,'?','?' @@ -882,11 +921,18 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'CHAC CIMIH','Oxley Terminal',701,'Y','L' 'CHACOBOG','Trinh Enterprise',0,'?','?' 'CHAMBO','Deb Settlement',824,'Y','M' +'CHAMBO','Deluc Settlement',0,'?','?' +'CHAMO','Fan Port',0,'?','?' +'CHAMO','Frost Terminal',0,'?','?' +'CHAMO','Heinkel City',0,'?','?' +'CHAMO','Martiniere Port',0,'?','?' +'CHAMO','Nagata Station',0,'?','?' 'CHAMUNDA','Gidzenko Ring',2709,'Y','L' 'CHANG YEH','Nicollet City',0,'?','?' 'CHANGDA','Bondar Mines',0,'?','?' 'CHANGGU','Braun Landing',683,'?','?' 'CHANGGU','Mendeleev Colony',17,'?','?' +'CHANGTHINI','Shkaplerov Hanger',0,'?','?' 'CHANGTHINI','Walker Platform',208,'?','?' 'CHANII','Lundwall Hub',0,'?','?' 'CHAPO','Nachtigal Vision',0,'?','?' @@ -897,6 +943,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'CHAPSUGAIBO','Schlesinger City',1297,'N','L' 'CHARA','Reilly Refinery',0,'?','?' 'CHARUNDER','Chomsky Terminal',0,'?','?' +'CHARUNDER','Treshchov Market',0,'?','?' +'CHARUNDER','Whitworth Station',0,'?','?' 'CHAXIRAXI','Brother''s Progress',0,'?','?' 'CHAXIRAXI','Liska Dock',0,'?','?' 'CHECHEHET','Desargues Works',0,'?','?' @@ -930,9 +978,11 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'CHIMBA','Hurley Port',9781,'?','L' 'CHIMBA','Nikolayev Hub',9782,'?','L' 'CHIMBA','Thornton Hub',9772,'N','L' +'CHINICOLLO','Onufriyenko Mine',0,'?','?' 'CHIRA','Dufay Vision',0,'?','?' 'CHNOUK','Van Scyoc Horizons',0,'?','?' 'CHNUMANDR','Weston Relay',0,'?','?' +'CHNUPHIS','Shaw Settlement',0,'?','?' 'CHONGQUAN','Eisele Park',0,'?','?' 'CHONO','Siddha Ring',9,'N','L' 'CHONOST','Savitskaya Hub',0,'?','?' @@ -974,6 +1024,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'CONCHUCOS','Arisman Hub',0,'?','?' 'CONCHUCOS','Bereznyak Dock',0,'?','?' 'CONDOVICHS','Walters Port',8803,'Y','L' +'CONTEGUS','Wang Dock',0,'?','?' 'COQUI RENES','Fullerton Hub',0,'N','M' 'COQUI RENES','Hooke Ring',0,'N','L' 'COQUI RENES','Kirchoff Enterprise',0,'Y','M' @@ -1034,6 +1085,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'CZERNOVALE','Berliner Enterprise',0,'?','M' 'CZERNOVALE','Evans Enterprise',0,'?','M' 'CZERNOVALE','Savinykh City',243,'Y','L' +'DADAL','Fiennes City',0,'?','?' 'DAGAZ','Wakata Refinery',0,'?','?' 'DAGDHANGJEL','Pasteur Terminal',0,'?','?' 'DAHA','Al-Khalili Dock',0,'?','?' @@ -1049,6 +1101,11 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'DAIKU','Chaviano Station',0,'?','?' 'DAIKU','Wrangel Orbital',274,'Y','L' 'DAIKULCANDI','Chretien Oudemans Hanger',0,'?','?' +'DAJOAR','Crown Terminal',0,'?','?' +'DAJOAR','Ejeta Enterprise',0,'?','?' +'DAJOAR','MacQuorn Rankine Port',0,'?','?' +'DAJOAR','Patrick Terminal',0,'?','?' +'DAJOAR','Thiele Port',0,'?','?' 'DALEVARD','Haxel City',0,'?','?' 'DALEVARD','Shepherd City',0,'?','?' 'DAMNA','Bao City',0,'?','?' @@ -1189,11 +1246,14 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ELEU','Pierce Gateway',0,'?','M' 'ELEU','Tem Station',0,'?','L' 'ELEUTSI','Brule Retreat',0,'?','L' +'ELUSCAP','Crown Terminal',0,'?','?' +'ELUSCAP','Jeschke Hub',0,'?','?' 'EN KUNGU','Silverberg Orbital',109,'?','L' 'ENEK','Carr Station',0,'?','?' 'ENEK','Milnor Port',0,'?','?' 'EOCHUMLIA','Altman Dock',0,'?','?' 'EOCHUMLIA','Tombaugh Installation',0,'?','?' +'EOS','Bloomfield Orbital',0,'?','?' 'EOTIENSES','Kaufmanis Port',0,'?','?' 'EPSILON CETI','Hennen Orbital',0,'?','L' 'EPSILON CYGNI','Grant Terminal',2480,'Y','?' @@ -1251,6 +1311,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ETA SERPENTIS','Qurra Ring',0,'?','L' 'ETA SERPENTIS','Ray Dock',662,'Y','L' 'ETHGREZE','Bloch Station',351,'Y','L' +'ETHLI','Gurragchaa Station',1759,'?','M' +'ETHLI','Halsell Station',2271,'?','M' 'EUBOA','Foreman Orbital',0,'?','?' 'EULEXIA','Mad J Wagar''s',105,'Y','L' 'EURIPUS','Blalock Horizons',2769,'Y','M' @@ -1310,13 +1372,16 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'FRIGGIRAWI','Ivanishin Platform',0,'?','?' 'FRIGUR','Barba Hub',0,'?','?' 'FRIGUR','Illy Landing',0,'?','?' +'FROG','Kempston Hardwick',0,'?','?' 'FT CETI','Greenland City',1776,'?','L' 'FU HUANGAA','Vizcaino Landing',327,'Y','M' 'FU HUANGAA','Williams Landing',327,'Y','M' 'FUELUM','Thesiger Enterprise',62,'Y','M' 'FUJIN','Futen Spaceport',560,'?','L' -'FULAR','Kotov Orbital',0,'N','L' -'FULAR','Maclean Horizons',0,'?','?' +'FULAR','Kotov Orbital',1344,'N','L' +'FULAR','Maclean Horizons',2379,'N','M' +'FULAR','Marshburn Installation',1759,'?','M' +'FURBAIDE','Cook Terminal',0,'?','?' 'FURBAIDE','Effinger Port',2062,'Y','L' 'FUTENO','Haipeng Ring',0,'?','?' 'FUTENO','Hermaszewski Installation',0,'?','?' @@ -1369,11 +1434,16 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'G 268-47','Archambault Hub',8,'Y','L' 'G 268-47','Dyson Ring',13,'?','?' 'G 268-47','Landsteiner Orbital',28,'N','M' +'G 41-14','Ramon Hub',0,'?','?' 'G 65-9','Marconi Port',0,'?','?' 'G 87-16','Ashton Station',22444,'Y','L' 'G 87-16','Clayton Port',22337,'Y','L' 'G 87-16','Elvstrom City',22019,'Y','M' 'G 87-16','Silverberg Dock',22524,'Y','M' +'G 98-44','Glashow Landing',498,'?','M' +'G 98-44','Oswald Ring',392,'?','L' +'G 98-44','Wankel Terminal',671,'?','M' +'GABIETYE','Holberg Terminal',0,'?','?' 'GABJAUJAVAS','Vetulani Installation',1750,'?','?' 'GABRACENI','Ahern Ring',335,'N','L' 'GABRACENI','Hughes Market',195,'Y','L' @@ -1386,6 +1456,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'GAMMA DORADUS','Wang City',40000,'?','?' 'GAMMA MENSAE','Koch Installation',0,'?','M' 'GANDUI','Regiomontanus Ring',0,'?','?' +'GANDVIK','Ordway Settlement',0,'?','?' 'GAOHIKEL','Behnken Settlement',1245,'?','M' 'GAOHIKEL','Dalton Dock',679,'?','L' 'GAOHIKEL','Wittgenstein Port',1274,'?','M' @@ -1395,6 +1466,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'GATEWAY','Wicca Town',0,'?','?' 'GATONESE','Darlton''s Progress',885,'Y','?' 'GATONESE','Shavers''s Claim',0,'?','?' +'GAULA','Gallun Terminal',0,'?','?' +'GAULA','J. G. Ballard Station',0,'?','?' +'GAULA','Ledyard Terminal',0,'?','?' +'GAULA','McQuay Port',0,'?','?' 'GCRV 13292','Walheim Dock',0,'?','?' 'GCRV 4654','Herzfeld Landing',2483,'N','M' 'GCRV 62586','Ing Station',29,'Y','M' @@ -1412,6 +1487,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'GEAWETE','Fontana Enterprise',0,'?','M' 'GEAWETE','Sevastyanov Dock',0,'?','M' 'GENDALLA','Normand Platform',0,'?','?' +'GENDE','Baliunas Hub',0,'?','?' 'GENDENWITHA','Filipchenko Gateway',1346,'N','L' 'GENDINI','Houtman Gateway',0,'?','?' 'GEORGE PANTAZIS','Banks Refinery',0,'?','?' @@ -1433,9 +1509,11 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'GLIESE 563.1','Matteucci Ring',328,'Y','L' 'GLIESE 67.2','Palisa Terminal',879,'N','M' 'GLIESE 67.2','Urata Colony',904,'N','M' +'GLIESE 868','Alas Station',0,'?','?' 'GLIESE 868','Bacon Port',0,'?','?' 'GLIESE 868','Braun Station',78,'N','L' 'GLIESE 868','Houssay Terminal',155,'Y','L' +'GLIESE 868','Maclean Terminal',0,'?','?' 'GLIESE 868','Reilly Enterprise',57,'?','M' 'GLIESE 875','Soddy Settlement',599,'N','?' 'GLIESE 875','Wilson Hanger',419,'N','?' @@ -1527,6 +1605,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HALAI','Bartoe Terminal',0,'?','?' 'HALAI','Cenker Station',0,'?','?' 'HALAI','Chaudhary Enterprise',0,'?','?' +'HAMBULA','Ejeta Orbital',0,'?','?' 'HAMBULA','Linenger Enterprise',0,'?','?' 'HAMBULA','Qureshi Hub',0,'?','?' 'HANG PO','Ericsson Dock',104,'Y','?' @@ -1535,12 +1614,14 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HANGGARDI','Henricks Gateway',726,'?','?' 'HANGGARDI','Soddy Market',340,'Y','?' 'HANGGARDI','Stott City',1059,'?','?' +'HANNENG','Baudin Gateway',0,'?','?' 'HAOKAH','Revin Horizons',0,'?','?' 'HAR PAHARY','Leonard Station',0,'?','?' 'HAR PAHARY','Lindemann Hub',0,'?','?' 'HARAKA','Blackman Station',0,'?','?' 'HARED','Morey Refinery',0,'?','?' 'HARED','Poisson Settlement',0,'?','?' +'HARERMID','Pausch Plant',0,'?','?' 'HARITI','Goeppert-Mayer Station',1080,'?','?' 'HASTAR','Alvares Enterprise',0,'?','?' 'HATMEHING','Celsius Dock',591,'?','?' @@ -1587,6 +1668,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HELVETITJ','Friend Orbital',445,'Y','L' 'HEMAKI','Coriolis',0,'?','?' 'HEMAKI','Kizim',0,'?','?' +'HEMASKAS','Osterbrock Platform',0,'?','?' 'HEPA','Hendel Refinery',0,'?','?' 'HEPA','Miller Refinery',0,'?','?' 'HERENGUL','Shapley Horizons',241,'N','M' @@ -1608,13 +1690,16 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HIP 10175','Stefanyshyn-Piper Station',4850,'?','L' 'HIP 103620','Anderson Terminal',0,'?','L' 'HIP 104471','Carlisle Enterprise',0,'?','?' +'HIP 105368','Newcomb Dock',0,'?','?' 'HIP 108822','Newcomen Depot',3208,'N','M' +'HIP 110483','Valigursky Orbital',0,'?','?' 'HIP 110773','Bain Orbital',0,'?','?' 'HIP 11111','Hadfield Survey',0,'?','?' 'HIP 11263','Froud Station',3249,'N','L' 'HIP 11263','Hay Port',3121,'N','L' 'HIP 11263','Wilhelm Klinkerfues Ring',3120,'N','M' 'HIP 113477','Diophantus Port',0,'?','?' +'HIP 113948','Baliunas Port',0,'?','?' 'HIP 114099','Bacigalupi Mine',0,'?','?' 'HIP 114135','Dixon Hub',3500,'?','?' 'HIP 114135','Karlsefni Settlement',3500,'?','?' @@ -1667,6 +1752,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HIP 24655','Hogan Dock',0,'?','?' 'HIP 27058','Carrasco Ring',0,'?','?' 'HIP 27986','Webb Port',0,'?','?' +'HIP 3930','Pond City',0,'?','?' +'HIP 3930','Pratchett Gateway',0,'?','?' 'HIP 41181','Andersson Station',523000,'?','L' 'HIP 41181','Garcia Port',0,'?','L' 'HIP 41955','Lukyanenko Platform',23,'Y','M' @@ -1710,6 +1797,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HIP 72353','Caidin Station',0,'?','?' 'HIP 72353','Doyle Dock',0,'?','?' 'HIP 72600','Wnuk-Lipinski Enterprise',2686,'Y','L' +'HIP 7298','Hamuy Survey',0,'?','?' 'HIP 73269','Pournelle Terminal',0,'?','?' 'HIP 74243','Bean City',0,'?','?' 'HIP 74255','Guest City',130,'?','L' @@ -1756,6 +1844,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HO HSI','Steiner Hub',36,'?','?' 'HO HSIEN','Bushnell Enterprise',670,'?','?' 'HO HSIEN','Dutton Station',670,'?','?' +'HOLIACAN','Fortress Yarrow',0,'?','?' 'HOLIACAN','Hopi',37,'Y','L' 'HOLIACAN','Melbourne',74,'?','?' 'HOLVA','Kreutz Orbital',22000,'?','L' @@ -1765,6 +1854,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HORAE','Haber Hub',4668,'Y','?' 'HORAE','McDivitt Dock',7961,'Y','?' 'HOU HSIEN','Hill Hub',589,'N','L' +'HR 1064','Kobayashi Port',0,'?','?' 'HR 1064','Nakano Market',0,'?','?' 'HR 1254','Ellis Orbital',1264,'?','?' 'HR 1254','Ivanishin City',2160,'?','?' @@ -1806,6 +1896,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HR 6987','Taylor City',3480,'Y','L' 'HR 7221','Jewitt Port',0,'?','L' 'HR 7221','Veron City',1886,'N','L' +'HR 7294','Springer Market',0,'?','?' 'HR 7451','Brady Port',0,'?','?' 'HR 7451','Cheli Gateway',0,'?','?' 'HR 7451','Comino Terminal',0,'?','?' @@ -1815,6 +1906,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HR 7766','Markov Hub',746,'Y','L' 'HR 7766','Sohl Station',1228,'Y','L' 'HR 7766','Tarski Gateway',404,'Y','L' +'HR 7793','Benyovszky Ring',0,'?','?' 'HR 7808','Haack Hub',600,'Y','L' 'HR 7907','Ham Hub',1870,'Y','L' 'HR 8170','Alexander Port',0,'?','?' @@ -1850,21 +1942,28 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'I BOOTIS','Chango Dock',1095,'Y','L' 'I BOOTIS','Maher Stellar Research',20934,'Y','M' 'I CARINAE','Somerset Station',0,'?','?' +'IADO','Boscovich Terminal',0,'?','?' +'IAH','Sagan Vision',0,'?','?' 'IAPO VUH','Favier Hub',0,'N','L' 'ICONTI SHI','Dyson Station',25,'N','M' 'ICONTI SHI','Jones Gateway',14,'N','L' 'ICONTIA','Betancourt Refinery',0,'?','?' +'IDIN','Secchi Station',0,'?','?' 'IDUNUNN','Frobisher City',0,'?','?' 'IDUNUNN','Quinn Gateway',0,'?','?' 'IGAL','Bouvard Hub',0,'?','?' 'IGAL','Hirayama Terminal',0,'?','?' +'IGAL','Qushji Orbital',0,'?','?' 'IGAL','Shapley Dock',0,'?','?' 'IGAL','Vuia Station',0,'?','?' 'IGALA','Laliberte Camp',0,'?','?' 'IGBIRIKAN','Barratt Hub',0,'?','?' 'IGBIRIKAN','Lyakhov Station',0,'?','?' +'IKSVATI','Olsen Horizons',0,'?','?' 'IMEUTS','Clark Terminal',0,'?','?' 'IMHOTH','Baraniecki Hub',799,'N','L' +'INARA','Koontz Port',0,'?','?' +'INARA','Krupkat Dock',0,'?','?' 'INDRACHIT','Hickam Hub',380,'N','L' 'INDRACHIT','Shirazi Orbital',637,'Y','L' 'INDRACHIT','Wood Port',914,'N','M' @@ -1938,12 +2037,15 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'JIUYOU','Keyes Refinery',346,'Y','M' 'JONAI','Pribylov Port',342,'N','L' 'JOTUNHEIM','Big Harry''s Monkey Hangout',147,'Y','L' +'JOTUNHEIM','Laird Enterprise',0,'?','?' 'JUAN','Lyell Hub',0,'?','?' 'JUKU','Harrison''s Pride',724,'?','M' 'JUKU','Ings Colony',710,'?','M' 'JULANGGARRI','Willis City',0,'?','?' 'JUMUZGO','Artsutanov Station',0,'?','?' 'JUNGA','Curtiss Station',0,'?','?' +'JUNGA','Henderson Station',0,'?','?' +'JUNGA','Lyne Port',0,'?','?' 'JURA','Baynes Terminal',0,'?','?' 'JURA','Brorsen Installation',0,'?','?' 'JUROKKJU','Nakamura Port',2394,'?','L' @@ -1973,6 +2075,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'KALIKI','Oren City',21,'?','L' 'KALIKI','Trimble Station',1172,'?','M' 'KALINE','Due Station',0,'?','?' +'KALUHET','Yaping Hub',0,'?','?' 'KALUMAR','Andreas Ring',388,'Y','L' 'KAMAKI','Kojima Gateway',2519,'Y','M' 'KAMBAIAMBO','Vonarburg Platform',0,'?','?' @@ -1994,6 +2097,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'KAPPA FORNACIS','Tshang Enterprise',0,'?','M' 'KAPPA PHOENICIS','Low Gateway',2730,'Y','M' 'KAPPA TUCANAE','Skiff Port',0,'?','?' +'KARAMA','I Sola Ring',0,'?','?' 'KARETII','Appel Horizons',0,'?','?' 'KARETII','Bridges Settlement',0,'?','L' 'KARETII','Sinclair Platform',990,'?','M' @@ -2017,6 +2121,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'KATURI','Stjepan Seljan Port',391,'N','L' 'KAUKAMAL','Dingle Port',407,'N','M' 'KAUKAMAL','Wigura Vision',408,'Y','M' +'KAUNAN','Herbert Station',0,'?','?' 'KAURAWISH','Kooi Hub',0,'?','?' 'KAUS BOREALIS','Blalock Terminal',1957,'Y','L' 'KAUS BOREALIS','Libby Port',2554,'Y','L' @@ -2049,6 +2154,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'KHOWATSU','Smith Port',12099,'Y','L' 'KHRONOS','Walter Refinery',0,'?','?' 'KICHO','Drebbel Landing',5.04,'N','?' +'KIDIL','Kopff Holdings',0,'?','?' 'KIKUA','Finlay-Freundlich Hub',344,'N','L' 'KIKUA','Stevenson Orbital',0,'?','L' 'KINAGO','Caidin Hub',0,'?','M' @@ -2149,6 +2255,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'KUTJALANGAI','Zenbei Port',367,'?','?' 'KUWAIR','Asire Horizons',2896,'Y','M' 'KUWAIR','Zahn Horizons',12,'Y','M' +'KUWEMARGL','Baillaud Ring',0,'?','?' +'KUWEMARGL','Oosterhoff Vision',0,'?','?' 'KWATEE','Cartier Dock',462,'?','?' 'KWATEE','Herreshoff Gateway',462,'?','?' 'KWATEE','Smith Dock',472,'?','?' @@ -2159,6 +2267,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'L 26-27','Chretien Colony',0,'?','M' 'L 26-27','McCoy City',417,'N','L' 'LA ROCHELLE','Shaver Dock',0,'?','?' +'LACAB KUI','Kandrup Colony',0,'?','?' 'LACAILLE 8760','Serebrov City',0,'?','?' 'LACAILLE 9352','Gupta City',0,'N','L' 'LACAILLE 9352','Kirtley Platform',0,'?','M' @@ -2169,6 +2278,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LAGUNNOSSO','Bulgarin Terminal',424,'N','M' 'LAGUNNOSSO','Wilkes Survey',583,'N','M' 'LAHASIM','Beaufoy Reach',0,'?','?' +'LAIAWAWAL','Roberts Port',0,'?','?' +'LAIFAN','Chilton Dock',0,'?','?' +'LAIFAN','Chilton Oock',0,'?','?' 'LAIFANGYI','Anders Hub',315,'Y','L' 'LAIFANGYI','Anning Enterprise',700,'N','L' 'LAIFANGYI','Johnson Hub',13500,'Y','M' @@ -2178,6 +2290,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LALANDE 15394','Salam Station',0,'?','?' 'LALANDE 15547','McDevitt Mines',22676,'Y','M' 'LALANDE 18115','Gilliland Port',0,'?','?' +'LALANDE 18115','Waldeck Terminal',0,'?','?' 'LALANDE 18115','Ziemkiewicz Hub',340132,'Y','L' 'LALANDE 22954','Haber Terminal',0,'?','?' 'LALANDE 29917','Cori Terminal',0,'?','?' @@ -2203,6 +2316,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LATJAL','Watt Terminal',0,'Y','M' 'LATORMODUR','Jung Terminal',13,'N','L' 'LATORMODUR','Van de Hulst Enterprise',270,'N','M' +'LATUGARA','Love Orbital',0,'?','?' 'LAUKAITU','Cummings Prospect',0,'Y','M' 'LAUKAITU','Makarov Depot',366,'N','M' 'LAUKANG','Matheson Orbital',0,'?','?' @@ -2244,6 +2358,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LFT 1446','Hurston Hub',471,'N','M' 'LFT 1446','Thorne Colony',472,'N','M' 'LFT 1448','Dirac Enterprise',313,'Y','L' +'LFT 1504','Brunel Terminal',0,'?','?' +'LFT 1504','Eyharts Hanger',0,'?','?' 'LFT 1664','Shull Settlement',0,'?','?' 'LFT 1664','Teng-Hui Colony',0,'?','?' 'LFT 1667','Shkaplerov Mines',272,'?','?' @@ -2255,6 +2371,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LFT 424','Howe Park',1347,'Y','M' 'LFT 6','Lamarck Colony',0,'?','?' 'LFT 6','Mayer Plant',775,'N','M' +'LFT 601','Scheutz Hub',0,'?','?' 'LFT 709','Hutchinson Ring',0,'?','?' 'LFT 78','Coye Orbital',0,'?','L' 'LFT 820','Bailey Landing',0,'?','?' @@ -2331,6 +2448,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LHS 1914','Volta Dock',1402,'N','M' 'LHS 1933','Hernandez Relay',802,'N','M' 'LHS 1933','Shatalov Prospect',9,'N','M' +'LHS 1951','Hobaugh Orbital',0,'?','?' 'LHS 1951','Yegorov Platform',0,'?','?' 'LHS 2029','McKay Legacy',489,'Y','M' 'LHS 2029','Skvortsov Landing',1264,'Y','M' @@ -2374,6 +2492,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LHS 250','Kovalevsky Enterprise',0,'?','?' 'LHS 2541','Artyukhin Platform',0,'?','?' 'LHS 263','Laval Hub',140,'Y','L' +'LHS 263','Pausch Enterprise',0,'?','?' 'LHS 2637','Perez Ring',398,'N','L' 'LHS 2651','Kennan Dock',1437,'N','L' 'LHS 2661','Irwin Gateway',0,'?','?' @@ -2453,13 +2572,18 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LHS 355','Crown Terminal',0,'?','?' 'LHS 355','Foucault Landing',0,'?','?' 'LHS 355','Ramelli City',0,'?','?' +'LHS 3564','Froude Enterprise',0,'?','?' 'LHS 3577','Elgin Terminal',0,'?','?' 'LHS 3586','Novitski Survey',0,'?','?' +'LHS 3598','Jemison Colony',0,'?','?' 'LHS 3631','Currie Hub',0,'?','?' 'LHS 369','Cavendish Port',0,'?','?' +'LHS 3705','Ricci Installation',0,'?','?' 'LHS 371','Fischer Works',0,'?','?' 'LHS 3749','Roddenberry Orbital',0,'?','?' 'LHS 380','Qureshi Orbital',0,'?','?' +'LHS 3802','Tokubei Terminal',0,'?','?' +'LHS 3802','White Ring',0,'?','?' 'LHS 3836','Wakata City',0,'?','?' 'LHS 3877','Ejeta Port',0,'?','?' 'LHS 3877','Fischer Colony',0,'?','?' @@ -2488,8 +2612,11 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LHS 5072','Boas Installation',27353,'?','M' 'LHS 5072','Lazutkin Hub',28298,'?','M' 'LHS 5072','Northrop Dock',0,'?','?' +'LHS 519','Clark Dock',0,'?','?' +'LHS 528','Cartwright Station',0,'?','?' 'LHS 5287','Heng Terminal',0,'?','?' 'LHS 5287','McArthur''s Reach',0,'?','?' +'LHS 53','Stafford Platform',0,'?','?' 'LHS 531','Nelson Terminal',0,'?','L' 'LHS 54','Nelson Dock',840,'?','?' 'LHS 54','Popper Enterprise',1590,'?','?' @@ -2500,6 +2627,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LHS 6031','Oefelein Terminal',193877,'?','L' 'LHS 6031','Polansky Hub',193871,'?','L' 'LHS 6031','Volta Hub',193877,'?','M' +'LHS 6103','Weston Orbital',1427,'?','M' 'LHS 6282','Kendrick Base',0,'?','?' 'LHS 6309','Beliaev Port',107,'N','M' 'LHS 6309','Bester Terminal',27,'N','L' @@ -2510,6 +2638,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LHS 6309','Noether City',90,'N','L' 'LHS 6309','Pierce Station',107,'N','M' 'LHS 6309','Starzl Station',2724,'Y','L' +'LHS 6326','Semeonis Dock',0,'?','?' 'LHS 64','McArthur Colony',0,'?','?' 'LHS 64','Wiberg Hanger',0,'?','?' 'LHS 71','Jun Hub',2100,'Y','L' @@ -2535,12 +2664,14 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LOGONI','Burnell Vision',1497,'?','M' 'LOGONI','Knight Platform',0,'?','?' 'LOKAPURI','McArthur Dock',0,'?','?' +'LOKITAKA MU','Forstchen Landing',0,'?','?' 'LOMBI','Lubbock Dock',428804,'?','M' 'LOMBI','Xin Hub',519,'?','L' 'LOMBI','Young Hub',518,'?','M' 'LONG','Grushin Prospect',0,'?','?' 'LONGHUS','Dubyago Port',50000,'Y','M' 'LONGHUS','Karachkina Prospect',60000,'N','M' +'LOPERADA','Bloch Vision',0,'?','?' 'LOPU MARIS','Garan Settlement',0,'?','?' 'LOPU MARIS','Messerschmid Outpost',0,'?','?' 'LOUGUALA','Akers Port',0,'?','?' @@ -2559,6 +2690,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LP 211-12','Dalton Port',22,'Y','L' 'LP 254-26','Harrison Terminal',18,'Y','L' 'LP 254-40','Jacobi Dock',0,'?','?' +'LP 254-40','Jacobidock',0,'?','?' 'LP 255-11','Burbank Port',1490,'Y','L' 'LP 27-9','Curbeam Dock',0,'?','?' 'LP 27-9','Drebbel Hub',0,'?','?' @@ -2578,10 +2710,13 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LP 322-836','Clairault Terminal',47000,'?','?' 'LP 322-836','Fife Platform',46000,'?','?' 'LP 322-836','Gaspar de Portola Dock',48000,'N','M' +'LP 329-20','Flade Refinery',0,'?','?' 'LP 332-45','Thoreau Station',0,'?','?' 'LP 332-45','Watson Enterprise',0,'?','?' 'LP 336-4','Bolotov City',2953,'Y','L' +'LP 339-7','Chapman Hub',0,'?','?' 'LP 339-7','Gell-Mann Ring',0,'?','?' +'LP 339-7','Kerwin Gateway',0,'?','?' 'LP 339-7','So-Yeon Dock',0,'?','?' 'LP 339-7','Whitson Orbital',0,'?','?' 'LP 375-25','King Gateway',514700,'?','L' @@ -2595,6 +2730,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LP 455-12','Bernoulli Gateway',0,'?','?' 'LP 455-12','Gamow Station',256,'Y','L' 'LP 458-64','Drexler Orbital',4153,'Y','M' +'LP 460-60','Liska Terminal',0,'?','?' 'LP 465-14','Oluwafemi Terminal',0,'?','?' 'LP 48-567','Crown Holdings',0,'?','?' 'LP 48-567','Noakes Hanger',0,'?','?' @@ -2608,6 +2744,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LP 51-17','Virchow Landing',18,'N','M' 'LP 552-48','Anning Port',0,'?','M' 'LP 552-48','Virtanen Terminal',370,'N','L' +'LP 575-38','Jenner Port',0,'?','?' +'LP 576-34','Curbeam Hanger',0,'?','?' 'LP 581-36','McKay Gateway',0,'?','?' 'LP 635-46','Cleave Plant',0,'?','?' 'LP 635-46','Lyakhov Settlement',0,'?','?' @@ -2650,6 +2788,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LP 90-39','Hermite Hanger',0,'?','?' 'LP 90-39','Robson Terminal',0,'?','?' 'LP 903-21','Avdeyev Settlement',0,'?','?' +'LP 906-9','Hertz Orbital',0,'?','?' 'LP 908-11','Huygens Ring',0,'?','?' 'LP 908-11','Smith Hub',0,'?','?' 'LP 908-11','So-Yeon City',0,'?','?' @@ -2659,10 +2798,12 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LP 98-132','Freeport',0,'?','?' 'LP 98-132','Prospect Five',0,'?','?' 'LP DRACONIS','McDivitt Settlement',0,'?','?' +'LPM 26','Bell Landing',0,'?','?' 'LPM 26','Hirn Prospect',1250,'N','M' 'LSE 239','Makarov Station',0,'?','?' 'LTT 1044','Grego Plant',80447,'Y','M' 'LTT 10482','Hubble Relay',0,'?','?' +'LTT 11103','Korniyenko Terminal',0,'?','?' 'LTT 11244','Crichton Dock',0,'?','?' 'LTT 11244','Delany City',0,'?','?' 'LTT 11244','Jones Orbital',0,'?','?' @@ -2712,6 +2853,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LTT 15574','Descartes Gateway',387,'N','M' 'LTT 15574','Haxel Port',603,'Y','L' 'LTT 15574','Yaping Dock',1297,'N','M' +'LTT 15587','Bouch Ring',0,'?','?' 'LTT 15587','Gresley Port',0,'?','?' 'LTT 1572','Young Dock',0,'?','?' 'LTT 1581','Keyes Retreat',341,'Y','M' @@ -2723,8 +2865,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LTT 15985','Akiyama Hanger',3019,'N','?' 'LTT 16016','Lee Station',0,'?','?' 'LTT 16016','Smith Colony',0,'?','?' +'LTT 16218','Chargaff Port',0,'?','?' 'LTT 16301','Detmer Landing',0,'?','?' 'LTT 16301','Leestma Port',0,'?','?' +'LTT 16522','Bluford Dock',0,'?','?' 'LTT 16523','Arrhenius Orbital',0,'?','?' 'LTT 16523','Bohm Hub',0,'?','?' 'LTT 16523','Curbeam Terminal',0,'?','?' @@ -2751,6 +2895,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LTT 18486','Boswell Platform',11318,'N','?' 'LTT 18486','MacArthur Terminal',11327,'N','?' 'LTT 1935','Wolf Port',0,'?','L' +'LTT 2322','Hubble Hub',0,'?','?' +'LTT 2322','Morey Orbital',0,'?','?' +'LTT 2322','Patsayev Dock',0,'?','?' +'LTT 2963','Leestma City',0,'?','?' 'LTT 305','Lefschetz Hanger',120,'N','M' 'LTT 3572','Horowitz Hub',392,'Y','L' 'LTT 377','Ahern Enterprise',1623,'Y','M' @@ -2801,6 +2949,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LTT 7448','Leiber Station',0,'?','?' 'LTT 7453','Clervoy Port',57,'Y','L' 'LTT 7453','Gidzenko Ring',258,'Y','L' +'LTT 7488','Rubin Vision',0,'?','?' 'LTT 7548','Alexandria Ring',1655,'N','M' 'LTT 7548','Boltzmann Gateway',1001,'N','L' 'LTT 7548','Hutton City',1323,'N','M' @@ -2854,12 +3003,15 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LUHMAN 16','Jenner Orbital',10,'Y','M' 'LULUWALA','Blenkinsop Settlement',353,'N','M' 'LUMANATA','Matthaus Olbers Colony',663,'N','?' +'LUMASTYA','Suzuki Terminal',0,'?','?' 'LUNDJI','MacKellar Orbital',0,'?','?' 'LUO WANG','Addams Camp',0,'N','?' +'LUYTEN 205-128','H. G. Wells Hub',0,'?','?' 'LUYTEN 674-15','Nobleport',0,'?','L' 'LUYTEN 674-15','Sinclair Relay',0,'?','?' 'LUYTEN 674-15','Tayler Platform',0,'?','M' 'LUYTEN''S STAR','Ashby City',0,'?','?' +'LUYTEN''S STAR','McNair Gateway',0,'?','?' 'LUYTEN''S STAR','Still Outpost',0,'?','?' 'LWALAMA','Wachmann Station',67,'N','L' 'LWEN','Hippalus Gateway',0,'?','M' @@ -2872,6 +3024,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MACHATKWA','Ikeya Orbital',657,'N','L' 'MACU KUANG','Linnehan Works',0,'?','?' 'MACUA','Brillant Relay',0,'?','?' +'MADYANMANA','Kondakova Hub',0,'?','?' 'MAFDETELA','Vinge Beacon',0,'?','?' 'MAFDETELA','Wallin Settlement',0,'?','?' 'MAGEC','Arrhenius Colony',16,'Y','M' @@ -2880,6 +3033,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MAGN','Brorsen Port',0,'?','L' 'MAGN','Burnham Hub',18892,'Y','M' 'MAHEO','Leestma Terminal',295428,'?','M' +'MAIDUBRIGEL','Macgill Estate',0,'?','?' 'MAIJARUA','Musgrave Dock',0,'?','M' 'MAIJARUA','Nagel City',0,'?','M' 'MAIJARUA','Sellers Gateway',11,'Y','L' @@ -2915,10 +3069,12 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MANDRA','Dunlop Terminal',124243,'?','L' 'MANDRA','Neujmin Port',123269,'?','M' 'MANDRA','Shklovsky Terminal',123271,'?','M' +'MANISSYET','Jensen Station',0,'?','?' 'MANISSYET','Stebler Ring',0,'?','?' 'MANNODAVA','Ali Port',0,'?','?' 'MANNODAVA','Aliport',0,'?','?' 'MANNONA','Thornycroft Penal Colony',0,'?','?' +'MANSMONIR','Allen''s Pride',0,'?','?' 'MANTXE','Carpini Station',503,'?','?' 'MANTXE','De Sousa Ring',359,'Y','L' 'MAORSI','Karachkina City',1350,'N','L' @@ -2964,6 +3120,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MCC 467','Xiaoguan Hub',0,'?','?' 'MCC 684','Clement Orbital',60.4,'N','M' 'MCC 684','Landsteiner City',983,'Y','M' +'MCC 818','Hauck Orbital',0,'?','?' +'MCC 818','Whitney Orbital',0,'?','?' 'MCC 858','Al-Farabi Port',0,'?','?' 'MCC 858','Fraley Orbital',0,'?','?' 'MCC 858','Rennie City',0,'?','?' @@ -3009,6 +3167,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MELIONTIT','Littrow Ring',1676,'N','M' 'MENAMBE','Beadle Settlement',230,'Y','M' 'MENKENT','Cenker Dock',0,'?','?' +'MENKENT','Porsche Works',0,'?','?' 'MENTSUCHUA','Hulse Holdings',0,'?','M' 'MERAK','Bottego Installation',384771,'N','L' 'MIAO THIXO','Plante Enterprise',0,'?','?' @@ -3019,7 +3178,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MILDEPTU','Buchli City',115505,'Y','L' 'MILDEPTU','Gerst Platform',115505,'?','?' 'MILDEPTU','Singer Enterprise',115505,'N','M' +'MILSCOTHACH','Hennepin Penal Colony',0,'?','?' 'MINATAE','Meucci Landing',0,'?','?' +'MINJANGO','Denning Platform',0,'?','?' 'MINMAR','Bayliss Landing',8,'Y','M' 'MIOLA','Harris Hospital',0,'?','?' 'MIPHIFA','Happis',190,'N','L' @@ -3027,9 +3188,11 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MIRDI','McDivitt Settlement',0,'?','?' 'MIRDI','Sagan Mines',545,'N','?' 'MIRIBUSHA','Wright Vision',0,'?','?' +'MIROLUNTS','Salam Ring',0,'?','?' 'MISISTURE','Gelfand Dock',0,'?','?' 'MISISTURE','Gelfano Dock',0,'?','?' 'MISISTURE','Gelfano Oock',0,'?','?' +'MITRA','Volterra Horizons',0,'?','?' 'MITSCHIGUA','Pond Installation',9.8,'?','L' 'MIZAR','Judson Station',160000,'?','L' 'MOKOJING','Ferguson Market',0,'?','L' @@ -3051,6 +3214,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MONG O','Potter Holdings',10700,'N','M' 'MONTET','Seddon Gateway',1542,'Y','L' 'MONTET','Thirsk Enterprise',7772,'?','?' +'MOOL','Gasparis Terminal',0,'?','?' 'MOORTIC','Bluford Settlement',118,'N','L' 'MOORTIC','DeLucas Hanger',102,'N','M' 'MOORTIC','Stott Station',175,'N','L' @@ -3081,6 +3245,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MULACHI','Laue City',0,'?','?' 'MULACHI','Shepard Enterprise',0,'?','?' 'MULACHI','Simonyi Enterprise',594512,'Y','M' +'MULLAG','Garfinkle City',0,'?','?' 'MULLAG','Kelly City',0,'?','?' 'MUMBAL','Adragna Station',0,'?','?' 'MUMBAL','Jones Dock',0,'?','?' @@ -3095,6 +3260,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MUTUJIALI','Siegel Orbital',0,'?','?' 'MZ URSAE MAJORIS','Collins Settlement',1522,'N','M' 'MZ URSAE MAJORIS','Tenn Landing',1445,'N','L' +'NADUNINDA','Robson Mines',0,'?','?' 'NAGNATAE','Cartwright City',1122,'?','M' 'NAGNATAE','Howard City',817,'?','L' 'NAGNATAE','Kondakova Port',1547,'?','M' @@ -3123,6 +3289,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'NEGANHOT','Gardner Settlement',0,'?','?' 'NEGANHOT','He Landing',0,'?','?' 'NEGIDALS','Perry Dock',0,'?','?' +'NEHEBKAU','Herbert Platform',0,'?','?' 'NEHET','Xuesen Orbital',2600,'?','L' 'NEITS','Crown Port',16260,'Y','?' 'NEITS','Watson Settlement',16141,'?','?' @@ -3134,13 +3301,16 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'NETO','Ising Vision',666,'N','L' 'NEVERMORE','Borel Enterprise',5674,'Y','L' 'NEVERMORE','Pinto Ring',367,'Y','L' +'NEZ PELLIRI','Jordan Landing',0,'?','?' 'NGADANDARI','Consolmagno Horizons',502302,'?','L' 'NGADANDARI','Delsanti Hub',0,'?','?' 'NGADJAL','Lundmark',0,'?','?' 'NGAISLAN','Murdoch Station',0,'?','?' 'NGALIBA','Kingsmill Settlement',973,'?','?' 'NGALIBA','Nordenskiold Landing',755,'Y','?' +'NGANDOWA','Fisher Orbital',0,'?','?' 'NGOBE','Hinz Hub',0,'?','?' +'NGOBEDU','Morin Relay',0,'?','?' 'NGOLITJALI','Vinogradov Platform',0,'?','?' 'NGUGIRAWA','Hadfield Enterprise',129,'Y','L' 'NGULUNGBARA','Filippenko Dock',7,'N','L' @@ -3239,6 +3409,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'NYANKTONA','Mackellar Dock',1714,'Y','L' 'NYANKTONA','Midgeley Hub',2498,'Y','M' 'NYIKAMANA','Mourelle Prospect',42,'Y','M' +'NYIKATES','Gibson Holdings',0,'?','?' 'NYSA','Arend Station',495730,'?','L' 'NYSA','Dolgov Plant',494620,'?','M' 'NZAMBASSEE','Arnarson Ring',353,'N','L' @@ -3264,6 +3435,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ODUDURO','Conrad Hub',0,'?','?' 'ODUDURO','Kraepelin Hub',0,'?','?' 'OGOWENDES','Hayashi Installation',0,'?','?' +'OGUNDA','Swainson Orbital',0,'?','?' 'OHO BAJO','Coke Landing',1674,'N','M' 'OHO BAJO','Herrington Colony',2515,'N','M' 'OKINOUKHE','Fincke Park',0,'?','M' @@ -3334,6 +3506,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'OSSITO','Stuart Mines',353,'?','?' 'OSSITO','Vizcaino Dock',2285,'?','?' 'OT SERPENTIS','Serebrov Port',0,'?','?' +'OTHEL','Valz Installation',0,'?','?' 'OTHIME','Levi-Montalcini Dock',999,'N','M' 'OU GEMINORUM','Bloomfield Station',0,'?','?' 'OU GEMINORUM','Cartwright Terminal',0,'?','?' @@ -3366,6 +3539,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'PANOI','Garan Hub',1893,'N','?' 'PANOI','Garn Settlement',2618,'?','?' 'PANOPI','Gillekens Holdings',0,'?','?' +'PARAS','Wilson Orbital',0,'?','?' 'PARAUDIKA','Hottot Station',0,'?','?' 'PARAUDIKA','Mouhot Port',0,'?','?' 'PARAUDIKA','Tem Station',0,'?','?' @@ -3401,8 +3575,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'PENG','Clerk Enterprise',34,'Y','M' 'PENG','Lockhart Port',0,'?','M' 'PENG','Runco Hub',301,'Y','L' -'PEPPER','Ehrlich Terminal',0,'?','?' -'PEPPER','Pepper',0,'?','?' +'PEPPER','Ehrlich Terminal',3360,'?','L' +'PEPPER','Pepper',865,'Y','L' 'PERADJARIU','Morris Dock',958,'N','M' 'PERADJARIU','Vries Port',686,'Y','L' 'PERAMONGAN','Robinson Ring',6,'N','L' @@ -3445,7 +3619,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'POLAHUKUNA','Griffith Dock',0,'?','M' 'POLAHUKUNA','Hardy Dock',1326,'Y','L' 'POLOCHANS','Neujmin Vision',0,'?','?' +'PONTUS','Bolotov Plant',0,'?','?' 'POPOCATEPETL','Arago Refinery',0,'?','?' +'POPONNE','Pimi Prospect',0,'?','?' +'POSENOI','Zhigang Plant',0,'?','?' 'POTRITI','Hartsfield Plant',164,'N','?' 'POTRITI','Tuan Orbital',278,'?','?' 'PPM 41187','Burnet Port',0,'?','?' @@ -3595,7 +3772,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ROSS 128','Warren Prison Mine',19,'Y','L' 'ROSS 130','Huxley Relay',0,'?','?' 'ROSS 154','Birkeland City',11,'?','L' +'ROSS 162','Jun Settlement',0,'?','?' 'ROSS 199','Nicollet Terminal',0,'?','?' +'ROSS 209','Janes Terminal',0,'?','?' 'ROSS 209','Margulies Mines',0,'?','?' 'ROSS 210','Chebyshev Ring',0,'?','?' 'ROSS 210','Clauss Gateway',0,'Y','?' @@ -3609,6 +3788,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ROSS 210','Viktorenko Park',0,'?','?' 'ROSS 211','Chilton Vision',0,'?','?' 'ROSS 211','Otiman Station',0,'Y','L' +'ROSS 263','Volta Gateway',0,'?','?' 'ROSS 318','Koch Hub',0,'?','?' 'ROSS 318','Noon Escape',0,'?','?' 'ROSS 42','Bartoe Station',0,'?','M' @@ -3624,6 +3804,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ROSS 490','Dunyach Enterprise',0,'?','?' 'ROSS 490','Griffiths Dock',0,'?','M' 'ROSS 529','Dzhanibekov Beacon',0,'?','?' +'ROSS 665','Mills Station',0,'?','?' 'ROSS 695','Bresnik Orbital',1150,'Y','L' 'ROSS 695','Feoktistov Orbital',1720,'?','M' 'ROSS 695','Hawley Hub',1699,'?','M' @@ -3664,8 +3845,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ROSS 991','Asire Dock',142116,'N','M' 'ROSS 991','Mallett Depot',140387,'N','M' 'ROTANEV','Ride Ring',2192,'N','L' +'RU SHIL','Bok Orbital',0,'?','?' 'RUCHBAH','Griffiths Horizons',823,'N','L' 'RUKANDINS','Mayer Plant',0,'?','?' +'RUNO','Mitzi''s Den',0,'?','?' 'RUSANI','Fernandes Market',73,'Y','L' 'RUWACHIS','Onizuka Gateway',50,'Y','L' 'SAHUALASTA','Den Berg Port',0,'?','?' @@ -3679,6 +3862,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'SAMEQUIT','Braun Enterprise',846,'N','L' 'SAMKYHA','Tesla Station',0,'?','?' 'SAN HUANG','Sharman Gateway',0,'?','?' +'SANAI','Mayer Enterprise',0,'?','?' +'SANAI','Veron Mines',0,'?','?' 'SANDAGARAY','Stirling City',6261,'N','M' 'SANGO','Baxter Station',0,'?','L' 'SANGO','Farrukh Hub',0,'?','L' @@ -3695,6 +3880,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'SANTY','Noakes City',27010,'Y','M' 'SANUMA','Dunyach Gateway',5994,'N','L' 'SAYA','Dzhanibekov Station',0,'?','?' +'SCORI','Hooper Relay',0,'?','?' +'SCORI','Lonchakov Gateway',0,'?','?' 'SCORIES','Belyanin Works',0,'?','?' 'SCORIES','Fanning Outpost',0,'?','?' 'SECOYA','Joy Port',98,'?','L' @@ -3705,6 +3892,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'SECOYA','Ulloa Port',242,'N','M' 'SEDITYA','Serre Prospect',402,'N','M' 'SEDITYA','Zamyatin Landing',17919,'N','M' +'SEGOVEDUWA','Mason Hub',0,'?','?' 'SEHARIS','Luu Works',0,'?','M' 'SELIANCIENS','Alexeyev Dock',4848,'N','L' 'SELIANCIENS','Jones Station',95,'Y','L' @@ -3713,7 +3901,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'SENTEC','Gregory Station',0,'?','?' 'SENTEC','Yu Station',234,'?','?' 'SERKLICH','Mitchell Terminal',0,'?','?' +'SESMETAE','Morgan Horizons',0,'?','?' 'SESUYAR','Al-Din Survey',0,'?','?' +'SHAKAL','Deere Port',0,'?','?' +'SHAKAL','Doi Station',0,'?','?' 'SHAKAPA','Gibson Dock',0,'?','?' 'SHAKAPA','Ore Horizons',0,'?','?' 'SHANGDI','Al-Din Platform',1854,'N','?' @@ -3730,6 +3921,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'SHEBAYEB','Volta Landing',0,'?','?' 'SHEELA NA GIG','Mitchell Hub',1079,'Y','M' 'SHEELA NA GIG','Szilard Orbital',1546,'N','M' +'SHERONES','Goldreich Vision',0,'?','?' 'SHIBBOLETH','Elgin''s Reach',0,'?','?' 'SHIBBOLETH','Galiano Principality',0,'?','?' 'SHILI','Al-Haytham''s Claim',0,'?','?' @@ -3755,6 +3947,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'SICUNCHEIM','Draper Market',160,'?','L' 'SIDDHA','Blaauw Orbital',0,'?','?' 'SIDDHA','Ludwig Struve Hub',0,'?','?' +'SIDDHA','Meuron Station',0,'?','?' 'SIDDHA','Otomo Market',0,'?','?' 'SIGMA BOOTIS','Chaudhary City',319,'Y','L' 'SIGMA BOOTIS','Collins Gateway',0,'?','L' @@ -3782,16 +3975,21 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'SITLANEI','Miklouho-Maclay Port',0,'?','L' 'SITLANEI','Rasmussen Port',0,'?','L' 'SITLANEI','Von Bellingshaausen Orbital',288299,'Y','L' +'SIVAS','Sharp Station',0,'?','?' +'SIVAS','Thurston Enterprise',0,'?','?' 'SKEGGIKO O','Kuo Terminal',77,'Y','L' 'SKIRARAGEA','Naubakht Platform',15,'?','M' 'SKIRARAGEA','Pu Settlement',25,'?','M' 'SLATUS','Hoffman Orbital',0,'?','?' 'SLAVANIBO','Irwin Mines',1854,'N','M' 'SLAVANIBO','Melnick Works',1320,'N','M' +'SMETHELLS 173','Babcock Port',0,'?','?' +'SMETHELLS 173','Schumacher Station',0,'?','?' 'SOBEK','Landis Freeport',4000,'Y','M' 'SOCH','Seamans Vision',569,'?','M' 'SOCH','Whitcomb Ring',324,'N','L' 'SOFAGRE','Markov Park',0,'?','?' +'SOKARA','Musa Al-Khwarizmi Station',0,'?','?' 'SOKOJI','Cavendish Relay',0,'?','?' 'SOL','Abraham Lincoln',506,'N','L' 'SOL','Burnell Station',364,'?','M' @@ -3850,8 +4048,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'STKM 1-823','Shinn Relay',739,'?','M' 'STYX','Boyle Terminal',72,'N','M' 'STYX','Searfoss Plant',646,'N','M' +'SU LIN','Schoenherr Prospect',0,'?','?' 'SUCHAGGA','Sherrington Platform',251,'?','?' 'SUDZ','Divis Enterprise',0,'?','?' +'SUESSETANI','Gutierrez Orbital',0,'?','?' 'SUGRIVIK','Delbruck Dock',0,'?','L' 'SUGRIVIK','Goddard Gateway',0,'?','?' 'SUHTE','Cavendish Station',0,'?','?' @@ -3885,6 +4085,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'TACAJANDI','Tsunenaga Port',0,'N','?' 'TAGA','Gamow Colony',68,'Y','M' 'TAGO','Kregel Dock',193,'?','?' +'TAHA DERG','Durrance Landing',0,'?','?' +'TAI QING','Soto Station',0,'?','?' 'TAILTSUR','Phillips Terminal',500,'N','M' 'TAKAK','Filipchenko Vision',0,'?','L' 'TALITHA','Ross Platform',0,'?','?' @@ -3935,6 +4137,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'TAUERNONESE','Wakata Port',0,'?','?' 'TAWERET','Okorafor Port',54,'?','L' 'TAWI','De Kamp Dock',0,'?','?' +'TAWILO','Brooks Station',0,'?','?' 'TE UIRA','Faraday Orbital',0,'?','M' 'TE UIRA','Highbanks',234,'Y','L' 'TE UIRA','Packard Goose',208,'N','L' @@ -3948,6 +4151,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'TEFENHUA','Naddoddur City',2230,'Y','M' 'TEFENHUA','Silves City',1559,'N','M' 'TEGMEN','Novitski Station',0,'?','?' +'TEHUEVI','Ford Port',0,'?','?' +'TEHUEVI','Ray Hub',0,'?','?' 'TELEDOLYAQA','Abernathy Outpost',0,'?','?' 'TELEDOLYAQA','O''Brien Horizons',0,'?','?' 'TELENISATES','Tull Mines',0,'?','?' @@ -3963,12 +4168,15 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'TENG YEH','Morgan Gateway',0,'?','?' 'TEPECHUA','Miller Mines',2166,'N','M' 'TEPI','Fibonacci Orbital',0,'?','?' +'TEPI','Jenkinson Port',0,'?','?' 'TERMINUS','Feoktistov Station',0,'?','M' 'TERMINUS','Onizuka Station',0,'?','L' 'TERMINUS','Payette Orbital',0,'?','L' 'TERMINUS','Sanger Orbital',0,'?','M' 'TERMINUS','Spring Dock',2174,'Y','M' 'TETEKHE','Gerst Platform',254,'N','M' +'TETONANG','Yaping Dock',0,'?','?' +'TETRIAN','Thanatos Minor',0,'?','?' 'TEWI','Baracchi Prospect',24702,'?','?' 'TEWI','Melotte Survey',24696,'?','?' 'TEWI','Meuron Survey',24698,'?','?' @@ -3988,9 +4196,11 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'THIANSI','Buffett Ring',586,'Y','M' 'THIANSI','Newman Ring',586,'N','M' 'THIANSI','Worlidge Port',442,'N','L' -'THIIN','Brandenstein Enterprise',0,'?','?' -'THIIN','Euler Orbital',0,'?','?' -'THIIN','Kotov Terminal',0,'?','?' +'THIIN','Brandenstein Enterprise',552,'?','L' +'THIIN','Euler Orbital',391,'Y','L' +'THIIN','Kotov Terminal',1025,'?','L' +'THOSIAO','Foster Orbital',0,'?','?' +'THOSIAO','Hertzsprung Port',0,'?','?' 'THRASKIAS','Herreshoff Station',0,'?','?' 'THRITE','Bracewell Vision',72,'?','L' 'THRITE','Dean Station',1177,'?','M' @@ -4022,6 +4232,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'TIANGCHI','Roberts Dock',40,'?','M' 'TIANGCHI','Vries Port',25,'N','L' 'TIANGCHI','Wylie Port',35,'?','M' +'TICUSHPAKHI','Vardeman Platform',0,'?','?' 'TIETHAY','Alexeyev Refinery',2119,'Y','M' 'TIETHAY','Palmer Platform',892,'Y','M' 'TIGUAI','Pippin Port',0,'?','?' @@ -4047,7 +4258,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'TIONISLA','Coulter City',0,'?','?' 'TIONISLA','Ing Ring',0,'?','?' 'TIRADA','Wagner Installation',380276,'Y','M' +'TIRIS','Chang-Diaz Orbital',0,'?','?' 'TJURINAS','Herndon Dock',1288,'Y','?' +'TJURINAS','Hernoon Oock',0,'?','?' 'TJUROJIU','Oluwafemi Orbital',727,'Y','L' 'TJUROJIU','Volk Settlement',728,'N','M' 'TODZHINAS','Gutierrez Dock',0,'?','?' @@ -4076,6 +4289,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'TRITON','Shepard Orbital',392,'?','M' 'TRITON','Wang Terminal',279,'?','L' 'TRITON','White Terminal',690,'Y','M' +'TRUKU','Tucker Vision',0,'?','?' 'TRUMANUCHU','Vian Enterprise',68,'Y','L' 'TS''IN GU','Nelson Port',0,'?','?' 'TSETAN','Hippalus Settlement',0,'N','M' @@ -4085,6 +4299,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'TSOHODA','Leopold Heckmann Terminal',0,'?','L' 'TSOHODA','Vaucouleurs Orbital',0,'?','M' 'TSOHODIAE','Barba Port',0,'?','?' +'TUAREG','Kopff Dock',0,'?','?' 'TUKUR','Charnas Installation',0,'?','?' 'TUKUR','Roberts Camp',0,'?','?' 'TUN','Tun''s Wart',0,'?','?' @@ -4118,12 +4333,15 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'UCHANG','Fisher Ring',988,'Y','L' 'UGRASWARKA','Baille City',0,'?','?' 'UGRIVIRII','Jefferies Port',877,'?','L' +'UIBUMISIN','Hubble Hub',0,'?','?' 'ULANQUIATES','Waldrop Dock',0,'?','?' 'ULURI','McDivitt Settlement',633,'Y','M' 'ULURI','Parker Beacon',914,'Y','M' 'UMAITIS','Stott Station',0,'?','?' 'UMASPI','Gardner Orbital',1464,'Y','L' +'UMED','Nespoli Hub',0,'?','?' 'UNA','Godwin Port',525,'Y','M' +'UNA','Hoard Orbital',0,'?','?' 'UNA','Prunariu Orbital',0,'?','?' 'UNDADJA','McArthur Hanger',0,'?','?' 'UNDADJA','Rutherford Depot',0,'?','?' @@ -4169,6 +4387,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'V2689 ORIONIS','Hodgson Dock',0,'?','L' 'V2689 ORIONIS','Powell Ring',0,'?','M' 'V2689 ORIONIS','Wyndham Ring',0,'?','L' +'V374 PEGASI','MacKellar Hub',0,'?','?' 'V390 PAVONIS','Yuzhe Refinery',2468,'Y','M' 'V401 HYDRAE','Hinz Terminal',5828,'?','?' 'V401 HYDRAE','Swanwick Terminal',3837,'?','?' @@ -4225,6 +4444,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'VEQUESS','Agnews'' Folly',300,'N','L' 'VEQUESS','Cuffey Orbital',0,'?','?' 'VERBIGENI','Archambault Plant',0,'?','?' +'VEROANDI','Gromov Orbital',0,'?','?' 'VEROANDI','Panshin Hub',0,'?','?' 'VEROANDI','Vardeman Gateway',0,'?','?' 'VEROANDI','Varoeman Gateway',0,'?','?' @@ -4235,6 +4455,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'VETR','Ehrlich City',4402,'?','M' 'VETR','Wisoff Depot',0,'?','?' 'VIDAVANTA','Lee Mines',516931,'N','L' +'VILLEACHI','Aksyonov Terminal',0,'?','?' 'VINDUMBIVA','Polyakov''s Claim',37817,'?','M' 'VIRUD','Beadle Hanger',429,'?','M' 'VIRUDNIR','Rennie Dock',359,'Y','M' @@ -4246,11 +4467,14 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'VOLKHAB','Gutierrez Terminal',2191,'?','M' 'VOLKHAB','Schweickart Hub',14042,'?','M' 'VOLKHAB','Vernadsky Dock',401,'Y','L' +'VOLUNGU','Cabrera Horizons',0,'?','?' 'VOLUNGU','Jemison Refinery',0,'?','?' 'VOTAT','Oluwafemi Vision',649,'N','M' 'VUCUB HUAN','Walter Prospect',355,'?','M' 'VUKUAPA','Mendeleev Terminal',2674,'N','M' 'WABA','Korlevic Station',0,'?','?' +'WADJALI','Tarelkin Port',0,'?','?' +'WADJALI','White Station',0,'?','?' 'WADJAMBARU','Kavandi Landing',0,'?','?' 'WADJUK','Baudry Hub',957,'N','M' 'WADJUK','Bose Station',956,'N','M' @@ -4259,6 +4483,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'WADJUK','Lucretius Hub',249,'Y','L' 'WADJUK','Zhigang Enterprise',699,'N','M' 'WAGINYIN','Weber Orbital',37,'N','M' +'WAKAWAL','Good Ring',569,'?','L' +'WAKAWAL','Olsen Terminal',324,'?','L' +'WAKAWAL','Virts Gateway',450,'?','L' 'WALLANGU','Krusvar Settlement',0,'?','?' 'WALLANGU','Noli City',48543,'N','?' 'WALLANGU','Ziemkiewicz Prospect',48436,'N','?' @@ -4348,6 +4575,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'WOLF 562','Faris Gateway',3222,'?','M' 'WOLF 562','Hopkins Port',37,'Y','L' 'WOLF 562','Nagel Enterprise',21,'?','M' +'WOLF 573','Gidzenko Ring',0,'?','?' 'WOLF 629','Gillekens Refinery',646,'?','?' 'WOLF 629','Grunsfield Plant',812,'?','?' 'WOLF 718','Filipchenko Dock',0,'?','?' @@ -4360,6 +4588,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'WOLF 751','Reightler Settlement',735,'?','?' 'WOLF 867','Dana Terminal',330,'Y','L' 'WOLF 867','Harbaugh Gateway',479,'Y','M' +'WOLF 906','Herbert Dock',0,'?','?' 'WOLF 926','Eddington Installation',0,'?','?' 'WONG SHER','Lawrence Holdings',0,'?','?' 'WONNERITI','Coulomb Terminal',0,'?','?' @@ -4375,6 +4604,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'WUTHIELO KU','Mattingly Gateway',0,'?','L' 'WUTHIELO KU','Robert Dock',0,'?','L' 'WUTHIELO KU','Tarter Dock',145,'N','L' +'WW PISCIS AUSTRINI','Garan Ring',0,'?','?' 'WW PISCIS AUSTRINI','Ivins Vision',0,'?','?' 'WW PISCIS AUSTRINI','Sevastyanov Terminal',0,'?','?' 'WX URSAE MAJORIS','Teng-Hui Terminal',0,'?','?' @@ -4384,6 +4614,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'XI HYDRAE','Chomsky Dock',0,'?','?' 'XI HYDRAE','Wingqvist Hub',0,'?','?' 'XI URSAE MAJORIS','Joule Settlement',0,'?','?' +'XI WANG MU','Khayyam Dock',0,'?','?' +'XI WANG MU','Marshall Enterprise',0,'?','?' 'XI WANGKALA','Ross Colony',0,'?','?' 'XIANS','Isherwood Base',0,'N','M' 'XIANS','Lerman Dock',0,'N','M' @@ -4402,6 +4634,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'YAMATZICNI','Hirayama Platform',0,'?','?' 'YAN YI','Burnham Prospect',0,'?','?' 'YANYAN','Morin City',0,'?','?' +'YAO TZU','Orbik Port',0,'?','?' 'YARIGUI','Kier Ring',0,'?','?' 'YARIGUI','Lem Dock',0,'?','?' 'YARIGUI','Moore Orbital',0,'?','?' @@ -4446,6 +4679,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'YZ CETI','Fuglesang Port',1819,'N','M' 'YZ FORNACIS','Davidson Gateway',124,'N','M' 'YZ FORNACIS','Kotzebue Gateway',86,'Y','L' +'ZACH','Milnor Enterprise',23078,'?','M' +'ZACH','Stanley Orbital',23015,'?','M' 'ZANDU','Frimout Horizons',419,'?','?' 'ZANDU','Vaucanson Hub',0,'?','?' 'ZANG TANGMA','Johnson Terminal',23,'Y','L' @@ -4456,6 +4691,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ZARALUVUL','Sturckow City',0,'?','?' 'ZAVIJAH','Wheelock Ring',4083,'Y','L' 'ZEAEX','Karl Diesel City',0,'?','?' +'ZEAEX','Tryggvason Orbital',0,'?','?' 'ZEAEX','Wheelock Settlement',0,'?','?' 'ZEARLA','Payson Hub',0,'?','?' 'ZEESSZE','Hoyle Fort',491,'?','L' diff --git a/data/System.csv b/data/System.csv index 004b680f..921cd678 100644 --- a/data/System.csv +++ b/data/System.csv @@ -243,6 +243,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified '47 ARIETIS',-32.03125,-58.4375,-85.25,'Gamma','2014-11-27 11:33:44' '47 CASSIOPEIAE',-83.03125,28.5625,-63.1875,'Beta2','2014-10-21 17:16:31' '47 CETI',-14.125,-116.96875,-32.53125,'Gamma','2014-11-27 11:33:44' +'47 OPHIUCHI',-30.09375,26.5,89.5,'Release 1.00-EDStar','2015-01-18 22:50:14' '47 URSAE MAJORIS',-1.4375,41.1875,-20.09375,'Beta2','2014-10-21 17:16:31' '48 CASSIOPEIAE',-88.3125,18.28125,-71.40625,'Release 1.00-EDStar','2014-12-08 20:48:53' '48 CHI BOOTIS',-94.3125,214.1875,94.625,'Gamma','2014-11-27 11:33:44' @@ -874,6 +875,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALRAI SECTOR XI-T A3-0',2.15625,-26.21875,43.4375,'Gamma-Inferred','2014-12-07 11:09:10' 'ALRAI SECTOR ZJ-R A4-4',-38.0625,-36.875,48.9375,'Release 1.00-EDStar','2015-01-18 02:02:26' 'ALS 16791',29.125,-52.03125,86.6875,'Gamma','2014-11-27 11:33:44' +'ALSHAIN',-31.78125,-8.96875,30.09375,'Release 1.00-EDStar','2015-01-18 16:19:56' 'ALTAIR',-12.3125,-2.75,11.0,'Gamma','2014-11-27 11:33:44' 'ALTAIS',-88.625,38.09375,-13.65625,'Beta2','2014-10-21 17:16:31' 'ALTANI',114.125,-115.71875,-62.03125,'Gamma','2014-11-27 11:33:44' @@ -2304,6 +2306,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'BEI DOU SECTOR AV-Y B2',-34.46875,91.5,-39.46875,'Release 1.00-EDStar','2015-01-14 10:15:24' 'BEI DOU SECTOR AV-Y B4',-31.0625,84.6875,-27.1875,'Release 1.00-EDStar','2015-01-12 15:27:30' 'BEI DOU SECTOR BQ-Y B1',-45.1875,56.3125,-42.84375,'Release 1.00-EDStar','2015-01-11 17:06:31' +'BEI DOU SECTOR CG-X B1-2',-28.8125,108.53125,-5.15625,'Release 1.00-EDStar','2015-01-18 14:59:57' 'BEI DOU SECTOR CQ-Y B3',-34.375,56.59375,-30.15625,'Beta3-Inferred','2014-11-19 12:56:46' 'BEI DOU SECTOR CQ-Y B4',-44.625,55.125,-38.53125,'Release 1.00-EDStar','2015-01-11 17:12:46' 'BEI DOU SECTOR CV-Y B1',3.375,80.46875,-25.96875,'Release 1.00-EDStar','2015-01-17 09:35:26' @@ -3925,6 +3928,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR GI-H B11-0',-173.84375,-12.3125,-121.96875,'Release 1.00-EDStar','2014-12-01 10:56:40' 'COL 285 SECTOR GI-P B20-4',-17.71875,-56.03125,85.8125,'Release 1.00-EDStar','2014-12-23 17:00:46' 'COL 285 SECTOR GJ-I A39-4',15.09375,-40.15625,70.1875,'Release 1.00-EDStar','2015-01-12 13:16:30' +'COL 285 SECTOR GJ-M B22-0',-60.21875,-3.71875,129.5625,'Release 1.00-EDStar','2015-01-18 18:02:47' 'COL 285 SECTOR GR-V D2-81',-6.09375,111.5625,-142.59375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR GR-V D2-87',5.09375,93.53125,-155.25,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR GT-D B14-2',-60.65625,166.21875,-64.9375,'Gamma','2014-11-27 11:33:44' @@ -4056,6 +4060,9 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR OE-G C11-24',-117.375,9.21875,134.09375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR OE-G C11-30',-143.6875,5.375,97.34375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR OM-T B17-2',146.28125,-183.1875,21.59375,'Release 1.00-EDStar','2014-12-31 09:16:39' +'COL 285 SECTOR ON-R B18-0',29.59375,-196.40625,47.5625,'Release 1.00-EDStar','2015-01-18 21:36:52' +'COL 285 SECTOR ON-R B18-1',19.125,-197.4375,49.875,'Release 1.00-EDStar','2015-01-18 21:30:29' +'COL 285 SECTOR ON-R B18-2',15.84375,-193.75,44.25,'Release 1.00-EDStar','2015-01-18 20:20:06' 'COL 285 SECTOR OO-P C6-6',-143.0,128.09375,-69.28125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR OP-G A40-2',60.25,-44.78125,76.40625,'Release 1.00-EDStar','2015-01-09 23:00:36' 'COL 285 SECTOR OS-T D3-130',161.75,10.25,-100.875,'Gamma','2014-11-27 11:33:44' @@ -4154,6 +4161,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR SQ-I B24-5',-7.90625,-10.875,167.625,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR SQ-N A36-2',0.5625,-43.90625,39.8125,'Release 1.00-EDStar','2014-12-24 00:16:25' 'COL 285 SECTOR SQ-N A36-5',1.5,-37.34375,36.5,'Release 1.00-EDStar','2014-12-24 00:11:22' +'COL 285 SECTOR ST-P B19-3',25.6875,-197.25,56.5,'Release 1.00-EDStar','2015-01-18 22:13:11' 'COL 285 SECTOR ST-R B19-2',-1.59375,-82.84375,58.3125,'Release 1.00-EDStar','2014-12-24 01:12:34' 'COL 285 SECTOR ST-W B16-5',114.96875,-21.3125,1.875,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR SU-F C11-1',-124.46875,-95.9375,101.4375,'Gamma','2014-11-27 11:33:44' @@ -4502,6 +4510,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CRUCIS SECTOR FW-W B1-5',41.9375,-12.875,26.4375,'Release 1.00-EDStar','2014-11-30 22:56:30' 'CRUCIS SECTOR FW-W B1-7',41.6875,-10.78125,28.125,'Release 1.00-EDStar','2014-11-30 22:56:30' 'CRUCIS SECTOR FW-W C1-25',66.65625,26.6875,64.34375,'Release 1.00-EDStar','2014-12-20 20:50:12' +'CRUCIS SECTOR GB-X B1-0',114.71875,2.46875,16.1875,'Release 1.00-EDStar','2015-01-18 17:16:51' 'CRUCIS SECTOR GH-V B2-6',25.34375,7.9375,53.375,'Release 1.00-EDStar','2014-12-20 20:50:10' 'CRUCIS SECTOR GM-V B2-2',69.09375,21.65625,42.625,'Gamma-Inferred','2014-11-29 06:45:17' 'CRUCIS SECTOR GR-W C1-18',33.25,-15.09375,75.34375,'Release 1.00-EDStar','2014-12-06 23:06:35' @@ -5327,6 +5336,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'EOTOTARI',-97.96875,-80.21875,-147.34375,'Gamma','2014-11-27 11:33:44' 'EOTOTO',-118.4375,18.59375,100.40625,'Gamma','2014-11-27 11:33:44' 'EP ERIDANI',3.84375,-28.53125,-17.65625,'Gamma','2014-11-27 11:33:44' +'EPHESUS',-47.71875,-6.09375,50.03125,'Release 1.00-EDStar','2014-11-26 07:39:42' 'EPOMA',132.0625,-59.125,52.1875,'Gamma','2014-11-27 11:33:44' 'EPOMALINII',-161.34375,44.625,1.53125,'Gamma','2014-11-27 11:33:44' 'EPOMAMO',67.03125,-44.5,45.09375,'Gamma','2014-11-27 11:33:44' @@ -5820,6 +5830,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'GAMMA MENSAE',83.3125,-52.84375,26.9375,'Gamma','2014-11-27 11:33:44' 'GAMMA PAVONIS',12.03125,-19.75,19.4375,'Release 1.00-EDStar','2014-12-23 23:50:52' 'GAMMA PHOENICIS',70.5,-222.46875,11.15625,'Gamma','2014-11-27 11:33:44' +'GAMMA TUCANAE',25.125,-61.8125,34.6875,'Release 1.00-EDStar','2015-01-18 16:13:39' 'GAMMA-1 VOLANTIS',144.78125,-66.15625,29.78125,'Gamma','2014-11-27 11:33:44' 'GAMMA-2 VOLANTIS',126.65625,-57.875,26.0625,'Gamma','2014-11-27 11:33:44' 'GAMMA-3 OCTANTIS',171.53125,-146.25,118.34375,'Gamma','2014-11-27 11:33:44' @@ -10450,6 +10461,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HSUANG',100.125,-143.34375,136.5625,'Gamma','2014-11-27 11:33:44' 'HSUANI',-122.25,-51.34375,119.0625,'Gamma','2014-11-27 11:33:44' 'HSUANQUENO',-7.03125,-117.25,89.09375,'Gamma','2014-11-27 11:33:44' +'HU DELPHINUS',-22.0,-8.25,16.25,'Release 1.00-EDStar','2015-01-18 12:12:08' 'HU JING TE',115.9375,37.96875,-61.15625,'Gamma','2014-11-27 11:33:44' 'HU JINI',139.125,-22.09375,2.96875,'Gamma','2014-11-27 11:33:44' 'HU JONA',-84.0,-9.21875,3.21875,'Gamma','2014-11-27 11:33:44' @@ -10757,6 +10769,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ICZ FB-X C1-17',66.5625,-71.03125,28.1875,'Release 1.00-EDStar','2015-01-02 18:10:19' 'ICZ FB-X C1-19',60.25,-76.96875,21.0,'Release 1.00-EDStar','2015-01-09 22:23:02' 'ICZ FB-X C1-22',67.5,-76.5,15.0625,'Release 1.00-EDStar','2015-01-12 18:39:26' +'ICZ FG-Y D73',17.0,-190.125,36.21875,'Release 1.00-EDStar','2015-01-18 17:08:24' 'ICZ FL-X B1-2',110.21875,-118.5,5.5625,'Release 1.00-EDStar','2014-12-16 12:44:27' 'ICZ FR-V B2-1',21.34375,-105.03125,22.875,'Release 1.00-EDStar','2015-01-01 19:40:31' 'ICZ FW-V B2-1',63.5,-97.75,22.0,'Release 1.00-EDStar','2014-12-31 03:04:36' @@ -13350,6 +13363,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LHS 492',20.3125,-45.09375,59.875,'Gamma','2014-11-27 11:33:44' 'LHS 493',31.84375,-29.1875,34.5,'Release 1.00-EDStar','2015-01-14 21:02:01' 'LHS 494',-50.5625,11.46875,-6.1875,'Beta2-Inferred','2014-11-02 14:36:45' +'LHS 495',-26.78125,-8.71875,15.40625,'Release 1.00-EDStar','2015-01-18 12:23:22' 'LHS 499',30.96875,-26.9375,29.78125,'Release 1.00-EDStar','2014-12-04 10:50:59' 'LHS 5072',-33.34375,15.15625,-27.53125,'Beta2','2014-10-21 17:16:31' 'LHS 510',-0.8125,-38.40625,35.96875,'Gamma','2014-11-27 11:33:44' @@ -13728,6 +13742,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LP 621-11',7.15625,48.5,42.03125,'Gamma','2014-11-27 11:33:44' 'LP 625-34',-9.46875,17.8125,30.4375,'Gamma-Inferred','2014-10-21 17:16:31' 'LP 633-12',-55.84375,-9.4375,49.71875,'Release 1.00-EDStar','2014-11-27 16:49:46' +'LP 634-1',-23.34375,-9.78125,28.1875,'Release 1.00-EDStar','2015-01-18 12:48:29' 'LP 634-18',-41.1875,-20.21875,48.21875,'Release 1.00-EDStar','2015-01-10 10:20:35' 'LP 634-24',-66.6875,-35.75,71.125,'Gamma','2014-11-27 11:33:44' 'LP 635-46',-59.28125,-38.34375,55.34375,'Gamma','2014-11-27 11:33:44' @@ -13831,6 +13846,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LP 926-40',-9.78125,-26.71875,45.1875,'Gamma','2014-11-27 11:33:44' 'LP 931-40',-14.84375,-60.4375,37.1875,'Gamma','2014-11-27 11:33:44' 'LP 932-12',-7.9375,-40.09375,21.0,'Gamma','2014-11-27 11:33:44' +'LP 932-89',-10.8125,-57.6875,25.4375,'Release 1.00-EDStar','2015-01-18 16:06:07' 'LP 933-24',-14.71875,-95.59375,41.875,'Gamma','2014-11-27 11:33:44' 'LP 937-31',8.71875,-188.46875,24.8125,'Gamma','2014-11-27 11:33:44' 'LP 937-95',7.40625,-59.53125,7.09375,'Release 1.00-EDStar','2015-01-04 22:29:48' @@ -14337,6 +14353,8 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified '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 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' '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' @@ -14841,6 +14859,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'MCC 613',65.40625,90.65625,-0.71875,'Gamma','2014-11-27 11:33:44' 'MCC 684',-44.9375,93.4375,-24.28125,'Gamma','2014-11-27 11:33:44' 'MCC 686',8.75,80.875,13.65625,'Gamma','2014-11-27 11:33:44' +'MCC 699',-54.9375,84.3125,-21.15625,'Release 1.00-EDStar','2015-01-18 19:16:15' 'MCC 741',-47.1875,94.40625,42.03125,'Gamma','2014-11-27 11:33:44' 'MCC 811',-63.9375,-9.65625,61.96875,'Release 1.00-EDStar','2014-12-31 09:45:08' 'MCC 813',-78.625,21.46875,-3.125,'Beta2-Inferred','2014-10-21 17:16:31' @@ -16367,6 +16386,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'OMBILIA',15.3125,-15.59375,94.75,'Gamma','2014-11-27 11:33:44' 'OMEGA DRACONIS',-63.375,39.90625,-10.125,'Beta2-Inferred','2014-10-21 17:16:31' 'OMEGA-1 AQUARII',-47.125,-132.90625,18.28125,'Gamma','2014-11-27 11:33:44' +'OMICRON AQUILAE',-46.875,-8.9375,40.53125,'Release 1.00-EDStar','2014-11-30 23:53:13' 'OMICRON CAPRICORNI B',-52.65625,-69.0,105.40625,'Gamma','2014-11-27 11:33:44' 'OMICRON COLUMBAE',75.59375,-57.84375,-46.28125,'Gamma','2014-11-27 11:33:44' 'OMICRON GRUIS',25.84375,-87.28125,42.28125,'Gamma','2014-11-27 11:33:44' @@ -17032,6 +17052,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'PISCIUM SECTOR PT-R B4-4',-81.71875,-63.5625,8.15625,'Release 1.00-EDStar','2014-12-24 03:55:49' 'PISCIUM SECTOR PT-R B4-5',-83.3125,-64.09375,1.9375,'Release 1.00-EDStar','2014-12-24 04:14:19' 'PISCIUM SECTOR SD-T B3-7',-9.1875,-88.3125,-13.6875,'Release 1.00-EDStar','2015-01-14 21:21:53' +'PISCIUM SECTOR VK-N A7-3',-45.84375,-27.59375,-5.4375,'Release 1.00-EDStar','2015-01-18 17:08:09' 'PISCIUM SECTOR YQ-L A8-2',-57.8125,-32.40625,0.46875,'Release 1.00-EDStar','2015-01-07 01:32:16' 'PISCIUM SECTOR ZK-X B1-0',-70.71875,-17.65625,-55.8125,'Release 1.00-EDStar','2015-01-03 19:04:57' 'PITANIANG',96.625,-30.125,-54.34375,'Gamma','2014-11-27 11:33:44' @@ -17319,6 +17340,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'PYEMMATSETY',105.96875,-20.875,-22.21875,'Gamma','2014-11-27 11:33:44' 'PYEMSITO',-39.90625,47.78125,40.4375,'Gamma','2014-11-27 11:33:44' 'PYEMSITOQ',72.03125,71.625,-88.40625,'Gamma','2014-11-27 11:33:44' +'PYREDI',-25.65625,-10.5625,20.03125,'Release 1.00-EDStar','2015-01-18 12:47:04' 'PYRITAPIYAR',-29.0625,-18.8125,-128.46875,'Gamma','2014-11-27 11:33:44' 'Q SCORPII',25.5625,-11.90625,163.375,'Gamma','2014-11-27 11:33:44' 'Q VELORUM',98.8125,20.875,8.28125,'Gamma','2014-11-27 11:33:44' @@ -20779,6 +20801,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'WOLF 1182',-71.6875,-20.96875,-0.9375,'Gamma','2014-11-27 11:33:44' 'WOLF 12',-44.65625,-21.53125,-27.1875,'Gamma','2014-11-27 11:33:44' 'WOLF 121',-38.90625,-144.59375,-97.4375,'Gamma','2014-11-27 11:33:44' +'WOLF 1225',-47.28125,-18.03125,-0.53125,'Release 1.00-EDStar','2015-01-18 16:13:52' 'WOLF 1230',-137.0,-47.59375,-5.28125,'Gamma','2014-11-27 11:33:44' 'WOLF 124',-7.25,-27.15625,-19.09375,'Gamma','2014-11-27 11:33:44' 'WOLF 1241',-31.0625,-47.40625,-107.21875,'Gamma','2014-11-27 11:33:44' @@ -20895,6 +20918,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'WOLF 827',-119.6875,51.1875,95.25,'Gamma','2014-11-27 11:33:44' 'WOLF 851',-57.9375,3.8125,89.25,'Release 1.00-EDStar','2015-01-06 22:13:14' 'WOLF 865',-50.46875,-9.0625,34.65625,'Gamma','2014-11-27 11:33:44' +'WOLF 866',-48.125,-8.03125,31.28125,'Release 1.00-EDStar','2015-01-04 23:30:12' 'WOLF 867',-45.375,-4.09375,23.84375,'Gamma','2014-11-27 11:33:44' 'WOLF 871',-64.21875,-12.34375,41.0,'Gamma','2014-11-27 11:33:44' 'WOLF 883',-92.125,-66.8125,87.71875,'Gamma','2014-11-27 11:33:44' diff --git a/edscupdate.py b/edscupdate.py index 838b5c32..622ddfbf 100644 --- a/edscupdate.py +++ b/edscupdate.py @@ -30,7 +30,7 @@ import tradedb import math -import misc.edstarquery +import misc.edsc import re import sys @@ -57,7 +57,7 @@ print("start date: {}".format(date), file=sys.stderr) -edsq = misc.edstarquery.EDStarQuery( +edsq = misc.edsc.StarQuery( test=False, confidence=2, date=date, @@ -70,6 +70,7 @@ 'CRU7CIS SECTOR EQ-Y B2', 'CRUCIS SECTOR FM-V B2-O', 'CRUCIS SECTOR MD-S B4-6', + 'CRUCIS SECTO GB-X B1-0', 'ED TUCANAE', 'HYADES SECTOR WF-M B8-3', 'PISCIUM SECTOR BM-L AB-1', # should be A8-1 @@ -77,9 +78,6 @@ 'WISE 0410+ 1502', # should be WISE 0410+1502 'ZAGARAS', ] -problems = [ - 'CRUCIS SECTOR MD-S B4-6', -] if edsq.status['statusnum'] != 0: raise Exception("Query failed: {} ({})".format( diff --git a/misc/edsc.py b/misc/edsc.py new file mode 100755 index 00000000..af56e9d7 --- /dev/null +++ b/misc/edsc.py @@ -0,0 +1,156 @@ +#! /usr/bin/env python3 + +from __future__ import absolute_import, with_statement, print_function, division, unicode_literals + +from urllib.parse import urlencode +from urllib.request import Request, urlopen + +import json + +try: + import requests +except ImportError as e: + import pip + print("ERROR: Unable to load the Python 'requests' package.") + approval = input( + "Do you want me to try and install it with the package manager (y/n)? " + ) + if approval.lower() != 'y': + raise e + pip.main(["install", "--upgrade", "requests"]) + import requests + + +class StarQuery(object): + url = 'http://edstarcoordinator.com/api.asmx/GetSystems' + + def __init__(self, detail=2, test=False, known=1, confidence=0, **kwargs): + self.params = { + 'data': { + 'ver': 2, + 'test': test, + 'outputmode': detail, + 'filter': { + 'knownstatus': known, + 'cr': confidence, + } + } + } + for k, v in kwargs.items(): + self.params['data']['filter'][k] = v + + self.jsData = None + + + def fetch(self): + params = json.dumps(self.params).encode('utf-8') + request = Request(EDStarQuery.url, params, { + 'Content-Type': 'application/json;charset=utf-8', + 'Content-Length': len(params) + }) + + with urlopen(request, params) as stream: + self.jsData = stream.read() + + data = json.loads(self.jsData.decode())['d'] + inputNo = 0 + self.status = data['status']['input'][inputNo]['status'] + + return data + + +class SubmissionError(Exception): + pass + + +class StarSubmission(object): + url = "http://edstarcoordinator.com/api.asmx/SubmitDistances" + + def __init__( + self, star, + test=False, commander=None, + refs=None, distances=None, + ): + assert isinstance(star, str) + assert isinstance(test, bool) + if refs: + assert isinstance(refs, list) + self.test = test + self.name = star.upper() + self.refs = refs or [] + if distances: + if isinstance(distances, list): + for name, dist in distances: + self.add_distance(name, dist) + elif isinstance(distances, dict): + for name, dist in distances.items(): + self.add_distance(name, dist) + else: + raise SubmissionError("Invalid distances parameter") + if commander: + self.commander = commander + + + def add_distance(self, name, dist): + assert isinstance(name, str) + assert isinstance(dist, (float, int)) + assert name.upper() != self.name + + name = name.upper() + for i, ref in enumerate(self.refs): + if ref['name'] == name: + ref['dist'] = dist + return + + self.refs.append({'name': name, 'dist': dist}) + + + def submit(self): + assert len(self.refs) != 0 + + headers = { 'Content-Type': 'application/json; charset=utf-8' } + data = { + 'data': { + 'test': self.test, + 'ver': 2, + 'p0': { 'name': self.name }, + 'refs': self.refs + }, + } + if self.commander: + data['commander'] = self.commander + + jsonData = json.dumps(data, indent=None, separators=(',', ':')) + + req = requests.post( + self.url, + headers=headers, + data=jsonData + ) + resp = req.text + if not resp.startswith('{'): + raise SubmissionError("Server Side Error: " + resp) + + try: + respData = json.loads(resp) + return respData['d'] + except Exception: + raise SubmissionError("Invalid server response: " + resp) + + +if __name__ == "__main__": + edsq = StarQuery(test=False, confidence=0) + data = edsq.fetch() + + if edsq.status['statusnum'] != 0: + raise Exception("Query failed: {} ({})".format( + edsq.status['msg'], + edsq.status['statusnum'], + )) + + date = data['date'] + systems = data['systems'] + + for sysinfo in systems: + print(sysinfo['id'], sysinfo['name'], sysinfo['coord'], sysinfo['createdate']) + diff --git a/misc/edstarquery.py b/misc/edstarquery.py deleted file mode 100755 index 5e5c1ff4..00000000 --- a/misc/edstarquery.py +++ /dev/null @@ -1,62 +0,0 @@ -#! /usr/bin/env python3 - -from __future__ import absolute_import, with_statement, print_function, division, unicode_literals - -from urllib.parse import urlencode -from urllib.request import Request, urlopen -import json - -class EDStarQuery(object): - url = 'http://edstarcoordinator.com/api.asmx/GetSystems' - - def __init__(self, detail=2, test=False, known=1, confidence=0, **kwargs): - self.params = { - 'data': { - 'ver': 2, - 'test': test, - 'outputmode': detail, - 'filter': { - 'knownstatus': known, - 'cr': confidence, - } - } - } - for k, v in kwargs.items(): - self.params['data']['filter'][k] = v - - self.jsData = None - - - def fetch(self): - params = json.dumps(self.params).encode('utf-8') - request = Request(EDStarQuery.url, params, { - 'Content-Type': 'application/json;charset=utf-8', - 'Content-Length': len(params) - }) - - with urlopen(request, params) as stream: - self.jsData = stream.read() - - data = json.loads(self.jsData.decode())['d'] - inputNo = 0 - self.status = data['status']['input'][inputNo]['status'] - - return data - - -if __name__ == "__main__": - edsq = EDStarQuery(test=False, confidence=0) - data = edsq.fetch() - - if edsq.status['statusnum'] != 0: - raise Exception("Query failed: {} ({})".format( - edsq.status['msg'], - edsq.status['statusnum'], - )) - - date = data['date'] - systems = data['systems'] - - for sysinfo in systems: - print(sysinfo['id'], sysinfo['name'], sysinfo['coord'], sysinfo['createdate']) - diff --git a/misc/madupload.py b/misc/madupload.py index 711af586..112a6e9a 100755 --- a/misc/madupload.py +++ b/misc/madupload.py @@ -1,7 +1,6 @@ #! /usr/bin/env python import pathlib -import platform import re import sys diff --git a/submit-distances.py b/submit-distances.py new file mode 100644 index 00000000..858431f4 --- /dev/null +++ b/submit-distances.py @@ -0,0 +1,359 @@ +#! /usr/bin/env python + +""" +Small tool to submit new star data to EDStarCoordinator. + +Use: + + submit-distances.py "system name" +""" + +# +# NOTE: This tool is very hacky. If someone wants to clean it up, +# and submit a diff, that'd be greatly appreciated! +# + +from __future__ import print_function + +import json +import math +import os +import pathlib +import platform +import random +import re +import sys +import tradedb + +from misc.edsc import StarSubmission +from tkinter import Tk + +try: + import requests +except ImportError as e: + import pip + print("ERROR: Unable to load the Python 'requests' package.") + approval = input( + "Do you want me to try and install it with the package manager (y/n)? " + ) + if approval.lower() != 'y': + raise e + pip.main(["install", "--upgrade", "requests"]) + import requests + +standardStars = [ + "SOL", + "ASELLUS AUSTRALIS", + "46 GAMMA HYDRAE", + "TEJAT POSTERIOR", + "RHO PUPPIS", +] + +outlierStars = [ + "1 AURIGAE", + "103 AQUARII", + "2MASS J21371591+5726591", + "52 PI AQUILAE", + "64 LEONIS", + "8 LEONIS", + "AUCOFS UZ-E C28-11", + "AUCOFS WL-J D10-28", + "BETELGEUSE", + "BLOO DRYE QA-C B33-5", + "BLU EUQ TJ-Q C5-6", + "CHRAICHOOE TU-M D8-0", + "DROJO DX-F C14", + "DRYEAE AEC HM-C D13-0", + "ELEPHANT'S TRUNK SECTOR LS-T B3-0", + "EZ ORIONIS", + "GM CEPHEI", + "HD 133948", + "HIP 24766", + "HIP 96375", + "HR 1327", + "HR 2028", + "HYPIAE BRUE EM-L D8-0", + "IC 1396 SECTOR YJ-Z D10", + "IORASP SP-G D10-0", + "KY CYGNI", + "NGC 3199 SECTOR MC-V C2-5", + "NORTH AMERICA SECTOR IR-W D1-81", + "PHIPOEA DC-B C1-4278", + "SADR", + "SMOJAI HA-H B39-0", + "SYNUEFAI XI-B D1", + "VV CEPHEI", + "VY CANIS MAJORIS", +] + + +############################################################################ + + +class UsageError(Exception): + pass + + +def get_system(tdb): + args = sys.argv[1:] + if not args or args[0].startswith('-'): + raise UsageError("""Usage: {} \"new system\" + +This tool prompts you with the names of several systems and asks you +to find the distance from "new system" to those systems. + +When the tool prompts you with a system's name, it will also copy it +into your clipboard. Alt-Tab into the game, go to the GALAXY MAP and +the NAVIGATION tab, and paste (SHIFT+INS or CTRL-V) the name. Hit +enter and the map will pan to the system and tell you how far away +it is. + +(Hint: Double-click the right end of the search box, then press +SHIFT+HOME to select the current text and backspace to delete it). + +You will first be prompted for 'Standard Systems' which is a list of +5 fairly well known systems. + +To skip a system: just hit enter. + +After that you'll be prompted with a list of outlier stars. Again you +can just press enter to skip them or q to skip to the next section. + +Finally you will be given a chance to choose stars not already listed. +Any stars you enter here will be saved in 'data/extra-stars.txt' and +added to the 'outlier stars' in future runs. + +Finally you'll be asked to review the data you've entered and, if it +looks good, it will be submitted to EDSC. +""" + ) + + systemName = ' '.join(sys.argv[1:]).upper() + if systemName.startswith('@'): + allowUpdate = True + systemName = systemName[1:] + else: + allowUpdate = False + + systemName = systemName.strip() + + try: + system = tdb.lookupSystem(systemName) + except (KeyError, tradedb.AmbiguityError, LookupError): + system = None + pass + else: + if not allowUpdate: + raise UsageError( + "ERROR: System '{}' already exists.\n" + "Prefix the name with an '@' sign if you want to force " + "submitting distances for an existing system, e.g. @SOL." + .format(systemName) + ) + + return systemName, system + + +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." + ) + + +def get_outliers(): + outliers = set(outlierStars) + try: + with open("data/extra-stars.txt", "rU") as input: + for line in input: + line = line.strip() + if line: + outliers.add(line.upper()) + except FileNotFoundError: + pass + return random.sample(list(outliers), len(outliers)) + + +def add_extra_star(name): + try: + with open("data/extra-stars.txt", "a") as output: + print(name, file=output) + except FileNotFoundError: + pass + + +def paste_for_ed(tkroot, text): + tkroot.clipboard_clear() + tkroot.clipboard_append(text.lower()) + + +def get_distances(tkroot, distances, stars): + for star in stars: + paste_for_ed(tkroot, star) + + dist = input("Distance to {}: ".format(star)) + if dist == 'q': + return distances, 'q' + + if dist: + distances.append({ + 'name': star.upper(), + 'dist': float(dist), + }) + + return distances, 'end' + + +def check_system(tdb, tdbSys, name): + try: + system = tdb.lookupSystem(name) + if not tdbSys: + print("KNOWN SYSTEM") + return + except (tradedb.AmbiguityError, LookupError, KeyError): + return + + print("KNOWN SYSTEM: {:.2f}ly".format( + math.sqrt(tdbSys.distToSq(system)) + )) + + +############################################################################ + +def main(): + tdb = tradedb.TradeDB() + + system, tdbSys = get_system(tdb) + cmdr = get_cmdr(tdb) + + outliers = get_outliers() + + print("Add EDSC Star Distances for \"{}\"".format(system)) + print() + print("You will now be prompted for distances to various stars.") + print() + print( + "At each prompt, the star name will be copied into your paste buffer. " + "You should alt-tab into the game and paste the name into the Galaxy " + "Map's search box. Then alt-tab back and enter the distance value." + ) + print() + print( + "At each prompt enter a ly distance (e.g. 123.45), q to stop, " + "or leave the line empty if you don't want to enter data for " + "this star." + ) + + print("The more distances you submit per star, the better.") + print() + + tkroot = Tk() + tkroot.withdraw() + + print() + print(""" +=================================================== +STANDARD STARS: (q to stop listing standard stars) + + These are stars with well-known positions. +=================================================== +""") + distances, term = get_distances(tkroot, list(), standardStars) + + print(""" +=================================================== +OUTLIERS: (q to stop listing outliers) + + Assorted outlier stars from around the galaxy + mixed with any stars from data/extra-stars.txt. +=================================================== +""") + distances, term = get_distances(tkroot, distances, outliers) + + print(""" +=================================================== +CHOOSE YOUR OWN: (leave blank to stop) + + Specify additional stars, the names will be saved + to data/extra-stars.txt so they appear in the + outliers section in future. + To avoid saving a particular star to this file, + prefix the name with a '*' (e.g. *SOL). +=================================================== +""") + while True: + star = input("Enter star name: ") + star = star.strip() + if not star or star == 'q': + break + if star.startswith('*'): + skipSave = True + star = star[1:].strip() + else: + skipSave = False + star = star.upper() + for ref in distances: + if ref['name'] == star: + print("Duplicate") + continue + check_system(tdb, tdbSys, star) + extras, term = get_distances(tkroot, list(), [star]) + if term != 'q' and len(extras) > 0: + distances.extend(extras) + if not skipSave and star not in outliers: + add_extra_star(star) + + if not distances: + print("No distances, no submission.") + return + + print() + print("System:", system) + print("Distances:") + for ref in distances: + print(" {}: {}ly".format( + ref['name'], ref['dist'] + )) + print() + + ok = input("Does this look correct (y/n)? ") + if ok != 'y': + print("Abandoning") + return + + print("Submitting") + + sub = StarSubmission( + star=system, + commander=cmdr, + refs=distances, + ) + resp = sub.submit() + + status = resp['status']['input'][0]['status'] + if status['statusnum'] == 0: + print(status['msg']) + else: + print("ERROR: {} ({})".format( + status['msg'], status['statusnum'], + )) + + +if __name__ == "__main__": + try: + main() + except UsageError as e: + print(str(e)) + diff --git a/tradedb.py b/tradedb.py index c25c0eaf..1f430c4e 100644 --- a/tradedb.py +++ b/tradedb.py @@ -1417,8 +1417,10 @@ def getDestinations(self, continue if (maxPadSize and not station.checkPadSize(maxPadSize)): continue - if (maxLsFromStar and station.lsFromStar > maxLsFromStar): - continue + if maxLsFromStar: + stnLs = station.lsFromStar + if stnLs <= 0 or stnLs > maxLsFromStar: + continue destStations.append( Destination(node.system, station,