From be6f8303e1ea62c2506eada76b4092add15e34f1 Mon Sep 17 00:00:00 2001
From: ofritz <oliver.fritz@heigit.org>
Date: Wed, 26 Nov 2025 17:38:52 +0100
Subject: [PATCH 01/10] feat(conflation): include ConflationProjectPropertyType
 in ProjectTypeSpecificFields fragment

---
 app/utils/query.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/utils/query.ts b/app/utils/query.ts
index 9a919ee..97454c5 100644
--- a/app/utils/query.ts
+++ b/app/utils/query.ts
@@ -56,7 +56,7 @@ fragment VectorTileServerPropertyFields on ProjectVectorTileServerConfig {
 export const PROJECT_TYPE_SPECIFIC_FRAGMENT = gql`
 ${TILE_SERVER_PROPERTY_FRAGMENT}
 ${VECTOR_TILE_SERVER_PROPERTY_FRAGMENT}
-fragment ProjectTypeSpecificFields on CompareProjectPropertyTypeFindProjectPropertyTypeValidateProjectPropertyTypeValidateImageProjectPropertyTypeCompletenessProjectPropertyTypeStreetProjectPropertyType {
+fragment ProjectTypeSpecificFields on CompareProjectPropertyTypeFindProjectPropertyTypeValidateProjectPropertyTypeValidateImageProjectPropertyTypeCompletenessProjectPropertyTypeStreetProjectPropertyTypeConflationProjectPropertyType {
     ... on CompareProjectPropertyType {
         __typename
         aoiGeometry
@@ -146,6 +146,15 @@ fragment ProjectTypeSpecificFields on CompareProjectPropertyTypeFindProjectPrope
             startTime
         }
     }
+    ... on ConflationProjectPropertyType {
+        __typename
+        objectSource {
+            objectGeojsonUrl
+        }
+        tileServerProperty {
+            ...RasterTileServerPropertyFields
+        }
+    }
 }
 `;
 

From e4065457bc46dab5d2e6baf7940961352758da1b Mon Sep 17 00:00:00 2001
From: ofritz <oliver.fritz@heigit.org>
Date: Tue, 2 Dec 2025 16:24:46 +0100
Subject: [PATCH 02/10] feat(conflation): conflation project creation

---
 .../ObjectSourceInput/index.tsx               | 45 ++++++++++++
 .../ObjectSourceInput/schema.ts               | 34 +++++++++
 .../ConflationProjectSpecifics/index.tsx      | 69 +++++++++++++++++++
 .../ConflationProjectSpecifics/schema.ts      | 38 ++++++++++
 .../EditProject/UpdateProjectForm/index.tsx   | 29 +++++++-
 .../EditProject/UpdateProjectForm/schema.ts   | 20 ++++++
 .../NewProject/ProjectGeneralInputs/index.tsx |  6 ++
 app/views/NewProject/index.tsx                | 18 ++++-
 8 files changed, 256 insertions(+), 3 deletions(-)
 create mode 100644 app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/ObjectSourceInput/index.tsx
 create mode 100644 app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/ObjectSourceInput/schema.ts
 create mode 100644 app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/index.tsx
 create mode 100644 app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/schema.ts

diff --git a/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/ObjectSourceInput/index.tsx b/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/ObjectSourceInput/index.tsx
new file mode 100644
index 0000000..86f8c8f
--- /dev/null
+++ b/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/ObjectSourceInput/index.tsx
@@ -0,0 +1,45 @@
+import {
+    EntriesAsList,
+    getErrorObject,
+    LeafError,
+    ObjectError,
+} from '@togglecorp/toggle-form';
+
+import Container from '#components/Container';
+import TextInput from '#components/TextInput';
+
+import { PartialConflationObjectSourceInputFields } from './schema';
+
+interface Props {
+    value: PartialConflationObjectSourceInputFields | undefined,
+    error: LeafError | ObjectError<PartialConflationObjectSourceInputFields>,
+    setFieldValue: (...entries: EntriesAsList<PartialConflationObjectSourceInputFields>) => void;
+}
+
+function ObjectSourceInput(props: Props) {
+    const {
+        value,
+        error: formError,
+        setFieldValue,
+    } = props;
+
+    const error = getErrorObject(formError);
+
+    return (
+        <Container
+            heading="Conflation Object Source"
+            headingLevel={4}
+        >
+            <TextInput
+                label="URL for geojson"
+                name="objectGeojsonUrl"
+                value={value?.objectGeojsonUrl}
+                error={error?.objectGeojsonUrl}
+                onChange={setFieldValue}
+                hint="Provide a direct link to a GeoJSON file containing your building footprint geometries."
+            />
+        </Container>
+    );
+}
+
+export default ObjectSourceInput;
diff --git a/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/ObjectSourceInput/schema.ts b/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/ObjectSourceInput/schema.ts
new file mode 100644
index 0000000..d0c8907
--- /dev/null
+++ b/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/ObjectSourceInput/schema.ts
@@ -0,0 +1,34 @@
+import {
+    ObjectSchema,
+    PartialForm,
+} from '@togglecorp/toggle-form';
+
+import {
+    ConflationObjectSourceConfig,
+    ConflationObjectSourceConfigInput,
+} from '#generated/types/graphql';
+import { DeepNonNullable } from '#utils/types';
+
+export type ConflationSourceConfigKeys = Exclude<keyof ConflationObjectSourceConfig, 'sourceType'>;
+
+export type PartialConflationObjectSourceInputFields = PartialForm<
+    DeepNonNullable<ConflationObjectSourceConfigInput>
+>;
+type ConflationSourceFormSchema = ObjectSchema<PartialConflationObjectSourceInputFields>;
+type ConflationSourceInputFields = ReturnType<ConflationSourceFormSchema['fields']>;
+
+export const defaultObjectSourceInputFormValue: PartialConflationObjectSourceInputFields = {
+    objectGeojsonUrl: '',
+};
+
+const objectSourceFormSchema: ConflationSourceFormSchema = {
+    fields: (): ConflationSourceInputFields => {
+        const schema: ConflationSourceInputFields = {
+            objectGeojsonUrl: { required: true },
+        };
+
+        return schema;
+    },
+};
+
+export default objectSourceFormSchema;
diff --git a/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/index.tsx b/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/index.tsx
new file mode 100644
index 0000000..bf7d68f
--- /dev/null
+++ b/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/index.tsx
@@ -0,0 +1,69 @@
+import {
+    EntriesAsList,
+    getErrorObject,
+    LeafError,
+    ObjectError,
+    useFormObject,
+} from '@togglecorp/toggle-form';
+
+import RasterTileServerInput from '#components/domain/RasterTileServerInput';
+import {
+    defaultRasterTileServerInputValue,
+    type PartialRasterTileServerInputFields,
+} from '#components/domain/RasterTileServerInput/schema';
+
+import {
+    defaultObjectSourceInputFormValue,
+    PartialConflationObjectSourceInputFields,
+} from './ObjectSourceInput/schema';
+import ObjectSourceInput from './ObjectSourceInput';
+import { type PartialConflationSpecificFields } from './schema';
+
+interface Props {
+    value: PartialConflationSpecificFields | undefined | null;
+    error: LeafError | ObjectError<PartialConflationSpecificFields>;
+    setFieldValue: (...entries: EntriesAsList<PartialConflationSpecificFields>) => void;
+    disabled?: boolean;
+}
+
+function ConflationProjectSpecifics(props: Props) {
+    const {
+        value,
+        error: formError,
+        setFieldValue,
+        disabled,
+    } = props;
+
+    const error = getErrorObject(formError);
+
+    const setTileServerInputFieldValue = useFormObject<'tileServerProperty', PartialRasterTileServerInputFields>(
+        'tileServerProperty' as const,
+        setFieldValue,
+        defaultRasterTileServerInputValue,
+    );
+
+    const setObjectSourceInputFieldValue = useFormObject<'objectSource', PartialConflationObjectSourceInputFields>(
+        'objectSource' as const,
+        setFieldValue,
+        defaultObjectSourceInputFormValue,
+    );
+
+    return (
+        <>
+            <ObjectSourceInput
+                value={value?.objectSource}
+                setFieldValue={setObjectSourceInputFieldValue}
+                error={error?.objectSource}
+            />
+            <RasterTileServerInput
+                value={value?.tileServerProperty}
+                error={error?.tileServerProperty}
+                setFieldValue={setTileServerInputFieldValue}
+                disabled={disabled}
+                zoomLevel={undefined}
+            />
+        </>
+    );
+}
+
+export default ConflationProjectSpecifics;
diff --git a/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/schema.ts b/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/schema.ts
new file mode 100644
index 0000000..97defd4
--- /dev/null
+++ b/app/views/EditProject/UpdateProjectForm/ConflationProjectSpecifics/schema.ts
@@ -0,0 +1,38 @@
+import {
+    ObjectSchema,
+    PartialForm,
+} from '@togglecorp/toggle-form';
+
+import rasterTileServerFormSchema, { defaultRasterTileServerInputValue } from '#components/domain/RasterTileServerInput/schema';
+import { ConflationProjectPropertyInput } from '#generated/types/graphql';
+import { DeepNonNullable } from '#utils/types';
+
+import {
+    type PartialProjectUpdateInput,
+    type UpdateProjectContext,
+} from '../schema';
+import objectSourceFormSchema, { defaultObjectSourceInputFormValue } from './ObjectSourceInput/schema';
+
+export type PartialConflationSpecificFields = PartialForm<
+    DeepNonNullable<ConflationProjectPropertyInput>,
+    'clientId'
+>;
+type ConflationSpecificFormSchema = ObjectSchema<
+    PartialConflationSpecificFields,
+    PartialProjectUpdateInput,
+    UpdateProjectContext
+>;
+
+export const defaultConflationSpecificFormValue: PartialConflationSpecificFields = {
+    objectSource: defaultObjectSourceInputFormValue,
+    tileServerProperty: defaultRasterTileServerInputValue,
+};
+
+const conflationSpecificFormSchema: ConflationSpecificFormSchema = {
+    fields: (): ReturnType<ConflationSpecificFormSchema['fields']> => ({
+        objectSource: objectSourceFormSchema,
+        tileServerProperty: rasterTileServerFormSchema,
+    }),
+};
+
+export default conflationSpecificFormSchema;
diff --git a/app/views/EditProject/UpdateProjectForm/index.tsx b/app/views/EditProject/UpdateProjectForm/index.tsx
index c327432..fbe7f4d 100644
--- a/app/views/EditProject/UpdateProjectForm/index.tsx
+++ b/app/views/EditProject/UpdateProjectForm/index.tsx
@@ -55,6 +55,11 @@ import {
     defaultCompletenessSpecificFormValue,
     PartialCompletenessSpecificFields,
 } from './CompletenessProjectSpecifics/schema.ts';
+import ConflationProjectSpecifics from './ConflationProjectSpecifics/index.tsx';
+import {
+    defaultConflationSpecificFormValue,
+    PartialConflationSpecificFields,
+} from './ConflationProjectSpecifics/schema.ts';
 import {
     defaultFindSpecificFormValue,
     PartialFindSpecificFields,
@@ -134,6 +139,10 @@ function UpdateProjectForm(props: Props) {
             return defaultFindSpecificFormValue;
         }
 
+        if (projectData.project.projectType === ProjectTypeEnum.Conflation) {
+            return defaultConflationSpecificFormValue;
+        }
+
         if (projectData.project.projectType === ProjectTypeEnum.Compare) {
             return defaultCompareSpecificFormValue;
         }
@@ -373,7 +382,7 @@ function UpdateProjectForm(props: Props) {
     const setValidateImageProjectSpecificsFieldValue = useFormObject<'validateImage', PartialValidateImageSpecificFields>(
         'validateImage',
         setProjectSpecificFieldValue,
-        defaultValidateSpecificFormValue,
+        defaultValidateImageSpecificFormValue,
     );
 
     const setCompletenessProjectSpecificsFieldValue = useFormObject<'completeness', PartialCompletenessSpecificFields>(
@@ -385,7 +394,13 @@ function UpdateProjectForm(props: Props) {
     const setStreetProjectSpecificsFieldValue = useFormObject<'street', PartialStreetSpecificFields>(
         'street',
         setProjectSpecificFieldValue,
-        defaultValidateSpecificFormValue,
+        defaultStreetSpecificFormValue,
+    );
+
+    const setConflationSpecificsFieldValue = useFormObject<'conflation', PartialConflationSpecificFields>(
+        'conflation',
+        setProjectSpecificFieldValue,
+        defaultConflationSpecificFormValue,
     );
 
     const pending = updateProjectPending;
@@ -416,6 +431,8 @@ function UpdateProjectForm(props: Props) {
         ?.validateImage as PartialValidateSpecificFields | undefined;
     const streetProjectTypeSpecifics = value.projectTypeSpecifics
         ?.street as PartialStreetSpecificFields | undefined;
+    const conflationProjectTypeSpecifics = value.projectTypeSpecifics
+        ?.conflation as PartialConflationSpecificFields | undefined;
 
     return (
         <PageLayout
@@ -570,6 +587,14 @@ function UpdateProjectForm(props: Props) {
                         disabled={projectTypeSpecificInputsDisabled || readOnly}
                     />
                 )}
+                {projectContext.projectType === ProjectTypeEnum.Conflation && (
+                    <ConflationProjectSpecifics
+                        value={conflationProjectTypeSpecifics}
+                        setFieldValue={setConflationSpecificsFieldValue}
+                        error={getErrorObject(error?.projectTypeSpecifics)?.conflation}
+                        disabled={projectTypeSpecificInputsDisabled || readOnly}
+                    />
+                )}
             </Container>
         </PageLayout>
     );
diff --git a/app/views/EditProject/UpdateProjectForm/schema.ts b/app/views/EditProject/UpdateProjectForm/schema.ts
index 1004f09..d19facd 100644
--- a/app/views/EditProject/UpdateProjectForm/schema.ts
+++ b/app/views/EditProject/UpdateProjectForm/schema.ts
@@ -14,6 +14,7 @@ import { DeepNonNullable } from '#utils/types';
 
 import compareSpecificFormSchema from './CompareProjectSpecifics/schema';
 import completenessSpecificFormSchema from './CompletenessProjectSpecifics/schema';
+import conflationSpecificFormSchema from './ConflationProjectSpecifics/schema';
 import findSpecificFormSchema from './FindProjectSpecifics/schema';
 import streetSpecificFormSchema from './StreetProjectSpecifics/schema.ts';
 import validateImageSpecificFormSchema from './ValidateImageProjectSpecifics/schema.ts';
@@ -84,6 +85,7 @@ const projectUpdateFormSchema: ProjectUpdateFormSchema = {
                         completeness: { forceValue: undefinedValue },
                         validate: { forceValue: undefinedValue },
                         validateImage: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
                     };
                 }
 
@@ -95,6 +97,7 @@ const projectUpdateFormSchema: ProjectUpdateFormSchema = {
                         completeness: { forceValue: undefinedValue },
                         validate: { forceValue: undefinedValue },
                         validateImage: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
                     };
                 }
 
@@ -106,6 +109,19 @@ const projectUpdateFormSchema: ProjectUpdateFormSchema = {
                         compare: { forceValue: undefinedValue },
                         validate: { forceValue: undefinedValue },
                         validateImage: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
+                    };
+                }
+
+                if (context?.projectType === ProjectTypeEnum.Conflation) {
+                    return {
+                        street: { forceValue: undefinedValue },
+                        validate: { forceValue: undefinedValue },
+                        completeness: { forceValue: undefinedValue },
+                        find: { forceValue: undefinedValue },
+                        compare: { forceValue: undefinedValue },
+                        validateImage: { forceValue: undefinedValue },
+                        conflation: conflationSpecificFormSchema,
                     };
                 }
 
@@ -117,6 +133,7 @@ const projectUpdateFormSchema: ProjectUpdateFormSchema = {
                         find: { forceValue: undefinedValue },
                         compare: { forceValue: undefinedValue },
                         validateImage: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
                     };
                 }
 
@@ -128,6 +145,7 @@ const projectUpdateFormSchema: ProjectUpdateFormSchema = {
                         find: { forceValue: undefinedValue },
                         compare: { forceValue: undefinedValue },
                         validate: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
                     };
                 }
 
@@ -139,6 +157,7 @@ const projectUpdateFormSchema: ProjectUpdateFormSchema = {
                         find: { forceValue: undefinedValue },
                         compare: { forceValue: undefinedValue },
                         validate: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
                     };
                 }
 
@@ -151,6 +170,7 @@ const projectUpdateFormSchema: ProjectUpdateFormSchema = {
                     completeness: { forceValue: undefinedValue },
                     validate: { forceValue: undefinedValue },
                     validateImage: { forceValue: undefinedValue },
+                    conflation: { forceValue: undefinedValue },
                 };
             },
         },
diff --git a/app/views/NewProject/ProjectGeneralInputs/index.tsx b/app/views/NewProject/ProjectGeneralInputs/index.tsx
index 7454095..637db76 100644
--- a/app/views/NewProject/ProjectGeneralInputs/index.tsx
+++ b/app/views/NewProject/ProjectGeneralInputs/index.tsx
@@ -60,6 +60,7 @@ const hintText: Record<
         [ProjectTypeEnum.ValidateImage]: 'Enter the description for your project. (markdown syntax is supported)',
         [ProjectTypeEnum.Completeness]: 'Enter the description for your project. (markdown syntax is supported)',
         [ProjectTypeEnum.Street]: 'Enter the description for your project. (markdown syntax is supported)',
+        [ProjectTypeEnum.Conflation]: 'Enter the description for your project. (markdown syntax is supported)',
     },
     topic: {
         [ProjectTypeEnum.Find]: 'Enter the title of your project. It should begin with project type. (e.g., "Find Features") ',
@@ -68,6 +69,7 @@ const hintText: Record<
         [ProjectTypeEnum.ValidateImage]: 'Enter the title of your project. It should begin with project type. (e.g., "Assess Images")',
         [ProjectTypeEnum.Completeness]: 'Enter the title of your project. It should begin with project type. (e.g., "Check Completeness")',
         [ProjectTypeEnum.Street]: 'Enter the title of your project. It should begin with project type. (e.g., "View Streets") ',
+        [ProjectTypeEnum.Street]: 'Enter the title of your project. It should begin with project type. (e.g., "Conflate Features") ',
     },
     projectInstruction: {
         [ProjectTypeEnum.Find]: 'What should the users look for (e.g. You are looking for: buildings, destroyed buildings, cars, trees, etc.)',
@@ -100,6 +102,7 @@ const hintText: Record<
         [ProjectTypeEnum.ValidateImage]: 'Is this project part of a bigger campaign with multiple projects? If so, increment this number up by one each time you create a new project in the series. ',
         [ProjectTypeEnum.Completeness]: 'Is this project part of a bigger campaign with multiple projects? If so, increment this number up by one each time you create a new project in the series. ',
         [ProjectTypeEnum.Street]: 'Is this project part of a bigger campaign with multiple projects? If so, increment this number up by one each time you create a new project in the series. ',
+        [ProjectTypeEnum.Conflation]: 'Is this project part of a bigger campaign with multiple projects? If so, increment this number up by one each time you create a new project in the series. ',
     },
     region: {
         [ProjectTypeEnum.Find]: 'Enter the region/location of your project (eg: City, Country)',
@@ -108,6 +111,7 @@ const hintText: Record<
         [ProjectTypeEnum.ValidateImage]: 'Enter the project location in the format "city/region, country".',
         [ProjectTypeEnum.Completeness]: 'Enter the region/location of your project (eg: City, Country)',
         [ProjectTypeEnum.Street]: 'Enter the region/location of your project (eg: City, Country)',
+        [ProjectTypeEnum.Conflation]: 'Enter the region/location of your project (eg: City, Country)',
     },
     requestingOrganization: {
         [ProjectTypeEnum.Find]: 'Which group, institution or community is requesting this project?',
@@ -116,6 +120,7 @@ const hintText: Record<
         [ProjectTypeEnum.ValidateImage]: 'Which group, institution, or community is requesting this project?',
         [ProjectTypeEnum.Completeness]: 'Which group, institution or community is requesting this project?',
         [ProjectTypeEnum.Street]: 'Which group, institution or community is requesting this project?',
+        [ProjectTypeEnum.Conflation]: 'Which group, institution or community is requesting this project?',
     },
     team: {
         [ProjectTypeEnum.Find]: 'Please note that if \'private\', this project will only be visible to the selected  team members',
@@ -124,6 +129,7 @@ const hintText: Record<
         [ProjectTypeEnum.ValidateImage]: 'Please note that if selected, this project will only be visible to the team members.',
         [ProjectTypeEnum.Completeness]: 'Please note that if \'private\', this project will only be visible to the selected  team members',
         [ProjectTypeEnum.Street]: 'Please note that if \'private\', this project will only be visible to the selected  team members',
+        [ProjectTypeEnum.Conflation]: 'Please note that if \'private\', this project will only be visible to the selected  team members',
     },
 };
 
diff --git a/app/views/NewProject/index.tsx b/app/views/NewProject/index.tsx
index d84b397..21fe166 100644
--- a/app/views/NewProject/index.tsx
+++ b/app/views/NewProject/index.tsx
@@ -156,7 +156,23 @@ const projectTypeDescriptions: Record<ProjectTypeEnum, React.ReactNode> = {
                 name="street-alert"
                 title="MapSwipe Web only"
                 type="warning"
-                description="Street project are currently only available in the MapSwipe web app."
+                description="Street projects are currently only available in the MapSwipe web app."
+                fullWidth
+                withoutShadow
+            />
+        </ListLayout>
+    ),
+    [ProjectTypeEnum.Conflation]: (
+        <ListLayout layout="block">
+            <div>
+                Validate AI generated features and compare with
+                existing features on OpenStreetMap.
+            </div>
+            <Alert
+                name="street-alert"
+                title="MapSwipe Web only"
+                type="warning"
+                description="Conflate feature projects are currently only available in the MapSwipe web app."
                 fullWidth
                 withoutShadow
             />

From 7cd1caaf192bddffe7598481d94712af45096dab Mon Sep 17 00:00:00 2001
From: ofritz <oliver.fritz@heigit.org>
Date: Wed, 3 Dec 2025 13:00:21 +0100
Subject: [PATCH 03/10] feat(conflation): update backend submodule pointer

---
 backend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend b/backend
index e1b0df8..858bfad 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit e1b0df8f3e270293b0b9fc9936254b4f859c61a9
+Subproject commit 858bfadab0f5f987f4fbef2499597f8601e2bd0c

From f8dae7c2786dfffaabcefd039f801dbe60ec6e54 Mon Sep 17 00:00:00 2001
From: ofritz <oliver.fritz@heigit.org>
Date: Mon, 8 Dec 2025 17:42:36 +0100
Subject: [PATCH 04/10] feat(conflation): update backend submodule pointer

---
 backend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend b/backend
index 858bfad..7015057 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit 858bfadab0f5f987f4fbef2499597f8601e2bd0c
+Subproject commit 701505789d21b9139d1490bb6c84df06e57204ae

From e6da863877eb3d3e03190e510c8790d4adfa7254 Mon Sep 17 00:00:00 2001
From: ofritz <oliver.fritz@heigit.org>
Date: Wed, 10 Dec 2025 14:08:11 +0100
Subject: [PATCH 05/10] feat(conflation): add and edit conflation tutorial

---
 .../ConflationPropertyInput/index.tsx         | 59 +++++++++++++++++
 .../ConflationPropertyInput/schema.ts         | 21 ++++++
 .../ConflationPropertyInput/styles.module.css |  8 +++
 .../ScenarioPageInput/TaskInput/index.tsx     | 16 +++++
 .../ScenarioPageInput/TaskInput/schema.ts     | 20 ++++++
 app/views/EditTutorial/index.tsx              | 64 +++++++++++++++++++
 backend                                       |  2 +-
 7 files changed, 189 insertions(+), 1 deletion(-)
 create mode 100644 app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/index.tsx
 create mode 100644 app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/schema.ts
 create mode 100644 app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/styles.module.css

diff --git a/app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/index.tsx b/app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/index.tsx
new file mode 100644
index 0000000..652a0aa
--- /dev/null
+++ b/app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/index.tsx
@@ -0,0 +1,59 @@
+import { _cs } from '@togglecorp/fujs';
+import {
+    EntriesAsList,
+    getErrorObject,
+    LeafError,
+    ObjectError,
+} from '@togglecorp/toggle-form';
+
+import NumberInput from '#components/NumberInput';
+import TextArea from '#components/TextArea';
+
+import { PartialConflationPropertyInputFields } from './schema.ts';
+
+import styles from './styles.module.css';
+
+interface Props {
+    className?: string;
+    value: PartialConflationPropertyInputFields | undefined;
+    setFieldValue: (...entries: EntriesAsList<PartialConflationPropertyInputFields>) => void;
+    error: LeafError | ObjectError<PartialConflationPropertyInputFields>;
+    disabled?: boolean;
+}
+
+function ConflationPropertyInput(props: Props) {
+    const {
+        className,
+        value,
+        setFieldValue,
+        error: formError,
+        disabled,
+    } = props;
+
+    const error = getErrorObject(formError);
+
+    return (
+        <div className={_cs(className, styles.conflationPropertyInput)}>
+            <NumberInput
+                label="Identifier"
+                name="identifier"
+                value={value?.identifier}
+                error={error?.identifier}
+                onChange={setFieldValue}
+                disabled={disabled}
+            />
+            <TextArea
+                className={styles.geometry}
+                label="Object Geometry"
+                name="objectGeometry"
+                value={value?.objectGeometry}
+                error={error?.objectGeometry}
+                onChange={setFieldValue}
+                disabled={disabled}
+                rows={22}
+            />
+        </div>
+    );
+}
+
+export default ConflationPropertyInput;
diff --git a/app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/schema.ts b/app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/schema.ts
new file mode 100644
index 0000000..81136fa
--- /dev/null
+++ b/app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/schema.ts
@@ -0,0 +1,21 @@
+import {
+    ObjectSchema,
+    PartialForm,
+} from '@togglecorp/toggle-form';
+
+import { ConflationTutorialTaskPropertyInput } from '#generated/types/graphql';
+import { DeepNonNullable } from '#utils/types';
+
+export type ConflationPropertyInputFields = DeepNonNullable<ConflationTutorialTaskPropertyInput>;
+export type PartialConflationPropertyInputFields = PartialForm<ConflationPropertyInputFields>;
+
+type TaskSchema = ObjectSchema<PartialConflationPropertyInputFields>;
+
+const conflationPropertyInputSchema: TaskSchema = {
+    fields: (): ReturnType<TaskSchema['fields']> => ({
+        identifier: {},
+        objectGeometry: {},
+    }),
+};
+
+export default conflationPropertyInputSchema;
diff --git a/app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/styles.module.css b/app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/styles.module.css
new file mode 100644
index 0000000..1f1e0d0
--- /dev/null
+++ b/app/views/EditTutorial/ScenarioPageInput/TaskInput/ConflationPropertyInput/styles.module.css
@@ -0,0 +1,8 @@
+.conflation-property-input {
+    .geometry {
+        textarea {
+            font-family: var(--font-family-monospace);
+            font-size: var(--font-size-2xs);
+        }
+    }
+}
diff --git a/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx b/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx
index 6b538e7..048348d 100644
--- a/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx
+++ b/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx
@@ -17,12 +17,14 @@ import {
 
 import { PartialComparePropertyInputFields } from './ComparePropertyInput/schema';
 import { PartialCompletenessPropertyInputFields } from './CompletenessPropertyInput/schema';
+import { PartialConflationPropertyInputFields } from './ConflationPropertyInput/schema';
 import { PartialFindPropertyInputFields } from './FindPropertyInput/schema';
 import { PartialStreetPropertyInputFields } from './StreetPropertyInput/schema';
 import { PartialValidateImagePropertyInputFields } from './ValidateImagePropertyInput/schema';
 import { PartialValidatePropertyInputFields } from './ValidatePropertyInput/schema';
 import ComparePropertyInput from './ComparePropertyInput';
 import CompletenessPropertyInput from './CompletenessPropertyInput';
+import ConflationPropertyInput from './ConflationPropertyInput';
 import FindPropertyInput from './FindPropertyInput';
 import {
     PartialProjectTypeSpecifics,
@@ -108,6 +110,12 @@ function TaskInput(props: Props) {
         {},
     );
 
+    const setConflationProjectSpecificsFieldValue = useFormObject<'conflation', PartialConflationPropertyInputFields>(
+        'conflation' as const,
+        setProjectSpecificFieldValue,
+        {},
+    );
+
     return (
         <div className={_cs(styles.taskInput, className)}>
             <div className={styles.content}>
@@ -188,6 +196,14 @@ function TaskInput(props: Props) {
                         disabled
                     />
                 )}
+                {projectData?.projectType === ProjectTypeEnum.Conflation && (
+                    <ConflationPropertyInput
+                        value={value.projectTypeSpecifics?.conflation}
+                        setFieldValue={setConflationProjectSpecificsFieldValue}
+                        error={getErrorObject(error?.projectTypeSpecifics)?.conflation}
+                        disabled
+                    />
+                )}
             </div>
         </div>
     );
diff --git a/app/views/EditTutorial/ScenarioPageInput/TaskInput/schema.ts b/app/views/EditTutorial/ScenarioPageInput/TaskInput/schema.ts
index da7dc5c..209f211 100644
--- a/app/views/EditTutorial/ScenarioPageInput/TaskInput/schema.ts
+++ b/app/views/EditTutorial/ScenarioPageInput/TaskInput/schema.ts
@@ -18,6 +18,7 @@ import {
 
 import comparePropertyInputSchema from './ComparePropertyInput/schema';
 import completenessPropertyInputSchema from './CompletenessPropertyInput/schema';
+import conflationPropertyInputSchema from './ConflationPropertyInput/schema';
 import findPropertyInputSchema from './FindPropertyInput/schema';
 import streetPropertyInputSchema from './StreetPropertyInput/schema';
 import validateImagePropertyInputSchema from './ValidateImagePropertyInput/schema';
@@ -66,6 +67,7 @@ const taskSchema: TaskSchema = {
                         validate: { forceValue: undefinedValue },
                         validateImage: { forceValue: undefinedValue },
                         street: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
                     };
                 }
 
@@ -77,6 +79,7 @@ const taskSchema: TaskSchema = {
                         validate: { forceValue: undefinedValue },
                         validateImage: { forceValue: undefinedValue },
                         street: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
                     };
                 }
 
@@ -88,6 +91,19 @@ const taskSchema: TaskSchema = {
                         validate: { forceValue: undefinedValue },
                         validateImage: { forceValue: undefinedValue },
                         street: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
+                    };
+                }
+
+                if (projectType === ProjectTypeEnum.Conflation) {
+                    return {
+                        validate: { forceValue: undefinedValue },
+                        find: { forceValue: undefinedValue },
+                        compare: { forceValue: undefinedValue },
+                        completeness: { forceValue: undefinedValue },
+                        validateImage: { forceValue: undefinedValue },
+                        street: { forceValue: undefinedValue },
+                        conflation: conflationPropertyInputSchema,
                     };
                 }
 
@@ -99,6 +115,7 @@ const taskSchema: TaskSchema = {
                         completeness: { forceValue: undefinedValue },
                         validateImage: { forceValue: undefinedValue },
                         street: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
                     };
                 }
 
@@ -110,6 +127,7 @@ const taskSchema: TaskSchema = {
                         completeness: { forceValue: undefinedValue },
                         validate: { forceValue: undefinedValue },
                         street: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
                     };
                 }
 
@@ -121,6 +139,7 @@ const taskSchema: TaskSchema = {
                         completeness: { forceValue: undefinedValue },
                         validate: { forceValue: undefinedValue },
                         validateImage: { forceValue: undefinedValue },
+                        conflation: { forceValue: undefinedValue },
                     };
                 }
 
@@ -133,6 +152,7 @@ const taskSchema: TaskSchema = {
                     validate: { forceValue: undefinedValue },
                     validateImage: { forceValue: undefinedValue },
                     street: { forceValue: undefinedValue },
+                    conflation: { forceValue: undefinedValue },
                 };
             },
         },
diff --git a/app/views/EditTutorial/index.tsx b/app/views/EditTutorial/index.tsx
index 3c9d7a9..5b1414b 100644
--- a/app/views/EditTutorial/index.tsx
+++ b/app/views/EditTutorial/index.tsx
@@ -61,6 +61,7 @@ import { PartialInformationPageInputFields } from './InformationPageInput/schema
 import { PartialScenarioPageInputFields } from './ScenarioPageInput/schema';
 import { ComparePropertyInputFields } from './ScenarioPageInput/TaskInput/ComparePropertyInput/schema';
 import { CompletenessPropertyInputFields } from './ScenarioPageInput/TaskInput/CompletenessPropertyInput/schema';
+import { ConflationPropertyInputFields } from './ScenarioPageInput/TaskInput/ConflationPropertyInput/schema';
 import { FindPropertyInputFields } from './ScenarioPageInput/TaskInput/FindPropertyInput/schema';
 import { StreetPropertyInputFields } from './ScenarioPageInput/TaskInput/StreetPropertyInput/schema';
 import { ValidatePropertyInputFields } from './ScenarioPageInput/TaskInput/ValidatePropertyInput/schema';
@@ -146,6 +147,15 @@ const StreetFeaturePropertyType = type({
     id: 'string',
 });
 
+const ConflationFeaturePropertyType = type.merge(
+    CommonFeaturePropertyType,
+    {
+        // This is not used anymore
+        // id: '"string" | "number"',
+        id: type.number,
+    },
+);
+
 const ValidateTutorialGeoJsonType = type({
     type: '"FeatureCollection"',
     features: type({
@@ -154,6 +164,14 @@ const ValidateTutorialGeoJsonType = type({
     }).array(),
 });
 
+const ConflationTutorialGeoJsonType = type({
+    type: '"FeatureCollection"',
+    features: type({
+        geometry: PolygonType.or(MultiPolygonType),
+        properties: ConflationFeaturePropertyType,
+    }).array(),
+});
+
 const FindTutorialGeoJsonType = type({
     type: '"FeatureCollection"',
     features: type({
@@ -385,6 +403,16 @@ function NewTutorial() {
                         };
                     }
 
+                    // eslint-disable-next-line no-underscore-dangle
+                    if (task.projectTypeSpecifics?.__typename === 'ConflationTutorialTaskPropertyType') {
+                        return {
+                            ...task,
+                            projectTypeSpecifics: {
+                                conflation: task.projectTypeSpecifics,
+                            },
+                        };
+                    }
+
                     task.projectTypeSpecifics satisfies undefined;
 
                     return { ...task };
@@ -665,6 +693,42 @@ function NewTutorial() {
                     ],
                 }));
 
+                setFieldValue(
+                    scenarioPages.toSorted((a, b) => (
+                        compareNumber(a.scenarioPageNumber, b.scenarioPageNumber)
+                    )),
+                    'scenarios',
+                );
+            }
+        } else if (projectType === ProjectTypeEnum.Conflation) {
+            const result = ConflationTutorialGeoJsonType(geoJson);
+            if (result instanceof type.errors) {
+                setError({
+                    scenarios: {
+                        [nonFieldError]: result.summary,
+                    },
+                });
+            } else {
+                const scenarioPages = result.features.map((feature, i) => ({
+                    clientId: ulid(),
+                    scenarioPageNumber: isDefined(feature.properties.screen)
+                        ? feature.properties.screen
+                        : i + 1,
+                    tasks: [
+                        {
+                            clientId: ulid(),
+                            reference: feature.properties.reference,
+                            projectTypeSpecifics: {
+                                // FIXME: Why objectGeometry is string?
+                                conflation: {
+                                    identifier: feature.properties.id,
+                                    objectGeometry: JSON.stringify(feature.geometry, null, 4),
+                                } satisfies ConflationPropertyInputFields,
+                            },
+                        },
+                    ],
+                }));
+
                 setFieldValue(
                     scenarioPages.toSorted((a, b) => (
                         compareNumber(a.scenarioPageNumber, b.scenarioPageNumber)
diff --git a/backend b/backend
index 7015057..ac1355f 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit 701505789d21b9139d1490bb6c84df06e57204ae
+Subproject commit ac1355f602a9648c6cfe96c2aadf7d5747f13211

From 35aa891783dd711bcbe3f1c8b684b7d7a16dca89 Mon Sep 17 00:00:00 2001
From: ofritz <oliver.fritz@heigit.org>
Date: Wed, 10 Dec 2025 16:09:38 +0100
Subject: [PATCH 06/10] feat(conflation): add conflation options input for
 scenario pages

---
 .../ConflationOptionSelectInput/index.tsx     | 95 +++++++++++++++++++
 app/utils/common.ts                           | 30 ++++++
 .../ScenarioPageInput/TaskInput/index.tsx     | 50 +++++-----
 3 files changed, 149 insertions(+), 26 deletions(-)
 create mode 100644 app/components/domain/ConflationOptionSelectInput/index.tsx

diff --git a/app/components/domain/ConflationOptionSelectInput/index.tsx b/app/components/domain/ConflationOptionSelectInput/index.tsx
new file mode 100644
index 0000000..e3147ef
--- /dev/null
+++ b/app/components/domain/ConflationOptionSelectInput/index.tsx
@@ -0,0 +1,95 @@
+import {
+    isDefined,
+    listToMap,
+} from '@togglecorp/fujs';
+
+import InlineLayout from '#components/InlineLayout';
+import SelectInput from '#components/SelectInput';
+import { SearchSelectInputProps } from '#components/SelectInput/SearchSelectInput';
+import {
+    conflationTileOptions,
+    labelSelector,
+    OPACITY_TILE_SELECTED,
+    TileSelectOption,
+    valueSelector,
+} from '#utils/common';
+
+interface ColorPreviewProps {
+    value: string | undefined | null;
+}
+
+function ColorPreview(props: ColorPreviewProps) {
+    const {
+        value,
+    } = props;
+
+    return (
+        <div
+            style={{
+                backgroundColor: value ?? undefined,
+                height: '1rem',
+                width: '1rem',
+                opacity: OPACITY_TILE_SELECTED,
+            }}
+        />
+    );
+}
+
+function iconOptionLabelSelector(option: TileSelectOption) {
+    return (
+        <InlineLayout
+            start={<ColorPreview value={option.color} />}
+        >
+            {option.label}
+        </InlineLayout>
+    );
+}
+
+type Def = { containerClassName?: string };
+
+type Props<NAME> = SearchSelectInputProps<
+number,
+NAME,
+TileSelectOption,
+Def,
+'onSearchValueChange'
+| 'searchOptions'
+| 'onShowDropdownChange'
+| 'totalOptionsCount'
+| 'value'
+| 'options'
+| 'keySelector'
+| 'labelSelector'
+| 'optionLabelSelector'
+| 'icons'
+> & { value: number | undefined | null};
+
+function TileOptionSelectInput<const NAME>(props: Props<NAME>) {
+    const {
+        value,
+        ...otherProps
+    } = props;
+
+    const optionToColorMapping = listToMap(
+        conflationTileOptions,
+        (option) => option.value,
+        (option) => option.color,
+    );
+
+    return (
+        <SelectInput
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...otherProps}
+            value={value}
+            options={conflationTileOptions}
+            keySelector={valueSelector}
+            labelSelector={labelSelector}
+            optionLabelSelector={iconOptionLabelSelector}
+            icons={isDefined(value) && (
+                <ColorPreview value={optionToColorMapping[value]} />
+            )}
+        />
+    );
+}
+
+export default TileOptionSelectInput;
diff --git a/app/utils/common.ts b/app/utils/common.ts
index c6aa428..b7ad95d 100644
--- a/app/utils/common.ts
+++ b/app/utils/common.ts
@@ -22,6 +22,12 @@ export const COLOR_TILE_OPTION_YES = 'green';
 export const COLOR_TILE_OPTION_MAYBE = 'orange';
 export const COLOR_TILE_OPTION_BAD_IMAGERY = 'red';
 
+export const COLOR_CONFLATION_OPTION_NO = 'red';
+export const COLOR_CONFLATION_OPTION_YES = 'green';
+export const COLOR_CONFLATION_OPTION_NOT_SURE = 'grey';
+export const COLOR_CONFLATION_OPTION_SKIP = 'orange';
+
+
 export const VALUE_TILE_OPTION_NO = 0;
 export const VALUE_TILE_OPTION_YES = 1;
 export const VALUE_TILE_OPTION_MAYBE = 2;
@@ -56,6 +62,29 @@ export const defaultTileOptions: TileSelectOption[] = [
     },
 ];
 
+export const conflationTileOptions: TileSelectOption[] = [
+    {
+        value: VALUE_TILE_OPTION_NO,
+        label: 'No | OSM',
+        color: COLOR_CONFLATION_OPTION_NO,
+    },
+    {
+        value: VALUE_TILE_OPTION_YES,
+        label: 'Yes | fAIr',
+        color: COLOR_CONFLATION_OPTION_YES,
+    },
+    {
+        value: VALUE_TILE_OPTION_MAYBE,
+        label: 'Not sure | Neither',
+        color: COLOR_CONFLATION_OPTION_NOT_SURE,
+    },
+    {
+        value: VALUE_TILE_OPTION_BAD_IMAGERY,
+        label: 'Skip',
+        color: COLOR_CONFLATION_OPTION_SKIP,
+    },
+];
+
 export const defaultMarkdownPreviewOptions: MarkdownViewProps['options'] = {
     simpleLineBreaks: true,
     headerLevelStart: 3,
@@ -156,6 +185,7 @@ export const projectTypeToKeyMap: Record<ProjectTypeEnum, keyof(ProjectTypeSpeci
     [ProjectTypeEnum.Validate]: 'validate',
     [ProjectTypeEnum.ValidateImage]: 'validateImage',
     [ProjectTypeEnum.Street]: 'street',
+    [ProjectTypeEnum.Conflation]: 'conflation',
 };
 
 interface NumericValueOption {
diff --git a/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx b/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx
index 048348d..f562310 100644
--- a/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx
+++ b/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx
@@ -8,8 +8,10 @@ import {
 } from '@togglecorp/toggle-form';
 import { ulid } from 'ulid';
 
+import ConflationOptionSelectInput from '#components/domain/ConflationOptionSelectInput';
 import CustomOptionSelectInput from '#components/domain/CustomOptionSelectInput';
 import TileOptionSelectInput from '#components/domain/TileOptionSelectInput';
+
 import {
     ProjectTypeEnum,
     TutorialProjectDetailQuery,
@@ -116,38 +118,34 @@ function TaskInput(props: Props) {
         {},
     );
 
+    const componentMap: Record<string, any> = {
+        ValidateProjectPropertyType: CustomOptionSelectInput,
+        ValidateImageProjectPropertyType: CustomOptionSelectInput,
+        ConflationProjectPropertyType: ConflationOptionSelectInput,
+    };
+
+    /* eslint-disable-next-line no-underscore-dangle */
+    const typeName = projectData?.projectTypeSpecifics?.__typename;
+    const OptionComponent = typeName && componentMap[typeName]
+        ? componentMap[typeName]
+        : TileOptionSelectInput;
+
     return (
         <div className={_cs(styles.taskInput, className)}>
             <div className={styles.content}>
                 <div>
                     {`#${index + 1}`}
                 </div>
-                {/* eslint-disable-next-line no-underscore-dangle */}
-                {(projectData?.projectTypeSpecifics?.__typename === 'ValidateProjectPropertyType'
-                    // eslint-disable-next-line no-underscore-dangle
-                    || projectData?.projectTypeSpecifics?.__typename === 'ValidateImageProjectPropertyType')
-                    ? (
-                        <CustomOptionSelectInput
-                            placeholder="Reference"
-                            name="reference"
-                            value={value.reference}
-                            onChange={setFieldValue}
-                            error={error?.reference}
-                            disabled={disabled}
-                            options={removeNull(projectData?.projectTypeSpecifics?.customOptions)}
-                            nonClearable
-                        />
-                    ) : (
-                        <TileOptionSelectInput
-                            placeholder="Reference"
-                            name="reference"
-                            value={value.reference}
-                            onChange={setFieldValue}
-                            error={error?.reference}
-                            disabled={disabled}
-                            nonClearable
-                        />
-                    )}
+                <OptionComponent
+                    placeholder="Reference"
+                    name="reference"
+                    value={value.reference}
+                    onChange={setFieldValue}
+                    error={error?.reference}
+                    disabled={disabled}
+                    options={removeNull(projectData?.projectTypeSpecifics?.customOptions)}
+                    nonClearable
+                />
                 {projectData?.projectType === ProjectTypeEnum.Find && (
                     <FindPropertyInput
                         value={value.projectTypeSpecifics?.find}

From 3f6de08d273e0bd3b3a2b7464d737f1fef2a764e Mon Sep 17 00:00:00 2001
From: ofritz <oliver.fritz@heigit.org>
Date: Tue, 20 Jan 2026 16:06:35 +0100
Subject: [PATCH 07/10] feat(conflation): remove instruction and lookFor
 inputs, hard-code values

---
 .../NewProject/ProjectGeneralInputs/index.tsx | 47 +++++++++++--------
 app/views/NewProject/index.tsx                | 11 +++++
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/app/views/NewProject/ProjectGeneralInputs/index.tsx b/app/views/NewProject/ProjectGeneralInputs/index.tsx
index 637db76..a45fdeb 100644
--- a/app/views/NewProject/ProjectGeneralInputs/index.tsx
+++ b/app/views/NewProject/ProjectGeneralInputs/index.tsx
@@ -69,7 +69,7 @@ const hintText: Record<
         [ProjectTypeEnum.ValidateImage]: 'Enter the title of your project. It should begin with project type. (e.g., "Assess Images")',
         [ProjectTypeEnum.Completeness]: 'Enter the title of your project. It should begin with project type. (e.g., "Check Completeness")',
         [ProjectTypeEnum.Street]: 'Enter the title of your project. It should begin with project type. (e.g., "View Streets") ',
-        [ProjectTypeEnum.Street]: 'Enter the title of your project. It should begin with project type. (e.g., "Conflate Features") ',
+        [ProjectTypeEnum.Conflation]: 'Enter the title of your project. It should begin with project type. (e.g., "Conflate Features") ',
     },
     projectInstruction: {
         [ProjectTypeEnum.Find]: 'What should the users look for (e.g. You are looking for: buildings, destroyed buildings, cars, trees, etc.)',
@@ -94,6 +94,7 @@ const hintText: Record<
         [ProjectTypeEnum.ValidateImage]: 'Provide an optional link to a resource with additional information on the project (only visible in the MapSwipe web app).',
         [ProjectTypeEnum.Completeness]: 'Provide an optional link to a resource with additional information on the project (only visible in the MapSwipe web app)',
         [ProjectTypeEnum.Street]: 'Provide an optional link to a resource with additional information on the project (only visible in the MapSwipe web app)',
+        [ProjectTypeEnum.Conflation]: 'Provide an optional link to a resource with additional information on the project (only visible in the MapSwipe web app)',
     },
     projectNumber: {
         [ProjectTypeEnum.Find]: 'Is this project part of a bigger campaign with multiple projects? If so, increment this number up by one each time you create a new project in the series. ',
@@ -270,24 +271,32 @@ function ProjectGeneralInputs(props: Props) {
                 layout="grid"
                 spacing="lg"
             >
-                <TextInput
-                    label="Instruction"
-                    name="projectInstruction"
-                    value={value?.projectInstruction}
-                    onChange={setFieldValue}
-                    error={error?.projectInstruction}
-                    disabled={isDisabled('projectInstruction')}
-                    hint={getHint('projectInstruction')}
-                />
-                <TextInput
-                    label="Look for (legacy)"
-                    name="lookFor"
-                    value={value?.lookFor}
-                    onChange={setFieldValue}
-                    error={error?.lookFor}
-                    hint={getHint('lookFor')}
-                    disabled={isDisabled('lookFor')}
-                />
+                {/*
+                    Remove instruction and lookFor inputs if project type is conflation,
+                    as values are hard-coded on form submission
+                */}
+                {projectType !== ProjectTypeEnum.Conflation && (
+                    <>
+                        <TextInput
+                            label="Instruction"
+                            name="projectInstruction"
+                            value={value?.projectInstruction}
+                            onChange={setFieldValue}
+                            error={error?.projectInstruction}
+                            disabled={isDisabled('projectInstruction')}
+                            hint={getHint('projectInstruction')}
+                        />
+                        <TextInput
+                            label="Look for (legacy)"
+                            name="lookFor"
+                            value={value?.lookFor}
+                            onChange={setFieldValue}
+                            error={error?.lookFor}
+                            hint={getHint('lookFor')}
+                            disabled={isDisabled('lookFor')}
+                        />
+                    </>
+                )}
                 <TeamSelectInput
                     label="Select Team (Private)"
                     name="team"
diff --git a/app/views/NewProject/index.tsx b/app/views/NewProject/index.tsx
index 21fe166..b4d08f6 100644
--- a/app/views/NewProject/index.tsx
+++ b/app/views/NewProject/index.tsx
@@ -214,6 +214,17 @@ function NewProject() {
         async (submittedFormValues: PartialProjectCreateInputFields) => {
             const finalValues = submittedFormValues as ProjectCreateInput;
 
+            /*
+                Conflation projects: instructions change per task depending
+                on the presence of OSM features. Currently, only building
+                features are supported.
+            */
+
+            if (finalValues.projectType === ProjectTypeEnum.Conflation) {
+                finalValues.lookFor = 'building';
+                finalValues.projectInstruction = 'Compare buildings';
+            }
+
             try {
                 const result = await createNewProject({
                     data: finalValues,

From 844a6b70a2b7bef86f5700c824cd0ea1c4e5427f Mon Sep 17 00:00:00 2001
From: ofritz <oliver.fritz@heigit.org>
Date: Wed, 21 Jan 2026 17:21:39 +0100
Subject: [PATCH 08/10] feat(conflation): do not require instruction and
 lookFor for conflation

---
 app/utils/common.ts                                  |  1 -
 .../ScenarioPageInput/TaskInput/index.tsx            |  1 -
 app/views/NewProject/index.tsx                       | 12 ++++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/utils/common.ts b/app/utils/common.ts
index b7ad95d..cb8dd52 100644
--- a/app/utils/common.ts
+++ b/app/utils/common.ts
@@ -27,7 +27,6 @@ export const COLOR_CONFLATION_OPTION_YES = 'green';
 export const COLOR_CONFLATION_OPTION_NOT_SURE = 'grey';
 export const COLOR_CONFLATION_OPTION_SKIP = 'orange';
 
-
 export const VALUE_TILE_OPTION_NO = 0;
 export const VALUE_TILE_OPTION_YES = 1;
 export const VALUE_TILE_OPTION_MAYBE = 2;
diff --git a/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx b/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx
index f562310..671d889 100644
--- a/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx
+++ b/app/views/EditTutorial/ScenarioPageInput/TaskInput/index.tsx
@@ -11,7 +11,6 @@ import { ulid } from 'ulid';
 import ConflationOptionSelectInput from '#components/domain/ConflationOptionSelectInput';
 import CustomOptionSelectInput from '#components/domain/CustomOptionSelectInput';
 import TileOptionSelectInput from '#components/domain/TileOptionSelectInput';
-
 import {
     ProjectTypeEnum,
     TutorialProjectDetailQuery,
diff --git a/app/views/NewProject/index.tsx b/app/views/NewProject/index.tsx
index b4d08f6..803fb83 100644
--- a/app/views/NewProject/index.tsx
+++ b/app/views/NewProject/index.tsx
@@ -99,12 +99,16 @@ const projectCreateFormSchema: ProjectCreateFormSchema = {
             requiredValidation: requiredStringCondition,
         },
         projectInstruction: {
-            required: true,
-            requiredValidation: requiredStringCondition,
+            required: (form) => form.projectType !== ProjectTypeEnum.Conflation,
+            requiredValidation: (value, form) => (form.projectType !== ProjectTypeEnum.Conflation
+                ? requiredStringCondition(value)
+                : undefined),
         },
         lookFor: {
-            required: true,
-            requiredValidation: requiredStringCondition,
+            required: (form) => form.projectType !== ProjectTypeEnum.Conflation,
+            requiredValidation: (value, form) => (form.projectType !== ProjectTypeEnum.Conflation
+                ? requiredStringCondition(value)
+                : undefined),
         },
         description: {},
         team: {},

From 4de2ea16e0821d13041cbffe6faf5f0b684bd7e7 Mon Sep 17 00:00:00 2001
From: ofritz <oliver.fritz@heigit.org>
Date: Wed, 21 Jan 2026 17:58:24 +0100
Subject: [PATCH 09/10] feat(conflation): update submodule pointer

---
 backend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend b/backend
index ac1355f..a587dd2 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit ac1355f602a9648c6cfe96c2aadf7d5747f13211
+Subproject commit a587dd21dba41fec35276ea4dabf9d97b71f8667

From 275b45da5bcbe7c55b992e25ff6e523be0e66d90 Mon Sep 17 00:00:00 2001
From: ofritz <oliver.fritz@heigit.org>
Date: Thu, 22 Jan 2026 16:02:55 +0100
Subject: [PATCH 10/10] feat(conflation): update submodule pointer

---
 backend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend b/backend
index 6a48a5d..271860f 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit 6a48a5d18a3789ea0b059fc59057f405839cfb86
+Subproject commit 271860fcf749a8f0c4c5eef8abe0ebb2de127f94