refactor: minor refactors, remove print statements

Author: spwoodcock

src/backend/app/projects/project_routes.py

@@ -806,16 +806,12 @@ async def generate_files(
     project = project_user_dict.get("project")
     project_id = project.id
     new_geom_type = project.new_geom_type
-
-    # Project requirement if they need to use odk-collect
     use_odk_collect = project.use_odk_collect or False
-
-    log.debug(f"Generating additional files for project: {project.id}")
-
     form_name = f"FMTM_Project_{project.id}"
-
     project_contains_existing_feature = True if combined_features_count else False
 
+    log.debug(f"Generating additional files for project: {project.id}")
+
     # Validate uploaded form
     await central_crud.validate_and_update_user_xlsform(
         xlsform=xlsform_upload,

src/backend/packages/osm-fieldwork/osm_fieldwork/update_xlsform.py

@@ -191,13 +191,6 @@ def merge_dataframes(
     # We wrap the survey question in a group to easily disable all questions if the
     # feature does not exist. If we don't have the `feature_exists` question, then
     # wrapping in the group is unnecessary (all groups are flattened in processing anyway)
-    print("")
-    print("")
-    print("")
-    print(need_verification)
-    print("")
-    print("")
-
     if need_verification:
         survey_group = {
             "begin": (
@@ -352,10 +345,11 @@ def _get_form_components(
         need_verification_fields: bool
     ) -> dict:
     """Select appropriate form components based on target platform."""
+    # only add verification questions if new feature type is Polygon
+    need_verification_fields = new_geom_type == DbGeomType.POLYGON and need_verification_fields
+
     if use_odk_collect:
-        # only add verification questions if new feature type is Polygon
-        need_verification_fields = new_geom_type == DbGeomType.POLYGON and need_verification_fields
-        # modify digitisation_df to include the `new_feature` field
+        # Here we modify digitisation_df to include the `new_feature` field
         # NOTE we set digitisation_correct to 'yes' if the user is drawing a new geometry
         digitisation_correct_col = digitisation_df["name"] == "digitisation_correct"
         digitisation_df.loc[digitisation_correct_col, "calculation"] = "once(if(${new_feature} != '', 'yes', ''))"

src/mapper/src/lib/components/map/main.svelte

@@ -590,7 +590,6 @@
 			geojsonUpdateDependency={[entityMapByEntity, entityMapByOsm]}
 		>
 			{#if primaryGeomType === MapGeomTypes.POLYGON}
-				<!-- TODO: colors values should be dynamic -->
 				<FillLayer
 					id="entity-polygon-layer"
 					paint={{
@@ -627,7 +626,6 @@
 					beforeLayerType="symbol"
 					manageHoverState
 				/>
-				<!-- TODO: colors values should be dynamic -->
 				<LineLayer
 					layout={{ 'line-cap': 'round', 'line-join': 'round' }}
 					paint={{
@@ -639,7 +637,6 @@
 					manageHoverState
 				/>
 			{:else if primaryGeomType === MapGeomTypes.POINT}
-				<!-- TODO: colors values should be dynamic -->
 				<SymbolLayer
 					id="entity-point-layer"
 					applyToClusters={false}