diff --git a/CHANGES.txt b/CHANGES.txt index bea846a6..5c0b780f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,7 +2,23 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014 ============================================================================== -[work in progress] +[wip] +. (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. +. (kfsone) Added "--progress" to "run" to show the current hop, +. (kfsone) "run" and TradeCalc are much smarter about which hops + they will consider when using --max-age, --blackmarket, etc. + (big perf win) + + +v6.7.0 Jan 17 2015 +. (kfsone) ".prices" import automatically creates local placeholders + for unknown stations when using "-i", e.g: + trade.py buildcache -f -i + trade.py import --plug=maddavo (this plugin sets -i for you) +. (kfsone) Added a "--ls-max" option to "run" for filtering stations +. (kfsone) +140 Systems . (tKE) "buy" sub-command now supports ship names (find a ship vendor) . (kfsone) Partial code/documentation cleanup . (kfsone) Added a "getRoute" function to TradeDB() diff --git a/README.txt b/README.txt index 3b73ff21..c75bc9c6 100644 --- a/README.txt +++ b/README.txt @@ -203,6 +203,51 @@ RUN sub-command: This command provides the primary trade run calculator functionality (it provides the functionality of the older TradeDangerous versions prior to 3.1) + Ship/Trade options: + --capacity N + --cap N + Maximum items you can carry on each hop. + + --credits N + --cr N + How many credits to start with + e.g. + --credits 20000 + + --ly-per N.NN + --ly N.NN + Maximum distance your ship can jump between systems at full capacity. + NOTE: You can increase your range by selling your weapons. + e.g. + --ly-per 19.1 + --ly-per 3 + + --empty-ly N.NN + --emp N.NN + DEFAULT: same as --ly-per + How far your ship can jump when empty (used by --start-jumps) + + --limit N DEFAULT: 0 + If set, limits the maximum number of units of any cargo + item you will buy on any trade hop, incase you want to + hedge your bets or be a good economy citizen. + e.g. + --capacity 16 --limit 8 + + --insurance N DEFAULT: 0 + --ins N + How many credits to hold back for insurance purposes + e.g. + --insurance 1000 + --ins 5000 + + --margin N.NN DEFAULT: 0.01 + At the end of each hop, reduce the profit by this much (0.02 = 2%), + to allow a margin of error in the accuracy of prices. + e.g. + --margin 0 (no margin) + --margin 0.01 (1% margin) + Route options: --from Lets you specify the starting station @@ -238,6 +283,21 @@ RUN sub-command: --via Enterprise --via Chango + --hops N + DEFAULT: 2 + Maximum number of hops (number of cargo pickups) + e.g. + --hops 8 + + --jumps-per N + --jum N + DEFAULT: 2 + Limit the number of systems jumped to between each station + e.g. + -jumps-per 5 + + + Filter options: --max-days-old N.NN -MD N.NN Filters out price data that exceeds a specified age in days @@ -269,22 +329,31 @@ RUN sub-command: --ls-penalty 2.5 --lsp=0 (disables this feature) - --unique - --uni - Only show routes which do not visit any station twice - - --hops N - DEFAULT: 2 - Maximum number of hops (number of cargo pickups) + --ls-max N + DEFAULT: 0 + Filter stations by their distance-to-star. Stations for which + distance-to-star is known that have a distance above this will + not be considered for trading. e.g. - --hops 8 + --ls-max 10000 + --ls-m 32000 + + --prune-score N.NN + DEFAULT: 0 + After a number of hops (controlled by --prune-hops), eliminate + candidate routes which have under-performed the leading candidate. + NOTE: This can speed up long run calculations, but it can also + cause you to miss gold-mines that are a just a few hops away... + e.g. + --prune-score 12.5 (prune routes scoring less than 10% of the leader) - --jumps-per N - --jum N - DEFAULT: 2 - Limit the number of systems jumped to between each station + --prune-hops N + DEFAULT: 3 + Being applying "--prune-score" from this hop onward. Set 0 to disable. + NOTE: This can speed up long run calculations, but it can also + cause you to miss gold-mines that are a just a few hops away... e.g. - -jumps-per 5 + --prune-hop 4 --prune-score 22.5 --avoid ITEM/SYSTEM/STATION --avoid AVOID,AVOID,...,AVOID @@ -298,50 +367,9 @@ RUN sub-command: --avoid prise --av gold,aulin,enterprise,anderson - Ship/Trade options: - --capacity N - --cap N - Maximum items you can carry on each hop. - - --credits N - --cr N - How many credits to start with - e.g. - --credits 20000 - - --ly-per N.NN - --ly N.NN - Maximum distance your ship can jump between systems at full capacity. - NOTE: You can increase your range by selling your weapons. - e.g. - --ly-per 19.1 - --ly-per 3 - - --empty-ly N.NN - --emp N.NN - DEFAULT: same as --ly-per - How far your ship can jump when empty (used by --start-jumps) - - --limit N DEFAULT: 0 - If set, limits the maximum number of units of any cargo - item you will buy on any trade hop, incase you want to - hedge your bets or be a good economy citizen. - e.g. - --capacity 16 --limit 8 - - --insurance N DEFAULT: 0 - --ins N - How many credits to hold back for insurance purposes - e.g. - --insurance 1000 - --ins 5000 - - --margin N.NN DEFAULT: 0.01 - At the end of each hop, reduce the profit by this much (0.02 = 2%), - to allow a margin of error in the accuracy of prices. - e.g. - --margin 0 (no margin) - --margin 0.01 (1% margin) + --unique + --uni + Only show routes which do not visit any station twice Other options: --routes N DEFAULT: 1 @@ -474,6 +502,12 @@ IMPORT sub-command: Any systems, stations, categories or items that aren't recognized by this version of TD will be reported but import will continue. + Unrecognized stations in the ".prices" file, or an import, will + have a placeholder station entry automatically created for them. + + Note: When the cache is rebuilt, these stations will be lost, so + you may need to add the "-i" flag to the buildcache command. + RARES sub-command: diff --git a/cache.py b/cache.py index bf7cab39..c4a89367 100644 --- a/cache.py +++ b/cache.py @@ -30,6 +30,7 @@ import re import sqlite3 import sys +import tradedb ###################################################################### # Regular expression patterns. Here be draegons. @@ -158,7 +159,7 @@ class DuplicateKeyError(BuildCacheBaseException): """ def __init__(self, fromFile, lineNo, keyType, keyValue, prevLineNo): super().__init__(fromFile, lineNo, - "Second occurance of {keytype} \"{keyval}\", " + "Second occurrance of {keytype} \"{keyval}\", " "previous entry at line {prev}.".format( keytype=keyType, keyval=keyValue, @@ -261,6 +262,15 @@ def parseSupply(pricesFile, lineNo, category, reading): ###################################################################### def getSystemByNameIndex(cur): + """ Build station index in STAR/Station notation """ + cur.execute(""" + SELECT system_id, UPPER(system.name) + FROM System + """) + return { name: ID for (ID, name) in cur } + + +def getStationByNameIndex(cur): """ Build station index in STAR/Station notation """ cur.execute(""" SELECT station_id, @@ -296,8 +306,11 @@ def processPrices(tdenv, priceFile, db, defaultZero): stationID, categoryID = None, None cur = db.cursor() + ignoreUnknown = tdenv.ignoreUnknown + quiet = tdenv.quiet systemByName = getSystemByNameIndex(cur) + stationByName = getStationByNameIndex(cur) categoriesByName = getCategoriesByNameIndex(cur) itemByName = getItemByNameIndex(cur) @@ -320,9 +333,9 @@ def processPrices(tdenv, priceFile, db, defaultZero): def ignoreOrWarn(error): nonlocal warnings - if not tdenv.ignoreUnknown: + if not ignoreUnknown: raise error - if not tdenv.quiet: + if not quiet: error.category = "WARNING" print(error) warnings += 1 @@ -343,7 +356,7 @@ def changeStation(matches): # Make sure it's valid. try: - stationID = systemByName[facility] + stationID = stationByName[facility] except KeyError: stationID = -1 @@ -370,7 +383,7 @@ def changeStation(matches): pass facility = systemName + '/' + stationName try: - stationID = systemByName[facility] + stationID = stationByName[facility] tdenv.DEBUG1("Renamed: {}/{} -> {}", systemNameIn, stationNameIn, facility @@ -378,7 +391,29 @@ def changeStation(matches): except KeyError: stationID = -1 - if stationID < 0 : + if stationID < 0 and ignoreUnknown: + try: + systemID = systemByName[systemName] + except KeyError: + pass + else: + name = tradedb.TradeDB.titleFixup(stationName) + inscur = db.cursor() + inscur.execute(""" + INSERT INTO Station ( + system_id, name, ls_from_star, blackmarket, max_pad_size + ) VALUES ( + ?, ?, 0, '?', '?' + ) + """, [systemID, name]) + stationID = inscur.lastrowid + stationByName[facility] = stationID + db.commit() + tdenv.NOTE("Added local station placeholder for {} (#{})", + facility, stationID + ) + + if stationID < 0: stationID = DELETED ignoreOrWarn( UnknownStationError(priceFile, lineNo, facility) diff --git a/commands/exceptions.py b/commands/exceptions.py index ec2f1d5a..eb04390d 100644 --- a/commands/exceptions.py +++ b/commands/exceptions.py @@ -37,9 +37,12 @@ def __init__(self, errorStr): self.errorStr = errorStr def __str__(self): return "Error: {}\n".format(self.errorStr) + (""" -This can either indicate a lack of data (such as missing -price information, station data, etc) or that there was no -data matching your criteria. +This could be due to a lack of price or station data. You +may want to consult the "local -vv" sub-command to see if +there are stations in the area with price data. + +It can also be caused by a lack of any profitable runs +that match the criteria you specified. See '{} update -h' for help entering/updating prices, or obtain a crowd-sourced '.prices' file from the web, such @@ -48,5 +51,3 @@ def __str__(self): For more help, see the TradeDangerous Wiki: http://kfs.org/td/wiki """).format(sys.argv[0]) - - diff --git a/commands/run_cmd.py b/commands/run_cmd.py index a6f7b579..d5458bed 100644 --- a/commands/run_cmd.py +++ b/commands/run_cmd.py @@ -91,7 +91,7 @@ metavar='N', type=int, ), - ParseArgument('--max-days-old', '-MD', + ParseArgument('--age', '--max-days-old', '-MD', help='Maximum age (in days) of trade data to use.', metavar='DAYS', type=float, @@ -113,6 +113,13 @@ type=float, dest='lsPenalty' ), + ParseArgument('--ls-max', + help='Only consider stations upto this many ls from their star.', + metavar='LS', + dest='maxLs', + type=int, + default=0, + ), ParseArgument('--unique', help='Only visit each station once.', action='store_true', @@ -149,6 +156,24 @@ default=False, dest='x52pro', ), + ParseArgument('--prune-score', + help='From the 3rd hop on, only consider routes which have ' \ + 'at least this percentage of the current best route''s score.', + dest='pruneScores', + type=float, + default=0, + ), + ParseArgument('--prune-hops', + help='Changes which hop --prune-score takes effect from.', + default=3, + type=int, + dest='pruneHops', + ), + ParseArgument('--progress', '-P', + help='Show hop progress', + default=False, + action='store_true', + ), ] ###################################################################### @@ -350,44 +375,62 @@ def checkAnchorNotInVia(hops, anchorName, place, viaSet): )) -def checkStationSuitability(cmdenv, station, src): +def checkStationSuitability(cmdenv, station, src=None): if not station.itemCount: - raise NoDataError( - "No price data in local database " - "for {} station: {}".format( - src, station.name(), - )) + if src: + raise NoDataError( + "No price data in local database " + "for {} station: {}".format( + src, station.name(), + )) + return False mps = cmdenv.maxPadSize if mps and not station.checkPadSize(mps): - raise CommandLineError( - "{} station {} does not meet pad-size " - "requirement.".format( - src, station.name(), - )) - if src != "--from": - bm = cmdenv.blackMarket - if bm and station.blackMarket != 'Y': + if src: + raise CommandLineError( + "{} station {} does not meet pad-size " + "requirement.".format( + src, station.name(), + )) + raise False + bm = cmdenv.blackMarket + if bm and station.blackMarket != 'Y': + if src and src != "--from": raise CommandLineError( "{} station {} does not meet black-market " "requirement.".format( src, station.name(), )) - + return False + mls = cmdenv.maxLs + if mls and station.lsFromStar > mls: + if src and src != "--from": + raise CommandLineError( + "{} station {} does not meet max-ls " + "requirement.".format( + src, station.name(), + )) + return False + maxAge = cmdenv.maxAge + if maxAge and station.dataAge > maxAge: + if src and src != "--from": + raise CommandLineError( + "{} station {} does not meet --max-age " + "requirement.".format( + src, station.name(), + )) + return False + return True 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 - if place.itemCount == 0: - stnSet.remove(place) - continue - if mps and not place.checkPadSize(mps): - stnSet.remove(place) - continue - if bm and place.blackMarket != 'Y': + if not checkStationSuitability(cmdenv, place): stnSet.remove(place) continue if not stnSet: @@ -446,7 +489,7 @@ def validateRunArguments(tdb, cmdenv): cmdenv.origins = [ station for station in tdb.stationByID.values() - if station.itemCount > 0 + if checkStationSuitability(cmdenv, station) ] if cmdenv.startJumps: raise CommandLineError("--start-jumps (-s) only works with --from") @@ -567,6 +610,13 @@ def validateRunArguments(tdb, cmdenv): if cmdenv.mfd: cmdenv.mfd.display("Loading Trades") + 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.") + else: + cmdenv.pruneScores = cmdenv.pruneHops = 0 ###################################################################### @@ -651,18 +701,29 @@ def run(results, cmdenv, tdb): results.summary = ResultRow() results.summary.exception = "" - for hopNo in range(numHops): - if not cmdenv.quiet and not cmdenv.debug: - print("* Hop {:3n}: {:.>10n} routes".format(hopNo+1, len(routes)), end='\r') - elif cmdenv.debug: - cmdenv.DEBUG0("Hop {}...", hopNo+1) + pruneMod = cmdenv.pruneScores / 100 + for hopNo in range(numHops): restrictTo = None if hopNo == lastHop and stopStations: restrictTo = set(stopStations) elif len(viaSet) > cmdenv.adhocHops: restrictTo = viaSet + if pruneMod and hopNo + 1 >= cmdenv.pruneHops and len(routes) > 10: + routes.sort() + bestScore, worstScore = routes[0].score, routes[-1].score + threshold = bestScore * pruneMod + oldLen = len(routes) + while routes[-1].score < threshold: + routes.pop() + cmdenv.NOTE("Pruned {} routes", oldLen - len(routes)) + + if cmdenv.progress: + print("* Hop {:3n}: {:.>10n} routes".format(hopNo+1, len(routes))) + elif cmdenv.debug: + cmdenv.DEBUG0("Hop {}...", hopNo+1) + newRoutes = calc.getBestHops(routes, restrictTo=restrictTo) if not newRoutes and hopNo > 0: if restrictTo: @@ -694,8 +755,6 @@ def run(results, cmdenv, tdb): ) break routes = newRoutes - if not cmdenv.quiet: - print("{:40}".format(" "), end='\r') if not routes: raise NoDataError("No profitable trades matched your critera, or price data along the route is missing.") diff --git a/commands/station_cmd.py b/commands/station_cmd.py index be54a3ef..986aefa8 100644 --- a/commands/station_cmd.py +++ b/commands/station_cmd.py @@ -88,29 +88,6 @@ ###################################################################### # Helpers -def titleFixup(text): - """ - Correct case in a word assuming the presence of titles/surnames, - including 'McDonald', 'MacNair', 'McKilroy', and cases that - python's title screws up such as "Smith's". - """ - - text = text.title() - text = re.sub( - r"\b(Mc)([a-z])", - lambda match: match.group(1) + match.group(2).upper(), - text - ) - text = re.sub( - r"\b(Mac)([bcdfgjklmnpqrstvwxyz])([a-z]{4,})", - lambda m: m.group(1) + m.group(2).upper() + m.group(3), - text - ) - text = re.sub(r"'S\b", "'s", text) - - return text - - def makeConfirmationCode(base, candidates): """ Makes a four-digit hex checksum of a station list. @@ -232,7 +209,7 @@ def checkSystemAndStation(tdb, cmdenv): if not sysName: raise CommandLineError("No system name specified") - cmdenv.system, cmdenv.station = sysName, titleFixup(stnName) + cmdenv.system, cmdenv.station = sysName, TradeDB.titleFixup(stnName) # If we're adding a station, we need to check that the system # exists and that it doesn't contain a close-match for this diff --git a/corrections.py b/corrections.py index d49e815c..43105fc6 100644 --- a/corrections.py +++ b/corrections.py @@ -20,6 +20,7 @@ "21 DRACO/ROBERTS PORT": DELETED, "37 XI BOOTIS/SCHIRRA PLANT": "Schirba Plant", "ADENETS/ALLEN HORIZONS": DELETED, + "ADEO/OOBROVOLSKI CITY": "Dobrovolski City", "AKHENATEN/WANG PLATFORM": DELETED, "ALBICEVCI/DUBROVOLSKI SURVEY": "Dobrovolski Survey", "AMAIT/LOPEZ DE VILLALOBOS": "Lopez De Villalobos Prospect", @@ -29,6 +30,7 @@ "APOYOTA/FLINTSTATION": "Flint Station", "APOYOTA/HAHNRELAY": "Hahn Relay", "AULIN/ALUIN ENTERPIRSE": "Aulin Enterprise", + "BALDUR/DUTTON STATION": DELETED, "BD+13 693/DRUMMOND`S PROGRESS": "Drummond's Progress", "BD+65 1846/SHARGIN BEACON": DELETED, "BOLG/MOXONS MOJO": "Moxon's Mojo", diff --git a/data/Ship.csv b/data/Ship.csv index 8497ca8a..7f0f85fc 100644 --- a/data/Ship.csv +++ b/data/Ship.csv @@ -1,16 +1,16 @@ unq:name,cost 'Adder',87808 'Anaconda',146969451 -'Asp Explorer',6661153 +'Asp',6661153 'Clipper',22295860 'Cobra',379718 'Dropship',37814205 'Eagle',44800 'Hauler',52720 -'Lakon Type 6',1045945 -'Lakon Type 7',17472252 -'Lakon Type 9',76555842 'Orca',48539887 'Python',56978179 'Sidewinder',32000 +'Type 6',1045945 +'Type 7',17472252 +'Type 9',76555842 'Viper',142931 diff --git a/data/ShipVendor.csv b/data/ShipVendor.csv index 1d3232ae..7ac30458 100644 --- a/data/ShipVendor.csv +++ b/data/ShipVendor.csv @@ -1,100 +1,100 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id -'ACHENAR','Bell Terminal','Asp Explorer' +'ACHENAR','Bell Terminal','Asp' 'ACHENAR','Bell Terminal','Eagle' 'ACHENAR','Bell Terminal','Hauler' -'ACHENAR','Bell Terminal','Lakon Type 7' 'ACHENAR','Bell Terminal','Sidewinder' +'ACHENAR','Bell Terminal','Type 7' 'ACHENAR','MacMillan Terminal','Eagle' 'ACHENAR','MacMillan Terminal','Hauler' 'ACHENAR','MacMillan Terminal','Orca' 'ACHENAR','MacMillan Terminal','Sidewinder' 'ACHENAR','MacMillan Terminal','Viper' 'AIABIKO','White Orbital','Anaconda' -'AIABIKO','White Orbital','Asp Explorer' +'AIABIKO','White Orbital','Asp' 'AIABIKO','White Orbital','Dropship' 'AIABIKO','White Orbital','Eagle' 'AIABIKO','White Orbital','Hauler' -'AIABIKO','White Orbital','Lakon Type 6' -'AIABIKO','White Orbital','Lakon Type 7' 'AIABIKO','White Orbital','Sidewinder' +'AIABIKO','White Orbital','Type 6' +'AIABIKO','White Orbital','Type 7' 'ANLAVE','Hogg City','Adder' 'ANLAVE','Hogg City','Cobra' 'ANLAVE','Hogg City','Dropship' 'ANLAVE','Hogg City','Eagle' 'ANLAVE','Hogg City','Hauler' -'ANLAVE','Hogg City','Lakon Type 6' 'ANLAVE','Hogg City','Python' 'ANLAVE','Hogg City','Sidewinder' +'ANLAVE','Hogg City','Type 6' 'ANLAVE','Hogg City','Viper' -'ANLAVE','Kobayashi City','Asp Explorer' +'ANLAVE','Kobayashi City','Asp' 'ANLAVE','Kobayashi City','Cobra' 'ANLAVE','Kobayashi City','Eagle' 'ANLAVE','Kobayashi City','Hauler' -'ANLAVE','Kobayashi City','Lakon Type 6' 'ANLAVE','Kobayashi City','Orca' 'ANLAVE','Kobayashi City','Python' 'ANLAVE','Kobayashi City','Sidewinder' +'ANLAVE','Kobayashi City','Type 6' 'ANLAVE','Kobayashi City','Viper' -'ANLAVE','Suri Park','Asp Explorer' +'ANLAVE','Suri Park','Asp' 'ANLAVE','Suri Park','Cobra' 'ANLAVE','Suri Park','Eagle' 'ANLAVE','Suri Park','Hauler' -'ANLAVE','Suri Park','Lakon Type 6' 'ANLAVE','Suri Park','Orca' 'ANLAVE','Suri Park','Python' 'ANLAVE','Suri Park','Sidewinder' +'ANLAVE','Suri Park','Type 6' 'ANLAVE','Suri Park','Viper' -'ANNA PERENNA','Wisoff Holdings','Asp Explorer' +'ANNA PERENNA','Wisoff Holdings','Asp' 'ANNA PERENNA','Wisoff Holdings','Eagle' 'ANNA PERENNA','Wisoff Holdings','Hauler' -'ANNA PERENNA','Wisoff Holdings','Lakon Type 7' -'ANNA PERENNA','Wisoff Holdings','Lakon Type 9' 'ANNA PERENNA','Wisoff Holdings','Sidewinder' +'ANNA PERENNA','Wisoff Holdings','Type 7' +'ANNA PERENNA','Wisoff Holdings','Type 9' 'APTET','Torricelli Port','Dropship' 'APTET','Torricelli Port','Hauler' -'APTET','Torricelli Port','Lakon Type 6' -'APTET','Torricelli Port','Lakon Type 7' -'APTET','Torricelli Port','Lakon Type 9' 'APTET','Torricelli Port','Sidewinder' +'APTET','Torricelli Port','Type 6' +'APTET','Torricelli Port','Type 7' +'APTET','Torricelli Port','Type 9' 'BAST','Hart Station','Cobra' 'BAST','Hart Station','Eagle' 'BHRITZAMENO','Feynman Terminal','Adder' -'BHRITZAMENO','Feynman Terminal','Asp Explorer' +'BHRITZAMENO','Feynman Terminal','Asp' 'BHRITZAMENO','Feynman Terminal','Cobra' 'BHRITZAMENO','Feynman Terminal','Dropship' 'BHRITZAMENO','Feynman Terminal','Eagle' 'BHRITZAMENO','Feynman Terminal','Hauler' -'BHRITZAMENO','Feynman Terminal','Lakon Type 6' -'BHRITZAMENO','Feynman Terminal','Lakon Type 7' -'BHRITZAMENO','Feynman Terminal','Lakon Type 9' 'BHRITZAMENO','Feynman Terminal','Orca' 'BHRITZAMENO','Feynman Terminal','Python' 'BHRITZAMENO','Feynman Terminal','Sidewinder' +'BHRITZAMENO','Feynman Terminal','Type 6' +'BHRITZAMENO','Feynman Terminal','Type 7' +'BHRITZAMENO','Feynman Terminal','Type 9' 'BHRITZAMENO','Feynman Terminal','Viper' 'BUNUVIVIA','Ellison Enterprise','Adder' 'BUNUVIVIA','Ellison Enterprise','Cobra' 'BUNUVIVIA','Ellison Enterprise','Dropship' 'BUNUVIVIA','Ellison Enterprise','Eagle' 'BUNUVIVIA','Ellison Enterprise','Hauler' -'BUNUVIVIA','Ellison Enterprise','Lakon Type 6' -'BUNUVIVIA','Ellison Enterprise','Lakon Type 7' -'BUNUVIVIA','Ellison Enterprise','Lakon Type 9' 'BUNUVIVIA','Ellison Enterprise','Sidewinder' +'BUNUVIVIA','Ellison Enterprise','Type 6' +'BUNUVIVIA','Ellison Enterprise','Type 7' +'BUNUVIVIA','Ellison Enterprise','Type 9' 'BUNUVIVIA','Ellison Enterprise','Viper' 'CALOR','Julian Hub','Adder' 'CALOR','Julian Hub','Hauler' -'CALOR','Julian Hub','Lakon Type 6' -'CALOR','Julian Hub','Lakon Type 9' 'CALOR','Julian Hub','Sidewinder' +'CALOR','Julian Hub','Type 6' +'CALOR','Julian Hub','Type 9' 'CALOR','Julian Hub','Viper' -'CAUANI','Hardy City','Asp Explorer' +'CAUANI','Hardy City','Asp' 'CAUANI','Hardy City','Eagle' 'CAUANI','Hardy City','Hauler' -'CAUANI','Hardy City','Lakon Type 7' 'CAUANI','Hardy City','Sidewinder' +'CAUANI','Hardy City','Type 7' 'DIMOCO','Edison Orbital','Cobra' -'DIMOCO','Edison Orbital','Lakon Type 6' -'DIMOCO','Edison Orbital','Lakon Type 9' +'DIMOCO','Edison Orbital','Type 6' +'DIMOCO','Edison Orbital','Type 9' 'DIMOCO','Meitner Ring','Eagle' 'DIMOCO','Meitner Ring','Orca' 'DIMOCO','Meitner Ring','Sidewinder' @@ -103,186 +103,196 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id 'DJENDELIS','Atwater Enterprise','Dropship' 'DJENDELIS','Atwater Enterprise','Eagle' 'DJENDELIS','Atwater Enterprise','Hauler' -'DJENDELIS','Atwater Enterprise','Lakon Type 6' -'DJENDELIS','Atwater Enterprise','Lakon Type 7' -'DJENDELIS','Atwater Enterprise','Lakon Type 9' 'DJENDELIS','Atwater Enterprise','Sidewinder' +'DJENDELIS','Atwater Enterprise','Type 6' +'DJENDELIS','Atwater Enterprise','Type 7' +'DJENDELIS','Atwater Enterprise','Type 9' 'DJENDELIS','Atwater Enterprise','Viper' 'ERAVATE','Ackerman Market','Eagle' 'ERAVATE','Ackerman Market','Hauler' -'ERAVATE','Ackerman Market','Lakon Type 6' 'ERAVATE','Ackerman Market','Sidewinder' +'ERAVATE','Ackerman Market','Type 6' 'ERAVATE','Cleve Hub','Cobra' 'ERAVATE','Cleve Hub','Eagle' 'ERAVATE','Cleve Hub','Hauler' -'ERAVATE','Cleve Hub','Lakon Type 6' 'ERAVATE','Cleve Hub','Sidewinder' +'ERAVATE','Cleve Hub','Type 6' 'ERAVATE','Russell Ring','Cobra' 'ERAVATE','Russell Ring','Eagle' 'ERAVATE','Russell Ring','Hauler' -'ERAVATE','Russell Ring','Lakon Type 6' 'ERAVATE','Russell Ring','Sidewinder' -'FK5 2550','Julian Gateway','Asp Explorer' +'ERAVATE','Russell Ring','Type 6' +'FK5 2550','Julian Gateway','Asp' 'FK5 2550','Julian Gateway','Dropship' 'FK5 2550','Julian Gateway','Hauler' -'FK5 2550','Julian Gateway','Lakon Type 7' -'FK5 2550','Julian Gateway','Lakon Type 9' 'FK5 2550','Julian Gateway','Sidewinder' +'FK5 2550','Julian Gateway','Type 7' +'FK5 2550','Julian Gateway','Type 9' 'FK5 2550','Samokutyayev Dock','Cobra' 'FK5 2550','Samokutyayev Dock','Dropship' 'FK5 2550','Samokutyayev Dock','Hauler' -'FK5 2550','Samokutyayev Dock','Lakon Type 6' -'FK5 2550','Samokutyayev Dock','Lakon Type 9' 'FK5 2550','Samokutyayev Dock','Python' 'FK5 2550','Samokutyayev Dock','Sidewinder' +'FK5 2550','Samokutyayev Dock','Type 6' +'FK5 2550','Samokutyayev Dock','Type 9' 'FK5 2550','Samokutyayev Dock','Viper' -'FK5 2550','Vela Ring','Asp Explorer' +'FK5 2550','Vela Ring','Asp' 'FK5 2550','Vela Ring','Dropship' 'FK5 2550','Vela Ring','Hauler' -'FK5 2550','Vela Ring','Lakon Type 7' -'FK5 2550','Vela Ring','Lakon Type 9' 'FK5 2550','Vela Ring','Sidewinder' +'FK5 2550','Vela Ring','Type 7' +'FK5 2550','Vela Ring','Type 9' 'FK5 2550','Wundt Gateway','Adder' 'FK5 2550','Wundt Gateway','Anaconda' -'FK5 2550','Wundt Gateway','Asp Explorer' +'FK5 2550','Wundt Gateway','Asp' 'FK5 2550','Wundt Gateway','Dropship' 'FK5 2550','Wundt Gateway','Eagle' -'FK5 2550','Wundt Gateway','Lakon Type 7' 'FK5 2550','Wundt Gateway','Sidewinder' +'FK5 2550','Wundt Gateway','Type 7' 'FK5 2550','Wundt Gateway','Viper' 'G 175-42','Werber Platform','Adder' 'G 175-42','Werber Platform','Cobra' 'G 175-42','Werber Platform','Eagle' 'G 175-42','Werber Platform','Hauler' -'G 175-42','Werber Platform','Lakon Type 6' -'G 175-42','Werber Platform','Lakon Type 7' 'G 175-42','Werber Platform','Sidewinder' +'G 175-42','Werber Platform','Type 6' +'G 175-42','Werber Platform','Type 7' 'GONG GU','Kelly Dock','Adder' -'GONG GU','Kelly Dock','Asp Explorer' +'GONG GU','Kelly Dock','Asp' 'GONG GU','Kelly Dock','Cobra' 'GONG GU','Kelly Dock','Dropship' 'GONG GU','Kelly Dock','Eagle' 'GONG GU','Kelly Dock','Hauler' -'GONG GU','Kelly Dock','Lakon Type 6' -'GONG GU','Kelly Dock','Lakon Type 7' -'GONG GU','Kelly Dock','Lakon Type 9' 'GONG GU','Kelly Dock','Python' 'GONG GU','Kelly Dock','Sidewinder' +'GONG GU','Kelly Dock','Type 6' +'GONG GU','Kelly Dock','Type 7' +'GONG GU','Kelly Dock','Type 9' 'GONG GU','Kelly Dock','Viper' 'HIP 43670','Shaara Gateway','Adder' 'HIP 43670','Shaara Gateway','Cobra' 'HIP 43670','Shaara Gateway','Hauler' -'HIP 43670','Shaara Gateway','Lakon Type 6' -'HIP 43670','Shaara Gateway','Lakon Type 9' 'HIP 43670','Shaara Gateway','Python' 'HIP 43670','Shaara Gateway','Sidewinder' +'HIP 43670','Shaara Gateway','Type 6' +'HIP 43670','Shaara Gateway','Type 9' 'HIP 43670','Shaara Gateway','Viper' 'HIP 87369','Carey Port','Adder' -'HIP 87369','Carey Port','Asp Explorer' +'HIP 87369','Carey Port','Asp' 'HIP 87369','Carey Port','Cobra' 'HIP 87369','Carey Port','Dropship' 'HIP 87369','Carey Port','Eagle' 'HIP 87369','Carey Port','Hauler' -'HIP 87369','Carey Port','Lakon Type 6' -'HIP 87369','Carey Port','Lakon Type 7' 'HIP 87369','Carey Port','Sidewinder' +'HIP 87369','Carey Port','Type 6' +'HIP 87369','Carey Port','Type 7' 'HIP 87369','Carey Port','Viper' -'HR 5451','Fraser Station','Asp Explorer' +'HR 5451','Fraser Station','Asp' 'HR 5451','Fraser Station','Hauler' -'HR 5451','Fraser Station','Lakon Type 7' -'HR 5451','Fraser Station','Lakon Type 9' 'HR 5451','Fraser Station','Sidewinder' +'HR 5451','Fraser Station','Type 7' +'HR 5451','Fraser Station','Type 9' 'HR 5451','MacDonald Hub','Adder' 'HR 5451','MacDonald Hub','Cobra' 'HR 5451','MacDonald Hub','Eagle' -'HR 5451','MacDonald Hub','Lakon Type 6' 'HR 5451','MacDonald Hub','Sidewinder' +'HR 5451','MacDonald Hub','Type 6' 'HR 8170','Fiennes Vision','Adder' -'HR 8170','Fiennes Vision','Asp Explorer' +'HR 8170','Fiennes Vision','Asp' 'HR 8170','Fiennes Vision','Cobra' 'HR 8170','Fiennes Vision','Dropship' -'HR 8170','Fiennes Vision','Lakon Type 6' 'HR 8170','Fiennes Vision','Orca' 'HR 8170','Fiennes Vision','Python' 'HR 8170','Fiennes Vision','Sidewinder' +'HR 8170','Fiennes Vision','Type 6' 'HR 8170','Fiennes Vision','Viper' 'HU JONA','Russell Station','Eagle' 'HU JONA','Russell Station','Hauler' -'HU JONA','Russell Station','Lakon Type 6' -'HU JONA','Russell Station','Lakon Type 7' 'HU JONA','Russell Station','Sidewinder' +'HU JONA','Russell Station','Type 6' +'HU JONA','Russell Station','Type 7' 'IOTA PERSEI','Walker City','Adder' 'IOTA PERSEI','Walker City','Anaconda' -'IOTA PERSEI','Walker City','Asp Explorer' +'IOTA PERSEI','Walker City','Asp' 'IOTA PERSEI','Walker City','Cobra' 'IOTA PERSEI','Walker City','Dropship' 'IOTA PERSEI','Walker City','Eagle' 'IOTA PERSEI','Walker City','Hauler' -'IOTA PERSEI','Walker City','Lakon Type 6' -'IOTA PERSEI','Walker City','Lakon Type 7' -'IOTA PERSEI','Walker City','Lakon Type 9' 'IOTA PERSEI','Walker City','Orca' 'IOTA PERSEI','Walker City','Sidewinder' +'IOTA PERSEI','Walker City','Type 6' +'IOTA PERSEI','Walker City','Type 7' +'IOTA PERSEI','Walker City','Type 9' 'IOTA PERSEI','Walker City','Viper' 'KALIKI','Oren City','Adder' 'KALIKI','Oren City','Anaconda' -'KALIKI','Oren City','Asp Explorer' +'KALIKI','Oren City','Asp' 'KALIKI','Oren City','Clipper' 'KALIKI','Oren City','Cobra' 'KALIKI','Oren City','Eagle' 'KALIKI','Oren City','Hauler' -'KALIKI','Oren City','Lakon Type 6' -'KALIKI','Oren City','Lakon Type 7' 'KALIKI','Oren City','Python' 'KALIKI','Oren City','Sidewinder' +'KALIKI','Oren City','Type 6' +'KALIKI','Oren City','Type 7' 'KALIKI','Oren City','Viper' 'KANOS','Geston Ring','Adder' -'KANOS','Geston Ring','Asp Explorer' +'KANOS','Geston Ring','Asp' 'KANOS','Geston Ring','Cobra' 'KANOS','Geston Ring','Dropship' 'KANOS','Geston Ring','Eagle' 'KANOS','Geston Ring','Hauler' -'KANOS','Geston Ring','Lakon Type 6' -'KANOS','Geston Ring','Lakon Type 7' -'KANOS','Geston Ring','Lakon Type 9' 'KANOS','Geston Ring','Python' 'KANOS','Geston Ring','Sidewinder' +'KANOS','Geston Ring','Type 6' +'KANOS','Geston Ring','Type 7' +'KANOS','Geston Ring','Type 9' 'KANOS','Geston Ring','Viper' +'KRUGER 60','Kepler Gateway','Cobra' +'KRUGER 60','Kepler Gateway','Dropship' +'KRUGER 60','Kepler Gateway','Eagle' +'KRUGER 60','Kepler Gateway','Hauler' +'KRUGER 60','Kepler Gateway','Orca' +'KRUGER 60','Kepler Gateway','Python' +'KRUGER 60','Kepler Gateway','Sidewinder' +'KRUGER 60','Kepler Gateway','Type 6' +'KRUGER 60','Kepler Gateway','Type 9' +'KRUGER 60','Kepler Gateway','Viper' 'LFT 1448','Dirac Enterprise','Anaconda' -'LFT 1448','Dirac Enterprise','Asp Explorer' +'LFT 1448','Dirac Enterprise','Asp' 'LFT 1448','Dirac Enterprise','Cobra' 'LFT 1448','Dirac Enterprise','Dropship' 'LFT 1448','Dirac Enterprise','Hauler' -'LFT 1448','Dirac Enterprise','Lakon Type 6' -'LFT 1448','Dirac Enterprise','Lakon Type 9' 'LFT 1448','Dirac Enterprise','Sidewinder' +'LFT 1448','Dirac Enterprise','Type 6' +'LFT 1448','Dirac Enterprise','Type 9' 'LFT 926','Meredith City','Adder' -'LFT 926','Meredith City','Asp Explorer' +'LFT 926','Meredith City','Asp' 'LFT 926','Meredith City','Cobra' 'LFT 926','Meredith City','Eagle' 'LFT 926','Meredith City','Hauler' -'LFT 926','Meredith City','Lakon Type 6' -'LFT 926','Meredith City','Lakon Type 7' -'LFT 926','Meredith City','Lakon Type 9' 'LFT 926','Meredith City','Orca' 'LFT 926','Meredith City','Python' 'LFT 926','Meredith City','Sidewinder' +'LFT 926','Meredith City','Type 6' +'LFT 926','Meredith City','Type 7' +'LFT 926','Meredith City','Type 9' 'LFT 926','Meredith City','Viper' 'LHANGKAMBE','Detmer Orbital','Adder' 'LHANGKAMBE','Detmer Orbital','Dropship' 'LHANGKAMBE','Detmer Orbital','Eagle' 'LHANGKAMBE','Detmer Orbital','Hauler' -'LHANGKAMBE','Detmer Orbital','Lakon Type 7' -'LHANGKAMBE','Detmer Orbital','Lakon Type 9' 'LHANGKAMBE','Detmer Orbital','Sidewinder' +'LHANGKAMBE','Detmer Orbital','Type 7' +'LHANGKAMBE','Detmer Orbital','Type 9' 'LHANGKAMBE','Detmer Orbital','Viper' 'LHANGKAMBE','Jacquard Dock','Adder' 'LHANGKAMBE','Jacquard Dock','Dropship' 'LHANGKAMBE','Jacquard Dock','Eagle' 'LHANGKAMBE','Jacquard Dock','Hauler' -'LHANGKAMBE','Jacquard Dock','Lakon Type 7' -'LHANGKAMBE','Jacquard Dock','Lakon Type 9' 'LHANGKAMBE','Jacquard Dock','Sidewinder' +'LHANGKAMBE','Jacquard Dock','Type 7' +'LHANGKAMBE','Jacquard Dock','Type 9' 'LHANGKAMBE','Jacquard Dock','Viper' 'LHANGKAMBE','Yeliseyev Terminal','Adder' 'LHANGKAMBE','Yeliseyev Terminal','Cobra' @@ -291,76 +301,76 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id 'LHANGKAMBE','Yeliseyev Terminal','Sidewinder' 'LHANGKAMBE','Yeliseyev Terminal','Viper' 'LHS 115','Aleksandrov Gateway','Anaconda' -'LHS 115','Aleksandrov Gateway','Asp Explorer' +'LHS 115','Aleksandrov Gateway','Asp' 'LHS 115','Aleksandrov Gateway','Cobra' 'LHS 115','Aleksandrov Gateway','Dropship' 'LHS 115','Aleksandrov Gateway','Eagle' 'LHS 115','Aleksandrov Gateway','Hauler' -'LHS 115','Aleksandrov Gateway','Lakon Type 7' -'LHS 115','Aleksandrov Gateway','Lakon Type 9' 'LHS 115','Aleksandrov Gateway','Orca' 'LHS 115','Aleksandrov Gateway','Python' 'LHS 115','Aleksandrov Gateway','Sidewinder' +'LHS 115','Aleksandrov Gateway','Type 7' +'LHS 115','Aleksandrov Gateway','Type 9' 'LHS 115','Aleksandrov Gateway','Viper' 'LHS 1446','Blalock Orbital','Adder' 'LHS 1446','Blalock Orbital','Cobra' 'LHS 1446','Blalock Orbital','Eagle' 'LHS 1446','Blalock Orbital','Hauler' -'LHS 1446','Blalock Orbital','Lakon Type 6' -'LHS 1446','Blalock Orbital','Lakon Type 9' 'LHS 1446','Blalock Orbital','Python' 'LHS 1446','Blalock Orbital','Sidewinder' +'LHS 1446','Blalock Orbital','Type 6' +'LHS 1446','Blalock Orbital','Type 9' 'LHS 1446','Blalock Orbital','Viper' 'LHS 1914','Bohm Terminal','Adder' 'LHS 1914','Bohm Terminal','Cobra' 'LHS 1914','Bohm Terminal','Eagle' -'LHS 1914','Bohm Terminal','Lakon Type 6' 'LHS 1914','Bohm Terminal','Sidewinder' +'LHS 1914','Bohm Terminal','Type 6' 'LHS 1914','Galvani Port','Cobra' 'LHS 1914','Galvani Port','Eagle' -'LHS 1914','Galvani Port','Lakon Type 6' -'LHS 1914','Galvani Port','Lakon Type 7' 'LHS 1914','Galvani Port','Sidewinder' +'LHS 1914','Galvani Port','Type 6' +'LHS 1914','Galvani Port','Type 7' 'LHS 1914','Heisenberg Terminal','Cobra' 'LHS 1914','Heisenberg Terminal','Eagle' -'LHS 1914','Heisenberg Terminal','Lakon Type 6' -'LHS 1914','Heisenberg Terminal','Lakon Type 7' 'LHS 1914','Heisenberg Terminal','Sidewinder' +'LHS 1914','Heisenberg Terminal','Type 6' +'LHS 1914','Heisenberg Terminal','Type 7' 'LHS 1914','Vittori Terminal','Adder' 'LHS 1914','Vittori Terminal','Cobra' 'LHS 1914','Vittori Terminal','Eagle' -'LHS 1914','Vittori Terminal','Lakon Type 6' 'LHS 1914','Vittori Terminal','Sidewinder' +'LHS 1914','Vittori Terminal','Type 6' 'LHS 220','Culpeper Colony','Eagle' 'LHS 220','Culpeper Colony','Hauler' -'LHS 220','Culpeper Colony','Lakon Type 6' -'LHS 220','Culpeper Colony','Lakon Type 7' -'LHS 220','Culpeper Colony','Lakon Type 9' 'LHS 220','Culpeper Colony','Sidewinder' +'LHS 220','Culpeper Colony','Type 6' +'LHS 220','Culpeper Colony','Type 7' +'LHS 220','Culpeper Colony','Type 9' 'LHS 220','Culpeper Colony','Viper' 'LHS 277','Rowley Port','Adder' 'LHS 277','Rowley Port','Cobra' 'LHS 277','Rowley Port','Eagle' 'LHS 277','Rowley Port','Hauler' -'LHS 277','Rowley Port','Lakon Type 6' -'LHS 277','Rowley Port','Lakon Type 7' -'LHS 277','Rowley Port','Lakon Type 9' 'LHS 277','Rowley Port','Python' 'LHS 277','Rowley Port','Sidewinder' +'LHS 277','Rowley Port','Type 6' +'LHS 277','Rowley Port','Type 7' +'LHS 277','Rowley Port','Type 9' 'LHS 277','Rowley Port','Viper' -'LHS 3447','Dalton Gateway','Asp Explorer' +'LHS 3447','Dalton Gateway','Asp' 'LHS 3447','Dalton Gateway','Hauler' -'LHS 3447','Dalton Gateway','Lakon Type 9' 'LHS 3447','Dalton Gateway','Sidewinder' +'LHS 3447','Dalton Gateway','Type 9' 'LHS 3447','Worlidge Terminal','Cobra' -'LHS 3447','Worlidge Terminal','Lakon Type 6' +'LHS 3447','Worlidge Terminal','Type 6' 'LHS 3447','Worlidge Terminal','Viper' 'LHS 3447','Yaping Enterprise','Cobra' -'LHS 3447','Yaping Enterprise','Lakon Type 6' +'LHS 3447','Yaping Enterprise','Type 6' 'LHS 3447','Yaping Enterprise','Viper' 'LP 205-44','Kaku Horizons','Adder' 'LP 205-44','Kaku Horizons','Anaconda' -'LP 205-44','Kaku Horizons','Asp Explorer' +'LP 205-44','Kaku Horizons','Asp' 'LP 205-44','Kaku Horizons','Dropship' 'LP 205-44','Kaku Horizons','Eagle' 'LP 205-44','Kaku Horizons','Hauler' @@ -372,50 +382,50 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id 'LP 255-11','Burbank Port','Cobra' 'LP 255-11','Burbank Port','Eagle' 'LP 255-11','Burbank Port','Hauler' -'LP 255-11','Burbank Port','Lakon Type 6' -'LP 255-11','Burbank Port','Lakon Type 9' 'LP 255-11','Burbank Port','Python' 'LP 255-11','Burbank Port','Sidewinder' +'LP 255-11','Burbank Port','Type 6' +'LP 255-11','Burbank Port','Type 9' 'LP 255-11','Burbank Port','Viper' 'LTT 15449','Binet Port','Adder' 'LTT 15449','Binet Port','Anaconda' -'LTT 15449','Binet Port','Asp Explorer' +'LTT 15449','Binet Port','Asp' 'LTT 15449','Binet Port','Dropship' 'LTT 15449','Binet Port','Eagle' -'LTT 15449','Binet Port','Lakon Type 7' 'LTT 15449','Binet Port','Sidewinder' +'LTT 15449','Binet Port','Type 7' 'LTT 15449','Binet Port','Viper' 'LTT 15574','Haxel Port','Adder' 'LTT 15574','Haxel Port','Cobra' 'LTT 15574','Haxel Port','Dropship' 'LTT 15574','Haxel Port','Eagle' 'LTT 15574','Haxel Port','Hauler' -'LTT 15574','Haxel Port','Lakon Type 6' -'LTT 15574','Haxel Port','Lakon Type 7' -'LTT 15574','Haxel Port','Lakon Type 9' 'LTT 15574','Haxel Port','Sidewinder' +'LTT 15574','Haxel Port','Type 6' +'LTT 15574','Haxel Port','Type 7' +'LTT 15574','Haxel Port','Type 9' 'LTT 15574','Haxel Port','Viper' 'LTT 4131','Lorrah Terminal','Cobra' 'LTT 4131','Lorrah Terminal','Dropship' 'LTT 4131','Lorrah Terminal','Eagle' 'LTT 4131','Lorrah Terminal','Hauler' -'LTT 4131','Lorrah Terminal','Lakon Type 6' -'LTT 4131','Lorrah Terminal','Lakon Type 9' 'LTT 4131','Lorrah Terminal','Python' 'LTT 4131','Lorrah Terminal','Sidewinder' +'LTT 4131','Lorrah Terminal','Type 6' +'LTT 4131','Lorrah Terminal','Type 9' 'LTT 4131','Lorrah Terminal','Viper' 'LU VELORUM','Miletus Station','Anaconda' -'LU VELORUM','Miletus Station','Asp Explorer' +'LU VELORUM','Miletus Station','Asp' 'LU VELORUM','Miletus Station','Cobra' 'LU VELORUM','Miletus Station','Hauler' -'LU VELORUM','Miletus Station','Lakon Type 7' -'LU VELORUM','Miletus Station','Lakon Type 9' 'LU VELORUM','Miletus Station','Python' 'LU VELORUM','Miletus Station','Sidewinder' +'LU VELORUM','Miletus Station','Type 7' +'LU VELORUM','Miletus Station','Type 9' 'LU VELORUM','Miletus Station','Viper' 'MEINJHALARA','Fremont Port','Adder' 'MEINJHALARA','Fremont Port','Anaconda' -'MEINJHALARA','Fremont Port','Asp Explorer' +'MEINJHALARA','Fremont Port','Asp' 'MEINJHALARA','Fremont Port','Cobra' 'MEINJHALARA','Fremont Port','Eagle' 'MEINJHALARA','Fremont Port','Hauler' @@ -424,202 +434,225 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id 'MEINJHALARA','Fremont Port','Viper' 'NETO','Ising Vision','Adder' 'NETO','Ising Vision','Anaconda' -'NETO','Ising Vision','Asp Explorer' +'NETO','Ising Vision','Asp' 'NETO','Ising Vision','Cobra' 'NETO','Ising Vision','Dropship' 'NETO','Ising Vision','Eagle' 'NETO','Ising Vision','Hauler' -'NETO','Ising Vision','Lakon Type 9' 'NETO','Ising Vision','Orca' 'NETO','Ising Vision','Python' 'NETO','Ising Vision','Sidewinder' +'NETO','Ising Vision','Type 9' 'NETO','Ising Vision','Viper' -'OBAMBIVAS','Clebsch Terminal','Asp Explorer' +'OBAMBIVAS','Clebsch Terminal','Asp' 'OBAMBIVAS','Clebsch Terminal','Orca' 'OBAMBIVAS','Clebsch Terminal','Sidewinder' 'OBAMBIVAS','Galouye Terminal','Orca' 'OBAMBIVAS','Galouye Terminal','Sidewinder' 'OBAMBIVAS','Kennan Orbital','Cobra' -'OBAMBIVAS','Kennan Orbital','Lakon Type 6' -'OBAMBIVAS','Kennan Orbital','Lakon Type 7' +'OBAMBIVAS','Kennan Orbital','Type 6' +'OBAMBIVAS','Kennan Orbital','Type 7' 'ONGKAMPAN','Fawcett Gateway','Adder' 'ONGKAMPAN','Fawcett Gateway','Anaconda' 'ONGKAMPAN','Fawcett Gateway','Cobra' 'ONGKAMPAN','Fawcett Gateway','Eagle' 'ONGKAMPAN','Fawcett Gateway','Hauler' -'ONGKAMPAN','Fawcett Gateway','Lakon Type 6' 'ONGKAMPAN','Fawcett Gateway','Sidewinder' +'ONGKAMPAN','Fawcett Gateway','Type 6' 'ONGKAMPAN','Fawcett Gateway','Viper' -'ONGKAMPAN','Patterson Station','Asp Explorer' +'ONGKAMPAN','Patterson Station','Asp' 'ONGKAMPAN','Patterson Station','Eagle' 'ONGKAMPAN','Patterson Station','Hauler' -'ONGKAMPAN','Patterson Station','Lakon Type 7' 'ONGKAMPAN','Patterson Station','Sidewinder' +'ONGKAMPAN','Patterson Station','Type 7' 'ONGKAMPAN','Rawat Hub','Adder' 'ONGKAMPAN','Rawat Hub','Anaconda' 'ONGKAMPAN','Rawat Hub','Cobra' 'ONGKAMPAN','Rawat Hub','Eagle' 'ONGKAMPAN','Rawat Hub','Hauler' -'ONGKAMPAN','Rawat Hub','Lakon Type 6' 'ONGKAMPAN','Rawat Hub','Sidewinder' +'ONGKAMPAN','Rawat Hub','Type 6' 'ONGKAMPAN','Rawat Hub','Viper' 'PERADJARIU','Vries Port','Adder' 'PERADJARIU','Vries Port','Anaconda' 'PERADJARIU','Vries Port','Cobra' 'PERADJARIU','Vries Port','Eagle' 'PERADJARIU','Vries Port','Hauler' -'PERADJARIU','Vries Port','Lakon Type 6' -'PERADJARIU','Vries Port','Lakon Type 9' 'PERADJARIU','Vries Port','Python' 'PERADJARIU','Vries Port','Sidewinder' +'PERADJARIU','Vries Port','Type 6' +'PERADJARIU','Vries Port','Type 9' 'PERADJARIU','Vries Port','Viper' -'RHO GEMINORUM','Crick Enterprise','Asp Explorer' +'RHO GEMINORUM','Crick Enterprise','Asp' 'RHO GEMINORUM','Crick Enterprise','Dropship' 'RHO GEMINORUM','Crick Enterprise','Eagle' 'RHO GEMINORUM','Crick Enterprise','Hauler' -'RHO GEMINORUM','Crick Enterprise','Lakon Type 6' -'RHO GEMINORUM','Crick Enterprise','Lakon Type 7' -'RHO GEMINORUM','Crick Enterprise','Lakon Type 9' 'RHO GEMINORUM','Crick Enterprise','Sidewinder' +'RHO GEMINORUM','Crick Enterprise','Type 6' +'RHO GEMINORUM','Crick Enterprise','Type 7' +'RHO GEMINORUM','Crick Enterprise','Type 9' 'RHO GEMINORUM','Khan City','Eagle' 'RHO GEMINORUM','Khan City','Hauler' -'RHO GEMINORUM','Khan City','Lakon Type 6' -'RHO GEMINORUM','Khan City','Lakon Type 7' 'RHO GEMINORUM','Khan City','Sidewinder' +'RHO GEMINORUM','Khan City','Type 6' +'RHO GEMINORUM','Khan City','Type 7' 'RHO GEMINORUM','Macquorn Rankine Gateway','Eagle' 'RHO GEMINORUM','Macquorn Rankine Gateway','Hauler' -'RHO GEMINORUM','Macquorn Rankine Gateway','Lakon Type 6' -'RHO GEMINORUM','Macquorn Rankine Gateway','Lakon Type 7' 'RHO GEMINORUM','Macquorn Rankine Gateway','Sidewinder' +'RHO GEMINORUM','Macquorn Rankine Gateway','Type 6' +'RHO GEMINORUM','Macquorn Rankine Gateway','Type 7' 'RHO GEMINORUM','Whitworth Station','Cobra' 'RHO GEMINORUM','Whitworth Station','Eagle' 'RHO GEMINORUM','Whitworth Station','Hauler' -'RHO GEMINORUM','Whitworth Station','Lakon Type 7' -'RHO GEMINORUM','Whitworth Station','Lakon Type 9' +'RHO GEMINORUM','Whitworth Station','Type 7' +'RHO GEMINORUM','Whitworth Station','Type 9' 'ROSS 1069','Viehbock City','Adder' -'ROSS 1069','Viehbock City','Asp Explorer' +'ROSS 1069','Viehbock City','Asp' 'ROSS 1069','Viehbock City','Dropship' 'ROSS 1069','Viehbock City','Eagle' 'ROSS 1069','Viehbock City','Hauler' -'ROSS 1069','Viehbock City','Lakon Type 6' -'ROSS 1069','Viehbock City','Lakon Type 7' -'ROSS 1069','Viehbock City','Lakon Type 9' 'ROSS 1069','Viehbock City','Sidewinder' +'ROSS 1069','Viehbock City','Type 6' +'ROSS 1069','Viehbock City','Type 7' +'ROSS 1069','Viehbock City','Type 9' 'ROSS 1069','Viehbock City','Viper' 'SHINRARTA DEZHRA','Jameson Memorial','Adder' 'SHINRARTA DEZHRA','Jameson Memorial','Anaconda' -'SHINRARTA DEZHRA','Jameson Memorial','Asp Explorer' +'SHINRARTA DEZHRA','Jameson Memorial','Asp' 'SHINRARTA DEZHRA','Jameson Memorial','Cobra' 'SHINRARTA DEZHRA','Jameson Memorial','Eagle' 'SHINRARTA DEZHRA','Jameson Memorial','Hauler' -'SHINRARTA DEZHRA','Jameson Memorial','Lakon Type 6' -'SHINRARTA DEZHRA','Jameson Memorial','Lakon Type 7' -'SHINRARTA DEZHRA','Jameson Memorial','Lakon Type 9' 'SHINRARTA DEZHRA','Jameson Memorial','Orca' 'SHINRARTA DEZHRA','Jameson Memorial','Python' 'SHINRARTA DEZHRA','Jameson Memorial','Sidewinder' +'SHINRARTA DEZHRA','Jameson Memorial','Type 6' +'SHINRARTA DEZHRA','Jameson Memorial','Type 7' +'SHINRARTA DEZHRA','Jameson Memorial','Type 9' 'SHINRARTA DEZHRA','Jameson Memorial','Viper' -'SKEGGIKO O','Kuo Terminal','Asp Explorer' +'SKEGGIKO O','Kuo Terminal','Asp' 'SKEGGIKO O','Kuo Terminal','Cobra' 'SKEGGIKO O','Kuo Terminal','Dropship' 'SKEGGIKO O','Kuo Terminal','Eagle' 'SKEGGIKO O','Kuo Terminal','Hauler' -'SKEGGIKO O','Kuo Terminal','Lakon Type 7' 'SKEGGIKO O','Kuo Terminal','Sidewinder' +'SKEGGIKO O','Kuo Terminal','Type 7' 'SKEGGIKO O','Kuo Terminal','Viper' 'SOCH','Whitcomb Ring','Adder' 'SOCH','Whitcomb Ring','Clipper' 'SOCH','Whitcomb Ring','Cobra' 'SOCH','Whitcomb Ring','Eagle' 'SOCH','Whitcomb Ring','Hauler' -'SOCH','Whitcomb Ring','Lakon Type 6' -'SOCH','Whitcomb Ring','Lakon Type 7' -'SOCH','Whitcomb Ring','Lakon Type 9' 'SOCH','Whitcomb Ring','Orca' 'SOCH','Whitcomb Ring','Python' 'SOCH','Whitcomb Ring','Sidewinder' +'SOCH','Whitcomb Ring','Type 6' +'SOCH','Whitcomb Ring','Type 7' +'SOCH','Whitcomb Ring','Type 9' 'SOCH','Whitcomb Ring','Viper' 'SOL','Columbus','Adder' 'SOL','Columbus','Hauler' -'SOL','Columbus','Lakon Type 6' -'SOL','Columbus','Lakon Type 9' 'SOL','Columbus','Sidewinder' +'SOL','Columbus','Type 6' +'SOL','Columbus','Type 9' 'SOL','Columbus','Viper' 'SOL','Daedalus','Eagle' 'SOL','Daedalus','Hauler' -'SOL','Daedalus','Lakon Type 7' -'SOL','Daedalus','Lakon Type 9' 'SOL','Daedalus','Sidewinder' +'SOL','Daedalus','Type 7' +'SOL','Daedalus','Type 9' 'SOL','Galileo','Eagle' 'SOL','Galileo','Hauler' -'SOL','Galileo','Lakon Type 7' -'SOL','Galileo','Lakon Type 9' 'SOL','Galileo','Sidewinder' +'SOL','Galileo','Type 7' +'SOL','Galileo','Type 9' +'SOL','Li Qing Jao','Cobra' +'SOL','Li Qing Jao','Type 6' +'SOL','Li Qing Jao','Viper' 'SOL','M.Gorbachev','Cobra' -'SOL','M.Gorbachev','Lakon Type 6' +'SOL','M.Gorbachev','Type 6' 'SOL','M.Gorbachev','Viper' +'SOL','Mars High','Cobra' +'SOL','Mars High','Type 6' +'SOL','Mars High','Viper' +'SOL','Titan City','Cobra' +'SOL','Titan City','Eagle' +'SOL','Titan City','Sidewinder' +'SOL','Titan City','Type 6' +'SOL','Titan City','Viper' 'SOLATI','Ising Refinery','Adder' 'SOLATI','Ising Refinery','Cobra' 'SOLATI','Ising Refinery','Eagle' -'SOLATI','Ising Refinery','Lakon Type 6' 'SOLATI','Ising Refinery','Sidewinder' +'SOLATI','Ising Refinery','Type 6' 'SOLATI','Solati Reach','Eagle' 'SOLATI','Solati Reach','Hauler' 'SOLATI','Solati Reach','Sidewinder' 'TAU-1 HYDRAE','Priestley Port','Adder' -'TAU-1 HYDRAE','Priestley Port','Asp Explorer' +'TAU-1 HYDRAE','Priestley Port','Asp' 'TAU-1 HYDRAE','Priestley Port','Dropship' 'TAU-1 HYDRAE','Priestley Port','Eagle' 'TAU-1 HYDRAE','Priestley Port','Hauler' -'TAU-1 HYDRAE','Priestley Port','Lakon Type 6' -'TAU-1 HYDRAE','Priestley Port','Lakon Type 7' -'TAU-1 HYDRAE','Priestley Port','Lakon Type 9' 'TAU-1 HYDRAE','Priestley Port','Sidewinder' +'TAU-1 HYDRAE','Priestley Port','Type 6' +'TAU-1 HYDRAE','Priestley Port','Type 7' +'TAU-1 HYDRAE','Priestley Port','Type 9' 'TAUERNI','Rushworth Port','Adder' 'TAUERNI','Rushworth Port','Eagle' 'TAUERNI','Rushworth Port','Hauler' -'TAUERNI','Rushworth Port','Lakon Type 9' 'TAUERNI','Rushworth Port','Sidewinder' +'TAUERNI','Rushworth Port','Type 9' 'TAUERNI','Rushworth Port','Viper' 'THIANSI','Worlidge Port','Cobra' 'THIANSI','Worlidge Port','Dropship' 'THIANSI','Worlidge Port','Eagle' 'THIANSI','Worlidge Port','Hauler' -'THIANSI','Worlidge Port','Lakon Type 6' -'THIANSI','Worlidge Port','Lakon Type 9' 'THIANSI','Worlidge Port','Orca' 'THIANSI','Worlidge Port','Python' 'THIANSI','Worlidge Port','Sidewinder' +'THIANSI','Worlidge Port','Type 6' +'THIANSI','Worlidge Port','Type 9' 'THIANSI','Worlidge Port','Viper' +'VOLKHAB','Vernadsky Dock','Adder' +'VOLKHAB','Vernadsky Dock','Anaconda' +'VOLKHAB','Vernadsky Dock','Asp' +'VOLKHAB','Vernadsky Dock','Cobra' +'VOLKHAB','Vernadsky Dock','Dropship' +'VOLKHAB','Vernadsky Dock','Eagle' +'VOLKHAB','Vernadsky Dock','Hauler' +'VOLKHAB','Vernadsky Dock','Orca' +'VOLKHAB','Vernadsky Dock','Sidewinder' +'VOLKHAB','Vernadsky Dock','Type 6' +'VOLKHAB','Vernadsky Dock','Type 7' +'VOLKHAB','Vernadsky Dock','Viper' 'WISE 1800+0134','Underwood Dock','Adder' 'WISE 1800+0134','Underwood Dock','Cobra' 'WISE 1800+0134','Underwood Dock','Eagle' 'WISE 1800+0134','Underwood Dock','Hauler' -'WISE 1800+0134','Underwood Dock','Lakon Type 6' 'WISE 1800+0134','Underwood Dock','Sidewinder' +'WISE 1800+0134','Underwood Dock','Type 6' 'WISE 1800+0134','Underwood Dock','Viper' 'WOLF 562','Hopkins Port','Adder' 'WOLF 562','Hopkins Port','Cobra' 'WOLF 562','Hopkins Port','Dropship' 'WOLF 562','Hopkins Port','Eagle' -'WOLF 562','Hopkins Port','Lakon Type 7' -'WOLF 562','Hopkins Port','Lakon Type 9' 'WOLF 562','Hopkins Port','Orca' 'WOLF 562','Hopkins Port','Python' 'WOLF 562','Hopkins Port','Sidewinder' +'WOLF 562','Hopkins Port','Type 7' +'WOLF 562','Hopkins Port','Type 9' 'WOLF 562','Hopkins Port','Viper' 'YAKABUGAI','Serebrov Station','Anaconda' -'YAKABUGAI','Serebrov Station','Asp Explorer' +'YAKABUGAI','Serebrov Station','Asp' 'YAKABUGAI','Serebrov Station','Dropship' 'YAKABUGAI','Serebrov Station','Eagle' 'YAKABUGAI','Serebrov Station','Hauler' -'YAKABUGAI','Serebrov Station','Lakon Type 9' 'YAKABUGAI','Serebrov Station','Sidewinder' +'YAKABUGAI','Serebrov Station','Type 9' 'ZAONCE','Ridley Scott','Anaconda' -'ZAONCE','Ridley Scott','Asp Explorer' +'ZAONCE','Ridley Scott','Asp' 'ZAONCE','Ridley Scott','Dropship' 'ZAONCE','Ridley Scott','Eagle' 'ZAONCE','Ridley Scott','Hauler' -'ZAONCE','Ridley Scott','Lakon Type 6' -'ZAONCE','Ridley Scott','Lakon Type 7' 'ZAONCE','Ridley Scott','Sidewinder' +'ZAONCE','Ridley Scott','Type 6' +'ZAONCE','Ridley Scott','Type 7' diff --git a/data/Station.csv b/data/Station.csv index fba3f513..b6c5f6c2 100644 --- a/data/Station.csv +++ b/data/Station.csv @@ -2016,7 +2016,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'KRAUDJI','Sakers Terminal',200,'N','M' 'KREMAINN','Volta Station',5281,'N','M' 'KREMAINN','Wohler Terminal',2864,'Y','L' -'KRUGER 60','Kepler Gateway',6536,'?','L' +'KRUGER 60','Kepler Gateway',6536,'Y','L' 'KUAN TI','McCool Terminal',0,'?','M' 'KUAN TI','Niemeyer Hub',0,'?','L' 'KUAN TI','Truly Terminal',0,'?','M' @@ -2779,6 +2779,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MALLOC','Onizuka Ring',2837,'Y','M' 'MAMARAGAN','Padalka Orbital',0,'?','?' 'MAMARAGAN','Wolf Platform',0,'?','?' +'MAMBO','Ising Survey',1818,'N','M' +'MAMBO','Tesla Depot',1277,'?','M' 'MAMBOJAS','Conrad Station',3261,'?','?' 'MAMBOJAS','Patsayev Enterprise',0,'?','?' 'MANAH','Lazutkin Station',0,'?','?' @@ -2872,7 +2874,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MEIDUBI','Sullivan Dock',35436,'?','L' 'MEINJHALARA','Fremont Port',1411,'N','L' 'MELCIOR','Goddard Dock',0,'?','?' -'MELI','Haise Beacon',359,'?','M' +'MELI','Haise Beacon',359,'N','M' 'MELIAE','Shawl Beacon',0,'?','?' 'MELIAE','Whitson Hub',1167,'Y','L' 'MELICI','Polansky Landing',184,'N','M' @@ -3638,8 +3640,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'SOL','Galileo',509,'N','L' 'SOL','Li Qing Jao',506,'Y','L' 'SOL','M.Gorbachev',506,'N','L' -'SOL','Mars High',699,'?','L' -'SOL','Titan City',4589,'?','L' +'SOL','Mars High',699,'N','L' +'SOL','Titan City',4589,'N','L' 'SOLATI','Elwirecraft',0,'?','L' 'SOLATI','Ising Refinery',46,'Y','M' 'SOLATI','Solati Reach',263,'Y','L' @@ -4308,4 +4310,4 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HIP 12716','Boss Station',0,'?','?' 'LHS 2363','Pontes Installation',0,'?','?' 'Polochans','Neujmin Vision',0,'?','?' -'Ratri','Sterling Ring',0,'?','?' \ No newline at end of file +'Ratri','Sterling Ring',0,'?','?' diff --git a/data/System.csv b/data/System.csv index 9b419748..36963b10 100644 --- a/data/System.csv +++ b/data/System.csv @@ -823,6 +823,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALPHARD',138.84375,88.46875,-73.5,'Gamma-Inferred','2014-10-21 17:16:31' 'ALPHEUS',2.03125,-56.375,56.21875,'Gamma','2014-11-27 11:33:44' 'ALRAI',-38.71875,12.3125,-21.625,'Beta2','2014-10-21 17:16:31' +'ALRAI SECTOR CK-R A4-6',-7.46875,-35.40625,51.625,'Release 1.00-EDStar','2015-01-15 18:00:48' 'ALRAI SECTOR CL-W C1-14',-33.59375,20.25,75.25,'Release 1.00-EDStar','2014-12-24 06:57:22' 'ALRAI SECTOR CL-Y D83',-105.125,37.9375,70.78125,'Gamma','2014-11-27 11:33:44' 'ALRAI SECTOR CL-Y D94',-84.875,2.09375,104.6875,'Release 1.00-EDStar','2015-01-07 11:58:15' @@ -837,6 +838,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALRAI SECTOR HH-V B2-5',-100.28125,-3.0,64.4375,'Release 1.00-EDStar','2015-01-09 13:13:20' 'ALRAI SECTOR HM-V B2-3',-50.09375,18.375,57.84375,'Release 1.00-EDStar','2015-01-03 02:09:30' 'ALRAI SECTOR HM-V B2-6',-60.96875,26.375,63.25,'Release 1.00-EDStar','2015-01-03 01:30:50' +'ALRAI SECTOR HR-W C1-12',-67.84375,-18.21875,72.84375,'Release 1.00-EDStar','2015-01-15 21:10:35' 'ALRAI SECTOR IH-V B2-1',-72.875,-1.78125,67.96875,'Release 1.00-EDStar','2014-12-28 21:59:25' 'ALRAI SECTOR IH-V B2-2',-71.71875,0.65625,62.875,'Release 1.00-EDStar','2015-01-09 07:51:47' 'ALRAI SECTOR IH-V B2-3',-78.5625,1.96875,65.125,'Release 1.00-EDStar','2015-01-09 08:05:54' @@ -844,6 +846,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALRAI SECTOR IR-W C1-24',-61.84375,8.0,55.21875,'Release 1.00-EDStar','2014-12-04 07:55:02' 'ALRAI SECTOR IR-W C1-31',-54.34375,-10.09375,88.6875,'Release 1.00-EDStar','2014-12-31 18:26:28' 'ALRAI SECTOR JR-W C1-22',-24.28125,-1.25,57.65625,'Release 1.00-EDStar','2014-12-24 06:50:04' +'ALRAI SECTOR KC-V B2-6',-80.34375,-21.28125,73.96875,'Release 1.00-EDStar','2015-01-14 20:24:36' 'ALRAI SECTOR KH-V B2-1',-44.9375,-4.65625,60.8125,'Gamma-Inferred','2014-12-02 16:30:49' 'ALRAI SECTOR KH-V B2-2',-34.46875,-3.46875,58.84375,'Release 1.00-EDStar','2014-11-29 17:56:10' 'ALRAI SECTOR KM-V B2-5',9.21875,25.375,71.4375,'Release 1.00-EDStar','2014-12-26 03:33:25' @@ -851,14 +854,17 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALRAI SECTOR LS-T B3-6',-56.6875,15.46875,77.59375,'Release 1.00-EDStar','2015-01-03 03:48:13' 'ALRAI SECTOR MS-T B3-1',-36.03125,21.53125,92.71875,'Release 1.00-EDStar','2015-01-09 00:09:24' 'ALRAI SECTOR MS-T B3-5',-32.5,23.40625,94.96875,'Release 1.00-EDStar','2014-12-24 07:02:18' +'ALRAI SECTOR NC-V B2-5',-15.84375,-20.5,66.4375,'Release 1.00-EDStar','2015-01-15 17:57:31' 'ALRAI SECTOR NN-T B3-0',-62.28125,-1.0625,88.375,'Release 1.00-EDStar','2015-01-03 10:11:30' 'ALRAI SECTOR NN-T BS-7',-55.46875,6.1875,84.65625,'Release 1.00-EDStar','2014-12-31 18:35:33' 'ALRAI SECTOR OI-T B3-2',-78.3125,-6.09375,92.28125,'Release 1.00-EDStar','2015-01-08 13:39:25' +'ALRAI SECTOR OI-T B3-6',-69.09375,-19.34375,85.96875,'Release 1.00-EDStar','2015-01-15 20:35:49' 'ALRAI SECTOR ON-T B3-2',-37.96875,3.78125,91.5,'Release 1.00-EDStar','2014-12-29 02:53:39' 'ALRAI SECTOR ON-T B3-3',-42.71875,8.34375,86.125,'Release 1.00-EDStar','2015-01-06 21:39:23' 'ALRAI SECTOR QC-V A2-3',-32.5625,-28.125,30.125,'Release 1.00-EDStar','2015-01-05 09:11:41' 'ALRAI SECTOR QT-R B4-2',-75.1875,0.625,105.96875,'Release 1.00-EDStar','2015-01-03 09:40:48' 'ALRAI SECTOR UI-T A3-2',-27.4375,-26.9375,39.90625,'Release 1.00-EDStar','2015-01-05 13:23:52' +'ALRAI SECTOR UO-R A4-1',-66.875,-31.71875,47.03125,'Release 1.00-EDStar','2015-01-12 21:16:33' 'ALRAI SECTOR UO-R A4-2',-68.40625,-32.9375,46.6875,'Release 1.00-EDStar','2014-12-02 19:21:04' 'ALRAI SECTOR VO-R A4-2',-60.3125,-28.84375,48.84375,'Release 1.00-EDStar','2014-12-02 19:14:59' 'ALRAI SECTOR WI-T A3-3',-6.75,-25.4375,50.0,'Release 1.00-EDStar','2015-01-08 12:05:31' @@ -1405,6 +1411,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ARIETIS SECTOR QN-T B3-1',-40.96875,-89.375,-130.90625,'Release 1.00-EDStar','2014-12-20 13:14:38' 'ARIETIS SECTOR QV-B A14-1',-89.3125,-42.03125,-70.8125,'Release 1.00-EDStar','2014-12-08 04:11:51' 'ARIETIS SECTOR TK-M A8-0',-82.3125,-44.6875,-134.90625,'Release 1.00-EDStar','2014-12-10 03:00:45' +'ARIETIS SECTOR VD-T B3-3',-21.15625,-127.25,-134.0,'Release 1.00-EDStar','2015-01-12 18:46:30' 'ARIETIS SECTOR YJ-A C13',-79.25,-71.84375,-203.625,'Release 1.00-EDStar','2014-12-18 04:11:37' 'ARIETIS SECTOR YJ-A C2',-78.625,-75.8125,-211.34375,'Release 1.00-EDStar','2014-12-18 03:56:01' 'ARIETIS SECTOR ZO-A B0',-64.78125,-85.375,-212.8125,'Release 1.00-EDStar','2014-12-02 00:04:14' @@ -2035,6 +2042,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'BD+03 3531A',-41.78125,20.125,71.875,'Gamma','2014-11-27 11:33:44' 'BD+03 3861',13.0,53.0,-93.5,'Gamma','2014-11-27 11:33:44' 'BD+03 515',3.3125,-48.53125,-61.53125,'Gamma','2014-11-27 11:33:44' +'BD+03 664',24.40625,-45.53125,-93.53125,'Release 1.00-EDStar','2015-01-16 18:38:53' 'BD+04 3919',-52.84375,0.40625,68.40625,'Release 1.00-EDStar','2015-01-08 15:53:23' 'BD+04 4344',-80.625,-28.46875,75.40625,'Gamma','2014-11-27 11:33:44' 'BD+04 4988',-52.6875,-63.21875,4.03125,'Gamma','2014-11-27 11:33:44' @@ -2223,6 +2231,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'BD-05 2489',83.34375,33.96875,-72.625,'Gamma','2014-11-27 11:33:44' 'BD-05 2603',73.21875,35.4375,-56.03125,'Gamma','2014-11-27 11:33:44' 'BD-05 2778',56.21875,37.84375,-34.78125,'Gamma','2014-11-27 11:33:44' +'BD-05 4401',-24.90625,34.40625,94.03125,'Release 1.00-EDStar','2015-01-15 20:59:01' 'BD-05 5480',-53.71875,-47.9375,51.1875,'Gamma','2014-11-27 11:33:44' 'BD-05 948',35.5,-63.90625,-93.90625,'Gamma','2014-11-27 11:33:44' 'BD-06 2528',80.4375,29.40625,-68.5625,'Gamma','2014-11-27 11:33:44' @@ -2286,17 +2295,29 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'BEGOCI',56.53125,-18.90625,-164.46875,'Gamma','2014-11-27 11:33:44' 'BEGONDA',55.84375,99.21875,-120.25,'Gamma','2014-11-27 11:33:44' 'BEGOVANS',-61.75,19.75,69.53125,'Gamma','2014-11-27 11:33:44' +'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 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' 'BEI DOU SECTOR DL-Y D76',-37.6875,70.09375,-14.1875,'Beta3-Inferred','2014-11-19 10:52:09' 'BEI DOU SECTOR DL-Y D92',-49.03125,72.5,-5.0,'Release 1.00-EDStar','2014-12-02 20:15:07' +'BEI DOU SECTOR EB-X B1-2',-41.65625,76.8125,-11.5,'Release 1.00-EDStar','2015-01-15 21:51:50' +'BEI DOU SECTOR EB-X B1-3',-39.3125,78.5,-9.40625,'Release 1.00-EDStar','2015-01-15 22:07:33' 'BEI DOU SECTOR FW-W B1-2',-49.0,66.3125,-16.8125,'Beta3-Inferred','2014-11-03 02:11:00' 'BEI DOU SECTOR GM-V B2-O',-40.5,99.09375,-4.71875,'Release 1.00-EDStar','2014-12-01 20:06:07' 'BEI DOU SECTOR IH-V B2-3',-34.9375,91.34375,-1.0625,'Release 1.00-EDStar','2014-12-01 20:19:56' +'BEI DOU SECTOR IH-V B2-4',-28.40625,76.0,0.46875,'Release 1.00-EDStar','2015-01-15 21:51:50' 'BEI DOU SECTOR JC-V B2-0',-62.21875,58.875,-2.3125,'Beta3-Inferred','2014-11-03 02:25:26' 'BEI DOU SECTOR JC-V B2-2',-61.125,58.15625,-2.40625,'Beta3-Inferred','2014-11-03 02:20:21' 'BEI DOU SECTOR JC-V B2-3',-61.21875,58.65625,0.125,'Beta3-Inferred','2014-11-03 02:30:10' 'BEI DOU SECTOR JC-V B2-4',-60.15625,55.96875,2.625,'Beta3-Inferred','2014-11-03 02:34:55' 'BEI DOU SECTOR KC-V B2-4',-39.25,68.71875,10.03125,'Release 1.00-EDStar','2014-12-03 13:06:32' +'BEI DOU SECTOR VO-A B1',-49.28125,78.875,-52.03125,'Release 1.00-EDStar','2015-01-11 17:22:33' +'BEI DOU SECTOR VO-A B3',-55.375,75.0625,-51.40625,'Release 1.00-EDStar','2015-01-11 17:19:04' +'BEI DOU SECTOR XJ-A B1',-60.5,67.125,-47.03125,'Release 1.00-EDStar','2015-01-11 10:24:31' +'BEI DOU SECTOR YZ-Y B3',-38.0625,95.65625,-31.65625,'Release 1.00-EDStar','2015-01-12 18:06:20' 'BEI DOU SECTOR ZE-A C16',-37.53125,66.46875,-36.125,'Beta3-Inferred','2014-11-19 13:01:43' 'BEID',32.1875,-74.625,-90.625,'Gamma','2014-11-27 11:33:44' 'BEIMECH',49.1875,14.875,71.0,'Gamma','2014-11-27 11:33:44' @@ -2738,9 +2759,11 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'BOVELTIBES',-7.25,49.9375,109.625,'Gamma','2014-11-27 11:33:44' 'BOVERDA',107.0625,37.34375,-16.4375,'Gamma','2014-11-27 11:33:44' 'BPM 16204',65.9375,-161.5,46.75,'Gamma','2014-11-27 11:33:44' +'BPM 26427',22.09375,-54.125,85.5625,'Release 1.00-EDStar','2015-01-12 13:12:20' 'BPM 28514',47.09375,-114.34375,48.75,'Gamma','2014-11-27 11:33:44' 'BPM 40823',30.875,-8.0,109.71875,'Gamma','2014-11-27 11:33:44' 'BPM 45047',15.28125,-67.84375,28.375,'Gamma','2014-11-27 11:33:44' +'BPM 46789',1.84375,-74.28125,-0.46875,'Release 1.00-EDStar','2015-01-14 21:14:22' 'BPM 590',-2.40625,-105.5625,0.6875,'Gamma','2014-11-27 11:33:44' 'BPM 62891',-14.34375,1.3125,102.71875,'Gamma','2014-11-27 11:33:44' 'BPM 72121',78.21875,-15.78125,-67.6875,'Gamma','2014-11-27 11:33:44' @@ -3332,8 +3355,10 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CEPHEI SECTOR FG-Y C13',-112.40625,5.875,-36.96875,'Release 1.00-EDStar','2015-01-09 19:31:26' 'CEPHEI SECTOR FG-Y C30',-141.125,-1.8125,-53.8125,'Beta3','2014-11-27 11:33:44' 'CEPHEI SECTOR FG-Y D139',-103.0625,41.96875,1.21875,'Beta3-Inferred','2014-11-03 06:53:11' +'CEPHEI SECTOR FG-Y D73',-97.4375,29.09375,-24.6875,'Release 1.00-EDStar','2015-01-16 23:55:24' 'CEPHEI SECTOR IR-W C1-15',-98.65625,38.4375,-15.21875,'Beta3-Inferred','2014-11-03 07:26:31' 'CEPHEI SECTOR IR-W C1-19',-103.875,39.3125,-9.1875,'Beta3-Inferred','2014-11-03 07:16:54' +'CEPHEI SECTOR IR-W C1-21',-98.28125,35.5625,-15.8125,'Release 1.00-EDStar','2015-01-14 20:36:25' 'CEPHEI SECTOR IW-W B1-1',-84.4375,16.90625,-60.40625,'Beta3','2014-11-01 06:36:37' 'CEPHEI SECTOR JC-V B2-1',-140.5,15.65625,-44.0,'Beta3-Inferred','2014-11-20 07:13:13' 'CEPHEI SECTOR KC-V B2-5',-119.125,21.28125,-26.21875,'Release 1.00-EDStar','2015-01-09 11:03:27' @@ -3349,11 +3374,14 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CEPHEI SECTOR MX-U B2-5',-109.375,-0.25,-35.5,'Release 1.00-EDStar','2014-12-30 01:33:15' 'CEPHEI SECTOR MX-U B2-7',-110.75,-3.03125,-41.1875,'Release 1.00-EDStar','2014-12-30 23:15:09' 'CEPHEI SECTOR NI-T B3-2',-143.03125,28.53125,-20.90625,'Beta3','2014-11-27 11:33:44' +'CEPHEI SECTOR NN-T B3-0',-93.75,46.9375,-7.3125,'Release 1.00-EDStar','2015-01-15 00:20:22' +'CEPHEI SECTOR NN-T B3-1',-96.21875,43.71875,-8.9375,'Release 1.00-EDStar','2015-01-15 00:04:51' 'CEPHEI SECTOR NS-U B2-5',-126.0625,-11.65625,-26.21875,'Release 1.00-EDStar','2015-01-09 22:26:36' 'CEPHEI SECTOR NX-U B2-2',-102.96875,-2.40625,-31.71875,'Release 1.00-EDStar','2014-12-30 01:14:05' 'CEPHEI SECTOR NX-U B2-6',-91.96875,0.78125,-29.03125,'Gamma-Inferred','2014-11-26 15:00:00' 'CEPHEI SECTOR NX-U B2-7',-96.53125,1.3125,-29.09375,'Gamma-Inferred','2014-11-26 15:00:00' 'CEPHEI SECTOR OI-T B3-1',-115.1875,17.625,-21.9375,'Release 1.00-EDStar','2015-01-09 14:35:35' +'CEPHEI SECTOR OI-T B3-3',-109.59375,23.65625,-20.21875,'Release 1.00-EDStar','2015-01-13 22:43:31' 'CEPHEI SECTOR ON-T B3-3',-72.21875,36.8125,-10.625,'Beta3-Inferred','2014-11-03 06:20:18' 'CEPHEI SECTOR ON-T B3-4',-76.0,37.15625,-6.5,'Beta3-Inferred','2014-11-03 02:59:42' 'CEPHEI SECTOR OS-U B2-1',-108.59375,-9.53125,-25.375,'Release 1.00-EDStar','2014-12-30 21:47:06' @@ -3395,9 +3423,13 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CETI SECTOR BV-Y B3',-9.5625,-143.375,-67.0625,'Release 1.00-EDStar','2015-01-10 17:02:54' 'CETI SECTOR CL-Y D57',-70.375,-105.96875,-9.96875,'Gamma','2014-11-27 11:33:44' 'CETI SECTOR CQ-Y D98',16.15625,-83.25,13.90625,'Release 1.00-EDStar','2015-01-07 20:25:47' +'CETI SECTOR DL-X B1-3',30.0625,-89.34375,-52.65625,'Release 1.00-EDStar','2015-01-11 08:05:54' 'CETI SECTOR FB-X B1-1',-20.5,-142.3125,-61.53125,'Release 1.00-EDStar','2015-01-09 16:29:47' 'CETI SECTOR FB-X B1-2',-12.375,-133.03125,-52.84375,'Release 1.00-EDStar','2015-01-09 17:08:19' +'CETI SECTOR KX-T B3-2',4.15625,-94.6875,-11.875,'Release 1.00-EDStar','2015-01-15 17:25:07' 'CETI SECTOR OC-V B2-0',46.0625,-145.84375,-35.25,'Release 1.00-EDStar','2014-12-08 21:51:40' +'CETI SECTOR XJ-A D109',8.96875,-73.28125,-56.875,'Release 1.00-EDStar','2015-01-17 08:20:14' +'CETI SECTOR YJ-A C15',-8.1875,-118.9375,-101.0625,'Release 1.00-EDStar','2015-01-12 19:55:18' 'CEUT',126.1875,-101.125,67.5625,'Gamma','2014-11-27 11:33:44' 'CEUTRONES',-166.5,-23.5,39.59375,'Gamma','2014-11-27 11:33:44' 'CEUTS',110.21875,-214.125,108.03125,'Gamma','2014-11-27 11:33:44' @@ -3837,6 +3869,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR AB-E C12-32',45.46875,-79.09375,163.71875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR AC-Y B16-0',26.53125,120.25,14.25,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR AG-O D6-86',-40.53125,-65.65625,184.125,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR AG-O D6-91',-48.03125,-64.21875,155.8125,'Release 1.00-EDStar','2015-01-11 07:27:05' 'COL 285 SECTOR AH-A B15-4',-101.25,-19.84375,-39.21875,'Release 1.00-EDStar','2014-12-30 23:42:54' 'COL 285 SECTOR AL-O D6-90',125.34375,-1.34375,199.90625,'Release 1.00-EDStar','2014-12-26 03:33:25' 'COL 285 SECTOR AM-R B19-4',19.71875,-22.0,60.25,'Release 1.00-EDStar','2014-12-04 10:50:59' @@ -3867,6 +3900,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR DV-O C6-12',156.9375,-41.71875,-90.34375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR DV-O C6-5',159.4375,-50.9375,-85.5,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR DX-J C9-15',-176.875,39.96875,33.59375,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR EC-R B19-3',24.5,-62.96875,66.84375,'Release 1.00-EDStar','2015-01-14 16:36:43' 'COL 285 SECTOR EM-L C8-22',-57.71875,7.875,-6.5,'Release 1.00-EDStar','2014-11-29 11:38:21' 'COL 285 SECTOR ES-I C10-5',-59.53125,149.125,89.34375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR FA-Q C5-13',141.0625,-182.53125,-118.0,'Release 1.00-EDStar','2014-12-26 05:20:11' @@ -3878,7 +3912,8 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR GD-W B17-0',18.375,98.6875,16.65625,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR GI-F B26-4',137.34375,-1.40625,206.46875,'Release 1.00-EDStar','2014-12-26 03:55:42' '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 A',-17.71875,-56.03125,85.8125,'Release 1.00-EDStar','2014-12-23 17:00:46' +'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 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' @@ -3923,6 +3958,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR IX-T D3-83',-182.15625,80.78125,-59.1875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR IX-T D3-85',-195.0625,128.96875,-84.875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR IX-T D3-90',-174.4375,102.6875,-31.71875,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR IY-W B16-6',-50.03125,5.0,-2.5,'Release 1.00-EDStar','2015-01-14 01:26:11' 'COL 285 SECTOR JB-U B17-5',157.03125,-118.125,25.875,'Release 1.00-EDStar','2014-12-21 01:17:05' 'COL 285 SECTOR JC-U D3-69',18.6875,156.25,-62.6875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR JD-T A33-0',46.03125,-34.84375,6.96875,'Release 1.00-EDStar','2014-12-06 23:06:34' @@ -3958,6 +3994,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR LC-V D2-63',-104.25,-179.65625,-156.34375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR LD-K A38-2',110.65625,-42.75,64.625,'Release 1.00-EDStar','2015-01-03 08:05:16' 'COL 285 SECTOR LE-E B13-1',-156.25,24.59375,-65.34375,'Beta3-Inferred','2014-11-17 23:15:53' +'COL 285 SECTOR LI-P B20-4',80.9375,-55.53125,83.40625,'Release 1.00-EDStar','2015-01-13 22:22:54' 'COL 285 SECTOR LM-W A31-3',127.0,-44.46875,-9.625,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR LM-W A31-4',125.25,-40.9375,-6.90625,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR LS-K C8-15',-75.46875,-176.84375,4.78125,'Gamma','2014-11-27 11:33:44' @@ -3997,6 +4034,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR NS-U A32-2',111.71875,-38.5,-2.375,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR NS-U A32-3',113.5625,-44.5625,2.375,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR NS-U A32-4',111.75,-44.8125,-3.875,'Gamma-Inferred','2014-11-29 06:45:17' +'COL 285 SECTOR NS-Y B15-2',132.71875,-1.8125,-17.3125,'Release 1.00-EDStar','2015-01-15 19:27:00' 'COL 285 SECTOR NT-E B13-2',2.75,76.28125,-67.65625,'Release 1.00-EDStar','2014-12-11 01:25:59' 'COL 285 SECTOR NT-P C6-2',-98.59375,171.8125,-104.53125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR NX-S C4-3',77.46875,84.96875,-170.3125,'Gamma','2014-11-27 11:33:44' @@ -4036,6 +4074,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR PS-U A32-1',132.5,-40.3125,-3.59375,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR PV-R B19-7',-118.28125,28.6875,68.90625,'Release 1.00-EDStar','2015-01-04 13:56:12' 'COL 285 SECTOR PY-I C9-2',-103.4375,-179.375,29.1875,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR PY-P B19-0',4.28125,-179.8125,61.5,'Release 1.00-EDStar','2015-01-12 12:32:34' 'COL 285 SECTOR PY-R D4-132',-72.6875,30.1875,-0.4375,'Beta3-Inferred','2014-11-03 06:24:35' 'COL 285 SECTOR QD-S D4-91',146.15625,117.1875,-11.71875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR QD-S D4-94',132.15625,128.1875,20.5625,'Gamma','2014-11-27 11:33:44' @@ -4050,6 +4089,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR QJ-Q D5-93',-176.25,81.4375,124.875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR QN-T D3-116',157.15625,-76.15625,-72.5625,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR QO-G C11-17',103.53125,68.96875,126.25,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR QP-G A40-3',83.90625,-40.71875,84.84375,'Release 1.00-EDStar','2015-01-13 22:14:50' 'COL 285 SECTOR QS-K C8-10',97.09375,-180.875,-23.4375,'Release 1.00-EDStar','2014-12-31 06:28:54' 'COL 285 SECTOR QU-C B14-5',-57.375,59.71875,-52.375,'Release 1.00-EDStar','2015-01-10 23:23:08' 'COL 285 SECTOR QU-E C12-11',-48.9375,60.5,155.09375,'Gamma','2014-11-27 11:33:44' @@ -4062,6 +4102,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR RD-T A33-1',129.65625,-34.40625,8.09375,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR RD-T A33-2',127.875,-32.6875,6.625,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR RE-P C6-16',-163.1875,25.59375,-79.0,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR RJ-O B20-4',6.9375,-157.78125,82.84375,'Release 1.00-EDStar','2015-01-12 12:43:33' 'COL 285 SECTOR RJ-Q D5-52',-137.25,69.125,82.4375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR RJ-Q D5-58',-124.5625,130.3125,129.3125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR RJ-Q D5-97',-139.6875,96.875,81.15625,'Gamma','2014-11-27 11:33:44' @@ -4071,6 +4112,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR RP-E C12-27',-82.40625,42.3125,162.90625,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR RQ-N A36-1',-12.3125,-42.1875,38.625,'Release 1.00-EDStar','2015-01-09 21:54:33' 'COL 285 SECTOR RQ-N A36-3',-8.96875,-42.53125,38.09375,'Gamma-Inferred','2014-12-08 11:36:52' +'COL 285 SECTOR RT-P B19-4',7.5625,-193.96875,66.03125,'Release 1.00-EDStar','2015-01-11 19:43:32' 'COL 285 SECTOR RU-E C12-12',-12.25,79.65625,140.25,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR RV-E A41-0',47.4375,-43.65625,85.3125,'Release 1.00-EDStar','2015-01-09 22:37:00' 'COL 285 SECTOR RV-Q B20-0',11.28125,108.0625,89.59375,'Gamma','2014-11-27 11:33:44' @@ -4081,6 +4123,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR RY-S A33-1',107.78125,-42.0,9.375,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR RY-S A33-2',106.0,-41.9375,8.8125,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR RY-S A33-3',106.46875,-42.90625,6.125,'Gamma-Inferred','2014-11-29 06:45:17' +'COL 285 SECTOR RY-W B16-1',128.46875,-3.21875,3.71875,'Release 1.00-EDStar','2015-01-15 19:22:14' 'COL 285 SECTOR SD-R C5-6',105.125,90.34375,-122.84375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR SD-T D3-57',-18.09375,-229.4375,-87.28125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR SD-T D3-61',-11.53125,-236.625,-33.625,'Gamma','2014-11-27 11:33:44' @@ -4102,6 +4145,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified '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' +'COL 285 SECTOR SV-E A41-2',58.65625,-44.8125,88.34375,'Release 1.00-EDStar','2015-01-12 21:02:19' 'COL 285 SECTOR SY-S A33-0',115.125,-43.34375,9.625,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR SY-S A33-2',120.1875,-41.65625,10.96875,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR SY-S A33-3',118.84375,-41.28125,11.625,'Gamma-Inferred','2014-11-29 06:45:17' @@ -4113,12 +4157,14 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR TJ-R A34-3',109.5,-34.34375,16.40625,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR TK-E C12-24',-102.21875,9.8125,140.65625,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR TK-E C12-9',-93.78125,-4.75,164.375,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR TO-H C10-12',83.78125,-67.90625,84.84375,'Release 1.00-EDStar','2015-01-13 22:34:00' 'COL 285 SECTOR TO-P C6-12',60.25,127.5,-89.21875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR TU-E C12-16',78.625,72.59375,168.9375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR TU-E C12-6',71.21875,66.4375,160.8125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR TY-S A33-4',126.4375,-41.75,11.71875,'Gamma-Inferred','2014-11-29 06:45:17' 'COL 285 SECTOR TY-W B16-3',158.40625,-0.03125,1.03125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR UE-G C11-14',126.5625,-13.5625,127.6875,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR UE-O B20-0',19.875,-182.4375,75.0,'Release 1.00-EDStar','2015-01-11 19:31:43' 'COL 285 SECTOR UG-P B21-0',34.53125,123.125,103.6875,'Release 1.00-EDStar','2014-12-07 21:14:42' 'COL 285 SECTOR UG-P B21-1',33.78125,127.03125,101.71875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR UJ-Q D5-95',144.5625,57.5625,124.1875,'Gamma','2014-11-27 11:33:44' @@ -4138,7 +4184,9 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR UZ-P D5-75',-149.03125,-102.09375,126.9375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR UZ-P D5-84',-156.5625,-86.625,81.71875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR UZ-P D5-87',-214.6875,-68.15625,118.125,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR VE-H C10-12',7.53125,-161.9375,71.3125,'Release 1.00-EDStar','2015-01-12 12:41:07' 'COL 285 SECTOR VE-M B22-9',196.6875,-11.46875,118.8125,'Release 1.00-EDStar','2015-01-05 14:03:50' +'COL 285 SECTOR VG-I B24-0',-43.34375,-62.71875,155.375,'Release 1.00-EDStar','2015-01-11 07:31:22' 'COL 285 SECTOR VK-E C12-24',-3.21875,-20.25,169.09375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR VM-O B21-3',-109.0625,44.71875,98.03125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR VP-E C12-23',76.90625,36.0625,161.375,'Gamma','2014-11-27 11:33:44' @@ -4169,6 +4217,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR XU-P D5-99',-111.9375,-178.6875,88.375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR XV-L C8-11',-174.71875,69.28125,-21.59375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR XW-O B21-3',9.6875,81.125,105.5,'Release 1.00-EDStar','2014-11-25 18:00:34' +'COL 285 SECTOR XZ-G C10-13',14.90625,-190.3125,71.03125,'Release 1.00-EDStar','2015-01-11 19:39:51' 'COL 285 SECTOR YE-L A10-1',-99.90625,-25.5,-244.40625,'Release 1.00-EDStar','2014-12-06 08:42:06' 'COL 285 SECTOR YE-L A10-2',-104.53125,-30.0,-235.53125,'Release 1.00-EDStar','2014-12-06 09:07:44' 'COL 285 SECTOR YF-N C7-31',-142.75,-5.75,-56.625,'Gamma','2014-11-27 11:33:44' @@ -4197,6 +4246,8 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'COL 285 SECTOR ZF-O D6-69',-84.8125,-33.96875,152.1875,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR ZF-O D6-71',-79.78125,-102.59375,179.34375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR ZF-O D6-93',-111.5,-30.6875,161.8125,'Gamma','2014-11-27 11:33:44' +'COL 285 SECTOR ZH-K A38-1',10.8125,-32.875,61.9375,'Release 1.00-EDStar','2015-01-12 13:19:21' +'COL 285 SECTOR ZH-K A38-2',6.53125,-29.875,55.0,'Release 1.00-EDStar','2015-01-12 13:21:17' 'COL 285 SECTOR ZK-O D6-117',92.78125,-20.53125,162.4375,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR ZK-O D6-132',60.5,50.15625,210.78125,'Gamma','2014-11-27 11:33:44' 'COL 285 SECTOR ZK-O D6-84',51.1875,46.125,183.21875,'Gamma','2014-11-27 11:33:44' @@ -4289,7 +4340,6 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CORE SYS SECTOR GH-M A7-0',-7.21875,-33.96875,28.59375,'Gamma-Inferred','2014-12-08 06:39:38' 'CORE SYS SECTOR HH-M A7-2',-0.15625,-29.15625,27.28125,'Release 1.00-EDStar','2014-12-26 22:02:32' 'CORE SYS SECTOR HH-M A7-3',-3.625,-33.5625,30.59375,'Release 1.00-EDStar','2015-01-07 21:29:47' -'CORE SYS SECTOR HH-V B2-7',-32.15625,6.15625,1.90625,'Release 1.00-EDStar','2014-11-29 12:14:49' 'CORE SYS SECTOR HW-N A6-0',19.1875,-40.21875,17.40625,'Release 1.00-EDStar','2015-01-06 20:48:51' 'CORE SYS SECTOR IR-W C1-25',16.53125,-13.75,22.5,'Release 1.00-EDStar','2014-12-23 23:40:25' 'CORE SYS SECTOR IR-W C1-29',26.21875,6.3125,35.5625,'Release 1.00-EDStar','2014-11-30 22:56:30' @@ -4313,6 +4363,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CORE SYS SECTOR UO-R B4-6',23.1875,-19.875,39.125,'Gamma-Inferred','2014-12-07 11:15:45' 'CORE SYS SECTOR WJ-R A4-1',-11.21875,-43.5,-2.8125,'Release 1.00-EDStar','2015-01-04 19:22:48' 'CORE SYS SECTOR YJ-R A4-1',5.4375,-40.71875,-4.0,'Release 1.00-EDStar','2014-12-06 20:26:47' +'CORE SYS SECTOR YO-R A4-1',27.3125,-31.15625,-0.84375,'Release 1.00-EDStar','2015-01-12 14:31:45' 'CORIABOG',-55.53125,-61.34375,69.0625,'Gamma','2014-11-27 11:33:44' 'CORIAN GUIT',-162.9375,25.125,72.53125,'Gamma','2014-11-27 11:33:44' 'CORIAT',46.6875,-226.0,71.0,'Gamma','2014-11-27 11:33:44' @@ -4415,10 +4466,12 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CRUCIS SECTOR EL-Y C19',106.5625,11.15625,30.375,'Release 1.00-EDStar','2014-12-09 09:00:12' 'CRUCIS SECTOR EL-Y C23',97.8125,10.28125,18.3125,'Release 1.00-EDStar','2014-12-04 10:32:02' 'CRUCIS SECTOR EM-V B2-5',29.96875,26.40625,41.59375,'Release 1.00-EDStar','2014-12-02 04:13:38' +'CRUCIS SECTOR EQ-Y B2',95.59375,-11.78125,6.375,'Release 1.00-EDStar','2015-01-15 19:29:02' 'CRUCIS SECTOR EQ-Y B4',101.0,-10.03125,3.875,'Release 1.00-EDStar','2015-01-08 13:55:28' 'CRUCIS SECTOR EQ-Y B6',104.84375,-14.59375,4.96875,'Release 1.00-EDStar','2015-01-07 19:29:52' 'CRUCIS SECTOR ER-V B2-0',62.875,41.3125,52.0,'Release 1.00-EDStar','2014-11-30 22:51:32' 'CRUCIS SECTOR ER-V B2-5',58.25,43.3125,38.46875,'Release 1.00-EDStar','2014-12-29 00:40:43' +'CRUCIS SECTOR EW-W C1-26',53.1875,42.53125,56.28125,'Release 1.00-EDStar','2015-01-14 14:01:33' 'CRUCIS SECTOR EW-W C1-28',49.875,40.375,59.3125,'Release 1.00-EDStar','2014-12-20 20:50:13' 'CRUCIS SECTOR FB-X B1-2',87.25,11.34375,24.75,'Gamma-Inferred','2014-11-29 06:45:17' 'CRUCIS SECTOR FB-X B1-3',87.46875,5.875,22.40625,'Gamma-Inferred','2014-11-29 06:45:17' @@ -4490,6 +4543,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CRUCIS SECTOR MI-T B3-6',34.09375,-11.125,59.53125,'Release 1.00-EDStar','2014-12-03 08:45:15' 'CRUCIS SECTOR MI-T B3-7',33.5,-16.375,57.5,'Release 1.00-EDStar','2014-12-04 10:50:59' 'CRUCIS SECTOR MN-T B3-1',69.4375,7.90625,63.40625,'Release 1.00-EDStar','2014-12-15 09:40:09' +'CRUCIS SECTOR MN-T B3-2',60.5625,-3.90625,72.875,'Release 1.00-EDStar','2014-12-20 20:50:22' 'CRUCIS SECTOR MN-T B3-4',56.625,1.09375,66.90625,'Release 1.00-EDStar','2014-12-04 10:13:01' 'CRUCIS SECTOR MN-T B3-5',55.6875,-0.25,67.3125,'Release 1.00-EDStar','2014-12-04 10:32:02' 'CRUCIS SECTOR MN-T B3-7',69.40625,5.1875,69.71875,'Release 1.00-EDStar','2014-12-20 20:50:22' @@ -4500,6 +4554,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CRUCIS SECTOR NI-T B3-4',48.21875,-7.65625,67.5625,'Release 1.00-EDStar','2014-12-04 10:32:02' 'CRUCIS SECTOR NI-T B3-5',41.34375,-24.46875,55.84375,'Release 1.00-EDStar','2014-12-04 10:50:59' 'CRUCIS SECTOR NI-T B3-7',42.625,-19.5625,55.09375,'Release 1.00-EDStar','2014-12-06 07:28:09' +'CRUCIS SECTOR NN-T B3-8',80.84375,10.28125,71.9375,'Release 1.00-EDStar','2014-12-20 20:50:22' 'CRUCIS SECTOR OC-V A2-1',82.46875,-25.5,14.875,'Gamma-Inferred','2014-11-29 06:45:17' 'CRUCIS SECTOR OC-V A2-2',79.9375,-27.8125,13.0,'Gamma-Inferred','2014-11-29 06:45:17' 'CRUCIS SECTOR OC-V A2-3',76.3125,-25.375,13.03125,'Release 1.00-EDStar','2014-11-30 22:51:32' @@ -4523,6 +4578,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'CRUCIS SECTOR SI-T A3-2',75.21875,-25.875,21.1875,'Gamma-Inferred','2014-11-29 06:45:17' 'CRUCIS SECTOR SO-R A4-0',40.59375,-29.53125,29.21875,'Release 1.00-EDStar','2014-12-12 09:31:54' 'CRUCIS SECTOR SO-R A4-1',39.21875,-27.84375,30.625,'Release 1.00-EDStar','2014-12-06 07:28:09' +'CRUCIS SECTOR SO-R B4-7',58.9375,-13.875,79.3125,'Release 1.00-EDStar','2015-01-12 21:11:45' 'CRUCIS SECTOR TI-T A3-2',87.75,-33.96875,16.96875,'Gamma-Inferred','2014-11-29 06:45:17' 'CRUCIS SECTOR TO-R A4-1',46.125,-32.71875,29.4375,'Release 1.00-EDStar','2014-12-06 07:28:09' 'CRUCIS SECTOR UI-T A3-1',97.28125,-34.46875,17.0625,'Gamma-Inferred','2014-11-29 06:45:17' @@ -4987,6 +5043,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'DK LEONIS',24.90625,61.15625,-36.1875,'Gamma','2014-11-27 11:33:44' 'DK URSAE MAJORIS',-48.96875,66.03125,-63.9375,'Gamma','2014-11-27 11:33:44' 'DN DRACONIS',-27.09375,21.625,0.78125,'Beta1','2014-10-21 17:16:31' +'DO CANUM VENATICORUM',-28.125,80.375,-22.03125,'Release 1.00-EDStar','2015-01-12 15:20:07' 'DOBUNN',-55.25,5.25,118.5625,'Gamma','2014-11-27 11:33:44' 'DOCLEACHI',76.96875,-2.9375,21.15625,'Gamma','2014-11-27 11:33:44' 'DOGONEJA',77.46875,-1.125,119.78125,'Gamma','2014-11-27 11:33:44' @@ -5109,6 +5166,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'DZIVATAE',118.0,-99.5625,-39.75,'Gamma','2014-11-27 11:33:44' 'DZOAVIT',130.84375,-9.6875,56.40625,'Gamma','2014-11-27 11:33:44' 'E GEMINORUM',33.65625,11.5,-83.90625,'Gamma','2014-11-27 11:33:44' +'EANRIC',20.59375,-25.75,17.3125,'Release 1.00-EDStar','2015-01-11 10:59:49' 'EBAN',146.96875,-61.8125,72.8125,'Gamma','2014-11-27 11:33:44' 'EBANA',151.65625,-14.9375,-15.03125,'Gamma','2014-11-27 11:33:44' 'EBANDII',124.5625,-101.28125,-67.9375,'Gamma','2014-11-27 11:33:44' @@ -5143,6 +5201,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'EGM 762',12.375,-79.1875,-3.59375,'Gamma','2014-11-27 11:33:44' 'EGM 823',10.59375,-75.875,-9.03125,'Gamma','2014-11-27 11:33:44' 'EGM 95',0.34375,-58.21875,7.25,'Release 1.00-EDStar','2015-01-03 16:12:54' +'EGN 4',26.78125,-43.46875,-101.8125,'Release 1.00-EDStar','2015-01-16 19:49:46' 'EGOVACH',-62.3125,-72.0625,-15.9375,'Gamma','2014-11-27 11:33:44' 'EGOVAE',61.8125,-79.125,32.9375,'Gamma','2014-11-27 11:33:44' 'EGOVI',55.5,-82.125,174.15625,'Gamma','2014-11-27 11:33:44' @@ -5594,6 +5653,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'G 113-20',18.78125,10.09375,-20.75,'Beta3','2014-11-01 06:36:37' 'G 116-72',-3.5,56.875,-44.78125,'Gamma','2014-11-27 11:33:44' 'G 121-8',9.1875,58.75,-10.59375,'Beta3','2014-11-01 06:36:37' +'G 122-20',-10.375,72.125,-31.9375,'Release 1.00-EDStar','2015-01-15 22:25:40' 'G 122-60',-11.0,73.46875,-22.5625,'Gamma','2014-11-27 11:33:44' 'G 123-16',-9.25,79.03125,-17.75,'Gamma','2014-11-27 11:33:44' 'G 123-49',-18.90625,66.875,-14.78125,'Beta3','2014-11-01 06:36:37' @@ -5634,6 +5694,8 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'G 224-46',-55.25,60.34375,-12.71875,'Beta2','2014-10-21 17:16:31' 'G 230-27',-58.125,11.4375,2.6875,'Beta2','2014-10-21 17:16:31' 'G 232-62',-67.96875,-2.03125,-14.03125,'Gamma','2014-11-27 11:33:44' +'G 232-70',-46.96875,1.375,-12.84375,'Release 1.00-EDStar','2015-01-12 00:56:58' +'G 236-75',-41.46875,80.46875,-45.5625,'Release 1.00-EDStar','2015-01-11 17:27:30' 'G 239-25',-22.6875,25.8125,-6.6875,'Beta1','2014-10-21 17:16:31' 'G 240-11',-74.21875,67.34375,-2.375,'Gamma','2014-11-27 11:33:44' 'G 241-62',-55.0625,-1.0625,-24.875,'Release 1.00-EDStar','2015-01-08 17:03:33' @@ -5769,6 +5831,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'GANEBUCAE',139.6875,-45.0,26.21875,'Gamma','2014-11-27 11:33:44' 'GANEKPE',-88.3125,-43.84375,160.84375,'Gamma','2014-11-27 11:33:44' 'GANG YUN',29.8125,140.71875,34.75,'Gamma','2014-11-27 11:33:44' +'GANGA',-29.15625,82.0,-27.3125,'Release 1.00-EDStar','2015-01-12 15:23:00' 'GANGBETAE',-103.625,-31.21875,92.6875,'Gamma','2014-11-27 11:33:44' 'GANGGA',113.3125,-123.4375,149.125,'Gamma','2014-11-27 11:33:44' 'GANGO',124.46875,2.625,21.75,'Gamma','2014-11-27 11:33:44' @@ -5799,6 +5862,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'GARUP',-21.75,-33.4375,-93.0625,'Gamma','2014-11-27 11:33:44' 'GARUTTII',38.90625,28.21875,131.625,'Gamma','2014-11-27 11:33:44' 'GARUWA',-130.6875,-51.3125,-74.46875,'Gamma','2014-11-27 11:33:44' +'GAT 1373',18.75,-24.46875,-75.5,'Release 1.00-EDStar','2015-01-15 22:55:20' 'GAT 2',-35.3125,17.71875,58.875,'Gamma','2014-11-27 11:33:44' 'GATEWAY',-11.0,77.84375,-0.875,'Gamma','2014-11-27 11:33:44' 'GATO',-69.5625,-0.03125,9.21875,'Gamma','2014-11-27 11:33:44' @@ -5837,6 +5901,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'GCRV 4259',13.3125,18.09375,-105.65625,'Gamma','2014-11-27 11:33:44' 'GCRV 4654',12.78125,21.125,-74.375,'Gamma','2014-11-27 11:33:44' 'GCRV 52424',-7.90625,-98.28125,-42.0,'Gamma','2014-11-27 11:33:44' +'GCRV 52788',-28.34375,-89.8125,-69.8125,'Release 1.00-EDStar','2015-01-12 20:09:10' 'GCRV 54903',-11.75,-34.875,-100.21875,'Gamma','2014-11-27 11:33:44' 'GCRV 60778',34.3125,76.40625,-63.375,'Gamma','2014-11-27 11:33:44' 'GCRV 60796',111.4375,3.375,8.75,'Gamma','2014-11-27 11:33:44' @@ -5959,6 +6024,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'GLADYANGAR',2.1875,-47.09375,131.625,'Gamma','2014-11-27 11:33:44' 'GLAUCUS',-65.96875,-32.9375,-33.28125,'Gamma','2014-11-27 11:33:44' 'GLAUSS',-15.15625,-16.0,98.625,'Gamma','2014-11-27 11:33:44' +'GLESTING',-13.15625,17.5625,-33.1875,'Release 1.00-EDStar','2015-01-16 16:43:32' 'GLETE',-30.125,-99.71875,-98.71875,'Gamma','2014-11-27 11:33:44' 'GLETICHUA',-66.4375,-59.03125,-125.125,'Gamma','2014-11-27 11:33:44' 'GLETINE',34.3125,-133.59375,98.34375,'Gamma','2014-11-27 11:33:44' @@ -5976,6 +6042,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'GLIESE 2126',20.125,4.75,123.375,'Gamma','2014-11-27 11:33:44' 'GLIESE 225.1',134.15625,-71.0625,-67.28125,'Gamma','2014-11-27 11:33:44' 'GLIESE 3002',-104.90625,-58.1875,-44.15625,'Gamma','2014-11-27 11:33:44' +'GLIESE 3008',-48.03125,-49.375,-17.0,'Release 1.00-EDStar','2015-01-12 20:58:12' 'GLIESE 3050',-99.71875,28.09375,-64.15625,'Beta2-Inferred','2014-10-21 17:16:31' 'GLIESE 307',48.34375,75.34375,-116.25,'Gamma','2014-11-27 11:33:44' 'GLIESE 3095',-58.25,-119.65625,-63.5625,'Gamma','2014-11-27 11:33:44' @@ -6509,6 +6576,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HD 208496',66.125,-160.0,133.9375,'Gamma','2014-11-27 11:33:44' 'HD 222582',-60.8125,-121.71875,7.15625,'Gamma','2014-11-27 11:33:44' 'HD 239729',-1098.90625,72.53125,-186.75,'Gamma','2014-11-27 11:33:44' +'HD 25508',-314.03125,-205.375,-940.90625,'Release 1.00-EDStar','2015-01-11 10:37:46' 'HDS 1065',40.375,33.3125,-99.96875,'Gamma','2014-11-27 11:33:44' 'HDS 123',4.71875,-99.28125,0.0,'Gamma','2014-11-27 11:33:44' 'HDS 1353',-6.28125,60.3125,-57.90625,'Gamma','2014-11-27 11:33:44' @@ -7072,6 +7140,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 11131',32.15625,-119.0,-31.71875,'Gamma','2014-11-27 11:33:44' 'HIP 111369',-155.21875,-83.71875,5.34375,'Gamma','2014-11-27 11:33:44' 'HIP 1114',82.40625,-191.6875,75.5,'Gamma','2014-11-27 11:33:44' +'HIP 111407',8.9375,-144.15625,87.40625,'Release 1.00-EDStar','2015-01-12 12:48:32' 'HIP 11144',98.65625,-260.21875,-41.90625,'Gamma','2014-11-27 11:33:44' 'HIP 111446',-118.75,-156.90625,57.96875,'Gamma','2014-11-27 11:33:44' 'HIP 111447',18.6875,-198.65625,121.875,'Gamma','2014-11-27 11:33:44' @@ -7281,6 +7350,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 115929',50.59375,-183.375,85.5,'Gamma','2014-11-27 11:33:44' 'HIP 115937',24.21875,-148.71875,61.96875,'Gamma','2014-11-27 11:33:44' 'HIP 115951',-66.625,-105.09375,7.21875,'Gamma','2014-11-27 11:33:44' +'HIP 115966',5.84375,-166.625,59.9375,'Release 1.00-EDStar','2015-01-12 12:38:40' 'HIP 11598',123.75,-127.59375,50.875,'Gamma','2014-11-27 11:33:44' 'HIP 11600',32.03125,-150.46875,-54.6875,'Gamma','2014-11-27 11:33:44' 'HIP 116033',-26.625,-131.1875,32.96875,'Gamma','2014-11-27 11:33:44' @@ -7296,6 +7366,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 116232',103.75,-231.59375,122.71875,'Gamma','2014-11-27 11:33:44' 'HIP 116263',91.59375,-234.09375,117.78125,'Gamma','2014-11-27 11:33:44' 'HIP 116277',-116.84375,-103.59375,-18.21875,'Gamma','2014-11-27 11:33:44' +'HIP 116293',0.75,-173.65625,57.15625,'Release 1.00-EDStar','2015-01-12 12:35:51' 'HIP 116298',37.78125,-224.46875,90.28125,'Gamma','2014-11-27 11:33:44' 'HIP 116334',-88.4375,-101.59375,-6.71875,'Gamma','2014-11-27 11:33:44' 'HIP 116351',-136.34375,-69.40625,-38.8125,'Gamma','2014-11-27 11:33:44' @@ -7630,6 +7701,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 16971',25.375,-150.0625,-161.46875,'Gamma','2014-11-27 11:33:44' 'HIP 16984',155.0625,-205.125,-44.28125,'Gamma','2014-11-27 11:33:44' 'HIP 16996',-85.625,-147.28125,-321.71875,'Release 1.00-EDStar','2015-01-09 00:19:24' +'HIP 17000',-84.65625,-171.75,-353.125,'Release 1.00-EDStar','2015-01-12 23:22:53' 'HIP 17022',-58.1875,-22.5625,-115.90625,'Gamma','2014-11-27 11:33:44' 'HIP 17047',110.59375,-154.53125,-43.625,'Gamma','2014-11-27 11:33:44' 'HIP 17091',-59.625,-115.25,-243.5625,'Release 1.00-EDStar','2014-12-01 01:55:51' @@ -7662,6 +7734,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 17552',-51.59375,-126.21875,-262.125,'Release 1.00-EDStar','2014-12-01 01:44:49' 'HIP 17568',-104.34375,11.53125,-144.53125,'Gamma','2014-11-27 11:33:44' 'HIP 17621',55.0,-110.40625,-76.0625,'Gamma','2014-11-27 11:33:44' +'HIP 17664',-90.375,-164.03125,-382.4375,'Release 1.00-EDStar','2015-01-12 23:15:39' 'HIP 17692',-74.125,-143.96875,-328.78125,'Release 1.00-EDStar','2014-11-30 22:41:02' 'HIP 17704',-72.03125,-133.90625,-311.09375,'Release 1.00-EDStar','2014-12-01 00:49:25' 'HIP 17706',-93.375,0.03125,-146.125,'Gamma','2014-11-27 11:33:44' @@ -7686,6 +7759,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 17999',-64.0625,-125.5,-296.71875,'Release 1.00-EDStar','2014-12-01 01:06:24' 'HIP 18011',144.9375,-172.53125,-34.25,'Gamma','2014-11-27 11:33:44' 'HIP 18075',104.46875,-172.09375,-100.34375,'Gamma','2014-11-27 11:33:44' +'HIP 18111',-281.96875,-224.0,-809.875,'Release 1.00-EDStar','2015-01-11 23:36:02' 'HIP 18150',112.46875,-157.4375,-66.1875,'Gamma','2014-11-27 11:33:44' 'HIP 18175',-204.78125,-343.5,-881.375,'Gamma','2014-11-27 11:33:44' 'HIP 18187',78.21875,-102.53125,-35.6875,'Gamma','2014-11-27 11:33:44' @@ -7699,6 +7773,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 18387',131.09375,-120.71875,19.8125,'Gamma','2014-11-27 11:33:44' 'HIP 18402',119.34375,-139.6875,-31.34375,'Gamma','2014-11-27 11:33:44' 'HIP 18427',125.21875,-136.125,-16.03125,'Gamma','2014-11-27 11:33:44' +'HIP 18458',-305.375,-242.15625,-914.875,'Release 1.00-EDStar','2015-01-11 23:19:32' 'HIP 18466',113.1875,-136.3125,-37.03125,'Gamma','2014-11-27 11:33:44' 'HIP 18496',161.375,-197.5,-58.9375,'Gamma','2014-11-27 11:33:44' 'HIP 18497',110.40625,-135.15625,-40.34375,'Gamma','2014-11-27 11:33:44' @@ -7706,6 +7781,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 18534',135.65625,-160.34375,-41.09375,'Gamma','2014-11-27 11:33:44' 'HIP 18563',156.0,-196.25,-68.5,'Gamma','2014-11-27 11:33:44' 'HIP 18609',-15.96875,-85.65625,-173.90625,'Gamma','2014-11-27 11:33:44' +'HIP 18627',-186.75,-168.34375,-609.09375,'Release 1.00-EDStar','2015-01-12 22:41:41' 'HIP 1866',-60.46875,-139.78125,-19.09375,'Gamma','2014-11-27 11:33:44' 'HIP 18664',-94.875,-33.5625,-221.25,'Release 1.00-EDStar','2014-12-06 08:42:06' 'HIP 18702',146.6875,-190.15625,-78.46875,'Gamma','2014-11-27 11:33:44' @@ -7746,6 +7822,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 1933',-13.625,-153.0625,9.03125,'Gamma','2014-11-27 11:33:44' 'HIP 19331',112.875,-126.28125,-36.78125,'Gamma','2014-11-27 11:33:44' 'HIP 19334',145.25,-151.25,-25.40625,'Gamma','2014-11-27 11:33:44' +'HIP 19364',-268.0625,-209.9375,-909.0625,'Release 1.00-EDStar','2015-01-11 11:55:14' 'HIP 1937',137.5625,-135.71875,94.90625,'Gamma','2014-11-27 11:33:44' 'HIP 19408',-113.75,19.875,-173.1875,'Gamma','2014-11-27 11:33:44' 'HIP 19410',51.25,-96.75,-94.96875,'Gamma','2014-11-27 11:33:44' @@ -7755,6 +7832,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 19510',60.65625,-101.59375,-89.34375,'Gamma','2014-11-27 11:33:44' 'HIP 19582',109.5625,-132.6875,-61.21875,'Gamma','2014-11-27 11:33:44' 'HIP 19591',-16.9375,-41.09375,-116.21875,'Gamma','2014-11-27 11:33:44' +'HIP 19629',-60.15625,-83.4375,-286.65625,'Release 1.00-EDStar','2015-01-12 23:41:48' 'HIP 19684',99.625,-137.75,-93.0625,'Gamma','2014-11-27 11:33:44' 'HIP 19758',97.71875,-105.46875,-31.4375,'Gamma','2014-11-27 11:33:44' 'HIP 1976',0.15625,-152.46875,16.5,'Gamma','2014-11-27 11:33:44' @@ -8444,6 +8522,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 43054',149.59375,41.84375,-68.09375,'Gamma','2014-11-27 11:33:44' 'HIP 4310',-21.96875,-156.96875,-19.21875,'Gamma','2014-11-27 11:33:44' 'HIP 4312',-53.84375,-123.59375,-39.5,'Gamma','2014-11-27 11:33:44' +'HIP 43129',39.09375,100.75,-127.4375,'Release 1.00-EDStar','2015-01-17 08:12:56' 'HIP 43197',139.875,-9.0625,-3.28125,'Gamma','2014-11-27 11:33:44' 'HIP 43296',11.84375,82.28125,-100.46875,'Gamma','2014-11-27 11:33:44' 'HIP 43299',109.625,39.78125,-58.5625,'Gamma','2014-11-27 11:33:44' @@ -8474,6 +8553,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 44137',96.03125,90.6875,-106.96875,'Gamma','2014-11-27 11:33:44' 'HIP 44169',23.15625,124.53125,-141.25,'Gamma','2014-11-27 11:33:44' 'HIP 44176',27.59375,88.71875,-101.0625,'Gamma','2014-11-27 11:33:44' +'HIP 44208',48.6875,105.53125,-120.53125,'Release 1.00-EDStar','2015-01-16 20:00:00' 'HIP 44212',117.25,60.75,-73.21875,'Gamma','2014-11-27 11:33:44' 'HIP 44387',34.09375,79.40625,-88.9375,'Gamma','2014-11-27 11:33:44' 'HIP 445',133.28125,-317.75,131.96875,'Gamma','2014-11-27 11:33:44' @@ -8850,6 +8930,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HIP 59559',73.21875,107.5,23.0,'Gamma','2014-11-27 11:33:44' 'HIP 596',160.1875,-168.90625,116.9375,'Gamma','2014-11-27 11:33:44' 'HIP 59610',40.375,116.09375,3.9375,'Gamma','2014-11-27 11:33:44' +'HIP 59642',165.15625,23.125,87.6875,'Release 1.00-EDStar','2015-01-15 03:37:39' 'HIP 59655',58.5,134.5625,11.4375,'Gamma','2014-11-27 11:33:44' 'HIP 59690',62.0625,169.0625,8.375,'Gamma','2014-11-27 11:33:44' 'HIP 59735',4.5,173.65625,-23.78125,'Gamma','2014-11-27 11:33:44' @@ -10019,6 +10100,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HR 1254',5.34375,-58.4375,-97.375,'Gamma','2014-11-27 11:33:44' 'HR 1257',13.65625,-64.84375,-94.5625,'Gamma','2014-11-27 11:33:44' 'HR 1279',-5.0,-61.8125,-128.125,'Gamma','2014-11-27 11:33:44' +'HR 1286',-261.6875,-212.125,-922.875,'Release 1.00-EDStar','2015-01-11 11:01:11' 'HR 1308',16.65625,-123.71875,-225.875,'Gamma','2014-11-27 11:33:44' 'HR 1354',-7.71875,-56.71875,-146.84375,'Gamma','2014-11-27 11:33:44' 'HR 1364',166.71875,-178.375,-62.65625,'Gamma','2014-11-27 11:33:44' @@ -10463,6 +10545,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HYADES SECTOR CB-X D1-121',-108.25,-3.96875,-156.8125,'Gamma','2014-11-27 11:33:44' 'HYADES SECTOR CF-Q B5-2',108.84375,-107.09375,-150.0,'Release 1.00-EDStar','2014-12-17 21:59:02' 'HYADES SECTOR CL-X C1-23',22.40625,-9.96875,-211.8125,'Release 1.00-EDStar','2014-12-02 01:02:00' +'HYADES SECTOR CM-K B9-2',55.3125,22.0,-83.65625,'Release 1.00-EDStar','2015-01-13 21:34:40' 'HYADES SECTOR DB-X C1-20',-79.40625,-86.15625,-221.46875,'Release 1.00-EDStar','2014-12-18 03:06:29' 'HYADES SECTOR DB-X D1-66',-29.625,9.25,-167.625,'Gamma','2014-11-27 11:33:44' 'HYADES SECTOR DQ-W B2-0',75.625,5.6875,-208.59375,'Release 1.00-EDStar','2014-12-02 02:48:13' @@ -10473,6 +10556,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HYADES SECTOR EW-V B2-0',-62.28125,-84.4375,-220.09375,'Release 1.00-EDStar','2014-12-01 23:58:25' 'HYADES SECTOR FB-X D1-73',97.46875,-15.78125,-137.875,'Gamma','2014-11-27 11:33:44' 'HYADES SECTOR FB-X D1-95',95.71875,25.03125,-171.4375,'Gamma','2014-11-27 11:33:44' +'HYADES SECTOR FR-M B7-1',2.53125,-119.71875,-122.625,'Release 1.00-EDStar','2015-01-12 19:08:03' 'HYADES SECTOR FW-V C2-5',87.125,17.0625,-171.15625,'Release 1.00-EDStar','2014-12-02 00:06:24' 'HYADES SECTOR GW-W D1-83',86.03125,-67.46875,-177.9375,'Gamma','2014-11-27 11:33:44' 'HYADES SECTOR GX-R B5-2',20.125,62.625,-146.9375,'Gamma','2014-11-27 11:33:44' @@ -10508,6 +10592,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HYADES SECTOR OZ-V A3-0',-100.40625,-39.40625,-236.84375,'Release 1.00-EDStar','2014-12-06 09:07:44' 'HYADES SECTOR OZ-V A3-1',-99.5,-39.96875,-241.03125,'Release 1.00-EDStar','2014-12-06 09:07:44' 'HYADES SECTOR OZ-V A3-2',-103.5,-42.125,-235.625,'Release 1.00-EDStar','2014-12-06 09:30:02' +'HYADES SECTOR PI-T C3-13',3.40625,-116.375,-122.4375,'Release 1.00-EDStar','2015-01-12 19:11:30' 'HYADES SECTOR PJ-O B7-3',38.28125,56.4375,-114.28125,'Release 1.00-EDStar','2014-12-09 22:24:24' 'HYADES SECTOR PN-T C3-7',87.40625,-85.4375,-142.3125,'Gamma','2014-11-27 11:33:44' 'HYADES SECTOR PZ-V A3-0',-93.34375,-42.5625,-244.46875,'Release 1.00-EDStar','2014-12-06 09:07:44' @@ -10533,6 +10618,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HYADES SECTOR SF-U A4-0',-103.03125,-43.71875,-232.09375,'Release 1.00-EDStar','2014-12-06 08:42:07' 'HYADES SECTOR SF-U A4-1',-98.625,-38.21875,-231.21875,'Release 1.00-EDStar','2014-12-06 08:42:07' 'HYADES SECTOR SF-U A4-2',-98.875,-40.78125,-229.375,'Release 1.00-EDStar','2014-12-06 08:42:07' +'HYADES SECTOR SU-N B7-4',-19.15625,4.21875,-122.0625,'Release 1.00-EDStar','2015-01-13 21:20:22' 'HYADES SECTOR TF-U A4-0',-92.71875,-35.5625,-232.15625,'Release 1.00-EDStar','2014-12-06 08:42:07' 'HYADES SECTOR TF-U A4-1',-90.8125,-37.84375,-233.625,'Release 1.00-EDStar','2014-12-06 08:42:07' 'HYADES SECTOR TF-U A4-2',-89.9375,-40.34375,-233.90625,'Release 1.00-EDStar','2014-12-06 09:30:02' @@ -10542,6 +10628,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HYADES SECTOR UQ-S A5-2',-100.34375,-28.125,-220.84375,'Release 1.00-EDStar','2014-12-06 08:42:07' 'HYADES SECTOR VQ-S A5-0',-94.4375,-34.71875,-222.28125,'Release 1.00-EDStar','2014-12-06 08:42:07' 'HYADES SECTOR VQ-S A5-1',-94.15625,-33.15625,-221.9375,'Release 1.00-EDStar','2014-12-06 08:42:07' +'HYADES SECTOR WF-M B8-2',31.65625,27.15625,-103.28125,'Release 1.00-EDStar','2015-01-16 23:27:07' 'HYADES SECTOR WF-M B8-5',32.78125,17.5,-94.78125,'Release 1.00-EDStar','2014-12-06 15:45:51' 'HYADES SECTOR WJ-Y B1-3',34.8125,9.875,-225.5625,'Release 1.00-EDStar','2014-12-02 04:35:27' 'HYADES SECTOR WU-X B1-1',-93.71875,-48.03125,-236.5625,'Release 1.00-EDStar','2014-12-06 09:07:45' @@ -10554,7 +10641,6 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'HYDRAE SECTOR BQ-Y B5',50.5,72.65625,29.09375,'Release 1.00-EDStar','2014-12-20 20:50:22' 'HYDRAE SECTOR CQ-Y B4',62.8125,64.40625,26.25,'Release 1.00-EDStar','2014-12-20 20:50:10' 'HYDRAE SECTOR DW-V B2-2',84.53125,143.59375,66.9375,'Gamma','2014-11-27 11:33:44' -'HYDRAE SECTOR IM-W C1-26',53.1875,42.53125,56.28125,'Release 1.00-EDStar','2014-11-30 22:51:15' 'HYDRAE SECTOR IR-W B1-2',58.9375,45.46875,35.375,'Gamma-Inferred','2014-11-29 06:45:17' 'HYDRAE SECTOR IR-W C1-16',131.21875,78.84375,59.9375,'Gamma','2014-11-27 11:33:44' 'HYDRAE SECTOR JC-V B2-2',48.6875,60.9375,73.625,'Release 1.00-EDStar','2015-01-04 18:32:14' @@ -10622,6 +10708,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ICZ BL-X B1-4',15.03125,-112.75,0.6875,'Release 1.00-EDStar','2015-01-03 10:22:33' 'ICZ BQ-Y D111',58.28125,-92.09375,23.71875,'Release 1.00-EDStar','2014-12-22 23:13:24' 'ICZ BQ-Y D113',16.15625,-97.9375,21.21875,'Release 1.00-EDStar','2015-01-01 18:33:53' +'ICZ CB-W B2-2',45.28125,-76.78125,26.96875,'Release 1.00-EDStar','2015-01-11 10:03:14' 'ICZ CB-W B2-5',43.34375,-84.78125,25.1875,'Release 1.00-EDStar','2014-12-22 23:09:57' 'ICZ CB-W B2-6',44.8125,-82.53125,24.09375,'Release 1.00-EDStar','2015-01-03 05:37:47' 'ICZ CQ-X B1-3',89.28125,-102.1875,3.25,'Release 1.00-EDStar','2015-01-04 20:34:46' @@ -10635,6 +10722,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ICZ DL-X B1-2',58.53125,-124.25,13.46875,'Release 1.00-EDStar','2014-12-13 21:33:31' 'ICZ DL-X B1-4',74.8125,-112.71875,1.46875,'Release 1.00-EDStar','2014-12-20 05:56:45' 'ICZ DL-X B1-5',74.8125,-122.6875,2.84375,'Release 1.00-EDStar','2015-01-04 20:20:58' +'ICZ DL-Y D106',67.46875,-146.3125,-3.625,'Release 1.00-EDStar','2015-01-15 18:58:23' 'ICZ DQ-X B1-1',98.75,-97.125,10.3125,'Release 1.00-EDStar','2014-12-21 05:17:14' 'ICZ DQ-X B1-6',99.78125,-101.625,-4.5,'Release 1.00-EDStar','2014-12-21 05:14:11' 'ICZ DQ-Y C13',84.25,-116.46875,11.625,'Release 1.00-EDStar','2015-01-03 10:06:45' @@ -10650,6 +10738,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ICZ EW-V B2-4',38.84375,-96.21875,16.4375,'Release 1.00-EDStar','2014-12-20 06:13:46' '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 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' @@ -10669,7 +10758,10 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ICZ HW-W C1-17',66.0,-116.71875,17.15625,'Release 1.00-EDStar','2014-12-20 01:16:17' 'ICZ IM-V B2-0',51.75,-138.5625,17.8125,'Release 1.00-EDStar','2014-12-14 14:16:53' 'ICZ IN-S B4-3',-1.59375,-82.84375,58.3125,'Release 1.00-EDStar','2014-12-30 02:27:05' +'ICZ IR-W C1-18',16.875,-182.59375,16.9375,'Release 1.00-EDStar','2015-01-11 12:29:20' +'ICZ IR-W C1-19',15.03125,-184.0,20.375,'Release 1.00-EDStar','2015-01-11 12:34:19' 'ICZ IW-V B2-0',117.71875,-100.84375,16.59375,'Release 1.00-EDStar','2015-01-03 09:54:14' +'ICZ JC-U B3-5',65.71875,-91.28125,41.9375,'Release 1.00-EDStar','2015-01-13 18:46:47' 'ICZ JM-V B2-3',58.28125,-144.96875,17.84375,'Release 1.00-EDStar','2014-12-14 15:50:01' 'ICZ JX-T B3-6',34.96875,-112.59375,37.71875,'Release 1.00-EDStar','2015-01-04 19:52:32' 'ICZ KM-W C1-10',15.4375,-196.1875,18.0,'Release 1.00-EDStar','2015-01-09 14:37:37' @@ -10677,15 +10769,21 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ICZ LC-U B3-5',106.21875,-103.0,35.75,'Release 1.00-EDStar','2014-12-19 02:34:56' 'ICZ LX-T B3-0',56.1875,-119.0625,39.28125,'Release 1.00-EDStar','2014-12-30 23:39:56' 'ICZ LX-T B3-4',64.40625,-107.09375,35.4375,'Release 1.00-EDStar','2014-12-10 23:00:46' +'ICZ MN-T C3-29',29.5625,-83.15625,95.9375,'Release 1.00-EDStar','2015-01-12 13:03:42' +'ICZ MX-U B2-2',7.125,-192.125,28.09375,'Release 1.00-EDStar','2015-01-11 12:38:34' 'ICZ NI-S B4-6',65.375,-103.4375,60.125,'Release 1.00-EDStar','2014-12-28 13:43:43' 'ICZ NN-T B3-2',16.59375,-153.125,51.0,'Gamma-Inferred','2014-12-14 12:34:20' 'ICZ NS-T B3-6',63.875,-143.28125,37.78125,'Release 1.00-EDStar','2015-01-02 16:03:56' 'ICZ NX-U B2-1',15.40625,-190.5625,15.46875,'Release 1.00-EDStar','2015-01-09 14:32:43' 'ICZ NX-U B2-2',18.46875,-193.09375,20.9375,'Release 1.00-EDStar','2015-01-09 14:43:40' 'ICZ NX-U B2-3',21.3125,-198.03125,22.875,'Release 1.00-EDStar','2015-01-09 15:23:02' +'ICZ NX-U C2-16',65.125,-166.71875,68.25,'Release 1.00-EDStar','2015-01-11 19:15:40' 'ICZ OS-T B3-3',79.46875,-141.9375,42.3125,'Release 1.00-EDStar','2015-01-04 13:06:38' 'ICZ PN-T B3-2',64.28125,-160.375,45.40625,'Gamma-Inferred','2014-12-14 12:00:22' 'ICZ PN-T B3-3',65.5625,-145.625,37.28125,'Release 1.00-EDStar','2015-01-02 16:21:34' +'ICZ PS-U B2',25.46875,-206.03125,16.09375,'Release 1.00-EDStar','2015-01-11 11:38:20' +'ICZ TU-O B6-5',26.53125,-91.625,97.1875,'Release 1.00-EDStar','2015-01-12 13:00:02' +'ICZ WK-O B6-5',11.8125,-134.96875,95.0,'Release 1.00-EDStar','2015-01-12 12:50:51' 'ICZ ZU-X B1-5',72.3125,-82.8125,1.0,'Release 1.00-EDStar','2015-01-07 18:29:25' 'ICZ ZZ-X B1-3',101.78125,-63.28125,-3.59375,'Release 1.00-EDStar','2015-01-11 05:22:28' 'IDA DHOR',128.34375,6.46875,16.78125,'Gamma','2014-11-27 11:33:44' @@ -11067,8 +11165,11 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'JASINATLEHI',-163.09375,60.0,60.71875,'Gamma','2014-11-27 11:33:44' 'JASIRA',169.78125,-159.3125,-2.75,'Gamma','2014-11-27 11:33:44' 'JASIRI',-125.28125,48.71875,33.84375,'Gamma','2014-11-27 11:33:44' +'JASTREB SECTOR BB-O A6-3',-33.8125,-33.8125,-22.6875,'Release 1.00-EDStar','2015-01-16 20:23:56' 'JASTREB SECTOR CB-X B1-4',-49.03125,8.8125,-49.59375,'Release 1.00-EDStar','2015-01-07 19:52:34' 'JASTREB SECTOR CL-Y C21',-50.0625,8.375,-41.78125,'Release 1.00-EDStar','2015-01-07 16:02:43' +'JASTREB SECTOR GR-W C1-27',-36.8125,9.5,-10.0625,'Release 1.00-EDStar','2015-01-13 01:56:57' +'JASTREB SECTOR PT-R B4-7',-32.15625,6.15625,1.90625,'Release 1.00-EDStar','2014-11-29 12:14:49' 'JATA',-67.78125,58.3125,-28.8125,'Beta3-Inferred','2014-11-19 09:23:28' 'JATANA',-99.9375,56.3125,-142.75,'Gamma','2014-11-27 11:33:44' 'JATANTHET',57.09375,-44.875,-116.90625,'Gamma','2014-11-27 11:33:44' @@ -12647,6 +12748,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LDS 1503',-51.78125,19.90625,-31.71875,'Beta2-Inferred','2014-11-01 23:33:17' 'LDS 1503A',-43.46875,16.4375,-26.46875,'Beta2-Inferred','2014-11-01 23:26:53' 'LDS 2314',-16.5,44.5625,-31.875,'Beta3','2014-11-01 06:36:37' +'LDS 3195',-10.71875,-78.71875,-4.28125,'Release 1.00-EDStar','2015-01-14 21:17:15' 'LDS 3768',27.71875,25.09375,-56.75,'Gamma','2014-11-27 11:33:44' 'LDS 413',53.65625,32.40625,30.84375,'Beta3','2014-11-01 06:36:37' 'LDS 883',-28.71875,-35.71875,-61.4375,'Gamma','2014-11-27 11:33:44' @@ -12878,6 +12980,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LHS 1391',27.9375,-100.15625,-24.75,'Gamma','2014-11-27 11:33:44' 'LHS 1393',-39.875,-27.09375,-51.40625,'Gamma','2014-11-27 11:33:44' 'LHS 140',-34.53125,16.1875,-23.0625,'Beta2','2014-10-21 17:16:31' +'LHS 1409',9.03125,-58.25,-24.34375,'Release 1.00-EDStar','2015-01-14 23:15:26' 'LHS 142',1.21875,-57.15625,-11.34375,'Gamma','2014-11-27 11:33:44' 'LHS 1442',-2.875,-54.65625,-41.03125,'Gamma','2014-11-27 11:33:44' 'LHS 1443',-13.78125,-30.28125,-35.875,'Release 1.00-EDStar','2015-01-09 16:17:49' @@ -12902,6 +13005,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LHS 1604',5.90625,-30.5,-36.375,'Gamma','2014-11-27 11:33:44' 'LHS 1612',-40.4375,7.40625,-54.875,'Gamma','2014-11-27 11:33:44' 'LHS 1617',1.78125,-30.65625,-48.6875,'Gamma','2014-11-27 11:33:44' +'LHS 163',-12.65625,-46.0,-50.8125,'Release 1.00-EDStar','2015-01-11 13:31:21' 'LHS 1650',30.1875,-29.6875,-4.21875,'Gamma','2014-11-27 11:33:44' 'LHS 1651',31.25,-44.09375,-32.5625,'Gamma','2014-11-27 11:33:44' 'LHS 1663',-40.53125,18.25,-40.90625,'Beta3','2014-11-01 06:36:37' @@ -13016,6 +13120,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LHS 2412',55.09375,62.28125,1.875,'Beta3','2014-11-01 06:36:37' 'LHS 2429',24.71875,13.375,6.875,'Beta3','2014-11-01 06:36:37' 'LHS 2430',-2.8125,52.03125,-18.46875,'Gamma','2014-11-27 11:33:44' +'LHS 2432',-4.34375,74.40625,-25.40625,'Release 1.00-EDStar','2015-01-17 09:31:52' 'LHS 2435',58.3125,21.71875,19.53125,'Gamma-Inferred','2014-11-29 06:45:17' 'LHS 2441',36.3125,11.5,13.53125,'Gamma','2014-11-27 11:33:44' 'LHS 2447',24.96875,4.5625,10.25,'Beta3-Inferred','2014-11-10 20:26:58' @@ -13199,6 +13304,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LHS 399',-13.5625,36.15625,25.78125,'Beta2-Inferred','2014-10-21 17:16:31' 'LHS 40',38.59375,2.03125,14.625,'Release 1.00-EDStar','2014-11-30 22:56:18' 'LHS 4003',-23.0,-10.9375,-7.4375,'Gamma','2014-11-27 11:33:44' +'LHS 4012',16.25,-58.34375,24.28125,'Release 1.00-EDStar','2015-01-14 21:07:49' 'LHS 4019',-56.5625,-36.1875,-17.5625,'Gamma','2014-11-27 11:33:44' 'LHS 4031',67.5625,-134.125,66.84375,'Gamma','2014-11-27 11:33:44' 'LHS 4032',-19.0,-59.46875,6.125,'Gamma','2014-11-27 11:33:44' @@ -13224,6 +13330,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LHS 475',34.375,-24.15625,30.21875,'Gamma','2014-11-27 11:33:44' 'LHS 480',11.21875,-42.40625,72.71875,'Gamma','2014-11-27 11:33:44' '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 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' @@ -13532,6 +13639,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LP 387-31',-49.625,47.65625,47.53125,'Gamma','2014-11-27 11:33:44' 'LP 390-16',-32.3125,14.28125,24.375,'Gamma','2014-11-27 11:33:44' 'LP 391-10',-55.84375,13.03125,39.09375,'Release 1.00-EDStar','2014-11-30 04:57:47' +'LP 397-41',-51.0625,-15.03125,14.9375,'Release 1.00-EDStar','2015-01-17 02:04:15' 'LP 399-165',-61.40625,-28.4375,6.5,'Gamma','2014-11-27 11:33:44' 'LP 4-258',-46.875,32.1875,-37.21875,'Beta2-Inferred','2014-10-21 17:16:31' 'LP 403-71',-108.09375,-95.125,-36.5,'Gamma','2014-11-27 11:33:44' @@ -13782,6 +13890,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LTT 13415',36.375,86.9375,7.5,'Gamma','2014-11-27 11:33:44' 'LTT 1345',92.625,-124.1875,12.90625,'Gamma','2014-11-27 11:33:44' 'LTT 1349',17.15625,-66.96875,-29.3125,'Gamma','2014-11-27 11:33:44' +'LTT 13497',-38.03125,95.5625,-32.0,'Release 1.00-EDStar','2015-01-12 18:09:46' 'LTT 135',22.03125,-113.0,28.375,'Gamma','2014-11-27 11:33:44' 'LTT 1353',8.5625,-81.96875,-50.46875,'Gamma','2014-11-27 11:33:44' 'LTT 1373',78.625,-122.59375,-5.5,'Gamma','2014-11-27 11:33:44' @@ -13802,6 +13911,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LTT 14493',-51.0625,95.34375,24.9375,'Gamma','2014-11-27 11:33:44' 'LTT 14542',-57.21875,57.84375,-14.625,'Beta2-Inferred','2014-10-21 17:16:31' 'LTT 14761',-72.3125,60.96875,-19.28125,'Beta2-Inferred','2014-10-21 17:16:31' +'LTT 1479',21.65625,-53.90625,-23.4375,'Release 1.00-EDStar','2015-01-15 18:59:31' 'LTT 1483',31.09375,-88.53125,-44.3125,'Gamma','2014-11-27 11:33:44' 'LTT 14850',-24.0,51.3125,63.28125,'Gamma','2014-11-27 11:33:44' 'LTT 149',-26.21875,-70.96875,-5.21875,'Gamma','2014-11-27 11:33:44' @@ -14068,6 +14178,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'LTT 9397',-11.59375,-83.3125,30.9375,'Gamma','2014-11-27 11:33:44' 'LTT 9455',-15.71875,-64.9375,19.53125,'Gamma','2014-11-27 11:33:44' 'LTT 9472',44.5625,-108.9375,60.8125,'Gamma','2014-11-27 11:33:44' +'LTT 9494',31.3125,-69.59375,39.6875,'Release 1.00-EDStar','2015-01-14 01:33:50' 'LTT 95',6.78125,-89.90625,17.9375,'Gamma','2014-11-27 11:33:44' 'LTT 9542',-52.9375,-83.28125,6.84375,'Gamma','2014-11-27 11:33:44' 'LTT 9552',14.75,-105.15625,43.25,'Gamma','2014-11-27 11:33:44' @@ -14795,6 +14906,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'MELINGOI',80.9375,-47.21875,-134.59375,'Gamma','2014-11-27 11:33:44' 'MELINOE',-89.375,-38.65625,55.0625,'Gamma','2014-11-27 11:33:44' 'MELIONTIT',67.34375,-136.625,-2.84375,'Gamma','2014-11-27 11:33:44' +'MELKIN',29.28125,-30.4375,-76.125,'Release 1.00-EDStar','2015-01-16 00:17:00' 'MEMINII',-3.03125,64.78125,-51.0,'Gamma','2014-11-27 11:33:44' 'MEN SAMIT',-122.9375,63.875,-36.03125,'Gamma','2014-11-27 11:33:44' 'MEN SHEN',35.125,9.53125,67.03125,'Gamma','2014-11-27 11:33:44' @@ -15828,6 +15940,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'NLTT 12130',1.75,-63.59375,-99.65625,'Gamma','2014-11-27 11:33:44' 'NLTT 12619',0.5,-48.75,-93.90625,'Gamma','2014-11-27 11:33:44' 'NLTT 13249',-38.8125,9.3125,-60.53125,'Gamma','2014-11-27 11:33:44' +'NLTT 14597',18.25,-25.625,-82.71875,'Release 1.00-EDStar','2015-01-15 23:02:35' 'NLTT 14641',97.625,-65.1875,35.03125,'Gamma','2014-11-27 11:33:44' 'NLTT 14879',-31.71875,14.0,-67.5,'Gamma','2014-11-27 11:33:44' 'NLTT 1512',-24.1875,-113.875,-3.84375,'Gamma','2014-11-27 11:33:44' @@ -16889,13 +17002,17 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'PISAMAZIN',84.9375,-30.8125,96.375,'Gamma','2014-11-27 11:33:44' 'PISAT',172.5625,41.4375,41.71875,'Gamma','2014-11-27 11:33:44' 'PISCIUM SECTOR B4-2',-80.75,-61.84375,8.46875,'Release 1.00-EDStar','2014-12-24 03:44:30' +'PISCIUM SECTOR BM-L A8-1',-52.53125,-43.4375,-3.28125,'Release 1.00-EDStar','2015-01-12 21:02:46' +'PISCIUM SECTOR FS-J A9-3',-53.84375,-38.15625,9.0,'Release 1.00-EDStar','2015-01-12 21:05:52' 'PISCIUM SECTOR FS-J A9-6',-52.28125,-42.4375,12.25,'Release 1.00-EDStar','2015-01-07 03:19:05' +'PISCIUM SECTOR GD-I A10-1',-59.34375,-35.0,19.40625,'Release 1.00-EDStar','2015-01-12 21:08:44' 'PISCIUM SECTOR JY-H A10-0',-47.0,-45.0,19.40625,'Release 1.00-EDStar','2015-01-07 03:26:15' 'PISCIUM SECTOR NC-V B2-2',-2.09375,-71.03125,-29.84375,'Release 1.00-EDStar','2015-01-03 10:58:25' 'PISCIUM SECTOR OY-Q A5-0',-43.875,-34.09375,-29.8125,'Release 1.00-EDStar','2014-12-06 21:32:05' 'PISCIUM SECTOR PT-R B4-3',-83.25,-60.25,9.46875,'Release 1.00-EDStar','2014-12-24 03:38:10' '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 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' @@ -17106,9 +17223,12 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'PUNUS',92.875,58.4375,95.65625,'Gamma','2014-11-27 11:33:44' 'PUPPIS SECTOR BL-P A5-0',44.84375,-40.3125,-18.78125,'Release 1.00-EDStar','2015-01-10 23:12:51' 'PUPPIS SECTOR BW-N A6-0',20.53125,-25.8125,-13.34375,'Release 1.00-EDStar','2015-01-07 20:54:06' +'PUPPIS SECTOR CL-P A5-4',46.375,-42.8125,-23.6875,'Release 1.00-EDStar','2015-01-12 14:38:37' 'PUPPIS SECTOR DL-Y D106',41.5625,13.15625,-1.6875,'Release 1.00-EDStar','2014-11-30 22:54:37' 'PUPPIS SECTOR DL-Y D117',43.625,-6.59375,14.0,'Release 1.00-EDStar','2015-01-03 16:01:08' +'PUPPIS SECTOR FR-N A6-1',42.46875,-38.46875,-12.4375,'Release 1.00-EDStar','2015-01-12 14:35:32' 'PUPPIS SECTOR FW-N A6-0',55.96875,-33.96875,-14.65625,'Release 1.00-EDStar','2015-01-08 18:11:05' +'PUPPIS SECTOR FW-N A6-3',62.53125,-27.15625,-14.5625,'Release 1.00-EDStar','2015-01-11 05:39:52' 'PUPPIS SECTOR HR-W C1-25',51.5625,-19.125,3.25,'Release 1.00-EDStar','2014-12-12 09:31:56' 'PUPPIS SECTOR HW-W B1-4',60.375,4.125,-33.34375,'Release 1.00-EDStar','2015-01-03 17:57:37' 'PUPPIS SECTOR IM-V B2-1',79.34375,37.3125,-10.34375,'Release 1.00-EDStar','2014-12-20 20:50:11' @@ -17120,6 +17240,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'PUPPIS SECTOR IR-W C1-31',76.96875,-1.4375,11.9375,'Gamma-Inferred','2014-11-29 06:45:17' 'PUPPIS SECTOR JH-V B2-3',69.3125,20.5,-7.375,'Release 1.00-EDStar','2014-12-20 20:50:31' 'PUPPIS SECTOR KC-M A7-0',71.75,-25.125,4.1875,'Release 1.00-EDStar','2014-11-30 22:51:32' +'PUPPIS SECTOR KC-M A7-3',71.375,-25.6875,-3.71875,'Release 1.00-EDStar','2015-01-15 19:19:20' 'PUPPIS SECTOR LC-V B2-6',60.0625,-0.21875,-8.34375,'Release 1.00-EDStar','2014-12-20 20:50:20' 'PUPPIS SECTOR LS-T B3-4',68.84375,37.90625,0.96875,'Release 1.00-EDStar','2014-12-03 07:27:53' 'PUPPIS SECTOR MC-V B2-2',75.5,-1.15625,-6.34375,'Release 1.00-EDStar','2014-11-30 22:51:32' @@ -17137,6 +17258,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'PUPPIS SECTOR RD-T B3-4',55.25,-14.96875,-3.59375,'Release 1.00-EDStar','2014-11-30 22:51:32' 'PUPPIS SECTOR RD-T B3-7',68.3125,-9.4375,8.09375,'Release 1.00-EDStar','2014-11-30 22:51:15' 'PUPPIS SECTOR SD-T B3-2',81.15625,-20.0,2.0625,'Release 1.00-EDStar','2014-11-30 22:51:32' +'PUPPIS SECTOR SD-T B3-3',78.5,-20.96875,2.8125,'Release 1.00-EDStar','2015-01-15 19:21:31' 'PUPPIS SECTOR SD-T B3-7',89.3125,-19.59375,-4.1875,'Release 1.00-EDStar','2015-01-08 14:02:02' 'PUPPIS SECTOR TO-R B4-3',65.53125,14.8125,15.03125,'Gamma-Inferred','2014-11-29 06:45:17' 'PUPPIS SECTOR TO-R B4-4',59.15625,9.625,17.9375,'Gamma-Inferred','2014-11-29 06:45:17' @@ -17619,6 +17741,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ROSS 769',-26.34375,-38.09375,42.03125,'Gamma','2014-11-27 11:33:44' 'ROSS 773',-59.09375,-22.09375,21.3125,'Gamma','2014-11-27 11:33:44' 'ROSS 775',-18.8125,-8.90625,6.78125,'Gamma','2014-11-27 11:33:44' +'ROSS 776',-47.59375,-11.46875,11.03125,'Release 1.00-EDStar','2015-01-17 02:22:31' 'ROSS 777',-130.90625,-31.9375,24.8125,'Gamma','2014-11-27 11:33:44' 'ROSS 779',-59.46875,-46.5,30.84375,'Gamma','2014-11-27 11:33:44' 'ROSS 780',-6.125,-13.28125,4.5625,'Gamma','2014-11-27 11:33:44' @@ -17714,6 +17837,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'RUTUMUKUJU',164.4375,-97.5625,112.0,'Gamma','2014-11-27 11:33:44' 'RUWACHIS',83.96875,-22.3125,83.125,'Gamma','2014-11-27 11:33:44' 'RUWAL',53.75,-96.3125,-130.5,'Gamma','2014-11-27 11:33:44' +'RY SEXTANTIS',24.625,34.6875,-13.59375,'Release 1.00-EDStar','2015-01-15 20:47:02' 'RYIJIN',-65.1875,66.59375,-30.59375,'Gamma','2014-11-27 11:33:44' 'RYNCHI',39.375,-218.1875,-64.71875,'Gamma','2014-11-27 11:33:44' 'RYNCHINES',162.84375,65.03125,13.0,'Gamma','2014-11-27 11:33:44' @@ -17975,6 +18099,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'SCORPII SECTOR FG-Y D71',43.09375,-27.84375,161.6875,'Gamma','2014-11-27 11:33:44' 'SCORPII SECTOR GR-W C1-34',12.8125,-21.875,172.09375,'Gamma','2014-11-27 11:33:44' 'SCORPII SECTOR GW-W C1-20',69.71875,38.34375,160.59375,'Gamma','2014-11-27 11:33:44' +'SCORPII SECTOR KB-X A1-0',57.8125,-34.28125,87.5625,'Release 1.00-EDStar','2015-01-12 21:05:28' 'SCORPII SECTOR QI-T B3-3',68.25,-17.875,144.21875,'Release 1.00-EDStar','2015-01-03 03:51:26' 'SCORPII SECTOR UO-R B4-0',60.28125,-13.03125,174.90625,'Gamma','2014-11-27 11:33:44' 'SCORPII SECTOR ZE-A D140',43.34375,43.84375,130.1875,'Gamma','2014-11-27 11:33:44' @@ -18276,18 +18401,26 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'SHUDUN SECTOR AA-A D142',-1.15625,34.53125,-7.59375,'Beta3-Inferred','2014-11-01 18:08:43' 'SHUDUN SECTOR KC-V B2-5',6.15625,45.96875,36.5625,'Release 1.00-EDStar','2014-12-29 17:46:24' 'SHUI',88.1875,-237.6875,-8.0625,'Gamma','2014-11-27 11:33:44' +'SHUI WEI SECTOR AA-Z B1',71.625,-107.625,-37.34375,'Release 1.00-EDStar','2015-01-12 15:07:05' +'SHUI WEI SECTOR AQ-P B5-2',55.75,-165.09375,67.8125,'Release 1.00-EDStar','2015-01-11 19:22:29' 'SHUI WEI SECTOR BQ-Y D102',16.0,-69.5,24.03125,'Release 1.00-EDStar','2015-01-03 06:08:11' 'SHUI WEI SECTOR BQ-Y D93',54.875,-74.1875,46.84375,'Release 1.00-EDStar','2014-12-31 04:49:23' 'SHUI WEI SECTOR FH-U B3-1',50.53125,-51.25,31.5625,'Gamma-Inferred','2014-12-12 12:41:35' +'SHUI WEI SECTOR FW-W D1-122',58.96875,-64.28125,69.0625,'Release 1.00-EDStar','2015-01-12 19:06:26' 'SHUI WEI SECTOR GH-U B3-3',57.09375,-58.53125,33.53125,'Release 1.00-EDStar','2014-12-30 11:39:11' 'SHUI WEI SECTOR GH-U B3-5',57.46875,-65.0,31.59375,'Release 1.00-EDStar','2014-12-30 11:34:20' +'SHUI WEI SECTOR GM-V C2-14',63.0625,-63.0,59.25,'Release 1.00-EDStar','2015-01-12 19:03:07' +'SHUI WEI SECTOR HH-V C2-21',47.3125,-75.4375,60.5,'Release 1.00-EDStar','2015-01-13 19:48:53' 'SHUI WEI SECTOR HW-W C1-24',128.96875,-124.25,15.9375,'Release 1.00-EDStar','2014-12-16 12:39:11' 'SHUI WEI SECTOR JW-W B1-0',80.375,-164.53125,-23.0,'Release 1.00-EDStar','2014-12-08 20:57:04' +'SHUI WEI SECTOR KI-S B4-3',31.375,-75.90625,38.84375,'Release 1.00-EDStar','2015-01-14 01:41:15' +'SHUI WEI SECTOR KI-S B4-4',21.6875,-68.09375,53.3125,'Release 1.00-EDStar','2015-01-14 08:33:12' 'SHUI WEI SECTOR KN-S B4-0',55.03125,-61.0,35.09375,'Release 1.00-EDStar','2014-12-30 11:37:09' 'SHUI WEI SECTOR KN-S B4-3',74.4375,-63.1875,37.46875,'Release 1.00-EDStar','2014-12-31 04:00:19' 'SHUI WEI SECTOR KN-S B4-5',67.28125,-61.9375,37.125,'Release 1.00-EDStar','2014-12-22 09:34:06' 'SHUI WEI SECTOR LN-S B4-7',82.15625,-63.0,40.25,'Release 1.00-EDStar','2014-12-31 04:03:40' 'SHUI WEI SECTOR MI-S B4-3',62.375,-68.03125,44.15625,'Release 1.00-EDStar','2014-12-26 20:33:17' +'SHUI WEI SECTOR OO-Q B5-2',23.8125,-74.96875,55.125,'Release 1.00-EDStar','2015-01-14 08:21:26' 'SHUI WEI SECTOR QS-T B3-5',136.625,-116.625,23.84375,'Release 1.00-EDStar','2014-12-16 09:23:13' 'SHUI WEI SECTOR RO-Q B5-6',92.375,-71.78125,58.0625,'Release 1.00-EDStar','2014-12-21 14:32:16' 'SHUI WEI SECTOR SN-T B3-0',139.90625,-140.25,20.03125,'Release 1.00-EDStar','2015-01-05 21:33:04' @@ -18570,6 +18703,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'STF 1774',-34.09375,74.8125,-8.21875,'Gamma','2014-11-27 11:33:44' 'STF 2841',-78.78125,-40.78125,19.15625,'Gamma','2014-11-27 11:33:44' 'STHA 181',-38.375,-35.8125,52.34375,'Gamma','2014-11-27 11:33:44' +'STHENO',-20.71875,75.0625,-22.84375,'Release 1.00-EDStar','2015-01-15 22:16:28' 'STKM 1-1118',-10.34375,113.65625,36.28125,'Gamma','2014-11-27 11:33:44' 'STKM 1-1341',-23.09375,51.84375,81.5625,'Gamma','2014-11-27 11:33:44' 'STKM 1-1379',-81.84375,59.3125,-27.96875,'Beta2-Inferred','2014-10-21 17:16:31' @@ -18941,6 +19075,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'TASCHETER SECTOR EG-Y D106',1.53125,-54.125,-36.03125,'Release 1.00-EDStar','2014-12-08 23:04:29' 'TASCHETER SECTOR FG-X B1-1',37.75,-3.84375,-68.46875,'Release 1.00-EDStar','2014-12-19 22:52:15' 'TASCHETER SECTOR FG-X B1-6',36.71875,3.5625,-84.5,'Release 1.00-EDStar','2014-12-06 10:56:32' +'TASCHETER SECTOR GM-M A7-2',7.8125,-43.28125,-27.75,'Release 1.00-EDStar','2015-01-11 13:38:18' 'TASCHETER SECTOR GX-K A8-0',-14.21875,-32.6875,-17.96875,'Release 1.00-EDStar','2015-01-03 08:02:58' 'TASCHETER SECTOR GX-K A8-1',-12.53125,-25.78125,-15.90625,'Release 1.00-EDStar','2015-01-03 08:28:01' 'TASCHETER SECTOR GX-K A8-2',-14.78125,-31.71875,-19.34375,'Release 1.00-EDStar','2015-01-03 08:08:36' @@ -18950,7 +19085,9 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'TASCHETER SECTOR KH-V B2-5',22.78125,-15.90625,-55.15625,'Release 1.00-EDStar','2015-01-08 13:11:21' 'TASCHETER SECTOR MN-T B3-6',-11.875,-21.96875,-29.03125,'Release 1.00-EDStar','2014-12-27 00:38:26' 'TASCHETER SECTOR NY-R A4-0',-42.0625,-33.34375,-62.09375,'Release 1.00-EDStar','2015-01-02 04:06:27' +'TASCHETER SECTOR OS-U B2-1',-6.84375,-66.75,-62.28125,'Release 1.00-EDStar','2015-01-11 08:12:06' 'TASCHETER SECTOR OX-U B2-4',16.4375,-63.125,-60.0625,'Release 1.00-EDStar','2014-12-28 18:14:32' +'TASCHETER SECTOR RT-R A4-0',-23.53125,-43.9375,-63.9375,'Release 1.00-EDStar','2015-01-11 13:27:48' 'TASCHETER SECTOR RY-R A4-2',-4.40625,-28.59375,-58.90625,'Release 1.00-EDStar','2015-01-09 15:35:16' 'TASCHETER SECTOR UE-Q A5-0',-7.03125,-27.40625,-50.8125,'Release 1.00-EDStar','2015-01-09 15:40:30' 'TASCHETER SECTOR VZ-P A5-0',-23.90625,-43.0625,-52.03125,'Release 1.00-EDStar','2014-12-08 23:15:31' @@ -19420,7 +19557,11 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'TREVAKAT',-130.90625,-11.625,83.4375,'Gamma','2014-11-27 11:33:44' 'TRIANGULI SECTOR BA-A D85',79.78125,-73.96875,-115.75,'Gamma','2014-11-27 11:33:44' 'TRIANGULI SECTOR CM-L A8-2',69.34375,-33.5625,-35.875,'Release 1.00-EDStar','2014-12-13 04:56:51' +'TRIANGULI SECTOR CW-V A2-3',27.5,-43.5625,-99.5625,'Release 1.00-EDStar','2015-01-16 19:33:25' 'TRIANGULI SECTOR FM-V B2-7',25.5625,-14.21875,-74.0,'Release 1.00-EDStar','2014-11-28 05:58:26' +'TRIANGULI SECTOR GC-U A3-0',27.375,-44.0625,-94.25,'Release 1.00-EDStar','2015-01-16 19:09:43' +'TRIANGULI SECTOR OO-Q A5-0',27.25,-44.875,-73.6875,'Release 1.00-EDStar','2015-01-16 16:17:29' +'TRIANGULI SECTOR TO-R B4-2',61.625,-59.40625,-35.09375,'Release 1.00-EDStar','2015-01-12 14:45:22' 'TRIBE',190.65625,-124.34375,8.8125,'Gamma','2014-11-27 11:33:44' 'TRIBEB',111.625,-55.96875,-57.40625,'Gamma','2014-11-27 11:33:44' 'TRICA',148.375,63.78125,-63.46875,'Gamma','2014-11-27 11:33:44' @@ -19839,6 +19980,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'V1198 ORIONIS',33.34375,-45.9375,-96.9375,'Gamma','2014-11-27 11:33:44' 'V1201 ORIONIS',9.5,-4.40625,-23.875,'Release 1.00-EDStar','2015-01-07 00:16:05' 'V1285 AQUILAE',-25.28125,1.625,28.84375,'Gamma','2014-11-27 11:33:44' +'V1396 CYGNI',-49.375,-3.59375,6.1875,'Release 1.00-EDStar','2015-01-17 01:06:14' 'V1581 CYGNI',-14.9375,2.25,2.9375,'Gamma','2014-11-27 11:33:44' 'V1688 AQUILAE',-61.9375,-0.75,59.1875,'Gamma','2014-12-03 21:33:09' 'V1703 AQUILAE',-40.09375,-20.71875,43.96875,'Gamma','2014-11-27 11:33:44' @@ -19866,6 +20008,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'V417 HYDRAE',61.65625,44.0,-20.125,'Beta3','2014-11-01 06:36:37' 'V418 HYDRAE',82.125,64.34375,-13.21875,'Gamma','2014-11-27 11:33:44' 'V419 HYDRAE',62.625,30.625,2.78125,'Beta3','2014-11-01 06:36:37' +'V439 ANDROMEDAE',-34.8125,-24.09375,-14.0625,'Release 1.00-EDStar','2015-01-16 20:31:52' 'V443 LACERTAE',-108.59375,-16.78125,-8.0,'Gamma','2014-11-27 11:33:44' 'V463 CARINAE',108.6875,-27.875,6.1875,'Gamma','2014-11-27 11:33:44' 'V484 TAURI',-0.625,-18.28125,-48.4375,'Gamma','2014-11-27 11:33:44' @@ -20555,6 +20698,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'WISAS',142.09375,-65.25,-89.90625,'Gamma','2014-11-27 11:33:44' 'WISE 0146+4234',-14.0,-6.75,-13.40625,'Release 1.00-EDStar','2014-12-15 16:47:00' 'WISE 0313+7807',-20.46875,8.3125,-17.25,'Beta3-Inferred','2014-11-11 19:20:09' +'WISE 0410+1502',-0.46875,-6.125,-12.59375,'Release 1.00-EDStar','2015-01-13 21:15:54' 'WISE 0855-0714',6.53125,-2.15625,2.03125,'Gamma','2014-11-27 11:33:44' 'WISE 1405+5534',-8.03125,13.4375,-1.84375,'Beta2-Inferred','2014-10-21 17:16:31' 'WISE 1506+7027',-7.375,7.09375,-2.4375,'Beta3','2014-11-01 06:36:37' diff --git a/edscupdate.py b/edscupdate.py new file mode 100644 index 00000000..488fd7d3 --- /dev/null +++ b/edscupdate.py @@ -0,0 +1,167 @@ +#! /usr/bin/env python + +""" +Usage: + edscupdate.py "" [""] + +This tool looks for changes in the EDSC service since the most +recent "modified" date in the System table or the date supplied +on the command line. + +It then tries to do some validation but also requires user +confirmation. + +For each star that appears to be new, it copies the name into +the clipboard so you can paste it into the "SEARCH" box in the +game to verify that the name is correct. + +Additionally it shows you the distance from "current system" +to the star as a way to verify the co-ordinates. + +This helps to catch cases where people have typo'd system names, +but given the right coordinates; it also helps catch cases where +people have used the star name from in-system which sometimes +differs from the star name in the galaxy map. + +For each star you can type "y" to accept the star, "n" to skip it +or "q" to stop recording. +""" + + +import tradedb +import math +import misc.edstarquery +import re +import sys + +from tkinter import Tk + +r = Tk() +r.withdraw() + +if len(sys.argv) < 2 or len(sys.argv) > 3: + print("Usage: {} [date]".format(sys.argv[0])) + sys.exit(1) + +tdb = tradedb.TradeDB() +date = tdb.query("SELECT MAX(modified) FROM System").fetchone()[0] + +startSys = tdb.lookupPlace(sys.argv[1]) +ox, oy, oz = startSys.posX, startSys.posY, startSys.posZ + +if len(sys.argv) > 1: + date = sys.argv[2] + if not date.startswith("201"): + print("ERROR: Invalid date {}".format(date)) + sys.exit(2) + +print("start date: {}".format(date), file=sys.stderr) + +edsq = misc.edstarquery.EDStarQuery( + test=False, + confidence=2, + date=date, + ) +data = edsq.fetch() + +ignore = [ + 'ALRAI SECTOR OI-T B3-6 A', # No 'A' at the end + 'CORE SYS SECTOR HH-V B2-7', + 'CRU7CIS SECTOR EQ-Y B2', + 'CRUCIS SECTOR FM-V B2-O', + 'CRUCIS SECTOR MD-S B4-6', + 'ED TUCANAE', + 'HYADES SECTOR WF-M B8-3', + 'PISCIUM SECTOR BM-L AB-1', # should be A8-1 + 'SCORPII SECTOR KB-X A1-01', # should be SCORPII SECTOR KB-X A1-0 + '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( + edsq.status['msg'], + edsq.status['statusnum'], + )) + +date = data['date'] +systems = data['systems'] + +def paste(text): + r.clipboard_clear() + r.clipboard_append(text.lower()) + + +def dist(x, y, z): + return math.sqrt((ox-x)**2 + (oy-y)**2 + (oz-z)**2) + +def ischange(sysinfo): + name = sysinfo['name'] = sysinfo['name'].upper() + if name.startswith("argetl"): + return False + if name in ignore: + return False + x, y, z = sysinfo['coord'] + try: + place = tdb.systemByName[name] + if place.posX == x and place.posY == y and place.posZ == z: + return False + except KeyError: + place = None + sysinfo['place'] = place + return True + +systems = [ + sysinfo for sysinfo in systems if ischange(sysinfo) +] +print("{} changes".format(len(systems))) + +with open("new.systems.csv", "w") as output: + try: + for sysinfo in systems: + name = sysinfo['name'] + x, y, z = sysinfo['coord'] + place = sysinfo['place'] + if place: + print("! @{} [{},{},{}] vs @{} [{},{},{}]".format( + name, x, y, z, + place.dbname, place.posX, place.posY, place.posZ + ), file=sys.stderr) + else: + created = sysinfo['createdate'] + + # is it in the database? + cur = tdb.query(""" + SELECT name, pos_x, pos_y, pos_z + FROM System + WHERE pos_x BETWEEN ? and ? + AND pos_y BETWEEN ? and ? + AND pos_z BETWEEN ? and ? + """, [ + x - 0.5, x + 0.5, + y - 0.5, y + 0.5, + z - 0.5, z + 0.5, + ]) + for mname, mx, my, mz in cur: + print( + "! @{} [{},{},{}] matches coords for " + "@{} [{},{},{}]".format( + name, x, y, z, + mname, mx, my, mz + ), file=sys.stderr) + paste(name.lower()) + prompt = "'{}'".format(name) + prompt += " ({:.2f}ly)".format(dist(x, y, z)) + + ok = input(prompt+": y, n or q (default 'n')? ".format(name)) + if ok.lower() == 'q': + break + if ok.lower() == 'y': + print("'{}',{},{},{},'Release 1.00-EDStar','{}'".format( + name, x, y, z, created, + ), file=output) + except KeyboardInterrupt: + print("^C") diff --git a/misc/madupload.py b/misc/madupload.py index 3b4327a0..711af586 100755 --- a/misc/madupload.py +++ b/misc/madupload.py @@ -7,30 +7,16 @@ try: import requests -except ImportError: - if platform.system() == "Windows": - prompt = "C:\ThisDir\>" - else: - prompt = "$" - raise Exception("""Missing 'requests' module: - ----------------------------------------------------------------- -You don't appear to have the Python module "requests" installed. - -It can be installed with Python's package installer, e.g: - {prompt} pip install requests -or - {prompt} pip3 install requests - -For additional help, see: - Bitbucket Wiki http://kfs.org/td/wiki - Facebook Group http://kfs.org/td/group - ED Forum Thread http://kfs.org/td/thread - ----------------------------------------------------------------- -""".format( - prompt=prompt -)) +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 ############################################################################ diff --git a/plugins/__init__.py b/plugins/__init__.py index e5672e20..0257607d 100644 --- a/plugins/__init__.py +++ b/plugins/__init__.py @@ -142,17 +142,21 @@ class ImportPluginBase(PluginBase): Called by "import" as soon as argument parsing has been done. - An import plugin implements "run()" and "finish()". The - run sub-command invokes "run()" before it does any argument - parsing or validation. + An import plugin implements "run()" and "finish()". - If your plugin does all the work neccessary to achieve your - import, it should return False to indicate "job done". The - import command will then exit immediately. + On entry to the "import" function, before the database has + been loaded or the cache file generated, the plugin's + "run()" member is invoked. - If you return True, the import command will proceed with - argument checking, downloading data if a URL was provided - by the user or configured by your module. + This function can do as much or as little work as you need. + + When you are done, return True to allow "import" to continue, + e.g. for example a plugin that simply sets the cmdenv.url to + a specific download would return True. + + On the other hand, if you complete all the import work + relevant to your plugin, return None or False and the command + will early-out. "finish()" will then be called before the import command tries to import the data. This gives you an opportunity to @@ -184,9 +188,17 @@ def __init__(self, tdb, tdenv): def run(self): """ Plugin Must Implement: - Called immediately on import command startup; should return - True if import needs to continue proceesing, or False if the - plugin did everything that needs to be done. + + Called immediately on entry to the import_cmd.run() function. + This means that you have no database access via the tdb object. + + If you need to access data from the .db file, you should put + that code in the "finish()" object. + + Returns: + True if you want the "import" command to continue (e.g. + to reach the call to "finish()", + False or None to early out after your return. """ raise PluginException("Not implemented") @@ -194,11 +206,16 @@ def run(self): def finish(self): """ Plugin Must Implement: - Called prior to the last step of import, before the actual - call to cache.importDataFromFile is invoked. - Returning False will cause the import command to exit, - returning True will allow the call to importDataFromFile - to proceed as usual. + + Called after import has rebuilt the cache, loaded the DB data + into it's TradeDB instance, done any downloads and checked for + the presence of cmdenv.filename, but before it has tried to + import the .prices data. + + Returns: + True if you want the "import" command to continue and + try to import the .prices data, + False or None to early out after your return. """ raise PluginException("Not implemented") @@ -225,3 +242,4 @@ class within it. )) return pluginClass + diff --git a/plugins/maddavo_plug.py b/plugins/maddavo_plug.py index 6030882c..1ddf76a8 100644 --- a/plugins/maddavo_plug.py +++ b/plugins/maddavo_plug.py @@ -25,7 +25,7 @@ class ImportPlugin(plugins.ImportPluginBase): 'stncsv': "Also download Station.csv from the site.", 'skipdl': "Skip doing any downloads.", 'force': "Process prices even if timestamps suggest " - "there is no new data." + "there is no new data.", } diff --git a/scripts/config.sh b/scripts/config.sh index 58800d4d..c7126fdd 100644 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -17,6 +17,11 @@ CR=270742 # Set the position of the update window relative to top-right of screen UPD_ARGS="-wx=-40 -wy=40" +# After a given number of hops, discard candidates that have scored less +# than the given percentage of the best candidate. +PRUNE_HOPS=3 # after 3 hops +PRUNE_SCORE=20 # percentage + # You can only have one set of variables "live" at a time, comment out # old ships while you are not flying them, then you can just uncomment # them later on. diff --git a/scripts/tdrun b/scripts/tdrun index a61d39da..725b6414 100755 --- a/scripts/tdrun +++ b/scripts/tdrun @@ -16,12 +16,14 @@ then fi cmd="${TRADEPY} run -vv \ - --ly ${MAXLY} \ - --empty ${EMPTYLY} \ - --cap ${CAP} \ - --jumps ${JUMPS} \ - --cr ${CR} \ - --from \"${origin}\" \ + --ly=${MAXLY} \ + --empty=${EMPTYLY} \ + --cap=${CAP} \ + --jumps=${JUMPS} \ + --cr=${CR} \ + --from=\"${origin}\" \ + --prune-score=${PRUNESCORE:-5} \ + --prune-hops=${PRUNEHOPS:-4} \ $@" echo \$ $cmd eval "$cmd" diff --git a/tradecalc.py b/tradecalc.py index 85e1a2ca..c3a63c1e 100644 --- a/tradecalc.py +++ b/tradecalc.py @@ -624,13 +624,14 @@ def getBestHops(self, routes, restrictTo=None): tdb = self.tdb tdenv = self.tdenv - avoidItems = getattr(tdenv, 'avoidItems', []) - avoidPlaces = getattr(tdenv, 'avoidPlaces', []) + avoidItems = getattr(tdenv, 'avoidItems', []) or [] + avoidPlaces = getattr(tdenv, 'avoidPlaces', []) or [] assert not restrictTo or isinstance(restrictTo, set) maxJumpsPer = tdenv.maxJumpsPer maxLyPer = tdenv.maxLyPer - reqBlackMarket = getattr(tdenv, 'blackMarket', False) - credits = tdenv.credits - getattr(tdenv, 'insurance', 0) + reqBlackMarket = getattr(tdenv, 'blackMarket', False) or False + maxAge = getattr(tdenv, 'maxAge') or 0 + credits = tdenv.credits - (getattr(tdenv, 'insurance', 0) or 0) bestToDest = {} safetyMargin = 1.0 - tdenv.margin @@ -723,6 +724,7 @@ def considerStation(dstStation, dest): maxLyPer=maxLyPer, avoidPlaces=avoidPlaces, maxPadSize=tdenv.padSize, + maxLsFromStar=tdenv.maxLs, ): dstStation = dest.station if dstStation is srcStation: @@ -734,6 +736,11 @@ def considerStation(dstStation, dest): if reqBlackMarket and dstStation.blackMarket != 'Y': continue + if maxAge: + stnDataAge = dstStation.dataAge + if stnDataAge is None or stnDataAge > maxAge: + continue + if tdenv.debug >= 1: tdenv.DEBUG1("destSys {}, destStn {}, jumps {}, distLy {}", dstStation.system.dbname, diff --git a/tradedb.py b/tradedb.py index 187bc5d5..c25c0eaf 100644 --- a/tradedb.py +++ b/tradedb.py @@ -233,12 +233,13 @@ class Station(object): 'ID', 'system', 'dbname', 'lsFromStar', 'blackMarket', 'maxPadSize', 'tradingWith', 'itemCount', + 'dataAge', ) def __init__( self, ID, system, dbname, lsFromStar, blackMarket, maxPadSize, - itemCount, + itemCount, dataAge, ): self.ID, self.system, self.dbname = ID, system, dbname self.lsFromStar = lsFromStar @@ -246,6 +247,7 @@ def __init__( self.maxPadSize = maxPadSize self.itemCount = itemCount self.tradingWith = None # dict[tradingPartnerStation] -> [ available trades ] + self.dataAge = dataAge system.stations.append(self) @@ -316,7 +318,8 @@ def __repr__(self): "ID={}, system='{}', dbname='{}', " "lsFromStar={}, " "blackMarket='{}', " - "maxPadSize='{}'" + "maxPadSize='{}', " + "dataAge={}" ")".format( self.ID, re.escape(self.system.dbname), @@ -324,6 +327,7 @@ def __repr__(self): self.lsFromStar, self.blackMarket, self.maxPadSize, + self.dataAge, )) @@ -967,10 +971,11 @@ def _loadStations(self): stmt = """ SELECT station_id, system_id, name, ls_from_star, blackmarket, max_pad_size, - (SELECT COUNT(*) - FROM StationItem - WHERE station_id = Station.station_id) AS itemCount + COUNT(StationItem.station_id) AS itemCount, + JULIANDAY('now') - JULIANDAY(MAX(StationItem.modified)) FROM Station + LEFT OUTER JOIN StationItem USING (station_id) + GROUP BY 1 """ self.cur.execute(stmt) stationByID = {} @@ -979,12 +984,12 @@ def _loadStations(self): for ( ID, systemID, name, lsFromStar, blackMarket, maxPadSize, - itemCount + itemCount, dataAge ) in self.cur: station = Station( ID, systemByID[systemID], name, lsFromStar, blackMarket, maxPadSize, - itemCount + itemCount, dataAge ) if itemCount > 0: self.tradingStationCount += 1 @@ -1041,7 +1046,7 @@ def addLocalStation( lsFromStar=lsFromStar, blackMarket=blackMarket, maxPadSize=maxPadSize, - itemCount=0, + itemCount=0, dataAge=0, ) self.stationByID[ID] = station db.commit() @@ -1321,7 +1326,9 @@ def getDestinations(self, maxLyPer=None, avoidPlaces=None, trading=False, - maxPadSize=None): + maxPadSize=None, + maxLsFromStar=0, + ): """ Gets a list of the Station destinations that can be reached from this Station within the specified constraints. @@ -1410,6 +1417,8 @@ def getDestinations(self, continue if (maxPadSize and not station.checkPadSize(maxPadSize)): continue + if (maxLsFromStar and station.lsFromStar > maxLsFromStar): + continue destStations.append( Destination(node.system, station, @@ -1842,3 +1851,27 @@ def normalizedStr(text): TradeDB.trimTrans ) + + @staticmethod + def titleFixup(text): + """ + Correct case in a word assuming the presence of titles/surnames, + including 'McDonald', 'MacNair', 'McKilroy', and cases that + python's title screws up such as "Smith's". + """ + + text = text.title() + text = re.sub( + r"\b(Mc)([a-z])", + lambda match: match.group(1) + match.group(2).upper(), + text + ) + text = re.sub( + r"\b(Mac)([bcdfgjklmnpqrstvwxyz])([a-z]{4,})", + lambda m: m.group(1) + m.group(2).upper() + m.group(3), + text + ) + text = re.sub(r"'S\b", "'s", text) + + return text +