From 1d2a5bce7fa95bf0360be5b2c462d07981cff0c1 Mon Sep 17 00:00:00 2001 From: Jakob Schnell Date: Fri, 8 Dec 2023 15:11:13 +0100 Subject: [PATCH] fix: fix rebasing errors --- ORStools/proc/isochrones_layer_proc.py | 5 +++-- ORStools/proc/isochrones_point_proc.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ORStools/proc/isochrones_layer_proc.py b/ORStools/proc/isochrones_layer_proc.py index f713dec3..f0582f33 100644 --- a/ORStools/proc/isochrones_layer_proc.py +++ b/ORStools/proc/isochrones_layer_proc.py @@ -95,11 +95,12 @@ def __init__(self): minValue=0, maxValue=100, optional=True, + ), QgsProcessingParameterEnum( name=self.LOCATION_TYPE, description=self.tr("Location Type"), options=LOCATION_TYPES, - defaultValue=LOCATION_TYPES[0] + defaultValue=LOCATION_TYPES[0], ), ] @@ -158,7 +159,7 @@ def processAlgorithm(self, parameters, context, feedback): "attributes": ["total_pop"], "id": id_value, "options": options, - "location_type": location_type + "location_type": location_type, } # only include smoothing if set diff --git a/ORStools/proc/isochrones_point_proc.py b/ORStools/proc/isochrones_point_proc.py index 30308785..1eb30ddc 100644 --- a/ORStools/proc/isochrones_point_proc.py +++ b/ORStools/proc/isochrones_point_proc.py @@ -86,8 +86,8 @@ def __init__(self): name=self.LOCATION_TYPE, description=self.tr("Location Type"), options=LOCATION_TYPES, - defaultValue=LOCATION_TYPES[0] - ) + defaultValue=LOCATION_TYPES[0], + ), ] # Save some important references @@ -125,7 +125,7 @@ def processAlgorithm(self, parameters, context, feedback): "attributes": ["total_pop"], "id": None, "options": options, - "location_type": location_type + "location_type": location_type, } if smoothing or smoothing == 0: