Remove a mutable default and correct mapping usage to allow tuple map…

…pings
dstl · May 5, 2020 · b52a273 · b52a273
1 parent 5478aaa
commit b52a273
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/stonesoup/feeder/geo.py b/stonesoup/feeder/geo.py
@@ -91,8 +91,8 @@ class LongLatToUTMConverter(Feeder):
     """
 
     mapping = Property(
-        [float, float], default=[0, 1],
-        doc="Indexes of long, lat. Default [0, 1]")
+        (float, float), default=(0, 1),
+        doc="Indexes of long, lat. Default (0, 1)")
     zone_number = Property(
         int, default=None,
         doc="UTM zone number to carry out conversion. Default `None`, where it"
@@ -109,7 +109,7 @@ def detections_gen(self):
             utm_detections = set()
             for detection in detections:
                 easting, northing, zone_num, northern = utm.from_latlon(
-                    *detection.state_vector[self.mapping[::-1]],
+                    *detection.state_vector[self.mapping[::-1], :],
                     self.zone_number)
                 if self.zone_number is None:
                     self.zone_number = zone_num

diff --git a/stonesoup/models/measurement/nonlinear.py b/stonesoup/models/measurement/nonlinear.py
@@ -257,7 +257,7 @@ def inverse_function(self, detection, **kwargs):
         xyz = inv_rotation_matrix @ xyz
 
         res = np.zeros((self.ndim_state, 1)).view(StateVector)
-        res[self.mapping] = xyz + self.translation_offset
+        res[self.mapping, :] = xyz + self.translation_offset
 
         return res
 
@@ -355,7 +355,7 @@ def inverse_function(self, detection, **kwargs):
         xy = xyz[0:2]
 
         res = np.zeros((self.ndim_state, 1)).view(StateVector)
-        res[self.mapping] = xy + self.translation_offset
+        res[self.mapping, :] = xy + self.translation_offset
 
         return res
 
@@ -503,7 +503,7 @@ def function(self, state, noise=False, **kwargs):
                 noise = 0
 
         # Account for origin offset
-        xyz = state.state_vector[self.mapping] - self.translation_offset
+        xyz = state.state_vector[self.mapping, :] - self.translation_offset
 
         # Rotate coordinates
         xyz_rot = self._rotation_matrix @ xyz