From 08260fa59115537f8e428ebd487a19ec6b27e05d Mon Sep 17 00:00:00 2001
From: Jonathan Harris <jonathan@marginal.org.uk>
Date: Tue, 15 Sep 2015 22:09:48 +0100
Subject: [PATCH] Add E:D 1.4 ships - Federal Assault Ship, Federal Gunship,
 Imperial Eagle.

---
 companion.py | 47 +++++++++++++++++++++++++----------------------
 eddn.py      |  2 +-
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/companion.py b/companion.py
index 15a4e422..8fb12d6f 100644
--- a/companion.py
+++ b/companion.py
@@ -48,28 +48,31 @@ commodity_map= {
 }
 
 ship_map = {
-    'Adder'               : 'Adder',
-    'Anaconda'            : 'Anaconda',
-    'Asp'                 : 'Asp',
-    'CobraMkIII'          : 'Cobra Mk III',
-    'DiamondBack'         : 'Diamondback Scout',
-    'DiamondBackXL'       : 'Diamondback Explorer',
-    'Eagle'               : 'Eagle',
-    'Empire_Courier'      : 'Imperial Courier',
-    'Empire_Fighter'      : 'Imperial Fighter',
-    'Empire_Trader'       : 'Imperial Clipper',
-    'Federation_Dropship' : 'Federal Dropship',
-    'Federation_Fighter'  : 'F63 Condor',
-    'FerDeLance'          : 'Fer-de-Lance',
-    'Hauler'              : 'Hauler',
-    'Orca'                : 'Orca',
-    'Python'              : 'Python',
-    'SideWinder'          : 'Sidewinder',
-    'Type6'               : 'Type-6 Transporter',
-    'Type7'               : 'Type-7 Transporter',
-    'Type9'               : 'Type-9 Heavy',
-    'Viper'               : 'Viper',
-    'Vulture'             : 'Vulture',
+    'Adder'                       : 'Adder',
+    'Anaconda'                    : 'Anaconda',
+    'Asp'                         : 'Asp',
+    'CobraMkIII'                  : 'Cobra Mk III',
+    'DiamondBack'                 : 'Diamondback Scout',
+    'DiamondBackXL'               : 'Diamondback Explorer',
+    'Eagle'                       : 'Eagle',
+    'Empire_Courier'              : 'Imperial Courier',
+    'Empire_Eagle'                : 'Imperial Eagle',
+    'Empire_Fighter'              : 'Imperial Fighter',
+    'Empire_Trader'               : 'Imperial Clipper',
+    'Federation_Dropship'         : 'Federal Dropship',
+    'Federation_Dropship_MkII'    : 'Federal Assault Ship',
+    'Federation_Gunship'          : 'Federal Gunship',
+    'Federation_Fighter'          : 'F63 Condor',
+    'FerDeLance'                  : 'Fer-de-Lance',
+    'Hauler'                      : 'Hauler',
+    'Orca'                        : 'Orca',
+    'Python'                      : 'Python',
+    'SideWinder'                  : 'Sidewinder',
+    'Type6'                       : 'Type-6 Transporter',
+    'Type7'                       : 'Type-7 Transporter',
+    'Type9'                       : 'Type-9 Heavy',
+    'Viper'                       : 'Viper',
+    'Vulture'                     : 'Vulture',
 }
 
 
diff --git a/eddn.py b/eddn.py
index f3b4832d..526ddaaa 100644
--- a/eddn.py
+++ b/eddn.py
@@ -97,6 +97,6 @@ def export(data):
                 'systemName'  : data['lastSystem']['name'].strip(),
                 'stationName' : data['lastStarport']['name'].strip(),
                 'timestamp'   : time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(querytime)),
-                'ships'       : [ship_map.get(ship['name'],ship['name']) for ship in (data['lastStarport']['ships'].get('shipyard_list') or {}).values() + data['lastStarport']['ships'].get('unavailable_list')],
+                'ships'       : [ship_map[ship['name']] for ship in (data['lastStarport']['ships'].get('shipyard_list') or {}).values() + data['lastStarport']['ships'].get('unavailable_list') if ship['name'] in ship_map],
             }
         })