diff --git a/client/app/project/project.controller.js b/client/app/project/project.controller.js
index f6d20266e2..7ececa1d7c 100644
--- a/client/app/project/project.controller.js
+++ b/client/app/project/project.controller.js
@@ -1404,7 +1404,6 @@
vm.isSelectedMappable = true;
vm.lockedTaskData = data;
vm.lockTime[taskId] = getLastLockedAction(vm.lockedTaskData).actionDate;
- vm.isSelectedSplittable = isTaskSplittable(vm.taskVectorLayer.getSource().getFeatures(), data.taskId);
formatHistoryComments(vm.selectedTaskData.taskHistory);
}, function (error) {
onLockError(projectId, error);
@@ -1446,7 +1445,7 @@
};
/**
- * Call api to lock currently selected task for validation. Will update view and map after unlock.
+ * Call api to lock currently selected task for validation. Will update view and map after unlock.
*/
vm.lockSelectedTaskValidation = function () {
// if(vm.user.isEmailVerified){
diff --git a/server/services/mapping_service.py b/server/services/mapping_service.py
index 52e3202088..4f0335afd5 100644
--- a/server/services/mapping_service.py
+++ b/server/services/mapping_service.py
@@ -199,8 +199,8 @@ def generate_gpx(project_id: int, task_ids_str: str, timestamp=None):
ET.SubElement(trkseg, 'trkpt', attrib=dict(lon=str(point[0]), lat=str(point[1])))
# Append wpt elements to end of doc
- # wpt = ET.Element('wpt', attrib=dict(lon=str(point[0]), lat=str(point[1])))
- # root.append(wpt)
+ wpt = ET.Element('wpt', attrib=dict(lon=str(point[0]), lat=str(point[1])))
+ root.append(wpt)
xml_gpx = ET.tostring(root, encoding='utf8')
return xml_gpx
@@ -299,7 +299,6 @@ def generate_project_file_osm_xml(project_id: int, file_id: int, task_ids_str: s
os.makedirs(filedir)
tasks_file = os.path.join(filedir, "{project_id}_tasks.geojson".format(project_id=str(project_id)))
- current_app.logger.debug(tasks_file)
with open(tasks_file, 'w') as t:
t.write(str(tasks))
@@ -307,8 +306,7 @@ def generate_project_file_osm_xml(project_id: int, file_id: int, task_ids_str: s
# Convert the geojson features into separate .poly files
# to use with osmosis
poly_cmd = './server/tools/ogr2poly.py {file} -p {filedir}/ -f taskId'.format(file=tasks_file, filedir=filedir)
- current_app.logger.debug(poly_cmd)
- subprocess.call(poly_cmd, shell=True)
+ subprocess.check_output(poly_cmd, shell=True)
os.remove(tasks_file)
osm_files = []
@@ -317,7 +315,13 @@ def generate_project_file_osm_xml(project_id: int, file_id: int, task_ids_str: s
task_cmd = './server/tools/osmosis/bin/osmosis --rx file={xml} enableDateParsing=no --bp completeWays=yes clipIncompleteEntities=true file={task_poly} --wx file={task_xml}'.format(
xml=os.path.join(dto.path, dto.file_name),
task_poly=os.path.join(filedir, poly),
- task_xml=os.path.join(filedir, "task_{task_id}_{file_name}.osm".format(task_id=os.path.splitext(poly)[0], file_name=os.path.splitext(dto.file_name)[0]))
+ task_xml=os.path.join(
+ filedir,
+ "task_{task_id}_{file_name}.osm".format(
+ task_id=os.path.splitext(poly)[0],
+ file_name=os.path.splitext(dto.file_name)[0]
+ )
+ )
)
osm_files.append(
os.path.join(
@@ -327,7 +331,7 @@ def generate_project_file_osm_xml(project_id: int, file_id: int, task_ids_str: s
file_name=os.path.splitext(dto.file_name)[0])
)
)
- subprocess.call(task_cmd, shell=True)
+ subprocess.check_output(task_cmd, shell=True)
os.remove(os.path.join(filedir, poly))
# Merge the extracted files back together. Used if more than one task is sent in request.
diff --git a/server/services/messaging/smtp_service.py b/server/services/messaging/smtp_service.py
index 1da1fd67de..1c91f9eca2 100644
--- a/server/services/messaging/smtp_service.py
+++ b/server/services/messaging/smtp_service.py
@@ -27,7 +27,7 @@ def send_verification_email(to_address: str, username: str):
text_template = text_template.replace('[USERNAME]', username)
text_template = text_template.replace('[VEFIFICATION_LINK]', verification_url)
- subject = 'HOT Tasking Manager - Email Verification'
+ subject = 'Kaart Tasking Manager - Email Verification'
SMTPService._send_mesage(to_address, subject, html_template, text_template)
return True
@@ -50,7 +50,7 @@ def send_email_alert(to_address: str, username: str):
text_template = text_template.replace('[USERNAME]', username)
text_template = text_template.replace('[PROFILE_LINK]', inbox_url)
- subject = 'You have a new message on the HOT Tasking Manager'
+ subject = 'You have a new message on the Kaart Tasking Manager'
SMTPService._send_mesage(to_address, subject, html_template, text_template)
return True
diff --git a/server/services/messaging/templates/email_verification_en.html b/server/services/messaging/templates/email_verification_en.html
index 8237c9938e..61f5c34879 100644
--- a/server/services/messaging/templates/email_verification_en.html
+++ b/server/services/messaging/templates/email_verification_en.html
@@ -7,7 +7,7 @@
Click here to verify your email address
Please ignore this email if you have received it by mistake.
Many thanks
- HOT Mapping Team
+ Kaart