From 26f286065b8c37dfcf350f7ac8120577df2c1cad Mon Sep 17 00:00:00 2001 From: Levi Szamek Date: Tue, 25 Mar 2025 16:23:11 +0100 Subject: [PATCH 01/29] feat: add conflation project --- src/components/ConflationProject.vue | 256 +++++++++++++++++++++++ src/components/ConflationProjectTask.vue | 157 ++++++++++++++ src/config/projectTypes.ts | 4 + src/views/ProjectView.vue | 2 + 4 files changed, 419 insertions(+) create mode 100644 src/components/ConflationProject.vue create mode 100644 src/components/ConflationProjectTask.vue diff --git a/src/components/ConflationProject.vue b/src/components/ConflationProject.vue new file mode 100644 index 0000000..22ce1a9 --- /dev/null +++ b/src/components/ConflationProject.vue @@ -0,0 +1,256 @@ + + + + + diff --git a/src/components/ConflationProjectTask.vue b/src/components/ConflationProjectTask.vue new file mode 100644 index 0000000..1172b4e --- /dev/null +++ b/src/components/ConflationProjectTask.vue @@ -0,0 +1,157 @@ + + + diff --git a/src/config/projectTypes.ts b/src/config/projectTypes.ts index f15c9ec..07486a6 100644 --- a/src/config/projectTypes.ts +++ b/src/config/projectTypes.ts @@ -27,6 +27,10 @@ const projectTypes = { name: 'Street', component: 'streetProject', }, + '8': { + name: 'Conflation', + component: 'conflationProject', + }, } export default projectTypes diff --git a/src/views/ProjectView.vue b/src/views/ProjectView.vue index 52ac56f..f39969b 100644 --- a/src/views/ProjectView.vue +++ b/src/views/ProjectView.vue @@ -22,6 +22,7 @@ import MediaProject from '@/components/MediaProject.vue' import ValidateProject from '@/components/ValidateProject.vue' import DigitizeProject from '@/components/DigitizeProject.vue' import StreetProject from '@/components/StreetProject.vue' +import ConflationProject from '@/components/ConflationProject.vue' import projectTypes from '@/config/projectTypes' import { decompressTasks } from '@/utils/tasks' @@ -34,6 +35,7 @@ export default defineComponent({ validateProject: ValidateProject, digitizeProject: DigitizeProject, streetProject: StreetProject, + conflationProject: ConflationProject, }, data() { return { From 18a8e3d20e06dd77d3f94cb4764733fff50fa42c Mon Sep 17 00:00:00 2001 From: Levi Szamek Date: Tue, 25 Mar 2025 16:52:23 +0100 Subject: [PATCH 02/29] fix: use conflation task in conflation project --- src/components/ConflationProject.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/ConflationProject.vue b/src/components/ConflationProject.vue index 22ce1a9..b3689ea 100644 --- a/src/components/ConflationProject.vue +++ b/src/components/ConflationProject.vue @@ -9,13 +9,13 @@ import ProjectInfo from '@/components/ProjectInfo.vue' import TaskProgress from '@/components/TaskProgress.vue' import ValidateProjectInstructions from '@/components/ValidateProjectInstructions.vue' import ValidateProjectTutorial from '@/components/ValidateProjectTutorial.vue' -import ValidateProjectTask from './ValidateProjectTask.vue' +import ConflationProjectTask from './ConflationProjectTask.vue' export default defineComponent({ components: { validateProjectInstructions: ValidateProjectInstructions, validateProjectTutorial: ValidateProjectTutorial, - validateProjectTask: ValidateProjectTask, + conflationProjectTask: ConflationProjectTask, taskProgress: TaskProgress, optionButtons: OptionButtons, projectHeader: ProjectHeader, @@ -97,7 +97,7 @@ export default defineComponent({ return colors }, mission() { - const message = this.$t('validateProject.doesTheShapeOutline', { + const message = this.$t('conflationProject.doesTheShapeOutline', { feature: this.project?.lookFor, }) return message @@ -174,7 +174,7 @@ export default defineComponent({