diff --git a/cache.py b/cache.py index 1712ac72..1de33cf0 100644 --- a/cache.py +++ b/cache.py @@ -166,7 +166,11 @@ \bCH[0D]MSKY\b | \b[O0]IESEL\b | [O0]{3} | - SCHMI[O0]T + SCHMI[O0]T | + \bSAUN[O0]ER | + [O0]IV[E3] | + VIRIDN$ | + )''', flags=re.X) diff --git a/corrections.py b/corrections.py index e9748a9d..57802f2b 100644 --- a/corrections.py +++ b/corrections.py @@ -30,18 +30,18 @@ "AMAIT/LOPEZ DE VILLALOBOS": "Lopez De Villalobos Prospect", "AMARAK/WERNER VON SIEMENS VISON": "Werner Von Siemens Vision", "ANAPOS/HERSCHEL PLATFORM": "Herschel Plant", - "ANINOHANU/BAROEEN HANGER": DELETED, + "ANINOHANU/BAROEEN HANGER": DELETED, "ANLAVE/KOBAYASHICRY": "Kobayashi City", - "ANLAVE/SURIPARK" : DELETED, + "ANLAVE/SURIPARK" : DELETED, "AO QIN/CHAPMAN HUB": DELETED, "APOYOTA/FLINTSTATION": "Flint Station", "APOYOTA/HAHNRELAY": "Hahn Relay", - "ARTEMIS/BURCKHAROT STATION": DELETED, + "ARTEMIS/BURCKHAROT STATION": DELETED, "AULIN/ALUIN ENTERPIRSE": "Aulin Enterprise", "BALDUR/DUTTON STATION": DELETED, "BD+13 693/DRUMMOND`S PROGRESS": "Drummond's Progress", "BD+65 1846/SHARGIN BEACON": DELETED, - "BD-02 4304/BRANOENSTEIN ENTERPRISE": DELETED, + "BD-02 4304/BRANOENSTEIN ENTERPRISE": DELETED, "BD-02 4304/OURRANCE STATION": DELETED, "BOLG/MOXONS MOJO": "Moxon's Mojo", "CEMIESS/TITUS STATION": "Titius Station", @@ -51,19 +51,19 @@ "DT VIRGINIS/CHUN STATION": "Chun Vision", "EGOVAE/ENOATE MARKET": "Endate Market", "EKONIR/MOREYVISION": "Morey Vision", - "ERLIK/REYNOLOS TERMINAL": DELETED, + "ERLIK/REYNOLOS TERMINAL": DELETED, "FROG/KEMPSTON HAROWICK": "KempstoN Hardwick", - "FUTHORC/ACQUIREO TASTE ORBITAL": DELETED, - "G 165-13/NAODODOUR PLATFORM": DELETED, + "FUTHORC/ACQUIREO TASTE ORBITAL": DELETED, + "G 165-13/NAODODOUR PLATFORM": DELETED, "GCRV 4654/HERZEFELD LANDING": "Herzfeld Landing", "GROOMBRIDGE 1618/FRANKUN RING": "Franklin Ring", - "HATMEHING/HEVEI.IUS TERMINAL": DELETED, - "HATMEHING/HEVEIIUS TERMINAL": DELETED, + "HATMEHING/HEVEI.IUS TERMINAL": DELETED, + "HATMEHING/HEVEIIUS TERMINAL": DELETED, "HDS 1879/HEDIN ORBITAL": DELETED, "HILLAUNGES/Argelanoer Port": DELETED, "HIP 110483/VALIGURSKY ORBITAE": "Valigursky Orbital", "HIP 4907/EDISON PLATFORM": DELETED, - "HIP 69913/KONORATYEV OUTPOST": DELETED, + "HIP 69913/KONORATYEV OUTPOST": DELETED, "HR 5451/MACDONALO HUB": "MacDonald Hub", "HR 5451/MACOONALD HUB": "MacDonald Hub", "HR 5451/MACOONALO HUB": "MacDonald Hub", @@ -72,11 +72,11 @@ "LEESTI/GEORGELUCAS": "George Lucas", "LFT 1446/BOSCH SETTLEMENT": DELETED, "LHS 1101/BONDAR CITY": DELETED, - "LHS 1453/SAAVEORA PORT": DELETED, + "LHS 1453/SAAVEORA PORT": DELETED, "LHS 220/CULPEPERCOLONY": "Culpeper Colony", "LHS 250/KOVALESKY ENTERPRISE": "Kovalevsky Enterprise", "LHS 2884/ABNETT PLATEFORM": "Abnett Platform", - "LHS 3447/WORLIOGE TERMINAL": DELETED, + "LHS 3447/WORLIOGE TERMINAL": DELETED, "LHS 380/QURESHIORBRAL": DELETED, "LHS 53/OCONNOR SETTLEMENT": "O'Connor Settlement", "LHS 64/WIBERG HANGAR": "Wiberg Hanger", # "Hanger", @@ -90,20 +90,20 @@ "LTT 16218/CHARGAFFPORT": "Chargaff Port", "LTT 7548/ALEXANDRIA RINF": "Alexandria Ring", "LTT 9455/OLEARY VISION": "O'Leary Vision", - "LUGH/BALANOIN GATEWAY": DELETED, + "LUGH/BALANOIN GATEWAY": DELETED, "MANNODAVA/ALIPORT": DELETED, "MANNONA/THORNYCROFY PENAL COLONY": "Thornycroft Penal Colony", "MCC 467/ROB HUBBARD RING": "Ron Hubbard Ring", "MINJANGO/OENNING PLATFORM": "Denning Platform", "MISISTURE/GELFANO DOCK": DELETED, "MOKOSH/LUBEN ORBITAL": "Lubin Orbital", - "NARASIMHA/MENOEL SURVEY": DELETED, + "NARASIMHA/MENOEL SURVEY": DELETED, "NLTT 49528/OCONNORLANQNG": "O'Connor Landing", "NLTT 49528/O‹CONNOR LANDING": "O'Connor Landing", "ONGKAMPAN/PATTERSON STATION: 274": "Patterson Station", "OPALA/ZAMK PLATFORM": "Zamka Platform", "ORERVE/WATSON SATION": "Watson Station", - "OSSITO/STOART MINES": DELETED, + "OSSITO/STOART MINES": DELETED, "PANGLUYA/BRADBURYWORKS": "Bradbury Works", "PERENDI/SHEPHERD INSTALLATION": DELETED, "PRIVA/DUGAN OOCK": "Dugan Dock", @@ -112,7 +112,7 @@ "RAHU/LEBEDEV BEACON": DELETED, "RHO CANCRI/HAMILTON R,SERVE": "Hamilton Reserve", "RHO CANCRI/HAMILTON R�SERVE": "Hamilton Reserve", - "SORBAGO/CARROLLSURVEY": DELETED, + "SORBAGO/CARROLLSURVEY": DELETED, "STEIN 2051/TREVITHICK PORT": DELETED, "TAHA DERG/0URRANCE LANDING": DELETED, "TANMARK/CASSI E-L-PEIA": DELETED, @@ -120,7 +120,7 @@ "TARACH TOR/TRANQUNLRY": DELETED, "TARACH TOR/TRANQUWUTY": DELETED, "TENG YEH/GARAN SURVERY": "Garan Survey", - "THUNDERBIRD/QUIMPY PORT": DELETED, + "THUNDERBIRD/QUIMPY PORT": DELETED, "TIETHAY/SANTOS PLANT1": DELETED, "TRELLA/TITTO COLONY": "Tito Colony", "TUAREG/KOPFF OOCK": "Kopff Dock", @@ -131,9 +131,10 @@ "V989 CASSIOPEIAE/LOW WORKS": DELETED, "VALDA/CLAIRAUT OOCK": "Clairaut Dock", "VEQUESS/AGNEWS FOLLY": "Agnews' Folly", - "VEROANDI/VAROEMAN GATEWAY": DELETED, + "VEROANDI/VAROEMAN GATEWAY": DELETED, "WOLF 1301/SAUNDER'S DIVE": "Saunders's Dive", "WOLF 46/FISCHER CITY": "Fischer Station", + "WW PISCIS AUSTRINI/INVINS VISION": DELETED, "YAKABUGAI/SEREBOV STATION": "Serebrov Station", "YAKABUGAI/SEREBROV": "Serebrov Station", "YANYAN/MORYN CITY": "Morin City",