Fixed imports & ran black

Author: anitagraser

qgis_processing/gtfsAlgorithm.py

@@ -113,10 +113,28 @@ def processAlgorithm(self, parameters, context, feedback):
             line = QgsGeometry.fromWkt(segment.geometry.wkt)
             f = QgsFeature()
             f.setGeometry(line)
-            attrs = [segment.shape_id, segment.route_id, segment.route_name, segment.direction_id, segment.stop_sequence, segment.segment_name,
-                     segment.start_stop_name, segment.end_stop_name, segment.segment_id, segment.start_stop_id, segment.end_stop_id, segment.distance_m]
+            attrs = [
+                segment.shape_id,
+                segment.route_id,
+                segment.route_name,
+                segment.direction_id,
+                segment.stop_sequence,
+                segment.segment_name,
+                segment.start_stop_name,
+                segment.end_stop_name,
+                segment.segment_id,
+                segment.start_stop_id,
+                segment.end_stop_id,
+                segment.distance_m,
+            ]
             if add_avg_speed:
-                attrs = attrs + [segment.window, segment.speed_kmh, segment.avg_route_speed_kmh, segment.segment_max_speed_kmh, segment.runtime_sec]
+                attrs = attrs + [
+                    segment.window,
+                    segment.speed_kmh,
+                    segment.avg_route_speed_kmh,
+                    segment.segment_max_speed_kmh,
+                    segment.runtime_sec,
+                ]
             f.setAttributes(attrs)
             self.sink_segments.addFeature(f, QgsFeatureSink.FastInsert)
 
@@ -125,7 +143,7 @@ def processAlgorithm(self, parameters, context, feedback):
     def get_segments(self, feed, add_avg_speed=False):
         if add_avg_speed:
             segments = feed.avg_speeds
-        else: 
+        else:
             segments = feed.segments
         return segments
 
@@ -150,5 +168,3 @@ def get_fields(self, add_avg_speed):
             fields.append(QgsField("segment_max_speed_kmh", QVariant.Double))
             fields.append(QgsField("runtime_sec", QVariant.Double))
         return fields
-
-

qgis_processing/qgisUtils.py

@@ -55,7 +55,7 @@ def tc_from_df(df, time_field_name, trajectory_id_field, crs, min_length):
         y="geom_y",
         t=time_field_name,
         crs=crs,
-        min_length=min_length
+        min_length=min_length,
     )
     return tc
 

qgis_processing/trajectoolsProvider.py

@@ -62,9 +62,15 @@ def getAlgs(self):
             ClipTrajectoriesByPolygonLayer(),
             ExtractODPtsAlgorithm(),
             ExtractStopsAlgorithm(),
-            HomeWorkAttack(),
-            GtfsAlgorithm(),
         ]
+        try:  # skmob-based algs
+            algs.append(HomeWorkAttack())
+        except ImportError:
+            pass
+        try:  # gtfs_functions-based algs
+            algs.append(GtfsAlgorithm())
+        except ImportError:
+            pass
         return algs
 
     def loadAlgorithms(self):

qgis_processing/trajectoriesAlgorithm.py

@@ -100,8 +100,8 @@ def initAlgorithm(self, config=None):
                 name=self.MIN_LENGTH,
                 description=self.tr("Minimum trajectory length"),
                 defaultValue=0,
-                #optional=True,
-                minValue=0
+                # optional=True,
+                minValue=0,
             )
         )
 
@@ -125,9 +125,7 @@ def prepare_parameters(self, parameters, context):
         self.speed_units = self.parameterAsString(
             parameters, self.SPEED_UNIT, context
         ).split("/")
-        self.min_length = self.parameterAsDouble(
-            parameters, self.MIN_LENGTH, context
-        )
+        self.min_length = self.parameterAsDouble(parameters, self.MIN_LENGTH, context)
 
     def create_tc(self, parameters, context):
         self.prepare_parameters(parameters, context)