check propulsion_type for current_range_meters

Author: ThorstenFroehlinghaus

app/converters/gbfs_nextbike_set_range_properties.py

@@ -6,26 +6,47 @@
 class GbfsNextbikeSetRangePropertiesConverter(BaseConverter):
     hostnames = ['gbfs.nextbike.net']
 
+    vehicle_types_cache_per_system: dict[str, list[dict]] = {}
+
+    @staticmethod
+    def _get_system_id_from_path(path: str) -> str:
+        return path.split('/')[-3:-2][0]
+
     def convert(self, data: Union[dict, list], path: str) -> Union[dict, list]:
         if not isinstance(data, dict):
             return data
 
         if path.endswith('/vehicle_types.json'):
-            for vehicle_type in data['data'].get('vehicle_types', []):
+            vehicle_types = data.get('data', {}).get('vehicle_types', [])
+            if not isinstance(vehicle_types, list):
+                return data
+            for vehicle_type in vehicle_types:
                 if 'propulsion_type' not in vehicle_type or vehicle_type['propulsion_type'] == 'human':
                     continue
                 if 'max_range_meters' not in vehicle_type or vehicle_type['max_range_meters'] == 0:
                     vehicle_type['max_range_meters'] = 60000
+            system_id = self._get_system_id_from_path(path)
+            self.vehicle_types_cache_per_system[system_id] = vehicle_types
             return data
 
         if path.endswith('/free_bike_status.json'):
-            for bike in data['data'].get('bikes', []):
-                if 'vehicle_type_id' not in bike:
+            system_id = self._get_system_id_from_path(path)
+            vehicles_types = self.vehicle_types_cache_per_system.get(system_id, [])
+            if not vehicles_types:
+                return data
+            vehicles = data.get('data', {}).get('bikes', [])
+            if not isinstance(vehicles, list):
+                return data
+            for vehicle in vehicles:
+                if 'vehicle_type_id' not in vehicle:
                     continue
-                # vehicle_type_id = bike['vehicle_type_id']
-                # check if vehicle_type has propulsion_type != human
-                if 'current_range_meters' not in bike or bike['current_range_meters'] == 0:
-                    bike['current_range_meters'] = 1000
+                vehicle_type_id = vehicle['vehicle_type_id']
+                for vehicle_type in vehicle_types:
+                    if 'vehicle_type_id' not in vehicle_type or vehicle_type['vehicle_type_id'] != vehicle_type_id:
+                        continue
+                    if 'current_range_meters' not in vehicle or vehicle['current_range_meters'] == 0:
+                        vehicle['current_range_meters'] = 1000
+                    break
             return data
 
         return data