Skip to content

Commit 6290bb3

Browse files
committed
Merge branch 'develop'
2 parents 7ef61c6 + 978c6cd commit 6290bb3

16 files changed

Lines changed: 40 additions & 17 deletions

processor/process/kommonitor/km_headline_indicator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ def run(config: KommonitorProcessConfig,
238238

239239
# get the intersection of all applicable su_features and check for missing spatial unit feature error
240240
collection.find_intersection_applicable_su_features()
241-
collection.check_applicable_spatial_unit_features(job_summary)
241+
all_times = collection.check_applicable_spatial_unit_features(job_summary, all_times)
242242

243243
logger.debug("Retrieved required indicators successfully")
244244

@@ -285,6 +285,8 @@ def run(config: KommonitorProcessConfig,
285285

286286
if not z_score:
287287
ranked = pykmhelper.rank(indicator_obj.lists[time_key])
288+
print(ranked)
289+
print(raw_time)
288290
normalized = func(ranked)
289291
else:
290292
normalized = func(indicator_obj.lists[time_key])

processor/process/kommonitor/km_indicator_absChange_nTemporalItems.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def run(config: KommonitorProcessConfig,
197197

198198
# get the intersection of all applicable su_features and check for missing spatial unit feature error
199199
collection.find_intersection_applicable_su_features()
200-
collection.check_applicable_spatial_unit_features(job_summary)
200+
all_times = collection.check_applicable_spatial_unit_features(job_summary, all_times)
201201

202202
logger.debug("Retrieved required computation indicator successfully...")
203203

processor/process/kommonitor/km_indicator_absChange_refDate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def run(config: KommonitorProcessConfig,
169169

170170
# get the intersection of all applicable su_features and check for missing spatial unit feature error
171171
collection.find_intersection_applicable_su_features()
172-
collection.check_applicable_spatial_unit_features(job_summary)
172+
all_times = collection.check_applicable_spatial_unit_features(job_summary, all_times)
173173

174174
logger.debug("Retrieved required computation indicator successfully...")
175175

processor/process/kommonitor/km_indicator_continuity_nTemporalItems.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ def run(config: KommonitorProcessConfig,
199199

200200
# get the intersection of all applicable su_features and check for missing spatial unit feature error
201201
collection.find_intersection_applicable_su_features()
202-
collection.check_applicable_spatial_unit_features(job_summary)
202+
all_times = collection.check_applicable_spatial_unit_features(job_summary, all_times)
203203

204204
logger.debug("Retrieved required indicators successfully")
205205

processor/process/kommonitor/km_indicator_divide.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def run(config: KommonitorProcessConfig,
180180

181181
# get the intersection of all applicable su_features and check for missing spatial unit feature error
182182
collection.find_intersection_applicable_su_features()
183-
collection.check_applicable_spatial_unit_features(job_summary)
183+
all_times = collection.check_applicable_spatial_unit_features(job_summary, all_times)
184184

185185
logger.debug("Retrieved required indicators successfully")
186186

processor/process/kommonitor/km_indicator_multiply.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def run(config: KommonitorProcessConfig,
163163

164164
# get the intersection of all applicable su_features and check for missing spatial unit feature error
165165
collection.find_intersection_applicable_su_features()
166-
collection.check_applicable_spatial_unit_features(job_summary)
166+
all_times = collection.check_applicable_spatial_unit_features(job_summary, all_times)
167167

168168
logger.debug("Retrieved required indicators successfully")
169169

processor/process/kommonitor/km_indicator_multiply_value.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def run(config: KommonitorProcessConfig,
176176

177177
# get the intersection of all applicable su_features and check for missing spatial unit feature error
178178
collection.find_intersection_applicable_su_features()
179-
collection.check_applicable_spatial_unit_features(job_summary)
179+
all_times = collection.check_applicable_spatial_unit_features(job_summary, all_times)
180180

181181
logger.debug("Retrieved required indicators successfully")
182182

processor/process/kommonitor/km_indicator_percentage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def run(config: KommonitorProcessConfig,
175175

176176
# get the intersection of all applicable su_features and check for missing spatial unit feature error
177177
collection.find_intersection_applicable_su_features()
178-
collection.check_applicable_spatial_unit_features(job_summary)
178+
all_times = collection.check_applicable_spatial_unit_features(job_summary, all_times)
179179

180180
logger.debug("Retrieved required indicators successfully")
181181

processor/process/kommonitor/km_indicator_promille.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def run(config: KommonitorProcessConfig,
175175

176176
# get the intersection of all applicable su_features and check for missing spatial unit feature error
177177
collection.find_intersection_applicable_su_features()
178-
collection.check_applicable_spatial_unit_features(job_summary)
178+
all_times = collection.check_applicable_spatial_unit_features(job_summary, all_times)
179179

180180
logger.debug("Retrieved required indicators successfully")
181181

processor/process/kommonitor/km_indicator_relChange_nTemporalItems.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ def run(config: KommonitorProcessConfig,
200200

201201
# get the intersection of all applicable su_features and check for missing spatial unit feature error
202202
collection.find_intersection_applicable_su_features()
203-
collection.check_applicable_spatial_unit_features(job_summary)
203+
all_times = collection.check_applicable_spatial_unit_features(job_summary, all_times)
204204

205205
logger.debug("Retrieved required indicators successfully")
206206

0 commit comments

Comments
 (0)