Merge pull request #227 from ayust/add_victim_coordinates

Add x,y,z coordinates to killmail victims
eve-val · Nov 4, 2015 · 013b9a1 · 013b9a1
2 parents f20886a + 5d2ce5e
commit 013b9a1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/evelink/parsing/kills.py b/evelink/parsing/kills.py
@@ -32,6 +32,9 @@ def parse_kills(api_result):
             },
             'damage': int(a['damageTaken']),
             'ship_type_id': int(a['shipTypeID']),
+            'x': float(a['x']),
+            'y': float(a['y']),
+            'z': float(a['z']),
         }
 
         result[kill_id]['attackers'] = {}

diff --git a/tests/parsing/test_kills.py b/tests/parsing/test_kills.py
@@ -52,7 +52,11 @@ def test_parse_kills(self):
                         'name': ''},
                     'id': 150080271,
                     'name': 'Pilot 333',
-                    'ship_type_id': 670}},
+                    'ship_type_id': 670,
+                    'x': 0.0,
+                    'y': 0.0,
+                    'z': 0.0,
+                }},
             15640551: {
                 'attackers': {
                     935091361: {
@@ -100,5 +104,9 @@ def test_parse_kills(self):
                         'name': ''},
                     'id': 150080271,
                     'name': 'Pilot 333',
-                    'ship_type_id': 670}}
+                    'ship_type_id': 670,
+                    'x': 1.4,
+                    'y': -20.0,
+                    'z': 3000.0,
+                }},
             })
diff --git a/tests/xml/char/kills.xml b/tests/xml/char/kills.xml
@@ -5,7 +5,7 @@
                 corporationID="1254875843" corporationName="Starbase Anchoring Corp"
                 allianceID="1254074" allianceName="EVE Gurus"
                 factionID="0" factionName="" damageTaken="446"
-                shipTypeID="670" />
+                shipTypeID="670" x="1.4" y="-20.0" z="3000" />
             <rowset name="attackers"> 
                 <row characterID="935091361" characterName="ICU123"
                     corporationID="224588600" corporationName="Inkblot Squad"
@@ -49,7 +49,7 @@
                 corporationID="1254875843" corporationName="Starbase Anchoring Corp"
                 allianceID="1254074" allianceName="EVE Gurus"
                 factionID="0" factionName="" damageTaken="446"
-                shipTypeID="670" />
+                shipTypeID="670" x="0" y="0" z="0" />
             <rowset name="attackers"> 
                 <row characterID="935091361" characterName="ICU123"
                     corporationID="224588600" corporationName="Inkblot Squad"