Stations from bitbucket, derp defense, credits

CHANGES.txt

@@ -6,6 +6,7 @@ v6.8.2 Jan 27 2015
 . (kfsone) Issue #148 Don't blow up horribly when tkinter is missing,
 . (kfsone) Issue #149 "nav" with --via was broken,
 . (kfsone) Typo correction in the maddavo splash (thanks, Stefan),
++ Stations: Stefan Morrell, Dave Ryalls, Jason Zions
 
 v6.8.1 Jan 25 2015
 . (kfsone) Additional rules to prevent data pollution (ocr derp protection),

cache.py

@@ -159,7 +159,14 @@
     G[O0][O0]([RW]|VV)[O0I]N |
     \bSPE([O0][DO0]|[DO0][O0])ING\b |
     \bARCHIMEOES\b |
-    \bH[O0D]L[O0]ING
+    \bH[O0D]L[O0]ING |
+    \bM[O0D]HMAN[O0] |
+    \b[O0]ANA\b |
+    \bALEKSAN[O0]R[O0D]V\b |
+    \bCH[0D]MSKY\b |
+    \b[O0]IESEL\b |
+    [O0]{3} |
+    SCHMI[O0]T
 )''', flags=re.X)
 
 

data/Station.csv

@@ -688,8 +688,8 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'BAKARA','Arzachel Colony',21,'?','M'
 'BAKER','White Rose',0,'?','?'
 'BAKER','Wylie Dock',0,'?','?'
-'BALAIKDA','Chelomey Vision',0,'?','?'
 'BAKONIRTARI','Gregory Vision',0,'?','?'
+'BALAIKDA','Chelomey Vision',0,'?','?'
 'BALAJI','Bellamy Dock',0,'?','?'
 'BALATU','Haise Dock',2400,'Y','L'
 'BALATU','Parker Enterprise',2400,'Y','L'
@@ -971,8 +971,8 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'BOHMSHOHM','Putzi Opk''s Heaven',0,'?','?'
 'BOLG','Moxon''s Mojo',0,'?','?'
 'BOLONES','Culbertson Settlement',0,'?','?'
-'BOMAZI','Farrer Orbital',0,'?','?'
 'BOLOWALA','Stillman Terminal',0,'?','?'
+'BOMAZI','Farrer Orbital',0,'?','?'
 'BONDE','Aksyonov Platform',0,'?','?'
 'BONITOU','Hughes-Fulford Terminal',0,'?','?'
 'BONITOU','Lyakhov City',0,'?','?'
@@ -1348,6 +1348,9 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'CONDOVICHS','Walters Port',8803,'Y','L'
 'CONNEDA','Illy Refinery',0,'?','?'
 'CONTEGUS','Wang Dock',0,'?','?'
+'CONTIKU','Jansky Vision',199,'N','L'
+'CONTIKU','Ritchey Terminal',199,'Y','M'
+'CONTIKU','Swift Station',126,'N','M'
 'COQUI RENES','Fullerton Hub',0,'N','M'
 'COQUI RENES','Hooke Ring',0,'N','L'
 'COQUI RENES','Kirchoff Enterprise',0,'Y','M'
@@ -1687,7 +1690,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'ERAVARENTH','Celsius Terminal',2752,'Y','M'
 'ERAVARENTH','Cooper Landing',1904,'Y','M'
 'ERAVATE','Ackerman Market',275,'Y','L'
-'ERAVATE','Cleve Hub',34.5,'N','L'
+'ERAVATE','Cleve Hub',34,'N','L'
 'ERAVATE','Eravate',0,'?','?'
 'ERAVATE','Maine Hub',496,'Y','M'
 'ERAVATE','McMahon Dock',148,'N','M'
@@ -1718,7 +1721,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'ETA CORVI','Ivins Plant',0,'?','?'
 'ETA CRUCIS','Midgeley Mines',0,'?','?'
 'ETA CRUCIS','Polyakov Survey',0,'?','?'
-'ETA DRACONIS','Zahn Orbital',0,'?','?'
 'ETA INDI','Glidden Terminal',0,'?','?'
 'ETA SERPENTIS','Baker Enterprise',3205,'Y','M'
 'ETA SERPENTIS','Carver Station',3205,'Y','L'
@@ -2085,13 +2087,16 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'GUI WANDE','Aikin Horizons',0,'?','?'
 'GUI WANDE','Clement Station',0,'?','?'
 'GUI XIAN','Pritchard Orbital',0,'?','?'
+'GUINCANS','Brust Dock',1151,'N','L'
 'GULNGABA','Galindo Dock',0,'?','?'
 'GULNGABA','Rawat Port',0,'?','?'
 'GUN','Gotlieb Refinery',1579,'Y','M'
 'GUN','Sleaton Prospect',4908,'Y','M'
 'GUNGKUNI','Sevastyanov Dock',195,'Y','L'
 'GUNNOVII','Wilder Prospect',0,'?','?'
 'GUNNUS','Tucker Colony',0,'?','?'
+'GUNWINGGU','Brundage Survey',443709,'?','M'
+'GUNWINGGU','Youll Horizons',3707,'N','M'
 'GURNEY SLADE','Adkins Terminal',451,'Y','L'
 'GURNEY SLADE','Diamond Landing',155,'Y','M'
 'GWIONES','Miklouho-Maclay Colony',0,'?','?'
@@ -2246,8 +2251,8 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'HIP 11263','Hay Port',3121,'N','L'
 'HIP 11263','Wilhelm Klinkerfues Ring',3120,'N','M'
 'HIP 113477','Diophantus Port',0,'?','?'
-'HIP 113528','Herschel Dock',0,'?','?'
-'HIP 113528','Vogel Station',0,'?','?'
+'HIP 113528','Herschel Dock',321063,'N','M'
+'HIP 113528','Vogel Station',321026,'N','M'
 'HIP 113948','Baliunas Port',0,'?','?'
 'HIP 114099','Bacigalupi Mine',0,'?','?'
 'HIP 114135','Dixon Hub',3500,'N','M'
@@ -2760,7 +2765,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'JETERAIT','Saavedra Terminal',1126,'?','M'
 'JETERAIT','Stiegler Orbital',0,'?','M'
 'JETERAIT','Vinge Station',0,'?','L'
-'JIAN YU','Saunders Orbital',0,'?','?'
+'JIAN YU','Saunders Orbital',720,'Y','L'
 'JIBITOQ','Mach Dock',322,'N','M'
 'JIBITOQ','Wellman Gateway',322,'Y','L'
 'JILNYTIS','Mikoyan Ring',12000,'?','?'
@@ -2781,8 +2786,15 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'JUKU','Ings Colony',710,'?','M'
 'JULANA','Shaikh Port',0,'?','?'
 'JULANGGARRI','Willis City',0,'?','?'
-'JUMUZGO','Artsutanov Station',0,'?','?'
-'JUMUZGO','Lindstrand Gateway',0,'?','?'
+'JUMUZGO','Andoyer Station',112,'N','L'
+'JUMUZGO','Artsutanov Station',52,'?','L'
+'JUMUZGO','Lindstrand Gateway',68,'?','L'
+'JUMUZGO','Lintott Port',7156,'N','M'
+'JUMUZGO','Mcquarrie Vision',7140,'N','M'
+'JUMUZGO','Pond Ring',7134,'N','M'
+'JUMUZGO','Ulloa City',91,'N','L'
+'JUMUZGO','Vess Hub',7156,'?','L'
+'JUMUZGO','Woodroffe Dock',7133,'Y','M'
 'JUNGA','Curtiss Station',0,'?','?'
 'JUNGA','Henderson Station',0,'?','?'
 'JUNGA','Lyne Port',0,'?','?'
@@ -2945,7 +2957,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'KIKUA','Stevenson Orbital',344,'N','L'
 'KILLKE','Clifford Horizons',0,'?','?'
 'KILLKE','Tavares Outpost',0,'?','?'
-'KIN','Shaikh Mines',0,'?','?'
+'KIN','Shaikh Mines',20,'Y','M'
 'KINAGO','Caidin Hub',1723,'Y','M'
 'KINAGO','Fozard Ring',1723,'Y','L'
 'KINAGO','Silva Settlement',1723,'Y','M'
@@ -3179,8 +3191,8 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LATJIL','Potter Enterprise',0,'?','?'
 'LATORMODUR','Jung Terminal',13,'N','L'
 'LATORMODUR','Van De Hulst Enterprise',270,'N','M'
-'LATU','Conway Works',0,'?','?'
-'LATU','Midgeley Settlement',0,'?','?'
+'LATU','Conway Works',328,'N','M'
+'LATU','Midgeley Settlement',272,'N','M'
 'LATUGARA','Czerny Dock',0,'?','?'
 'LATUGARA','Love Orbital',0,'?','?'
 'LAUKAITU','Cummings Prospect',0,'Y','M'
@@ -4249,7 +4261,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'METZILI','Shaw Station',0,'?','?'
 'METZILI','Shepard Port',0,'?','?'
 'METZILI','Swanwick Port',0,'?','?'
-'MEZA VIRS','Aldrin Vision',0,'?','?'
+'MEZA VIRS','Aldrin Vision',1668,'N','L'
 'MI LINKAMPI','Williams City',0,'?','?'
 'MIAO THIXO','Plante Enterprise',328,'N','L'
 'MICTLAN','Kowal Dock',0,'?','?'
@@ -4870,6 +4882,9 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'PSI CAPRICORNI','Shaw Holdings',0,'?','?'
 'PSI OCTANTIS','Gernsback Settlement',0,'?','?'
 'PSPF-LF 2','Geston Port',0,'?','?'
+'PUIKIRI','Bolden Holdings',79813,'N','M'
+'PUIKIRI','Brouwer Prospect',80667,'N','M'
+'PUIKIRI','Nilson Orbital',2543,'N','M'
 'PUKKEITHA','Foster Hub',409,'N','M'
 'PUKKEITHA','McKie Orbital',409,'N','M'
 'PUKKEITHA','Wilhelm Von Struve Dock',409,'N','M'
@@ -5490,7 +5505,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'TAI QING','Soto Station',0,'?','?'
 'TAI SHENEF','Lyne Holdings',0,'?','?'
 'TAILTSUR','Phillips Terminal',500,'N','M'
-'TAIOCHA','Koch Stop',0,'?','?'
+'TAIOCHA','Koch Stop',462,'N','M'
 'TAIOWAL','Woodroffe Station',0,'?','?'
 'TAKAK','Filipchenko Vision',0,'?','L'
 'TALIESIN','Dunbar Platform',0,'?','?'
@@ -5503,8 +5518,8 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'TANGAROA','Sovica',296,'N','L'
 'TANGKAN','Alcala Retreat',15308,'N','M'
 'TANMARK','Cassie-L-Peia',414,'N','L'
-'TAO TZAKA','Fossum Plant',0,'?','?'
 'TANMARK','Fernao Do Po Dock',0,'?','?'
+'TAO TZAKA','Fossum Plant',0,'?','?'
 'TAOSHA','Agnesi Terminal',1425,'Y','M'
 'TAOSHA','Braun Hub',2701,'Y','L'
 'TAOSHA','Mohmand Dock',177,'N','M'
@@ -6169,7 +6184,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'YAB CAMALO','Muller Station',17889,'?','L'
 'YAB CAMALO','Von Zach Hub',386,'N','L'
 'YAB CAMALO','Weill Hub',17889,'?','M'
-'YADHARIU','Berezovoy Hub',0,'?','?'
+'YADHARIU','Berezovoy Hub',626,'Y','L'
 'YAKABUGAI','Aristotle Gateway',690,'N','M'
 'YAKABUGAI','Levi-Montalcini City',509,'N','M'
 'YAKABUGAI','Serebrov Station',365,'Y','L'