Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into localsubcommand
Browse files Browse the repository at this point in the history 
Conflicts:
	data/TradeDangerous.sql
  • Loading branch information
@SamMackrill
SamMackrill committed Oct 8, 2014
2 parents 9206284 + 2bf298f commit eb6219b
Show file tree
Hide file tree
Showing 3 changed files with 135 additions and 141 deletions.
164 changes: 31 additions & 133 deletions data/Sys-that-need-work.txt
View file
Original file line number Diff line number Diff line change
@@ -1,138 +1,36 @@
---------
---List of current systems that need stations added and markets data added. I will use this list to keep track of what needs done. When sys is added,remove line.
---List of current systems supplied by Brookes that should have had markets but for some reason doesn't.
---------Shadowgar

197,'LP 45-128',-69.28125,32.25,-13.90625,'2014-10-02 14:21:15');
198,'Sofagre',-54.21875,48.53125,-30.15625,'2014-10-02 14:21:15');
199,'Miola',-64,24,-41,'2014-10-02 14:21:15');
200,'Ehlangai',-11.21875,32.53125,-23.03125,'2014-10-02 14:21:15');
201,'BD+87 118',-58.59375,40.65625,-37.75,'2014-10-02 14:21:15');
202,'LHS 1065',-51.71875,15.84375,-31.75,'2014-10-02 14:21:15');
203,'Aeolus',-43.28125,37.28125,-31.53125,'2014-10-02 14:21:15');
204,'LP 1-52',-49.9375,28.8125,-33.28125,'2014-10-02 14:21:15');
205,'LP 7-226',-42.78125,31.75,-27.25,'2014-10-02 14:21:15');
206,'Moros',-45.96875,17.375,-31.3125,'2014-10-02 14:21:15');
207,'BD+74 526',-48.65625,53.28125,-29.25,'2014-10-02 14:21:15');
208,'LHS 5072',-33.34375,15.15625,-27.53125,'2014-10-02 14:21:15');
209,'Alrai',-38.71875,12.3125,-21.625,'2014-10-02 14:21:15');
210,'Mufrid',-1.125,35.25,11.09375,'2014-10-02 14:21:15');
211,'47 Ursae Majoris',-1.4375,41.1875,-20.09375,'2014-10-02 14:21:15');
212,'LFT 1446',-38.8125,18.25,-7.9375,'2014-10-02 14:21:15');
213,'14 Herculis',-36.71875,41.6875,14.125,'2014-10-02 14:21:15');
214,'LHS 215',-20.59375,13.28125,-18.3125,'2014-10-02 14:21:15');
215,'Ackycha',-29.03125,39.8125,-25.03125,'2014-10-02 14:21:15');
216,'Arcturus',-3.53125,34.15625,12.96875,'2014-10-02 14:21:15');
217,'Ross 640',-31.6875,35.125,18.9375,'2014-10-02 14:21:15');
218,'Wunjo',-65,53.3125,-22.59375,'2014-10-02 14:21:15');
219,'Chara',-4.84375,26.65625,-4.78125,'2014-10-02 14:21:15');
220,'LTT 16016',-62.53125,12.375,-5.5,'2014-10-02 14:21:15');
221,'LP 37-75',-27.25,38.5,-33.65625,'2014-10-02 14:21:15');
222,'41 Gamma Serpentis',-12.125,26,22.875,'2014-10-02 14:21:15');
223,'LHS 2123',-56.53125,42.40625,-44.75,'2014-10-02 14:21:15');
224,'LHS 3549',-29.625,6.125,-1.9375,'2014-10-02 14:21:15');
225,'Beta Comae Berenices',-1.6875,29.65625,2.03125,'2014-10-02 14:21:15');
226,'72 Herculis',-32.875,24.6875,22.21875,'2014-10-02 14:21:15');
227,'Hyperion',-51.1875,7.5,-16.71875,'2014-10-02 14:21:15');
228,'Sigma Bootis',-14.46875,47.4375,14.40625,'2014-10-02 14:21:15');
230,'Eta Coronae Borealis',-23.78125,48.4375,21.9375,'2014-10-02 14:21:15');
232,'Lalande 30699',-64.34375,48.96875,-10.875,'2014-10-02 14:21:15');
233,'Eta Cephei',-45.125,9.375,-6.4375,'2014-10-02 14:21:15');
234,'21 Draco',-60.03125,45.65625,8.09375,'2014-10-02 14:21:15');
235,'Paul-Friedrichs Star',-48.15625,34.3125,8.78125,'2014-10-02 14:21:15');
236,'LHS 2405',-45.875,45.5625,-36.28125,'2014-10-02 14:21:15');
237,'G 230-27',-58.125,11.4375,2.6875,'2014-10-02 14:21:15');
238,'Quiness',-46.46875,37.78125,-24.9375,'2014-10-02 14:21:15');
239,'36 Ursae Majoris',-11.125,32.9375,-23,'2014-10-02 14:21:15');
240,'Perendi',-52.5625,33.09375,-11.875,'2014-10-02 14:21:15');
241,'Vaccimici',-33.21875,37.34375,12.75,'2014-10-02 14:21:15');
242,'Vetr',-59.0625,12.65625,1.46875,'2014-10-02 14:21:15');
243,'Xi Ursae Majoris',2.65625,27.09375,-9.9375,'2014-10-02 14:21:15');
244,'Connla',-29.90625,14.5625,13.65625,'2014-10-02 14:21:15');
245,'CR Draconis',-48.3125,46.15625,4.46875,'2014-10-02 14:21:15');
246,'86 Mu Herculis',-19.5,11.53125,14.875,'2014-10-02 14:21:15');
247,'Ao Qin',-62.90625,46.78125,1.53125,'2014-10-02 14:21:15');
248,'Wolf 1409',-56.125,29.8125,9.0625,'2014-10-02 14:21:15');
249,'LFT 1073',-38.9375,32.5625,-21.65625,'2014-10-02 14:21:15');
250,'LHS 140',-34.53125,16.1875,-23.0625,'2014-10-02 14:21:15');
251,'LP 25-2',-48.9375,27.25,-19.5625,'2014-10-02 14:21:15');
252,'LP 71-157',-52.34375,28.375,-8.03125,'2014-10-02 14:21:15');
253,'Eos',-51.875,16.78125,-0.375,'2014-10-02 14:21:15');
254,'Tun',-47.96875,20.96875,-17.53125,'2014-10-02 14:21:15');
255,'NLTT 46621',-43.8125,20.34375,4.8125,'2014-10-02 14:21:15');
256,'Caer Bran',-31.28125,14.3125,13.78125,'2014-10-02 14:21:15');
257,'V1090 Herculis',-44.9375,36.9375,13.46875,'2014-10-02 14:21:15');
258,'LFT 1072',-45.90625,43.71875,-23.25,'2014-10-02 14:21:15');
259,'Malina',-48.1875,23,14.40625,'2014-10-02 14:21:15');
260,'Wolf 654',-28.46875,22.40625,14.8125,'2014-10-02 14:21:15');
261,'Coelrind',3.0625,35.28125,6.96875,'2014-10-02 14:21:15');
262,'LFT 1421',-45.46875,18.5625,12.59375,'2014-10-02 14:21:15');
263,'LP 102-320',-60.625,35.125,3.21875,'2014-10-02 14:21:15');
264,'LHS 3057',-50.75,50.03125,-13.28125,'2014-10-02 14:21:15');
265,'Belobog',-13.34375,53.78125,12.5625,'2014-10-02 14:21:15');
266,'61 Ursae Majoris',0.5625,30.09375,-8.6875,'2014-10-02 14:21:15');
267,'Demeter',-55.34375,40.8125,7.5625,'2014-10-02 14:21:15');
268,'LP 5-88',-27.28125,19.59375,-23.03125,'2014-10-02 14:21:15');
269,'Ross 1003',-4.3125,33.90625,-11.96875,'2014-10-02 14:21:15');
--270,'Training',-22,36,1,'2014-10-02 14:21:15');
--271,'Destination',-22,37,4,'2014-10-02 14:21:15');
272,'Tollan',-14.78125,20,-21.96875,'2014-10-02 14:21:15');
273,'LHS 287',1.03125,29.59375,-16.5,'2014-10-02 14:21:15');
274,'Ross 905',4.46875,31.9375,-7.21875,'2014-10-02 14:21:15');
275,'LHS 283',-20.78125,29.59375,-23.53125,'2014-10-02 14:21:15');
276,'CR Draco',-49.46875,47.4375,4.375,'2014-10-02 14:21:15');
277,'LHS 293',1.84375,28.3125,-14.4375,'2014-10-02 14:21:15');
278,'37 Xi Bootis',-4.21875,19.09375,9.8125,'2014-10-02 14:21:15');
279,'Mullag',0.5,35.09375,-19.1875,'2014-10-02 14:21:15');
280,'Flousop',-1.625,16.8125,4,'2014-10-02 14:21:15');
281,'CW Ursae Majoris',2.65625,36.78125,-14.90625,'2014-10-02 14:21:15');
282,'LP 440-38',-4.65625,43.78125,20.6875,'2014-10-02 14:21:15');
283,'Miquich',-17.71875,19.125,19.59375,'2014-10-02 14:21:15');
284,'LHS 355',1.09375,46.15625,9.71875,'2014-10-02 14:21:15');
285,'Hepa',-29.4375,34.46875,21.53125,'2014-10-02 14:21:15');
286,'Ross 130',-3.90625,41,19.75,'2014-10-02 14:21:15');
287,'LP 320-359',1.25,49.71875,-6.5625,'2014-10-02 14:21:15');
288,'LHS 411',-13.125,23.59375,18.625,'2014-10-02 14:21:15');
289,'LHS 3080',-21.625,42.90625,21.375,'2014-10-02 14:21:15');
290,'LAWD 52',-52.28125,61.8125,-26.5625,'2014-10-02 14:21:15');
291,'10 Canum Venaticorum',-9.375,55.4375,-7,'2014-10-02 14:21:15');
292,'LHS 350',-1.46875,44.59375,5.75,'2014-10-02 14:21:15');
293,'Zeta Herculis',-21.34375,22.375,16.25,'2014-10-02 14:21:15');
294,'LHS 2764a',-4.71875,54.125,0.65625,'2014-10-02 14:21:15');
295,'Hera',-36.8125,55.59375,-17.96875,'2014-10-02 14:21:15');
296,'LHS 6282',-11.46875,39.78125,22.78125,'2014-10-02 14:21:15');
297,'LHS 2522',-24.8125,56.53125,-23.4375,'2014-10-02 14:21:15');
298,'G 180-18',-28.96875,40.6875,19.03125,'2014-10-02 14:21:15');
299,'Ross 860',-20.125,19.28125,19,'2014-10-02 14:21:15');
300,'LHS 391',-15.90625,45.15625,21.375,'2014-10-02 14:21:15');
301,'Wolf 497',0.125,41.46875,11.96875,'2014-10-02 14:21:15');
302,'Rahu',-43.78125,62.4375,-0.25,'2014-10-02 14:21:15');
303,'G 224-46',-55.25,60.34375,-12.71875,'2014-10-02 14:21:15');
304,'BF Canis Venatici',-8.25,62.1875,-3.0625,'2014-10-02 14:21:15');
305,'LHS 371',-9.625,49.4375,17.625,'2014-10-02 14:21:15');
306,'LHS 2936',-31.6875,55.5625,0.5,'2014-10-02 14:21:15');
307,'Parcae',-8.125,55.09375,-17,'2014-10-02 14:21:15');
308,'LP 322-836',-3.4375,51.59375,2.03125,'2014-10-02 14:21:15');
309,'Ori',-26.28125,56.09375,2.4375,'2014-10-02 14:21:15');
310,'LHS 2948',-21.6875,60.4375,15.09375,'2014-10-02 14:21:15');
311,'CE Bootis',-5.40625,29.375,16.46875,'2014-10-02 14:21:15');
312,'LHS 2651',-22.84375,60.375,-13.8125,'2014-10-02 14:21:15');

--83,'GCRV 13292',-99.84375,27.5625,-28.1875,'2014-10-02 14:21:15'); This system has no market ?
--92,'Loga',-79.78125,36.53125,-42.0625,'2014-10-02 14:21:15'); This system has no market ?
--96,'Balmus',-89,9.375,-52.0625,'2014-10-02 14:21:15'); This system has no market ?
--97,'LTT 16523',-72.65625,13.28125,-25.9375,'2014-10-02 14:21:15'); This system has no market ?
--98,'HIP 7338',-96.5,33.21875,-68.65625,'2014-10-02 14:21:15'); This system has no market ?
--112,'HR 7925',-104.53125,21.0625,-12.1875,'2014-10-02 14:21:15'); This system has no market ?
--118,'HIP 108110',-122.625,22,-37.34375,'2014-10-02 14:21:15'); This system has no market ?
--119,'Ross 210',-73.5,10.0625,-15.71875,'2014-10-02 14:21:15'); This system has no market ?
--126,'Altais',-88.625,38.09375,-13.65625,'2014-10-02 14:21:15'); This system has no market ?
--142,'Njirika',-117.46875,36.28125,-15.40625,'2014-10-02 14:21:15'); This system has no market ?
--83,'GCRV 13292',-99.84375,27.5625,-28.1875,'2014-10-02 14:21:15');
--92,'Loga',-79.78125,36.53125,-42.0625,'2014-10-02 14:21:15');
--96,'Balmus',-89,9.375,-52.0625,'2014-10-02 14:21:15');
--97,'LTT 16523',-72.65625,13.28125,-25.9375,'2014-10-02 14:21:15');
--98,'HIP 7338',-96.5,33.21875,-68.65625,'2014-10-02 14:21:15');
--112,'HR 7925',-104.53125,21.0625,-12.1875,'2014-10-02 14:21:15');
--118,'HIP 108110',-122.625,22,-37.34375,'2014-10-02 14:21:15');
--119,'Ross 210',-73.5,10.0625,-15.71875,'2014-10-02 14:21:15');
--126,'Altais',-88.625,38.09375,-13.65625,'2014-10-02 14:21:15');
--142,'Njirika',-117.46875,36.28125,-15.40625,'2014-10-02 14:21:15');
--146,'Manamaya',-43.53125,35.03125,-19.15625,'2014-10-02 14:21:15'); System is bugged, ticket sent.
--151,'Medusa',-67.96875,42.5,-14.5,'2014-10-02 14:21:15'); This system has no market ?
--154,'Merki',-81.625,50.625,-19.28125,'2014-10-02 14:21:15'); This system has no market ?
--165,'21 Eta Ursae Minoris',-74.625,56.25,-26,'2014-10-02 14:21:15'); This system has no market ?
--169,'Men Samit',-120.375,55.6875,-40.6875,'2014-10-02 14:21:15'); This system has no market ?
--170,'Jaitu',-92.59375,15.1875,-9.15625,'2014-10-02 14:21:15'); This system has no market ?
--174,'Lakluit',-83.875,21.125,-10.0625,'2014-10-02 14:21:15'); This system has no market ?
--179,'BD+65 1846',-60.3125,7.125,-25.53125,'2014-10-02 14:21:15'); This system has no market ?
--183,'HIP 93119',-113.5625,57.40625,-33.9375,'2014-10-02 14:21:15'); This system has no market ?
--151,'Medusa',-67.96875,42.5,-14.5,'2014-10-02 14:21:15');
--154,'Merki',-81.625,50.625,-19.28125,'2014-10-02 14:21:15');
--165,'21 Eta Ursae Minoris',-74.625,56.25,-26,'2014-10-02 14:21:15');
--169,'Men Samit',-120.375,55.6875,-40.6875,'2014-10-02 14:21:15');
--170,'Jaitu',-92.59375,15.1875,-9.15625,'2014-10-02 14:21:15');
--174,'Lakluit',-83.875,21.125,-10.0625,'2014-10-02 14:21:15');
--179,'BD+65 1846',-60.3125,7.125,-25.53125,'2014-10-02 14:21:15');
--183,'HIP 93119',-113.5625,57.40625,-33.9375,'2014-10-02 14:21:15');
--203,'Aeolus',-43.28125,37.28125,-31.53125,'2014-10-02 14:21:15');
--210,'Mufrid',-1.125,35.25,11.09375,'2014-10-02 14:21:15');
--214,'LHS 215',-20.59375,13.28125,-18.3125,'2014-10-02 14:21:15');
--220,'LTT 16016',-62.53125,12.375,-5.5,'2014-10-02 14:21:15');
--221,'LP 37-75',-27.25,38.5,-33.65625,'2014-10-02 14:21:15');
--230,'Eta Coronae Borealis',-23.78125,48.4375,21.9375,'2014-10-02 14:21:15');
--245,'CR Draconis',-48.3125,46.15625,4.46875,'2014-10-02 14:21:15');
--250,'LHS 140',-34.53125,16.1875,-23.0625,'2014-10-02 14:21:15');
--253,'Eos',-51.875,16.78125,-0.375,'2014-10-02 14:21:15');
--267,'Demeter',-55.34375,40.8125,7.5625,'2014-10-02 14:21:15');
--272,'Tollan',-14.78125,20,-21.96875,'2014-10-02 14:21:15');
--310,'LHS 2948',-21.6875,60.4375,15.09375,'2014-10-02 14:21:15');
102 changes: 101 additions & 1 deletion data/TradeDangerous.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ INSERT INTO "System" VALUES(319,'Polaris',-322.694559,194.561748,-212.451208,'20
INSERT INTO "System" VALUES(320,'Taran',-42.50011,45.468803,-3.000247,'2014-10-05 17:49:18');
INSERT INTO "System" VALUES(321,'Achenar',67.498165,-119.469951,24.84084,'2014-10-05 17:49:18');
--INSERT INTO "System" VALUES(322,'Sagittarius A*',-7371.313229,-21643.12915,12112.54096,'2014-10-05 17:49:18'); Bad Calc. Needs fixed.
INSERT INTO "System" VALUES(323,'Hagalaz',-51.967872,36.653411,2.52069,'2014-10-05 17:49:18');
--INSERT INTO "System" VALUES(323,'Hagalaz',-51.967872,36.653411,2.52069,'2014-10-05 17:49:18'); Bad Calc. Needs fixed.
INSERT INTO "System" VALUES(324,'Alphard',99.25266,-27.376891,-122.037074,'2014-10-05 17:49:18');
INSERT INTO "System" VALUES(325,'Enif',-536.59161,-363.040063,236.177363,'2014-10-05 17:49:18');
INSERT INTO "System" VALUES(326,'Sol',-0.000447,-0.000311,-0.000324,'2014-10-05 17:49:18');
Expand Down Expand Up @@ -564,6 +564,106 @@ INSERT INTO "Station" VALUES(182,'Bush High',191,0.0);
INSERT INTO "Station" VALUES(183,'Noblehome',192,0.0);
INSERT INTO "Station" VALUES(184,'Andreas Horizons',194,3335.0);
INSERT INTO "Station" VALUES(185,'Clement Plant',195,0.0);
INSERT INTO "Station" VALUES(186,'Hobaugh Beacon',197,0.0);
INSERT INTO "Station" VALUES(187,'Horowitz Reserve',198,0.0);
INSERT INTO "Station" VALUES(188,'Harris Hospital',199,0.0);
INSERT INTO "Station" VALUES(189,'Revin Laboratory',200,0.0);
INSERT INTO "Station" VALUES(190,'Armstrong Dock',201,0.0);
INSERT INTO "Station" VALUES(191,'Battuta Terminal',202,0.0);
INSERT INTO "Station" VALUES(192,'Budarin Outpost',204,0.0);
INSERT INTO "Station" VALUES(193,'Christopher Colony',205,0.0);
INSERT INTO "Station" VALUES(194,'Ziemkiewicz Legacy',206,0.0);
INSERT INTO "Station" VALUES(195,'Fife Ring',207,0.0);
INSERT INTO "Station" VALUES(196,'Dutton Beacon',208,0.0);
INSERT INTO "Station" VALUES(197,'Resnik Dock',209,0.0);
INSERT INTO "Station" VALUES(198,'Rasmussen Relay',211,0.0);
INSERT INTO "Station" VALUES(199,'Ray Colony',212,0.0);
INSERT INTO "Station" VALUES(200,'Ejeta Station',213,0.0);
INSERT INTO "Station" VALUES(201,'Hurston Base',215,0.0);
INSERT INTO "Station" VALUES(202,'Fort Harrison',216,0.0);
INSERT INTO "Station" VALUES(203,'Onnes Gateway',217,0.0);
INSERT INTO "Station" VALUES(204,'Burkin Depot',218,0.0);
INSERT INTO "Station" VALUES(205,'Schade Dock',219,0.0);
INSERT INTO "Station" VALUES(206,'Speke Dock',222,0.0);
INSERT INTO "Station" VALUES(207,'Pangborn Point',223,0.0);
INSERT INTO "Station" VALUES(208,'Conrad Colony',224,0.0);
INSERT INTO "Station" VALUES(209,'Landsteiner Plant',225,0.0);
INSERT INTO "Station" VALUES(210,'Jernigan Landing',226,0.0);
INSERT INTO "Station" VALUES(211,'Joliot-Curie Port',227,0.0);
INSERT INTO "Station" VALUES(212,'Dupuy De Lome Holdings',228,0.0);
INSERT INTO "Station" VALUES(213,'Peral Installation',232,0.0);
INSERT INTO "Station" VALUES(214,'Isherwood Ring',233,0.0);
INSERT INTO "Station" VALUES(215,'Williams Point',234,0.0);
INSERT INTO "Station" VALUES(216,'Paul-Friedrichs Expedition Base Camp',235,0.0);
INSERT INTO "Station" VALUES(217,'Fraas Dock',236,0.0);
INSERT INTO "Station" VALUES(218,'Trinh Dock',237,0.0);
INSERT INTO "Station" VALUES(219,'Lockyer Rest',238,0.0);
INSERT INTO "Station" VALUES(220,'Richards Station',239,0.0);
INSERT INTO "Station" VALUES(221,'Guidoni Landing',240,0.0);
INSERT INTO "Station" VALUES(222,'Gannt Enterprise',241,0.0);
INSERT INTO "Station" VALUES(223,'Solovyov Colony',242,0.0);
INSERT INTO "Station" VALUES(224,'Comino Dock',243,0.0);
INSERT INTO "Station" VALUES(225,'Nelson Point',244,0.0);
INSERT INTO "Station" VALUES(226,'Mcmonagle Hub',246,0.0);
INSERT INTO "Station" VALUES(227,'Volterra Refinery',247,0.0);
INSERT INTO "Station" VALUES(228,'Al-Khalili Refinery',248,0.0);
INSERT INTO "Station" VALUES(229,'Roberts Camp',249,0.0);
INSERT INTO "Station" VALUES(230,'Fourneyron Station',251,0.0);
INSERT INTO "Station" VALUES(231,'Linenger Hub',252,0.0);
INSERT INTO "Station" VALUES(232,'Tun Wart',254,0.0);
INSERT INTO "Station" VALUES(233,'Bradley Inheritance',255,0.0);
INSERT INTO "Station" VALUES(234,'Browns Port',256,0.0);
INSERT INTO "Station" VALUES(235,'Low Landing',257,0.0);
INSERT INTO "Station" VALUES(236,'Nansen Inheritance',258,0.0);
INSERT INTO "Station" VALUES(237,'Humboldt Prospect',259,0.0);
INSERT INTO "Station" VALUES(238,'Diesel Survey',260,0.0);
INSERT INTO "Station" VALUES(239,'Daimler Settlement',261,0.0);
INSERT INTO "Station" VALUES(240,'Volkov Plant',262,0.0);
INSERT INTO "Station" VALUES(241,'Springer Port',263,0.0);
INSERT INTO "Station" VALUES(242,'Al-Khayyam Colony',264,0.0);
INSERT INTO "Station" VALUES(243,'Clifford Point',265,0.0);
INSERT INTO "Station" VALUES(244,'Murray Claim',266,0.0);
INSERT INTO "Station" VALUES(245,'Gurragchaa Station',268,0.0);
INSERT INTO "Station" VALUES(246,'Vaugh Dock',269,0.0);
INSERT INTO "Station" VALUES(247,'Cox Ring',273,0.0);
INSERT INTO "Station" VALUES(248,'Mitchell Refinery',274,0.0);
INSERT INTO "Station" VALUES(249,'Renenbellot Oasis',275,0.0);
INSERT INTO "Station" VALUES(250,'Bruce Terminal',276,0.0);
INSERT INTO "Station" VALUES(251,'Onufriyenko Retreat',277,0.0);
INSERT INTO "Station" VALUES(252,'Leeuwenhoek Works',278,0.0);
INSERT INTO "Station" VALUES(253,'Gardner Gateway',279,0.0);
INSERT INTO "Station" VALUES(254,'Mcculley Refinery',280,0.0);
INSERT INTO "Station" VALUES(255,'Pike Vision',281,0.0);
INSERT INTO "Station" VALUES(256,'Reynolds Colony',282,0.0);
INSERT INTO "Station" VALUES(257,'Onufrienko Hanger',283,0.0);
INSERT INTO "Station" VALUES(258,'Glashow Settlement',284,0.0);
INSERT INTO "Station" VALUES(259,'Ryman Dock',285,0.0);
INSERT INTO "Station" VALUES(260,'Coleman Settlement',286,0.0);
INSERT INTO "Station" VALUES(261,'Springer City',287,0.0);
INSERT INTO "Station" VALUES(262,'Schottky Port',288,0.0);
INSERT INTO "Station" VALUES(263,'Malyshev Depot',289,0.0);
INSERT INTO "Station" VALUES(264,'Bryant''s Colony',290,0.0); -- Had to add an apostrophe since there is already another station with the same name.
INSERT INTO "Station" VALUES(265,'Trevithick Hub',291,0.0);
INSERT INTO "Station" VALUES(266,'Wiley Port',292,0.0);
INSERT INTO "Station" VALUES(267,'Jemison Plant',293,0.0);
INSERT INTO "Station" VALUES(268,'Maclean Station',294,0.0);
INSERT INTO "Station" VALUES(269,'Moore Station',295,0.0);
INSERT INTO "Station" VALUES(270,'Stephens Terminal',296,0.0);
INSERT INTO "Station" VALUES(271,'Weyl Estate',297,0.0);
INSERT INTO "Station" VALUES(272,'Murrays Port',298,0.0);
INSERT INTO "Station" VALUES(273,'Lockhart Enterprise',299,0.0);
INSERT INTO "Station" VALUES(274,'Scheickart Depot',300,0.0);
INSERT INTO "Station" VALUES(275,'Kadenyuk Camp',301,0.0);
INSERT INTO "Station" VALUES(276,'Weierstrass Refinery',302,0.0);
INSERT INTO "Station" VALUES(277,'Chomsky Orbital',303,0.0);
INSERT INTO "Station" VALUES(278,'Lefschetz Installation',304,0.0);
INSERT INTO "Station" VALUES(279,'Pudwill Gorie Port',305,0.0);
INSERT INTO "Station" VALUES(280,'Mcmullen Installation',306,0.0);
INSERT INTO "Station" VALUES(281,'Windt Plant',307,0.0);
INSERT INTO "Station" VALUES(282,'Piccard Point',308,0.0);
INSERT INTO "Station" VALUES(283,'Griffith Terminal',309,0.0);
INSERT INTO "Station" VALUES(284,'Moseley Park',311,0.0);
INSERT INTO "Station" VALUES(285,'Kippax Depot',312,0.0);
INSERT INTO "Station" VALUES(186,'Bruce Terminal',245,0.0);


Expand Down
10 changes: 3 additions & 7 deletions tradedb.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -831,13 +831,9 @@ def listSearch(listType, lookup, values, key=lambda item: item, val=lambda item:
return val(entry)
if matchVal and matchVal != val(entry):
# Check if one match matches a whole word and prefer that.
wordStr = r'\b{}\b'.format(lookup)
wordRe = re.compile(wordStr, re.IGNORECASE)
prevWholeWord = wordRe.match(matchKey)
newWholeWord = wordRe.match(entryKey)
print("%s %s %s / %s" % (wordStr, wordRe, prevWholeWord, newWholeWord))
if prevWholeWord:
if not newWholeWord:
wordRe = re.compile(r'\b{}\b'.format(lookup), re.IGNORECASE)
if wordRe.match(matchKey):
if not wordRe.match(entryKey):
continue
raise AmbiguityError(listType, lookup, matchKey, entryKey)
matchKey, matchVal = entryKey, val(entry)
Expand Down

0 comments on commit eb6219b

Please sign in to comment.