Skip to content

Commit ec03a0b

Browse files
Hagellach37Hagellach37
authored
Merge pull request #605 from mapswipe/dev
Dev - fix get results
2 parents c3c4127 + 6f7097c commit ec03a0b

File tree

10 files changed

+10252
-2
lines changed

10 files changed

+10252
-2
lines changed

‎mapswipe_workers/mapswipe_workers/generate_stats/project_stats.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ def normalize_project_type_specifics(path):
5151
columns={column: column.replace("properties.", "")}, inplace=True
5252
)
5353

54-
df.dropna(inplace=True, axis=0)
5554
df.to_csv(path)
5655

5756

‎mapswipe_workers/mapswipe_workers/generate_stats/user_stats.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get_agg_results_by_user_id(
3737
] - (raw_contributions_df["agreeing_contributions"] + 1)
3838

3939
agg_results_by_user_id_df = raw_contributions_df.groupby(
40-
["project_id", "user_id"]
40+
["project_id", "user_id", "username"]
4141
).agg(
4242
groups_completed=pd.NamedAgg(column="group_id", aggfunc=pd.Series.nunique),
4343
total_contributions=pd.NamedAgg(column="user_id", aggfunc="count"),

‎mapswipe_workers/tests/integration/fixtures/tile_map_service_grid/groups/build_area_sandoa.csv‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-NFNr55R_LYJvxP7wmte g101 258 0 3 0 {"progress": 0, "finishedCount": 0, "xMax": "147872", "xMin": "147787", "yMax": "137942", "yMin": "137940"}
2+
-NFNr55R_LYJvxP7wmte g102 258 0 3 0 {"progress": 0, "finishedCount": 0, "xMax": "147958", "xMin": "147873", "yMax": "137942", "yMin": "137940"}
3+
-NFNr55R_LYJvxP7wmte g103 258 0 3 0 {"progress": 0, "finishedCount": 0, "xMax": "148044", "xMin": "147959", "yMax": "137942", "yMin": "137940"}
4+
-NFNr55R_LYJvxP7wmte g104 360 0 3 0 {"progress": 0, "finishedCount": 0, "xMax": "147906", "xMin": "147787", "yMax": "137945", "yMin": "137943"}
5+
-NFNr55R_LYJvxP7wmte g105 354 0 3 0 {"progress": 0, "finishedCount": 0, "xMax": "148024", "xMin": "147907", "yMax": "137945", "yMin": "137943"}
6+
-NFNr55R_LYJvxP7wmte g106 42 0 3 0 {"progress": 0, "finishedCount": 0, "xMax": "148038", "xMin": "148025", "yMax": "137945", "yMin": "137943"}
7+
-NFNr55R_LYJvxP7wmte g107 354 0 3 0 {"progress": 0, "finishedCount": 0, "xMax": "147905", "xMin": "147788", "yMax": "137948", "yMin": "137946"}
8+
-NFNr55R_LYJvxP7wmte g108 354 0 3 0 {"progress": 0, "finishedCount": 0, "xMax": "148023", "xMin": "147906", "yMax": "137948", "yMin": "137946"}
9+
-NFNr55R_LYJvxP7wmte g109 354 0 3 0 {"progress": 0, "finishedCount": 0, "xMax": "147905", "xMin": "147788", "yMax": "137951", "yMin": "137949"}

‎mapswipe_workers/tests/integration/fixtures/tile_map_service_grid/mapping_sessions/build_area_sandoa.csv‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
-NFNr55R_LYJvxP7wmte g101 17aIydNSZrdvKvPSbQdnjHDTJXS2 118511 2022-11-21 09:28:31.189 2022-11-21 09:30:32.386 258
2+
-NFNr55R_LYJvxP7wmte g101 YfM2ogClDscTNMmYzArFXdOVsAx2 3117247 2022-11-24 07:56:22.087 2022-11-24 08:00:06.922 258
3+
-NFNr55R_LYJvxP7wmte g102 n6Jx2WK7cpNAODawNBOtldyrOE42 3601734 2022-11-27 20:05:43.79 2022-11-27 20:07:08.898 258
4+
-NFNr55R_LYJvxP7wmte g102 osm:10372358 2663748 2022-11-21 08:03:17.402 2022-11-21 08:04:07.072 258
5+
-NFNr55R_LYJvxP7wmte g102 YfM2ogClDscTNMmYzArFXdOVsAx2 627233 2022-11-24 08:00:07.415 2022-11-24 08:02:40.263 258
6+
-NFNr55R_LYJvxP7wmte g103 w9Z1PCbXhzUxEbSpKYDA2odS3Cx1 1542945 2022-11-21 08:48:50.718 2022-11-21 08:51:00.485 258
7+
-NFNr55R_LYJvxP7wmte g103 xD2wBReeGyQG8NR6d0o5xUxBNqF2 3251168 2022-11-24 07:29:28.427 2022-11-24 07:30:22.364 258
8+
-NFNr55R_LYJvxP7wmte g103 zmFAlQk53YMSgj72WVUZF9wrmQy1 3601756 2022-11-27 20:26:22.951 2022-11-27 20:28:04.074 258
9+
-NFNr55R_LYJvxP7wmte g104 2VTWdSHeNbRecgDUb9cLAq1hW952 3601737 2022-11-27 20:03:20.101 2022-11-27 20:08:30.07 360
10+
-NFNr55R_LYJvxP7wmte g104 GlN8ASICbBg90QOJvUjgkCVsHeo2 1266124 2022-11-21 10:39:54.06 2022-11-21 10:40:40.081 360
11+
-NFNr55R_LYJvxP7wmte g104 Xk2ZMqoP9rausddX8Ub2FGzkvQx2 1234700 2022-11-24 07:55:48.238 2022-11-24 07:57:08.256 360
12+
-NFNr55R_LYJvxP7wmte g105 ndS1FDQQiaQ1athXP4ZFc8L1p4k2 2217674 2022-11-24 15:34:09.855 2022-11-24 15:38:53.253 354
13+
-NFNr55R_LYJvxP7wmte g105 yaE8mheLJGSemHpTROcd7psRDkp2 2889063 2022-11-21 08:54:14.175 2022-11-21 08:56:46.664 354
14+
-NFNr55R_LYJvxP7wmte g105 Zp6CMMdUhqUOWmSX2f3uX8PQCNX2 3601731 2022-11-27 20:00:20.232 2022-11-27 20:03:53.226 354
15+
-NFNr55R_LYJvxP7wmte g106 gBluckQVe8bI7c8jCmSjBPmpOGS2 3515067 2022-11-21 07:46:59.443 2022-11-21 07:47:06.349 42
16+
-NFNr55R_LYJvxP7wmte g106 Xk2ZMqoP9rausddX8Ub2FGzkvQx2 1878008 2022-11-24 07:57:09.548 2022-11-24 07:57:20.131 42
17+
-NFNr55R_LYJvxP7wmte g106 Zp6CMMdUhqUOWmSX2f3uX8PQCNX2 3601728 2022-11-27 19:59:44.554 2022-11-27 20:00:10.087 42
18+
-NFNr55R_LYJvxP7wmte g107 Sn6Sc9EfiFM6CXo7Qk5L87GaDZF2 874551 2022-11-24 07:38:26.038 2022-11-24 07:39:58.656 354
19+
-NFNr55R_LYJvxP7wmte g107 w9Z1PCbXhzUxEbSpKYDA2odS3Cx1 708128 2022-11-21 08:51:09.004 2022-11-21 08:55:45.387 354
20+
-NFNr55R_LYJvxP7wmte g107 zmFAlQk53YMSgj72WVUZF9wrmQy1 3601759 2022-11-27 20:28:33.498 2022-11-27 20:30:33.689 354
21+
-NFNr55R_LYJvxP7wmte g108 FPpUllubfxbw0DPYN8x31wbrrDs1 3505563 2022-11-24 13:38:19.477 2022-11-24 13:39:35.03 354
22+
-NFNr55R_LYJvxP7wmte g108 osm:10553599 3535721 2022-11-21 06:02:37.822 2022-11-21 06:04:45.497 354
23+
-NFNr55R_LYJvxP7wmte g109 HrEdMForV1hYOe0H9Chkmy7eKKj2 566198 2022-11-21 09:53:15.981 2022-11-21 09:55:03.035 354
24+
-NFNr55R_LYJvxP7wmte g109 SD7thSU84hWqtQAEFNdNi0vBGhv1 3601718 2022-11-27 19:44:18.327 2022-11-27 19:51:31.809 354
25+
-NFNr55R_LYJvxP7wmte g109 xD2wBReeGyQG8NR6d0o5xUxBNqF2 2248341 2022-11-24 07:25:52.586 2022-11-24 07:27:31.536 354

0 commit comments

Comments
 (0)