From 526045065db1fa77cc221af5f78ef8a9de0e14ce Mon Sep 17 00:00:00 2001 From: Jared Buntain Date: Sun, 11 Jan 2015 12:06:52 -0600 Subject: [PATCH 1/3] Stations prior to a Maddavo import --- data/Station.csv | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/Station.csv b/data/Station.csv index 16fa7d63..50da1fe9 100644 --- a/data/Station.csv +++ b/data/Station.csv @@ -1124,6 +1124,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'GEAWETE','Fontana Enterprise',0,'?','M' 'GEAWETE','Sevastyanov Dock',0,'?','M' 'GENDALLA','Normand Platform',0,'?','?' +'GENDENWITHA','Filipchenko Gateway',1346,'N','L' 'GENDINI','Houtman Gateway',0,'?','?' 'GEORGE PANTAZIS','Banks Refinery',0,'?','?' 'GEORGE PANTAZIS','Melvin Hanger',0,'?','?' @@ -1276,6 +1277,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HILL PA HSI','Reilly Terminal',33,'?','L' 'HILL PA HSI','Teng-Hui Gateway',53,'N','M' 'HILL PA HSI','Wisoff Terminal',106,'N','M' +'HIMANES','Ochoa Port',444,'N','L' 'HIP 10175','Lucretius Gateway',0,'?','L' 'HIP 10175','Stefanyshyn-Piper Station',0,'?','L' 'HIP 103620','Anderson Terminal',0,'?','L' @@ -2786,6 +2788,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'PWYLL','Northrop Refinery',9051,'Y','L' 'QA''WAKANA','Tall Dock',0,'?','?' 'QARATO','Drexler Dock',20,'Y','M' +'QUAPA','Grabe Dock',808,'Y','L' 'QUATOR','Quator Station',141,'Y','L' 'QUECHE','Rutherford Works',0,'?','?' 'QUECHUA','Crown Ring',120,'N','L' From 8cf6397211b35cb4e0ea7e129d08856d481869ba Mon Sep 17 00:00:00 2001 From: Jared Buntain Date: Sun, 11 Jan 2015 12:21:38 -0600 Subject: [PATCH 2/3] weee have I messed something up or what --- data/Station.csv | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/data/Station.csv b/data/Station.csv index 6ed20a8f..689ba37b 100644 --- a/data/Station.csv +++ b/data/Station.csv @@ -253,12 +253,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ANDULIGA','Celsius Estate',0,'?','?' 'ANEK WANG','Henize Hub',0,'?','?' 'ANEMOI','Abasheli Point',0,'?','?' -<<<<<<< HEAD -======= 'ANGI','Georg Bothe Beacon',0,'?','M' 'ANGI','Khan Port',96.4,'N','M' 'ANINOHINI','Griffith Orbital',0,'Y','L' ->>>>>>> 20c0505f0af40cc8ff50f1eb6a22573f486f2c0d 'ANLAVE','Bain Dock',3279,'N','M' 'ANLAVE','Brunton Gateway',73,'N','M' 'ANLAVE','Hogg City',1075,'N','L' @@ -483,9 +480,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'BD+55 1519','Arber Colony',0,'Y','M' 'BD+55 1519','Eskridge Orbital',0,'?','?' 'BD+55 1519','Schirra Port',856,'Y','M' -<<<<<<< HEAD 'BD+65 1846','Shargin Beacon',0,'?','?' -======= 'BD+57 2595','Conklin Station',0,'N','L' 'BD+57 2595','Smith Enterprise',0,'N','L' 'BD+63 1764','Alpers Ring',0,'Y','L' @@ -500,7 +495,6 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'BD+65 1846','Thiele Hub',27,'N','L' 'BD+65 210','Belyayev Gateway',321,'N','L' 'BD+65 210','Stefanyshyn-Piper Port',190,'Y','L' ->>>>>>> 20c0505f0af40cc8ff50f1eb6a22573f486f2c0d 'BD+65 626','Chalker Dock',8555,'Y','M' 'BD+71 1033','Fourneyron Port',0,'?','?' 'BD+74 526','Smith Prospect',0,'?','?' @@ -1373,9 +1367,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HIP 41181','Garcia Port',0,'?','L' 'HIP 41955','Lukyanenko Platform',23,'Y','M' 'HIP 41955','Nixon Landing',23,'N','M' -<<<<<<< HEAD 'HIP 4907','Edison Platform',0,'?','?' -======= 'HIP 43670','Aldiss Ring',32694,'?','L' 'HIP 43670','Emshwiller Station',32735,'?','M' 'HIP 43670','Holden Dock',32789,'?','M' @@ -1389,7 +1381,6 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HIP 44387','Priestley Orbital',1235,'?','L' 'HIP 44387','Thagard Port',2310,'?','M' 'HIP 4907','Macgregor City',2370,'N','L' ->>>>>>> 20c0505f0af40cc8ff50f1eb6a22573f486f2c0d 'HIP 59533','Burnham Beacon',0,'?','L' 'HIP 60679','Cady Enterprise',2455,'Y','L' 'HIP 62536','Onnes Orbital',0,'?','?' @@ -3647,13 +3638,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'YAX BALAM','Ivanchenkov Plant',0,'?','?' 'YAX BALAM','Kendrick Holdings',0,'?','?' 'YE''KUAPEMAS','Hawke''s Progress',0,'?','?' -<<<<<<< HEAD -'YEMAIA','Hartog Relay',0,'?','?' -'YEMBO','Naddoddur Terminal',0,'?','?' -======= 'YEMAIA','Hartog Relay',0,'N','M' 'YEMBO','Naddoddur Terminal',1009,'N','?' ->>>>>>> 20c0505f0af40cc8ff50f1eb6a22573f486f2c0d 'YEN DI','Brown Dock',0,'?','?' 'YEN K''UIE','Siddha Gateway',1099,'?','L' 'YGGDRAJANG','Schade Platform',0,'?','?' From de31e2ead17822dcf4e131287ce572240cfcabea Mon Sep 17 00:00:00 2001 From: Jared Buntain Date: Sun, 11 Jan 2015 22:27:40 -0600 Subject: [PATCH 3/3] Station merge --- data/Station.csv | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/data/Station.csv b/data/Station.csv index 96cacb51..283b1e35 100644 --- a/data/Station.csv +++ b/data/Station.csv @@ -877,7 +877,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'CORATHA','Gohar Gateway',0,'?','?' 'CORATHA','Korzun Ring',0,'?','?' 'CORDENET','Brom Hub',0,'?','M' -'CORDENET','Chernykh Station',0,'?','L' +'CORDENET','Chernykh Station',367,'N','L' 'CORDENET','Karachkina Vision',0,'?','M' 'CORICCHA','Beckman Station',521,'Y','L' 'CORICCHA','Cunningham',0,'?','?' @@ -1087,8 +1087,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ERAVATE','McMahon Dock',148,'N','M' 'ERAVATE','Russell Ring',99,'N','L' 'ERAVATE','Sylvester City',495,'N','M' -'ERIVIA','Cottenot Hub',0,'?','L' -'ERIVIA','Stevenson City',0,'?','M' +'ERIVIA','Cottenot Hub',299680,'?','L' +'ERIVIA','Stevenson City',299690,'?','M' 'ERLIK','Reynolds Terminal',0,'?','M' 'ESHU','Shajn Terminal',1742,'N','L' 'ESUMINDII','Nourse City',1800,'N','L' @@ -1652,7 +1652,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'INDRAMASCI','Shepard Settlement',184119,'N','M' 'INOVAE','Clark Settlement',63,'N','M' 'INOVAE','Ryman Station',705,'N','L' -'INUPIATES','Ashman Station',0,'?','L' +'INUPIATES','Ashman Station',31,'N','L' 'INUPIATES','Rankin Terminal',0,'?','M' 'INUPIATES','Wolszczan Terminal',0,'?','M' 'IOTA HOROLOGII','Dirac Refinery',490,'N','M' @@ -2925,7 +2925,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ONGKAMPAN','Ross Station',475,'?','?' 'ONGKAMPAN','Thompson Station',155,'?','?' 'ONGKAMPAN','Vercors Orbital',111,'?','?' -'ONGKUMA','Pickering Ring',444,'?','L' +'ONGKUMA','Pickering Ring',444,'N','L' 'ONURIS','Nielsen Horizons',0,'?','M' 'ONURIS','Stokes Dock',532,'Y','L' 'OPALA','Onizuka''s Hold',70,'N','L' @@ -3949,3 +3949,6 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ZVAITHHOGG','Karachkina Orbital',22.1,'?','M' 'ZVAITHHOGG','Laming Vision',11.6,'?','L' 'ZVAIZGAN','Ellis Hub',59,'Y','M' +'Gongalungul','Andoyer Station',61,'N','L' +'Gongalungul','Van Der Riet Woolley Ring',0,'?','M' +'Gongalungul','Edmondson Port',0,'?','M' \ No newline at end of file