From ff9eaa88b75338e165cda2b5d911302c3c532ec3 Mon Sep 17 00:00:00 2001 From: Ed Molyneux Date: Fri, 15 Mar 2024 08:32:00 +0000 Subject: [PATCH] Merge `next` to master at v3.1.0 (#174) * 166 missing discriminator properties in items inside arrays (#168) * Simplify TA10 structure, fix extractOverlay to handle discriminator in array items, correct planOnlyIndicator boolean * Fix TA10 enums * Bump version to release 3.0.1 * Remove "None" as accessibilityAndAdaptations option (#169) * Remove "None" as accessibilityAndAdaptations option * Bump to 3.0.2-1 * Add support for MI for lettings and NTS-L overlay (#171) * Add support for MI for lettings and NTS-L overlay * Add more transaction statuses, bump version * Fix holding deposit title and building safety description typo, bump version * AccessibiityAndAdaptations no longer required, as it can be empty, bump version * Add missing ntslRequireds, bump version * Missing NTSL Required * Bump to v3.1.0 --- index.js | 1 + package.json | 2 +- src/examples/v3/exampleTransaction.json | 8 +- src/schemas/v3/combined.json | 3763 ++++++----------------- src/schemas/v3/overlays/baspi.json | 4 +- src/schemas/v3/overlays/con29R.json | 2 +- src/schemas/v3/overlays/nts.json | 6 +- src/schemas/v3/overlays/ntsl.json | 1661 ++++++++++ src/schemas/v3/overlays/piq.json | 27 +- src/schemas/v3/overlays/rds.json | 27 +- src/schemas/v3/overlays/ta10.json | 3218 +++++-------------- src/schemas/v3/overlays/ta7.json | 2 +- src/schemas/v3/pdtf-transaction.json | 3332 +++++--------------- src/schemas/v3/skeleton.json | 92 +- src/tests/v3/transactionSchema.test.js | 26 + src/utils/extractOverlay.js | 92 +- 16 files changed, 4385 insertions(+), 7878 deletions(-) create mode 100644 src/schemas/v3/overlays/ntsl.json diff --git a/index.js b/index.js index 1b510ca..8ded9e7 100644 --- a/index.js +++ b/index.js @@ -41,6 +41,7 @@ const overlaysMap = { fme1ed2: require("./src/schemas/v3/overlays/fme1.json"), llc1v2: require("./src/schemas/v3/overlays/llc1.json"), nts2023: require("./src/schemas/v3/overlays/nts.json"), + ntsl2023: require("./src/schemas/v3/overlays/ntsl.json"), con29R2019: require("./src/schemas/v3/overlays/con29R.json"), con29DW: require("./src/schemas/v3/overlays/con29DW.json"), rdsV333: require("./src/schemas/v3/overlays/rds.json"), diff --git a/package.json b/package.json index 6d9ffee..a147aca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pdtf/schemas", - "version": "3.0.0", + "version": "3.1.0", "description": "Property Data Trust Framework Schemas and Utilities", "main": "index.js", "directories": { diff --git a/src/examples/v3/exampleTransaction.json b/src/examples/v3/exampleTransaction.json index 731f38a..6da3cd0 100644 --- a/src/examples/v3/exampleTransaction.json +++ b/src/examples/v3/exampleTransaction.json @@ -1,7 +1,7 @@ { "$schema": "https://trust.propdata.org.uk/schemas/v3/pdtf-transaction.json", "transactionId": "3e4666bf-d5e5-4aa7-b8ce-cefe41c7568a", - "status": "active", + "status": "For sale", "participants": [ { "name": { @@ -40,6 +40,10 @@ "postcode": "AL3 5AF" }, "localAuthority": { "localAuthorityName": "Neverland Hook" }, + "priceInformation": { + "price": 1260000, + "priceQualifier": "Offers in excess of" + }, "buildInformation": { "building": { "propertyType": "House", "builtForm": "Detached" }, "roomDimensions": { @@ -728,7 +732,7 @@ "documentDetails": { "document": { "entryNumber": ["B3", "C2", "C3", "C4"], - "planOnlyIndicator": "false", + "planOnlyIndicator": false, "registerDescription": "Charge", "documentType": "50", "documentDate": "2020-11-03" diff --git a/src/schemas/v3/combined.json b/src/schemas/v3/combined.json index 8aad383..97a6578 100644 --- a/src/schemas/v3/combined.json +++ b/src/schemas/v3/combined.json @@ -7,6 +7,7 @@ "baspiRequired": ["participants", "propertyPack"], "ta6Required": ["participants", "propertyPack"], "ntsRequired": ["propertyPack"], + "ntslRequired": ["propertyPack"], "properties": { "$schema": { "type": "string" @@ -20,7 +21,17 @@ }, "status": { "type": "string", - "enum": ["active", "cancelled", "completed"] + "enum": [ + "active", + "For sale", + "Under offer", + "Sold subject to contract", + "Contracts exchanged", + "Completed", + "Cancelled", + "To let", + "Let agreed" + ] }, "participants": { "title": "Transaction participants", @@ -120,7 +131,9 @@ "Buyer's Agent", "Surveyor", "Mortgage Broker", - "Lender" + "Lender", + "Landlord", + "Tenant" ] }, "externalIds": { @@ -204,6 +217,7 @@ "baspiRef": "0", "ta6Ref": "0", "ntsRef": "0", + "ntslRef": "0", "title": "Property Pack", "type": "object", "baspiRequired": [ @@ -266,6 +280,7 @@ "confirmationOfAccuracyByOwners" ], "ntsRequired": [ + "priceInformation", "ownership", "councilTax", "energyEfficiency", @@ -281,6 +296,22 @@ "environmentalIssues", "notices" ], + "ntslRequired": [ + "lettingInformation", + "councilTax", + "energyEfficiency", + "buildInformation", + "typeOfConstruction", + "electricity", + "connectivity", + "waterAndDrainage", + "heating", + "parking", + "listingAndConservation", + "rightsAndInformalArrangements", + "environmentalIssues", + "notices" + ], "ta7Required": ["ownership"], "properties": { "address": { @@ -473,6 +504,36 @@ } } }, + "lettingInformation": { + "ntslRef": "A2", + "title": "Letting information", + "type": "object", + "ntslRequired": ["rent", "rentFrequency"], + "properties": { + "rent": { + "ntslRef": "A2.1", + "title": "Rent", + "type": "number", + "minimum": 1 + }, + "rentFrequency": { + "ntslRef": "A2.2", + "title": "Rent frequency", + "type": "string", + "enum": ["Yearly", "Quarterly", "Monthly", "Weekly"] + }, + "securityDeposit": { + "ntslRef": "A3.1", + "title": "Security deposit", + "type": "number" + }, + "holdingDeposit": { + "ntslRef": "A3.2", + "title": "Holding deposit", + "type": "number" + } + } + }, "summaryDescription": { "title": "Summary description", "type": "string" @@ -523,18 +584,23 @@ }, "buildInformation": { "ntsRef": "B1.1", + "ntslRef": "B1.1", "title": "About the property building", "type": "object", "ntsRequired": ["building", "roomDimensions"], + "ntslRequired": ["building", "roomDimensions"], "properties": { "building": { "ntsRef": "B1.1.1", + "ntslRef": "B1.1.1", "title": "Building information", "type": "object", "ntsRequired": ["builtForm", "propertyType"], + "ntslRequired": ["builtForm", "propertyType"], "properties": { "builtForm": { "ntsRef": "B1.1.2", + "ntslRef": "B1.1.2", "title": "Built form", "type": "string", "enum": [ @@ -547,6 +613,7 @@ }, "propertyType": { "ntsRef": "B1.1.1.1", + "ntslRef": "B1.1.1.1", "title": "Property type", "type": "string", "enum": [ @@ -570,12 +637,14 @@ }, "otherType": { "ntsRef": "B1.1.1.1", + "ntslRef": "B1.1.1.1", "title": "Please describe the other type of property build", "type": "string", "minLength": 1 } }, - "ntsRequired": ["otherType"] + "ntsRequired": ["otherType"], + "ntslRequired": ["otherType"] }, { "properties": { @@ -591,28 +660,33 @@ }, "numberOfFloors": { "ntsRef": "B1.1.3", + "ntslRef": "B1.1.3", "title": "Number of floors in the building", "type": "integer" }, "entranceFloor": { "ntsRef": "B1.1.4", + "ntslRef": "B1.1.4", "title": "Entrance floor", "description": "Floor level of the entrance floor relative to the lowest level of the property (0 for ground floor). If there is a basement, the basement is level 0 and the other floors are from 1 upwards", "type": "integer" }, "hasLift": { "ntsRef": "B1.1.5", + "ntslRef": "B1.1.5", "title": "Is the property served by a lift?", "type": "string", "enum": ["Yes", "No"] }, "overCommercialPremises": { "ntsRef": "B1.1.6", + "ntslRef": "B1.1.6", "title": "Located over commercial premises?", "type": "object", "properties": { "isLocatedOverCommercialPremises": { "ntsRef": "B1.1.6.1", + "ntslRef": "B1.1.6.1", "type": "string", "title": "Is the property located over commercial premises?", "enum": ["Yes", "No"] @@ -637,12 +711,14 @@ }, "details": { "ntsRef": "B1.1.6.2", + "ntslRef": "B1.1.6.2", "title": "Please provide details", "type": "string", "minLength": 1 } }, - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] } ] } @@ -652,6 +728,12 @@ "entranceFloor", "hasLift", "overCommercialPremises" + ], + "ntslRequired": [ + "numberOfFloors", + "entranceFloor", + "hasLift", + "overCommercialPremises" ] } ] @@ -688,12 +770,15 @@ }, "roomDimensions": { "ntsRef": "B2", + "ntslRef": "B2", "title": "Room dimensions", "type": "object", "ntsRequired": ["hasFloorplan"], + "ntslRequired": ["hasFloorplan"], "properties": { "hasFloorplan": { "ntsRef": "B2.1", + "ntslRef": "B2.1", "title": "Is a floorplan available which includes the dimensions of all the rooms?", "type": "string", "enum": ["Yes", "No"] @@ -710,6 +795,7 @@ }, "attachments": { "ntsRef": "B2.1.1", + "ntslRef": "B2.1.1", "title": "Attachments", "type": "string", "enum": ["Attached", "With agent"] @@ -723,6 +809,7 @@ }, "rooms": { "ntsRef": "B2.2", + "ntslRef": "B2.2", "title": "Rooms", "description": "Please supply dimensions for each of the rooms.", "type": "array", @@ -731,30 +818,35 @@ "properties": { "roomName": { "ntsRef": "B2.2.1", + "ntslRef": "B2.2.1", "type": "string", "title": "The name of the room", "minLength": 1 }, "description": { "ntsRef": "B2.2.2", + "ntslRef": "B2.2.2", "type": "string", "minLength": 1, "title": "Description of the room" }, "length": { "ntsRef": "B2.2.3", + "ntslRef": "B2.2.3", "type": "number", "minimum": 0, "title": "The length of the room" }, "width": { "ntsRef": "B2.2.4", + "ntslRef": "B2.2.4", "type": "number", "minimum": 0, "title": "The width of the room" }, "units": { "ntsRef": "B2.2.5", + "ntslRef": "B2.2.5", "title": "The units which the length and width of the room have been provided in", "type": "string", "enum": [ @@ -767,12 +859,14 @@ }, "dimensionDetails": { "ntsRef": "B2.6", + "ntslRef": "B2.6", "title": "Any additional description or clarification of the room dimensions", "type": "string", "minLength": 1 } }, - "ntsRequired": ["roomName", "length", "width", "units"] + "ntsRequired": ["roomName", "length", "width", "units"], + "ntslRequired": ["roomName", "length", "width", "units"] } } } @@ -8263,6 +8357,7 @@ }, "parking": { "ntsRef": "B4", + "ntslRef": "B4", "baspiRef": "A1.6", "rdsRef": "Services/Parking", "ta6Ref": "9", @@ -8279,10 +8374,17 @@ "controlledParking", "electricVehicleChargingPoint" ], + "ntslRequired": [ + "parkingArrangements", + "disabledParking", + "controlledParking", + "electricVehicleChargingPoint" + ], "ta6Required": ["parkingArrangements", "controlledParking"], "properties": { "parkingArrangements": { "ntsRef": "B4.1", + "ntslRef": "B4.1", "baspiRef": "A1.6.0", "ta6Ref": "9.1", "piqRef": "A1.5", @@ -8290,6 +8392,7 @@ "title": "Parking arrangements", "items": { "ntsRef": "B4.1.1", + "ntslRef": "B4.1.1", "type": "string", "enum": [ "Allocated", @@ -8308,20 +8411,24 @@ }, "disabledParking": { "ntsRef": "B4.2", + "ntslRef": "B4.2", "title": "Is disabled parking available?", "type": "object", "properties": { "yesNo": { "ntsRef": "B4.2.1", + "ntslRef": "B4.2.1", "type": "string", "title": "", "enum": ["Yes", "No", "Not known"] } }, - "ntsRequired": ["yesNo"] + "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"] }, "controlledParking": { "ntsRef": "B4.3", + "ntslRef": "B4.3", "baspiRef": "A1.6.2", "ta6Ref": "9.2", "title": "Is the property in a controlled parking zone or within a local authority parking scheme?", @@ -8329,6 +8436,7 @@ "properties": { "yesNo": { "ntsRef": "B4.3.1", + "ntslRef": "B4.3.1", "baspiRef": "A1.6.2.1", "ta6Ref": "9.2.1", "type": "string", @@ -8338,16 +8446,19 @@ }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"] }, "electricVehicleChargingPoint": { "ntsRef": "B4.4", + "ntslRef": "B4.4", "baspiRef": "A1.6.1", "title": "Is there an electric vehicle charging point belonging to the property?", "type": "object", "properties": { "yesNo": { "ntsRef": "B4.4.1", + "ntslRef": "B4.4.1", "baspiRef": "A1.6.1.1", "type": "string", "title": "", @@ -8355,12 +8466,14 @@ } }, "baspiRequired": ["yesNo"], - "ntsRequired": ["yesNo"] + "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"] } } }, "listingAndConservation": { "ntsRef": "C2.1", + "ntslRef": "C2.1", "baspiRef": "A1.7", "ta6Ref": "4.7", "title": "Listing and Conservation", @@ -8370,6 +8483,11 @@ "isConservationArea", "hasTreePreservationOrder" ], + "ntslRequired": [ + "isListed", + "isConservationArea", + "hasTreePreservationOrder" + ], "baspiRequired": [ "isListed", "isConservationArea", @@ -8383,6 +8501,7 @@ "properties": { "isListed": { "ntsRef": "C2.1.1", + "ntslRef": "C2.1.1", "baspiRef": "A1.7.1", "rdsRef": "Protections", "ta6Ref": "4.7a", @@ -8392,17 +8511,20 @@ "properties": { "yesNo": { "ntsRef": "C2.1.1.1", + "ntslRef": "C2.1.1.1", "baspiRef": "A1.7.1.1", "ta6Ref": "4.7a1", "piqRef": "A1.6.1.1", "type": "string", "title": "", "enum": ["Yes", "No", "Not known"], - "ntsEnum": ["Yes", "No"] + "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"] } }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"], "discriminator": { "propertyName": "yesNo" @@ -8422,6 +8544,7 @@ }, "details": { "ntsRef": "C2.1.1.2", + "ntslRef": "C2.1.1.2", "baspiRef": "A1.7.1.2", "ta6Ref": "4.7a2", "title": "Please provide details of the listing", @@ -8437,6 +8560,7 @@ } }, "ntsRequired": ["details"], + "ntslRequired": ["details"], "baspiRequired": ["details", "attachments"], "ta6Required": ["details", "attachments"] } @@ -8444,6 +8568,7 @@ }, "isConservationArea": { "ntsRef": "C2.1.2", + "ntslRef": "C2.1.2", "baspiRef": "A1.7.2", "rdsRef": "Protections", "ta6Ref": "4.7b", @@ -8453,17 +8578,20 @@ "properties": { "yesNo": { "ntsRef": "C2.1.2.1", + "ntslRef": "C2.1.2.1", "baspiRef": "A1.7.2.1", "piqRef": "A1.6.2.1", "ta6Ref": "4.7b1", "type": "string", "title": "", "enum": ["Yes", "No", "Not known"], - "ntsEnum": ["Yes", "No"] + "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"] } }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"], "discriminator": { "propertyName": "yesNo" @@ -8483,6 +8611,7 @@ }, "details": { "ntsRef": "C2.1.2.2", + "ntslRef": "C2.1.2.2", "baspiRef": "A1.7.2.2", "ta6Ref": "4.7b2", "title": "Please provide details of the listing", @@ -8498,6 +8627,7 @@ } }, "ntsRequired": ["details"], + "ntslRequired": ["details"], "baspiRequired": ["details", "attachments"], "ta6Required": ["details", "attachments"] } @@ -8505,6 +8635,7 @@ }, "hasTreePreservationOrder": { "ntsRef": "C2.1.3", + "ntslRef": "C2.1.3", "baspiRef": "A1.7.3", "rdsRef": "Property/Flags", "ta6Ref": "4.8", @@ -8514,17 +8645,20 @@ "properties": { "yesNo": { "ntsRef": "C2.1.3.1", + "ntslRef": "C2.1.3.1", "baspiRef": "A1.7.3.1", "ta6Ref": "4.8.1", "piqRef": "A1.6.3.1", "type": "string", "title": "", "enum": ["Yes", "No", "Not known"], - "ntsEnum": ["Yes", "No"] + "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"] } }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"], "discriminator": { "propertyName": "yesNo" @@ -8544,6 +8678,7 @@ }, "workCarriedOut": { "ntsRef": "C2.1.3.2", + "ntslRef": "C2.1.3.2", "baspiRef": "A1.7.3.2", "rdsRef": "WorksAlterationsChanges", "ta6Ref": "4.8a", @@ -8562,6 +8697,7 @@ }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"], "discriminator": { "propertyName": "yesNo" @@ -8581,6 +8717,7 @@ }, "consentsObtained": { "ntsRef": "C2.1.3.3", + "ntslRef": "C2.1.3.3", "baspiRef": "A1.7.3.3", "ta6Ref": "4.8a2", "title": "Were the relevant consents obtained?", @@ -8597,6 +8734,7 @@ } }, "ntsRequired": ["consentsObtained"], + "ntslRequired": ["consentsObtained"], "baspiRequired": ["consentsObtained"], "ta6Required": ["consentsObtained"] } @@ -8613,6 +8751,7 @@ "typeOfConstruction": { "baspiRef": "A1.8", "ntsRef": "A1.2", + "ntslRef": "A1.2", "title": "Type of Construction", "type": "object", "baspiRequired": [ @@ -8620,15 +8759,13 @@ "buildingSafety", "sprayFoamInsulation" ], - "ntsRequired": [ - "isStandardForm", - "buildingSafety", - "accessibilityAndAdaptations" - ], + "ntsRequired": ["isStandardForm", "buildingSafety"], + "ntslRequired": ["isStandardForm", "buildingSafety"], "properties": { "isStandardForm": { "baspiRef": "A1.8.1", "ntsRef": "A1.2.1", + "ntslRef": "A1.2.1", "rdsRef": "Buildings,BuildingSections/ConstructionType,ConstructionMaterials", "piqRef": "A5.5", "title": "Is the property built in a standard form of construction?", @@ -8638,6 +8775,7 @@ "yesNo": { "baspiRef": "A1.8.1.1", "ntsRef": "A1.2.1.1", + "ntslRef": "A1.2.1.1", "piqRef": "A5.5.1", "type": "string", "title": "", @@ -8646,6 +8784,7 @@ }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "discriminator": { "propertyName": "yesNo" }, @@ -8665,28 +8804,32 @@ "details": { "baspiRef": "A1.8.1.2", "ntsRef": "A1.2.1.2", + "ntslRef": "A1.2.1.2", "title": "Details", "type": "string", "minLength": 1 } }, "baspiRequired": ["details"], - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] } ] }, "buildingSafety": { "ntsRef": "C1", + "ntslRef": "C1", "baspiRef": "A1.8.2", "ta7Ref": "11.1", "title": "Are you aware of any building safety issues?", "baspiTitle": "Are you aware of any remediation required to the property due to building safety?", "ta7Title": "Have any remediation works on the building been proposed or carried out?", - "description": "For example issues related to unsafe cladding, integrity of building materials used in construction (e.g. asbestos), risk of collapse (e.g. damaged roofs or strucutural failures), at-risk wooden decking for external structures (including balconies), lack of emergency lighting where required or insufficient fire/smoke alarm systems", + "description": "For example issues related to unsafe cladding, integrity of building materials used in construction (e.g. asbestos), risk of collapse (e.g. damaged roofs or structural failures), at-risk wooden decking for external structures (including balconies), lack of emergency lighting where required or insufficient fire/smoke alarm systems", "type": "object", "properties": { "yesNo": { "ntsRef": "C1.1", + "ntslRef": "C1.1", "baspiRef": "A1.8.2.1", "ta7Ref": "11.1.1", "type": "string", @@ -8694,10 +8837,12 @@ "enum": ["Yes", "No", "Not applicable"], "ta7Enum": ["Yes", "No", "Not applicable"], "baspiEnum": ["Yes", "No"], - "ntsEnum": ["Yes", "No"] + "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"] } }, "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "baspiRequired": ["yesNo"], "ta7Required": ["yesNo"], "discriminator": { @@ -8719,6 +8864,7 @@ }, "details": { "ntsRef": "C1.2", + "ntslRef": "C1.2", "baspiRef": "A1.8.2.2", "ta7Ref": "11.1.2", "title": "What are the defects or hazards?", @@ -8728,6 +8874,7 @@ }, "workAlreadyDone": { "ntsRef": "C1.3", + "ntslRef": "C1.3", "baspiRef": "A1.8.2.2", "ta7Ref": "11.1.2", "title": "What work has already been done?", @@ -8736,6 +8883,7 @@ }, "workToBeDone": { "ntsRef": "C1.4", + "ntslRef": "C1.4", "baspiRef": "A1.8.2.2", "ta7Ref": "11.1.2", "title": "What work is required to be done?", @@ -8744,6 +8892,7 @@ }, "potentialCost": { "ntsRef": "C1.5", + "ntslRef": "C1.5", "baspiRef": "A1.8.2.2", "ta7Ref": "11.1.2", "title": "What will the potential cost be?", @@ -8752,6 +8901,7 @@ }, "abilityToResideAtProperty": { "ntsRef": "C1.6", + "ntslRef": "C1.6", "baspiRef": "A1.8.2.2", "ta7Ref": "11.1.2", "title": "Will the work impact the ability to reside at the property?", @@ -8774,6 +8924,13 @@ "workToBeDone", "potentialCost", "abilityToResideAtProperty" + ], + "ntslRequired": [ + "details", + "workAlreadyDone", + "workToBeDone", + "potentialCost", + "abilityToResideAtProperty" ] } ] @@ -8826,13 +8983,13 @@ }, "accessibilityAndAdaptations": { "ntsRef": "C5", + "ntslRef": "C5", "title": "Are there any adaptations or features that provide easier access to, and within, the property?", "description": "Lateral living is where a property has all essential facilities e.g. kitchen, bathroom and bedroom on the entrance level.", "type": "array", "items": { "type": "string", "enum": [ - "None", "Level access", "Ramped access", "Lift access", @@ -8850,11 +9007,13 @@ "baspiRef": "A1.8.3", "ta6Ref": "7.6", "ntsRef": "A4", + "ntslRef": "A4", "rdsRef": "Certificates/{category='energyEfficiency',standard='EPC',gradeLevelRating=?},Certificates/{category='energyEfficiency',standard='EPC',status='exempt'},", "title": "Energy Efficiency", "type": "object", "baspiRequired": ["certificate", "greenDealLoan"], "ntsRequired": ["certificate"], + "ntslRequired": ["certificate"], "ta6Required": ["certificateIsSupplied", "greenDealLoan"], "properties": { "certificateIsSupplied": { @@ -8866,9 +9025,11 @@ "certificate": { "baspiRef": "A1.8.3.1", "ntsRef": "A4.1", + "ntslRef": "A4.1", "type": "object", "baspiRequired": ["currentEnergyRating"], "ntsRequired": ["currentEnergyRating"], + "ntslRequired": ["currentEnergyRating"], "properties": { "certificateNumber": { "type": "string" @@ -8918,6 +9079,7 @@ "currentEnergyRating": { "baspiRef": "A1.8.3.1.1", "ntsRef": "A4.1.1", + "ntslRef": "A4.1.1", "title": "Current energy efficiency rating", "description": "What is the energy efficiency rating of the property according to the latest Energy Performance Certificate (EPC)?", "type": "string", @@ -9269,15 +9431,18 @@ "councilTax": { "baspiRef": "A1.9", "ntsRef": "A1", + "ntslRef": "A1", "piqRef": "B2", "title": "Council Tax", "type": "object", "baspiRequired": ["councilTaxBand", "councilTaxAffectingAlterations"], "ntsRequired": ["councilTaxBand", "councilTaxAffectingAlterations"], + "ntslRequired": ["councilTaxBand", "councilTaxAffectingAlterations"], "properties": { "councilTaxBand": { "baspiRef": "A1.9.1", "ntsRef": "A1.1", + "ntslRef": "A1.1", "rdsRef": "TenureAgreements/Taxes/{banding=?}", "piqRef": "B2.1", "title": "Which Council Tax band does this property fall within?", @@ -9288,6 +9453,7 @@ "councilTaxAffectingAlterations": { "baspiRef": "A1.9.2", "ntsRef": "A1.2", + "ntslRef": "A1.2", "rdsRef": "TenureAgreements/Taxes/WorksAlterationsChanges", "title": "Have you altered the property in any way to the extent that it might change the Council Tax band e.g. added a bedroom or substantially extended the property?", "type": "object", @@ -9295,6 +9461,7 @@ "yesNo": { "baspiRef": "A1.9.2.1", "ntsRef": "A1.2.1", + "ntslRef": "A1.2.1", "type": "string", "title": "", "enum": ["Yes", "No"] @@ -9302,6 +9469,7 @@ }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "discriminator": { "propertyName": "yesNo" }, @@ -9321,6 +9489,7 @@ "details": { "baspiRef": "A1.9.2.2", "ntsRef": "A1.2.2", + "ntslRef": "A1.2.2", "title": "Please give details", "type": "string", "minLength": 1 @@ -9328,13 +9497,15 @@ "attachments": { "baspiRef": "A1.9.2.3", "ntsRef": "A1.2.3", + "ntslRef": "A1.2.3", "title": "Attachments", "type": "string", "enum": ["Attached", "To follow"] } }, "baspiRequired": ["details"], - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] } ] }, @@ -10758,6 +10929,7 @@ "baspiRef": "A4", "ta6Ref": "3", "ntsRef": "C4", + "ntslRef": "C4", "title": "Notices which Affect the Property", "description": "Are you aware of, or have you received, any of the following notices?", "type": "object", @@ -10771,6 +10943,7 @@ "otherNotices" ], "ntsRequired": ["neighbourDevelopment", "planningApplication"], + "ntslRequired": ["neighbourDevelopment", "planningApplication"], "ta6Required": [ "neighbourDevelopment", "partyWallAct", @@ -10780,6 +10953,7 @@ "neighbourDevelopment": { "baspiRef": "A4.1", "ntsRef": "C4.1", + "ntslRef": "C4.1", "ta6Ref": "3.2", "rdsRef": "Property/Flags,Planning", "piqRef": "A4.1", @@ -10789,6 +10963,7 @@ "properties": { "yesNo": { "ntsRef": "C4.1.1", + "ntslRef": "C4.1.1", "baspiRef": "A4.1.1", "piqRef": "A4.1.1", "ta6Ref": "3.2.1", @@ -10799,6 +10974,7 @@ }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"], "discriminator": { "propertyName": "yesNo" @@ -10818,6 +10994,7 @@ }, "details": { "ntsRef": "C4.1.2", + "ntslRef": "C4.1.2", "baspiRef": "A4.1.2", "ta6Ref": "3.2.2", "title": "Details", @@ -10833,12 +11010,14 @@ }, "baspiRequired": ["details", "attachments"], "ta6Required": ["details"], - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] } ] }, "planningApplication": { "ntsRef": "C4.2", + "ntslRef": "C4.2", "baspiRef": "A4.2", "rdsRef": "Property/Flags,Planning", "ta6Ref": "3.1", @@ -10848,6 +11027,7 @@ "properties": { "yesNo": { "ntsRef": "C4.2.1", + "ntslRef": "C4.2.1", "baspiRef": "A4.2.1", "ta6Ref": "3.1.1", "piqRef": "A4.2.1", @@ -10858,6 +11038,7 @@ }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"], "discriminator": { "propertyName": "yesNo" @@ -10877,6 +11058,7 @@ }, "details": { "ntsRef": "C4.2.2", + "ntslRef": "C4.2.2", "baspiRef": "A4.2.2", "ta6Ref": "3.1.2", "title": "Details", @@ -10892,7 +11074,8 @@ }, "baspiRequired": ["details", "attachments"], "ta6Required": ["details"], - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] } ] }, @@ -11448,7 +11631,8 @@ "fittedUnits", "outdoorArea", "televisionAndTelephone", - "stockOfFuel" + "stockOfFuel", + "otherItems" ], "properties": { "itemsToRemove": { @@ -11571,6 +11755,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -11581,12 +11770,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.1c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -11599,23 +11783,6 @@ "ta10Ref": "1.1b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.1c", - "title": "Comments", - "type": "string" } } } @@ -11631,6 +11798,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -11641,12 +11813,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.2c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -11659,23 +11826,6 @@ "ta10Ref": "1.2b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.2c", - "title": "Comments", - "type": "string" } } } @@ -11691,6 +11841,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -11701,12 +11856,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.3c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -11719,23 +11869,6 @@ "ta10Ref": "1.3b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.3c", - "title": "Comments", - "type": "string" } } } @@ -11751,6 +11884,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -11761,12 +11899,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.4c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -11779,23 +11912,6 @@ "ta10Ref": "1.4b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.4c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.4c", - "title": "Comments", - "type": "string" } } } @@ -11811,6 +11927,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -11821,12 +11942,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.5c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -11839,23 +11955,6 @@ "ta10Ref": "1.5b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.5c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.5c", - "title": "Comments", - "type": "string" } } } @@ -11871,6 +11970,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -11881,12 +11985,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.6c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -11899,23 +11998,6 @@ "ta10Ref": "1.6b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.6c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.6c", - "title": "Comments", - "type": "string" } } } @@ -11931,6 +12013,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -11941,12 +12028,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.7c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -11959,23 +12041,6 @@ "ta10Ref": "1.7b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.7c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.7c", - "title": "Comments", - "type": "string" } } } @@ -11991,6 +12056,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12001,12 +12071,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.8c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -12019,23 +12084,6 @@ "ta10Ref": "1.8b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.8c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.8c", - "title": "Comments", - "type": "string" } } } @@ -12051,6 +12099,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12061,12 +12114,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.9c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -12079,23 +12127,6 @@ "ta10Ref": "1.9b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.9c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.9c", - "title": "Comments", - "type": "string" } } } @@ -12111,6 +12142,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12121,12 +12157,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.10c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -12139,23 +12170,6 @@ "ta10Ref": "1.10b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.10c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.10c", - "title": "Comments", - "type": "string" } } } @@ -12171,6 +12185,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12181,12 +12200,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.11c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -12199,23 +12213,6 @@ "ta10Ref": "1.11b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.11c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.11c", - "title": "Comments", - "type": "string" } } } @@ -12231,6 +12228,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12241,12 +12243,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.12c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -12259,23 +12256,6 @@ "ta10Ref": "1.12b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.12c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.12c", - "title": "Comments", - "type": "string" } } } @@ -12291,6 +12271,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12301,12 +12286,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.13c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -12319,23 +12299,6 @@ "ta10Ref": "1.13b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.13c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.13c", - "title": "Comments", - "type": "string" } } } @@ -12351,6 +12314,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12361,12 +12329,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.14c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -12379,23 +12342,6 @@ "ta10Ref": "1.14b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.14c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.14c", - "title": "Comments", - "type": "string" } } } @@ -12411,6 +12357,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12421,12 +12372,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.15c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -12439,23 +12385,6 @@ "ta10Ref": "1.15b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.15c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "1.15c", - "title": "Comments", - "type": "string" } } } @@ -12489,11 +12418,6 @@ "properties": { "isIncludedOrExcluded": { "enum": ["Included"] - }, - "comments": { - "ta10Ref": "1.16c", - "title": "Comments", - "type": "string" } } }, @@ -12506,11 +12430,6 @@ "ta10Ref": "1.16b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "1.16c", - "title": "Comments", - "type": "string" } } } @@ -12547,6 +12466,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12554,6 +12478,13 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": ["None"] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -12563,43 +12494,14 @@ "ta10Ref": "2.1d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.1d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.1c", - "title": "Comments", - "type": "string" - } - } - } - ] + "ta10Required": ["fittedOrFreestanding"] } } }, @@ -12617,55 +12519,14 @@ "ta10Ref": "2.1d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.1d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.1c", - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.1c", - "title": "Comments", - "type": "string" + "ta10Required": ["fittedOrFreestanding"] } } } @@ -12681,6 +12542,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12688,6 +12554,13 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": ["None"] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -12697,43 +12570,14 @@ "ta10Ref": "2.2d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.2d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.2c", - "title": "Comments", - "type": "string" - } - } - } - ] + "ta10Required": ["fittedOrFreestanding"] } } }, @@ -12751,55 +12595,14 @@ "ta10Ref": "2.2d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.2d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.2c", - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.2c", - "title": "Comments", - "type": "string" + "ta10Required": ["fittedOrFreestanding"] } } } @@ -12815,6 +12618,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12822,6 +12630,13 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": ["None"] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -12831,43 +12646,14 @@ "ta10Ref": "2.3d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.3d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.3c", - "title": "Comments", - "type": "string" - } - } - } - ] + "ta10Required": ["fittedOrFreestanding"] } } }, @@ -12885,55 +12671,14 @@ "ta10Ref": "2.3d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.3d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.3c", - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.3c", - "title": "Comments", - "type": "string" + "ta10Required": ["fittedOrFreestanding"] } } } @@ -12949,6 +12694,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -12956,6 +12706,13 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": ["None"] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -12965,43 +12722,14 @@ "ta10Ref": "2.4d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.4d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.4c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.4c", - "title": "Comments", - "type": "string" - } - } - } - ] + "ta10Required": ["fittedOrFreestanding"] } } }, @@ -13019,55 +12747,14 @@ "ta10Ref": "2.4d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.4d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.4c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.4c", - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.4c", - "title": "Comments", - "type": "string" + "ta10Required": ["fittedOrFreestanding"] } } } @@ -13083,6 +12770,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -13090,6 +12782,13 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": ["None"] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -13099,43 +12798,14 @@ "ta10Ref": "2.5d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.5d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.5c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.5c", - "title": "Comments", - "type": "string" - } - } - } - ] + "ta10Required": ["fittedOrFreestanding"] } } }, @@ -13153,55 +12823,14 @@ "ta10Ref": "2.5d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.5d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.5c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.5c", - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.5c", - "title": "Comments", - "type": "string" + "ta10Required": ["fittedOrFreestanding"] } } } @@ -13217,6 +12846,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -13224,6 +12858,13 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": ["None"] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -13233,43 +12874,14 @@ "ta10Ref": "2.6d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.6d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.6c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.6c", - "title": "Comments", - "type": "string" - } - } - } - ] + "ta10Required": ["fittedOrFreestanding"] } } }, @@ -13287,55 +12899,14 @@ "ta10Ref": "2.6d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.6d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.6c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.6c", - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.6c", - "title": "Comments", - "type": "string" + "ta10Required": ["fittedOrFreestanding"] } } } @@ -13351,6 +12922,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -13358,6 +12934,13 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": ["None"] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -13367,43 +12950,14 @@ "ta10Ref": "2.7d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.7d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.7c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.7c", - "title": "Comments", - "type": "string" - } - } - } - ] + "ta10Required": ["fittedOrFreestanding"] } } }, @@ -13421,55 +12975,14 @@ "ta10Ref": "2.7d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.7d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.7c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.7c", - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.7c", - "title": "Comments", - "type": "string" + "ta10Required": ["fittedOrFreestanding"] } } } @@ -13485,6 +12998,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -13492,6 +13010,13 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": ["None"] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -13501,43 +13026,14 @@ "ta10Ref": "2.8d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.8d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.8c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.8c", - "title": "Comments", - "type": "string" - } - } - } - ] + "ta10Required": ["fittedOrFreestanding"] } } }, @@ -13555,55 +13051,14 @@ "ta10Ref": "2.8d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.8d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.8c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.8c", - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.8c", - "title": "Comments", - "type": "string" + "ta10Required": ["fittedOrFreestanding"] } } } @@ -13619,6 +13074,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -13626,6 +13086,13 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": ["None"] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -13635,43 +13102,14 @@ "ta10Ref": "2.9d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.9d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.9c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.9c", - "title": "Comments", - "type": "string" - } - } - } - ] + "ta10Required": ["fittedOrFreestanding"] } } }, @@ -13689,55 +13127,14 @@ "ta10Ref": "2.9d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.9d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.9c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.9c", - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.9c", - "title": "Comments", - "type": "string" + "ta10Required": ["fittedOrFreestanding"] } } } @@ -13753,6 +13150,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -13760,6 +13162,13 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": ["None"] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -13769,43 +13178,14 @@ "ta10Ref": "2.10d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.10d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.10c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.10c", - "title": "Comments", - "type": "string" - } - } - } - ] + "ta10Required": ["fittedOrFreestanding"] } } }, @@ -13823,55 +13203,14 @@ "ta10Ref": "2.10d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.10d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.10c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.10c", - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.10c", - "title": "Comments", - "type": "string" + "ta10Required": ["fittedOrFreestanding"] } } } @@ -13910,39 +13249,29 @@ "ta10Ref": "2.11d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.11d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], + "ta10Required": ["fittedOrFreestanding"], "discriminator": { - "propertyName": "isFittedOrFreestanding" + "propertyName": "fittedOrFreestanding" }, "oneOf": [ { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.11c", - "title": "Comments", - "type": "string" } } }, { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.11c", - "title": "Comments", - "type": "string" } } } @@ -13964,39 +13293,29 @@ "ta10Ref": "2.11d", "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.11d", "title": "Fitted, Freestanding", "type": "string", "enum": ["Fitted", "Freestanding"] } }, - "ta10Required": ["isFittedOrFreestanding"], + "ta10Required": ["fittedOrFreestanding"], "discriminator": { - "propertyName": "isFittedOrFreestanding" + "propertyName": "fittedOrFreestanding" }, "oneOf": [ { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": ["Fitted"] - }, - "comments": { - "ta10Ref": "2.11c", - "title": "Comments", - "type": "string" } } }, { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": ["Freestanding"] - }, - "comments": { - "ta10Ref": "2.11c", - "title": "Comments", - "type": "string" } } } @@ -14008,11 +13327,6 @@ "properties": { "isIncludedOrExcluded": { "enum": ["None"] - }, - "comments": { - "ta10Ref": "2.11c", - "title": "Comments", - "type": "string" } } } @@ -14048,6 +13362,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14058,12 +13377,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "3.1c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14076,23 +13390,6 @@ "ta10Ref": "3.1b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "3.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "3.1c", - "title": "Comments", - "type": "string" } } } @@ -14108,6 +13405,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14118,12 +13420,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "3.2c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14136,23 +13433,6 @@ "ta10Ref": "3.2b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "3.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "3.2c", - "title": "Comments", - "type": "string" } } } @@ -14168,6 +13448,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14178,12 +13463,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "3.3c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14196,23 +13476,6 @@ "ta10Ref": "3.3b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "3.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "3.3c", - "title": "Comments", - "type": "string" } } } @@ -14228,6 +13491,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14238,12 +13506,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "3.4c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14256,23 +13519,6 @@ "ta10Ref": "3.4b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "3.4c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "3.4c", - "title": "Comments", - "type": "string" } } } @@ -14288,6 +13534,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14298,12 +13549,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "3.5c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14316,23 +13562,6 @@ "ta10Ref": "3.5b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "3.5c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "3.5c", - "title": "Comments", - "type": "string" } } } @@ -14348,6 +13577,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14358,12 +13592,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "3.6c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14376,23 +13605,6 @@ "ta10Ref": "3.6b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "3.6c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "3.6c", - "title": "Comments", - "type": "string" } } } @@ -14408,6 +13620,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14418,12 +13635,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "3.7c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14436,23 +13648,6 @@ "ta10Ref": "3.7b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "3.7c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "3.7c", - "title": "Comments", - "type": "string" } } } @@ -14468,6 +13663,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14478,12 +13678,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "3.8c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14496,23 +13691,6 @@ "ta10Ref": "3.8b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "3.8c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "3.8c", - "title": "Comments", - "type": "string" } } } @@ -14528,6 +13706,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14538,12 +13721,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "3.9c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14556,23 +13734,6 @@ "ta10Ref": "3.9b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "3.9c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "3.9c", - "title": "Comments", - "type": "string" } } } @@ -14588,6 +13749,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14598,12 +13764,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "3.10c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14616,23 +13777,6 @@ "ta10Ref": "3.10b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "3.10c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "3.10c", - "title": "Comments", - "type": "string" } } } @@ -14664,6 +13808,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14674,12 +13823,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "4.1c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14692,23 +13836,6 @@ "ta10Ref": "4.1b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "4.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "4.1c", - "title": "Comments", - "type": "string" } } } @@ -14724,6 +13851,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14734,12 +13866,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "4.2c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14752,23 +13879,6 @@ "ta10Ref": "4.2b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "4.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "4.2c", - "title": "Comments", - "type": "string" } } } @@ -14784,6 +13894,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14794,12 +13909,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "4.3c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14812,23 +13922,6 @@ "ta10Ref": "4.3b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "4.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "4.3c", - "title": "Comments", - "type": "string" } } } @@ -14844,6 +13937,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14854,12 +13952,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "4.4c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14872,23 +13965,6 @@ "ta10Ref": "4.4b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "4.4c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "4.4c", - "title": "Comments", - "type": "string" } } } @@ -14904,6 +13980,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14914,12 +13995,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "4.5c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14932,23 +14008,6 @@ "ta10Ref": "4.5b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "4.5c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "4.5c", - "title": "Comments", - "type": "string" } } } @@ -14964,6 +14023,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -14974,12 +14038,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "4.6c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -14992,23 +14051,6 @@ "ta10Ref": "4.6b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "4.6c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "4.6c", - "title": "Comments", - "type": "string" } } } @@ -15024,6 +14066,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15034,12 +14081,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "4.7c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15052,23 +14094,6 @@ "ta10Ref": "4.7b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "4.7c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "4.7c", - "title": "Comments", - "type": "string" } } } @@ -15102,11 +14127,6 @@ "properties": { "isIncludedOrExcluded": { "enum": ["Included"] - }, - "comments": { - "ta10Ref": "4.8c", - "title": "Comments", - "type": "string" } } }, @@ -15119,11 +14139,6 @@ "ta10Ref": "4.8b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "4.8c", - "title": "Comments", - "type": "string" } } } @@ -15162,6 +14177,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15172,12 +14192,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.1c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15190,23 +14205,6 @@ "ta10Ref": "5.1b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.1c", - "title": "Comments", - "type": "string" } } } @@ -15222,6 +14220,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15232,12 +14235,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.2c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15250,23 +14248,6 @@ "ta10Ref": "5.2b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.2c", - "title": "Comments", - "type": "string" } } } @@ -15282,6 +14263,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15292,12 +14278,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.3c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15310,23 +14291,6 @@ "ta10Ref": "5.3b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.3c", - "title": "Comments", - "type": "string" } } } @@ -15342,6 +14306,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15352,12 +14321,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.4c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15370,23 +14334,6 @@ "ta10Ref": "5.4b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.4c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.4c", - "title": "Comments", - "type": "string" } } } @@ -15402,6 +14349,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15412,12 +14364,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.5c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15430,23 +14377,6 @@ "ta10Ref": "5.5b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.5c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.5c", - "title": "Comments", - "type": "string" } } } @@ -15462,6 +14392,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15472,12 +14407,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.6c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15490,23 +14420,6 @@ "ta10Ref": "5.6b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.6c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.6c", - "title": "Comments", - "type": "string" } } } @@ -15522,6 +14435,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15532,12 +14450,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.7c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15550,23 +14463,6 @@ "ta10Ref": "5.7b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.7c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.7c", - "title": "Comments", - "type": "string" } } } @@ -15600,11 +14496,6 @@ "properties": { "isIncludedOrExcluded": { "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.8c", - "title": "Comments", - "type": "string" } } }, @@ -15617,11 +14508,6 @@ "ta10Ref": "5.8b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.8c", - "title": "Comments", - "type": "string" } } } @@ -15654,6 +14540,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15664,12 +14555,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.12c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15682,23 +14568,6 @@ "ta10Ref": "5.12b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.12c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.12c", - "title": "Comments", - "type": "string" } } } @@ -15714,6 +14583,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15724,12 +14598,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.13c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15742,23 +14611,6 @@ "ta10Ref": "5.13b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.13c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.13c", - "title": "Comments", - "type": "string" } } } @@ -15774,6 +14626,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15784,12 +14641,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.14c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15802,23 +14654,6 @@ "ta10Ref": "5.14b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.14c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.14c", - "title": "Comments", - "type": "string" } } } @@ -15834,6 +14669,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15844,12 +14684,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.15c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15862,23 +14697,6 @@ "ta10Ref": "5.15b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.15c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.15c", - "title": "Comments", - "type": "string" } } } @@ -15894,6 +14712,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15904,12 +14727,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.16c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15922,23 +14740,6 @@ "ta10Ref": "5.16b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.16c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.16c", - "title": "Comments", - "type": "string" } } } @@ -15954,6 +14755,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -15964,12 +14770,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.17c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -15982,23 +14783,6 @@ "ta10Ref": "5.17b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.17c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.17c", - "title": "Comments", - "type": "string" } } } @@ -16014,6 +14798,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16024,12 +14813,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.18c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16042,23 +14826,6 @@ "ta10Ref": "5.18b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.18c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "5.18c", - "title": "Comments", - "type": "string" } } } @@ -16092,11 +14859,6 @@ "properties": { "isIncludedOrExcluded": { "enum": ["Included"] - }, - "comments": { - "ta10Ref": "5.19c", - "title": "Comments", - "type": "string" } } }, @@ -16109,11 +14871,6 @@ "ta10Ref": "5.19b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "5.19c", - "title": "Comments", - "type": "string" } } } @@ -16149,6 +14906,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16159,12 +14921,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "6.1c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16177,23 +14934,6 @@ "ta10Ref": "6.1b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "6.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "6.1c", - "title": "Comments", - "type": "string" } } } @@ -16209,6 +14949,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16219,12 +14964,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "6.2c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16237,23 +14977,6 @@ "ta10Ref": "6.2b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "6.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "6.2c", - "title": "Comments", - "type": "string" } } } @@ -16269,6 +14992,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16279,12 +15007,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "6.3c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16297,23 +15020,6 @@ "ta10Ref": "6.3b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "6.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "6.3c", - "title": "Comments", - "type": "string" } } } @@ -16329,6 +15035,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16339,12 +15050,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "6.4c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16357,23 +15063,6 @@ "ta10Ref": "6.4b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "6.4c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "6.4c", - "title": "Comments", - "type": "string" } } } @@ -16389,6 +15078,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16399,12 +15093,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "6.5c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16417,23 +15106,6 @@ "ta10Ref": "6.5b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "6.5c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "6.5c", - "title": "Comments", - "type": "string" } } } @@ -16449,6 +15121,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16459,12 +15136,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "6.6c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16477,23 +15149,6 @@ "ta10Ref": "6.6b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "6.6c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "6.6c", - "title": "Comments", - "type": "string" } } } @@ -16509,6 +15164,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16519,12 +15179,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "6.7c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16537,23 +15192,6 @@ "ta10Ref": "6.7b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "6.7c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "6.7c", - "title": "Comments", - "type": "string" } } } @@ -16587,11 +15225,6 @@ "properties": { "isIncludedOrExcluded": { "enum": ["Included"] - }, - "comments": { - "ta10Ref": "6.8c", - "title": "Comments", - "type": "string" } } }, @@ -16604,11 +15237,6 @@ "ta10Ref": "6.8b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "6.8c", - "title": "Comments", - "type": "string" } } } @@ -16642,6 +15270,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16652,12 +15285,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "7.1c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16670,23 +15298,6 @@ "ta10Ref": "7.1b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "7.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "7.1c", - "title": "Comments", - "type": "string" } } } @@ -16702,6 +15313,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16712,12 +15328,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "7.2c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16730,23 +15341,6 @@ "ta10Ref": "7.2b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "7.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "7.2c", - "title": "Comments", - "type": "string" } } } @@ -16762,6 +15356,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16772,12 +15371,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "7.3c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16790,23 +15384,6 @@ "ta10Ref": "7.3b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "7.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "7.3c", - "title": "Comments", - "type": "string" } } } @@ -16822,6 +15399,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16832,12 +15414,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "7.4c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16850,23 +15427,6 @@ "ta10Ref": "7.4b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "7.4c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "7.4c", - "title": "Comments", - "type": "string" } } } @@ -16882,6 +15442,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16892,12 +15457,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "7.5c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16910,23 +15470,6 @@ "ta10Ref": "7.5b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "7.5c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "7.5c", - "title": "Comments", - "type": "string" } } } @@ -16942,6 +15485,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -16952,12 +15500,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "7.6c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -16970,23 +15513,6 @@ "ta10Ref": "7.6b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "7.6c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "7.6c", - "title": "Comments", - "type": "string" } } } @@ -17002,6 +15528,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17012,12 +15543,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "7.7c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17030,23 +15556,6 @@ "ta10Ref": "7.7b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "7.7c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "7.7c", - "title": "Comments", - "type": "string" } } } @@ -17080,11 +15589,6 @@ "properties": { "isIncludedOrExcluded": { "enum": ["Included"] - }, - "comments": { - "ta10Ref": "7.8c", - "title": "Comments", - "type": "string" } } }, @@ -17097,11 +15601,6 @@ "ta10Ref": "7.8b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "7.8c", - "title": "Comments", - "type": "string" } } } @@ -17139,6 +15638,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17149,12 +15653,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.1c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17167,23 +15666,6 @@ "ta10Ref": "8.1b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.1c", - "title": "Comments", - "type": "string" } } } @@ -17199,6 +15681,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17209,12 +15696,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.2c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17227,23 +15709,6 @@ "ta10Ref": "8.2b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.2c", - "title": "Comments", - "type": "string" } } } @@ -17259,6 +15724,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17269,12 +15739,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.3c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17287,23 +15752,6 @@ "ta10Ref": "8.3b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.3c", - "title": "Comments", - "type": "string" } } } @@ -17319,6 +15767,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17329,12 +15782,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.4c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17347,23 +15795,6 @@ "ta10Ref": "8.4b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.4c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.4c", - "title": "Comments", - "type": "string" } } } @@ -17379,6 +15810,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17389,12 +15825,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.5c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17407,23 +15838,6 @@ "ta10Ref": "8.5b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.5c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.5c", - "title": "Comments", - "type": "string" } } } @@ -17439,6 +15853,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17449,12 +15868,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.6c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17467,23 +15881,6 @@ "ta10Ref": "8.6b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.6c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.6c", - "title": "Comments", - "type": "string" } } } @@ -17499,6 +15896,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17509,12 +15911,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.7c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17527,23 +15924,6 @@ "ta10Ref": "8.7b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.7c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.7c", - "title": "Comments", - "type": "string" } } } @@ -17559,6 +15939,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17569,12 +15954,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.8c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17587,23 +15967,6 @@ "ta10Ref": "8.8b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.8c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.8c", - "title": "Comments", - "type": "string" } } } @@ -17619,6 +15982,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17629,12 +15997,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.9c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17647,23 +16010,6 @@ "ta10Ref": "8.9b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.9c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.9c", - "title": "Comments", - "type": "string" } } } @@ -17679,6 +16025,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17689,12 +16040,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.10c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17707,23 +16053,6 @@ "ta10Ref": "8.10b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.10c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.10c", - "title": "Comments", - "type": "string" } } } @@ -17739,6 +16068,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17749,12 +16083,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.11c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17767,23 +16096,6 @@ "ta10Ref": "8.11b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.11c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.11c", - "title": "Comments", - "type": "string" } } } @@ -17799,6 +16111,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17809,12 +16126,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.12c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17827,23 +16139,6 @@ "ta10Ref": "8.12b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.12c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "8.12c", - "title": "Comments", - "type": "string" } } } @@ -17877,11 +16172,6 @@ "properties": { "isIncludedOrExcluded": { "enum": ["Included"] - }, - "comments": { - "ta10Ref": "8.13c", - "title": "Comments", - "type": "string" } } }, @@ -17894,11 +16184,6 @@ "ta10Ref": "8.13b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "8.13c", - "title": "Comments", - "type": "string" } } } @@ -17928,6 +16213,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17938,12 +16228,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "9.1c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -17956,23 +16241,6 @@ "ta10Ref": "9.1b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "9.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "9.1c", - "title": "Comments", - "type": "string" } } } @@ -17988,6 +16256,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -17998,12 +16271,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "9.2c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -18016,23 +16284,6 @@ "ta10Ref": "9.2b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "9.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "9.2c", - "title": "Comments", - "type": "string" } } } @@ -18048,6 +16299,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -18058,12 +16314,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "9.3c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -18076,23 +16327,6 @@ "ta10Ref": "9.3b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "9.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "9.3c", - "title": "Comments", - "type": "string" } } } @@ -18108,6 +16342,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -18118,12 +16357,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "9.4c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -18136,23 +16370,6 @@ "ta10Ref": "9.4b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "9.4c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "9.4c", - "title": "Comments", - "type": "string" } } } @@ -18176,6 +16393,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -18186,12 +16408,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "10.1c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -18204,23 +16421,6 @@ "ta10Ref": "10.1b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "10.1c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "10.1c", - "title": "Comments", - "type": "string" } } } @@ -18236,6 +16436,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -18246,12 +16451,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "10.2c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -18264,23 +16464,6 @@ "ta10Ref": "10.2b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "10.2c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "10.2c", - "title": "Comments", - "type": "string" } } } @@ -18296,6 +16479,11 @@ "title": "Included, Excluded or None", "type": "string", "enum": ["Included", "Excluded", "None"] + }, + "comments": { + "ta10Ref": "1.1c", + "title": "Comments", + "type": "string" } }, "ta10Required": ["isIncludedExcludedOrNone"], @@ -18306,12 +16494,7 @@ { "properties": { "isIncludedExcludedOrNone": { - "enum": ["Included"] - }, - "comments": { - "ta10Ref": "10.3c", - "title": "Comments", - "type": "string" + "enum": ["Included", "None"] } } }, @@ -18324,23 +16507,6 @@ "ta10Ref": "10.3b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "10.3c", - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": ["None"] - }, - "comments": { - "ta10Ref": "10.3c", - "title": "Comments", - "type": "string" } } } @@ -18381,11 +16547,6 @@ "properties": { "isIncludedOrExcluded": { "enum": ["Included"] - }, - "comments": { - "ta10Ref": "11.1c", - "title": "Comments", - "type": "string" } } }, @@ -18398,11 +16559,6 @@ "ta10Ref": "11.1b", "title": "Price", "type": "number" - }, - "comments": { - "ta10Ref": "11.1c", - "title": "Comments", - "type": "string" } } } @@ -18429,18 +16585,21 @@ "electricity": { "baspiRef": "A7.1.0.1", "ntsRef": "B3.1", + "ntslRef": "B3.1", "ta6Ref": "13.1", "rdsRef": "Services/Electricity", "piqRef": "A7.1.1", "title": "Electricity supply", "type": "object", "ntsRequired": ["mainsElectricity", "solarPanels", "otherSources"], + "ntslRequired": ["mainsElectricity", "solarPanels", "otherSources"], "baspiRequired": ["mainsElectricity", "solarPanels", "otherSources"], "ta6Required": ["mainsElectricity", "solarPanels"], "properties": { "mainsElectricity": { "baspiRef": "A7.1.0.1", "ntsRef": "B3.1", + "ntslRef": "B3.1", "ta6Ref": "13.1", "rdsRef": "Services/Electricity", "piqRef": "A7.1.1", @@ -18449,17 +16608,20 @@ "properties": { "yesNo": { "ntsRef": "B3.1.1", + "ntslRef": "B3.1.1", "baspiRef": "A7.1.0.1.1", "ta6Ref": "13.1.1", "type": "string", "title": "", "enum": ["Yes", "To be connected", "No"], "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"], "ta6Enum": ["Yes", "No"] } }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"], "discriminator": { "propertyName": "yesNo" @@ -18542,6 +16704,7 @@ }, "solarPanels": { "ntsRef": "B3.7", + "ntslRef": "B3.7", "baspiRef": "A7.1.0.8", "piqRef": "A7.1.17", "ta6Ref": "4.6", @@ -18550,17 +16713,20 @@ "properties": { "yesNo": { "ntsRef": "B3.7.1", + "ntslRef": "B3.7.1", "baspiRef": "A7.1.0.8.1", "ta6Ref": "4.6", "type": "string", "title": "", "enum": ["Yes", "To be connected", "No"], - "ntsEnum": ["Yes", "No"] + "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"] } }, "baspiRequired": ["yesNo"], "ta6Required": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "discriminator": { "propertyName": "yesNo" }, @@ -18829,6 +16995,7 @@ }, "otherSources": { "ntsRef": "B3.8", + "ntslRef": "B3.8", "baspiRef": "A7.1.0.9", "rdsRef": "Services/Other", "piqRef": "A7.1.19", @@ -18838,15 +17005,18 @@ "properties": { "yesNo": { "ntsRef": "B3.8.1", + "ntslRef": "B3.8.1", "baspiRef": "A7.1.0.9.1", "type": "string", "title": "", "enum": ["Yes", "To be connected", "No"], - "ntsEnum": ["Yes", "No"] + "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"] } }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "discriminator": { "propertyName": "yesNo" }, @@ -18865,6 +17035,7 @@ }, "details": { "ntsRef": "3.8.2", + "ntslRef": "3.8.2", "title": "Details", "type": "string" }, @@ -18874,7 +17045,8 @@ "type": "string" } }, - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] }, { "properties": { @@ -18884,6 +17056,7 @@ "details": { "baspiRef": "A7.1.0.9.2", "ntsRef": "3.8.2", + "ntslRef": "3.8.2", "title": "Details", "type": "string" }, @@ -18908,6 +17081,7 @@ }, "waterAndDrainage": { "ntsRef": "B3.2", + "ntslRef": "B3.2", "baspiRef": "A7.1.0", "ta6Ref": "13", "con29DWRef": "0", @@ -18917,6 +17091,7 @@ "baspiRequired": ["water", "drainage", "maintenanceAgreements"], "ta6Required": ["water", "drainage"], "ntsRequired": ["water", "drainage"], + "ntslRequired": ["water", "drainage"], "con29DWRequired": ["maps", "water", "drainage", "charging"], "properties": { "maps": { @@ -18944,6 +17119,7 @@ }, "water": { "ntsRef": "B3.2", + "ntslRef": "B3.2", "baspiRef": "A7.1.0.10", "ta6Ref": "13", "con29DWRef": "3", @@ -18951,6 +17127,7 @@ "type": "object", "baspiRequired": ["mainsWater"], "ntsRequired": ["mainsWater"], + "ntslRequired": ["mainsWater"], "ta6Required": ["mainsWater"], "con29DWRequired": [ "mainsWater", @@ -18962,6 +17139,7 @@ "properties": { "mainsWater": { "ntsRef": "B3.2", + "ntslRef": "B3.2", "baspiRef": "A7.1.0.10.0", "ta6Ref": "13.3", "piqRef": "A7.1.7", @@ -18972,6 +17150,7 @@ "properties": { "yesNo": { "ntsRef": "B3.2.1", + "ntslRef": "B3.2.1", "baspiRef": "A7.1.0.10.1", "ta6Ref": "13.3.1", "con29DWRef": "3.1.1", @@ -18980,11 +17159,13 @@ "enum": ["Yes", "To be connected", "No"], "ta6Enum": ["Yes", "No"], "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"], "con29DWEnum": ["Yes", "No"] } }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"], "con29DWRequired": ["yesNo"], "discriminator": { @@ -18998,13 +17179,15 @@ }, "details": { "ntsRef": "3.2.2", + "ntslRef": "3.2.2", "title": "How is water supplied?", "description": "e.g. Private well, borehole, springs etc.", "type": "string", "minLength": 1 } }, - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] }, { "properties": { @@ -19051,15 +17234,18 @@ "waterMeter": { "type": "object", "ntsRef": "B3.2.1.1", + "ntslRef": "B3.2.1.1", "baspiRef": "A7.", "ta6Ref": "13.3b", "ntsRequired": ["isSupplyMetered"], + "ntslRequired": ["isSupplyMetered"], "baspiRequired": ["isSupplyMetered"], "ta6Required": ["isSupplyMetered"], "con29DWRequired": ["isSupplyMetered"], "properties": { "isSupplyMetered": { "ntsRef": "3.2.3", + "ntslRef": "3.2.3", "ta6Ref": "13.3b", "baspiRef": "B4.6.2", "title": "Is the supply metered?", @@ -19108,7 +17294,8 @@ "ta6Required": ["supplier", "stopcock", "waterMeter"], "con29DWRequired": ["details", "waterMeter"], "baspiRequired": ["stopcock", "waterMeter"], - "ntsRequired": ["waterMeter"] + "ntsRequired": ["waterMeter"], + "ntslRequired": ["waterMeter"] }, { "properties": { @@ -19263,6 +17450,7 @@ }, "drainage": { "ntsRef": "B3.3", + "ntslRef": "B3.3", "baspiRef": "A7.1.0.12", "con29DWRef": "2", "title": "Drainage", @@ -19272,6 +17460,10 @@ "mainsFoulDrainage" ], "ntsRequired": ["mainsSurfaceWaterDrainage", "mainsFoulDrainage"], + "ntslRequired": [ + "mainsSurfaceWaterDrainage", + "mainsFoulDrainage" + ], "ta6Required": ["mainsSurfaceWaterDrainage", "mainsFoulDrainage"], "con29DWRequired": [ "mainsSurfaceWaterDrainage", @@ -19289,6 +17481,7 @@ "properties": { "mainsSurfaceWaterDrainage": { "ntsRef": "B3.3.1", + "ntslRef": "B3.3.1", "baspiRef": "A7.1.0.12.0", "rdsRef": "Services/StormWaterDrainage", "ta6Ref": "12.4b", @@ -19299,6 +17492,7 @@ "yesNo": { "baspiRef": "A7.1.0.12.1", "ntsRef": "B3.3.1.1", + "ntslRef": "B3.3.1.1", "ta6Ref": "12.4b1", "con29DWRef": "2.2.1", "type": "string", @@ -19306,11 +17500,13 @@ "enum": ["Yes", "To be connected", "No", "Not known"], "con29DWEnum": ["Yes", "No"], "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"], "ta6Enum": ["Yes", "No", "Not known"] } }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"], "discriminator": { "propertyName": "yesNo" @@ -19355,6 +17551,7 @@ }, "mainsFoulDrainage": { "ntsRef": "B3.3.2", + "ntslRef": "B3.3.2", "baspiRef": "A7.1.0.11", "rdsRef": "Services/WasteWaterSewerageDisposal", "ta6Ref": "12.4a", @@ -19364,9 +17561,11 @@ "baspiRequired": ["yesNo"], "ta6Required": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "properties": { "yesNo": { "ntsRef": "B3.3.2.1", + "ntslRef": "B3.3.2.1", "baspiRef": "A7.1.0.11.1", "ta6Ref": "12.4a1", "type": "string", @@ -19374,6 +17573,7 @@ "enum": ["Yes", "To be connected", "No", "Not known"], "con29DWEnum": ["Yes", "No"], "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"], "ta6Enum": ["Yes", "No", "Not known"] } }, @@ -19430,6 +17630,7 @@ }, "offMainsDrainageSystem": { "ntsRef": "B3.3.3", + "ntslRef": "B3.3.3", "baspiRef": "A7.1.10.13", "ta6Ref": "12.4a", "type": "object", @@ -19441,6 +17642,7 @@ "plantDrainsIntoWaterway" ], "ntsRequired": ["offMainsDrainageSystemType"], + "ntslRequired": ["offMainsDrainageSystemType"], "ta6Required": [ "offMainsDrainageSystemType", "otherConnectedProperties", @@ -19449,6 +17651,7 @@ "properties": { "offMainsDrainageSystemType": { "ntsRef": "B3.3.3.1", + "ntslRef": "B3.3.3.1", "baspiRef": "A7.1", "ta6Ref": "12.5", "type": "string", @@ -19756,11 +17959,13 @@ }, "details": { "ntsRef": "B3.3.3.2", + "ntslRef": "B3.3.3.2", "title": "Details", "type": "string" } }, - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] } ] } @@ -20199,6 +18404,7 @@ }, "heating": { "ntsRef": "B3.4", + "ntslRef": "B3.4", "baspiRef": "A7.4", "ta6Ref": "12.3", "rdsRef": "Buildings|BuildingSections/isUnheated=no|yes|true|false", @@ -20208,9 +18414,11 @@ "baspiRequired": ["heatingSystem"], "ta6Required": ["heatingSystem"], "ntsRequired": ["heatingSystem"], + "ntslRequired": ["heatingSystem"], "properties": { "heatingSystem": { "ntsRef": "B3.4.1", + "ntslRef": "B3.4.1", "baspiRef": "A7.4.0", "ta6Ref": "12.3.1", "piqRef": "A7.3.1", @@ -20219,9 +18427,11 @@ "baspiRequired": ["heatingType"], "ta6Required": ["heatingType"], "ntsRequired": ["heatingType"], + "ntslRequired": ["heatingType"], "properties": { "heatingType": { "ntsRef": "B3.4.1", + "ntslRef": "B3.4.1", "baspiRef": "A7.4.0", "ta6Ref": "12.3.1", "piqRef": "A7.3.1", @@ -20253,6 +18463,7 @@ }, "centralHeatingDetails": { "ntsRef": "B3.4.3", + "ntslRef": "B3.4.3", "baspiRef": "A7.4.0.0", "ta6Ref": "12.3.2", "piqRef": "A7.3.1.1", @@ -20267,6 +18478,7 @@ "heatingInGoodWorkingOrder" ], "ntsRequired": ["centralHeatingFuel"], + "ntslRequired": ["centralHeatingFuel"], "ta6Required": [ "centralHeatingFuel", "centralHeatingInstalled", @@ -20278,17 +18490,20 @@ "properties": { "centralHeatingFuel": { "ntsRef": "B3.4.3.1", + "ntslRef": "B3.4.3.1", "baspiRef": "A7.4.0.1", "ta6Ref": "12.3.3", "rdsRef": "Buildings|BuildingSections/Heating/isGas=no|yes|true|false", "type": "object", "title": "Central Heating Fuel", "ntsRequired": ["centralHeatingFuelType"], + "ntslRequired": ["centralHeatingFuelType"], "baspiRequired": ["centralHeatingFuelType"], "ta6Required": ["centralHeatingFuelType"], "properties": { "centralHeatingFuelType": { "ntsRef": "B3.4.3.1.1", + "ntslRef": "B3.4.3.1.1", "baspiRef": "A7.4.0.2", "ta6Ref": "12.3a1", "title": "What type of fuel does the system run on?", @@ -20509,6 +18724,7 @@ }, "baspiRequired": ["centralHeatingDetails"], "ntsRequired": ["centralHeatingDetails"], + "ntslRequired": ["centralHeatingDetails"], "ta6Required": ["centralHeatingDetails"] }, { @@ -20518,18 +18734,21 @@ }, "details": { "ntsRef": "B3.4.4", + "ntslRef": "B3.4.4", "title": "Community heating system details", "description": "Please describe how the cost of heating supply is charged, whether you have control over the energy supplier and whether you have any control over the heating.", "type": "string", "minLength": 1 } }, - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] } ] }, "otherHeatingFeatures": { "ntsRef": "B3.4.2", + "ntslRef": "B3.4.2", "title": "What other heating features does the property have?", "type": "array", "items": { @@ -20555,11 +18774,13 @@ "connectivity": { "baspiRef": "A7", "ntsRef": "B3", + "ntslRef": "B3", "ta6Ref": "13", "title": "Connectivity", "type": "object", "baspiRequired": ["telephone", "cableSatelliteTV", "broadband"], "ntsRequired": ["broadband"], + "ntslRequired": ["broadband"], "ta6Required": ["telephone", "cableSatelliteTV"], "properties": { "telephone": { @@ -20577,6 +18798,7 @@ "title": "", "enum": ["Yes", "To be connected", "No"], "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"], "ta6Enum": ["Yes", "No"] } }, @@ -20646,6 +18868,7 @@ "title": "", "enum": ["Yes", "To be connected", "No"], "ntsEnum": ["Yes", "No"], + "ntslEnum": ["Yes", "No"], "ta6Enum": ["Yes", "No"] } }, @@ -20700,6 +18923,7 @@ }, "broadband": { "ntsRef": "B3.5", + "ntslRef": "B3.5", "baspiRef": "A7.1.0.7", "title": "Broadband", "rdsRef": "Services/Internet", @@ -20708,6 +18932,7 @@ "properties": { "typeOfConnection": { "ntsRef": "B3.5.2", + "ntslRef": "B3.5.2", "baspiRef": "A7.1.0.7.2", "piqRef": "A7.1.16", "title": "Type of connection", @@ -20751,22 +18976,27 @@ } } }, - "ntsRequired": ["typeOfConnection"] + "ntsRequired": ["typeOfConnection"], + "ntslRequired": ["typeOfConnection"] }, "mobilePhone": { "ntsRef": "B3.6", + "ntslRef": "B3.6", "title": "Mobile phone coverage", "type": "object", "properties": { "knownSignalIssues": { "ntsRef": "B3.6.1", + "ntslRef": "B3.6.1", "title": "Are there any issues with mobile phone signal or coverage at the property?", "description": "You should disclose any known issues with signal strength or dropped calls specific to the property.", "type": "object", "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "properties": { "yesNo": { "ntsRef": "B3.6.1.1", + "ntslRef": "B3.6.1.1", "title": "", "type": "string", "enum": ["Yes", "No"] @@ -20790,11 +19020,13 @@ }, "details": { "ntsRef": "B3.6.1.2", + "ntslRef": "B3.6.1.2", "title": "Details", "type": "string" } }, - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] } ] }, @@ -21231,6 +19463,7 @@ }, "rightsAndInformalArrangements": { "ntsRef": "C2.2", + "ntslRef": "C2.2", "baspiRef": "A10", "ta6Ref": "8", "title": "Rights and Informal Arrangements", @@ -21242,6 +19475,7 @@ "rightsOrArrangements" ], "ntsRequired": ["rightsOrArrangements"], + "ntslRequired": ["rightsOrArrangements"], "ta6Required": [ "sharedContributions", "neighbouringLandRights", @@ -21404,11 +19638,13 @@ }, "rightsOrArrangements": { "ntsRef": "C2.2.1", + "ntslRef": "C2.2.1", "baspiRef": "A10.4", "ta6Ref": "8.4", "title": "Do you know if any of the following rights or arrangements affect the property?", "type": "object", "ntsRequired": ["publicRightOfWay"], + "ntslRequired": ["publicRightOfWay"], "baspiRequired": [ "publicRightOfWay", "rightsOfLight", @@ -21431,6 +19667,7 @@ "properties": { "publicRightOfWay": { "ntsRef": "C2.2.1", + "ntslRef": "C2.2.1", "baspiRef": "A10.4.1", "rdsRef": "Tenure/Rights,Tenure/Restrictions,Tenure/Responsibilities,Tenure/CadastralMapOfParcels", "ta6Ref": "8.6", @@ -21441,6 +19678,7 @@ "properties": { "yesNo": { "ntsRef": "C2.2.1.1", + "ntslRef": "C2.2.1.1", "baspiRef": "A10.4.1.1", "ta6Ref": "8.6.1", "piqRef": "A10.4.1", @@ -21451,6 +19689,7 @@ }, "baspiRequired": ["yesNo"], "ntsRequired": ["yesNo"], + "ntslRequired": ["yesNo"], "ta6Required": ["yesNo"], "discriminator": { "propertyName": "yesNo" @@ -21470,6 +19709,7 @@ }, "details": { "ntsRef": "C2.2.1.2", + "ntslRef": "C2.2.1.2", "baspiRef": "A10.4.1.2", "ta6Ref": "8.6.2", "piqRef": "A10.4.2", @@ -21486,7 +19726,8 @@ }, "baspiRequired": ["details", "attachments"], "ta6Required": ["details"], - "ntsRequired": ["details"] + "ntsRequired": ["details"], + "ntslRequired": ["details"] } ] }, @@ -21822,6 +20063,7 @@ }, "environmentalIssues": { "ntsRef": "C3.1", + "ntslRef": "C3.1", "baspiRef": "A11.1", "ta6Ref": "7", "piqRef": "A11.1", @@ -21834,10 +20076,17 @@ "nonCoalMining", "coastalErosion" ], + "ntslRequired": [ + "flooding", + "coalMining", + "nonCoalMining", + "coastalErosion" + ], "ta6Required": ["flooding", "radon"], "properties": { "flooding": { "ntsRef": "C3.1.1", + "ntslRef": "C3.1.1", "baspiRef": "A11.1.1", "rdsRef": "Sustainability/Environmental|Natural|Situational", "ta6Ref": "7.1.0", @@ -21845,19 +20094,23 @@ "type": "object", "baspiRequired": ["historicalFlooding"], "ntsRequired": ["floodRisk", "historicalFlooding"], + "ntslRequired": ["floodRisk", "historicalFlooding"], "ta6Required": ["historicalFlooding"], "properties": { "floodRisk": { "ntsRef": "C3.1.1.1", + "ntslRef": "C3.1.1.1", "rdsRef": "Sustainability/Environmental|Natural|Situational", "piqRef": "A11.1.1", "title": "Flood Risk", "type": "object", "ntsRequired": ["riskIndicator"], + "ntslRequired": ["riskIndicator"], "baspiRequired": ["riskIndicator"], "properties": { "riskIndicator": { "ntsRef": "C3.1.1.1", + "ntslRef": "C3.1.1.1", "type": "string", "title": "Is the property impacted?", "ntsTitle": "To your knowledge, is the property at risk of flooding of any type?", @@ -21894,6 +20147,7 @@ }, "summary": { "ntsRef": "C3.1.1.2", + "ntslRef": "C3.1.1.2", "type": "string", "title": "Summary of risk", "ntsTitle:": "Please provide details", @@ -21954,22 +20208,26 @@ } } }, - "ntsRequired": ["summary"] + "ntsRequired": ["summary"], + "ntslRequired": ["summary"] } ] }, "historicalFlooding": { "ntsRef": "C3.1.1.2", + "ntslRef": "C3.1.1.2", "baspiRef": "A11.1.2", "ta6Ref": "7.1", "title": "Historical flooding", "type": "object", "baspiRequired": ["hasBeenFlooded"], "ntsRequired": ["hasBeenFlooded"], + "ntslRequired": ["hasBeenFlooded"], "ta6Required": ["hasBeenFlooded"], "properties": { "hasBeenFlooded": { "ntsRef": "C3.1.1.2.1", + "ntslRef": "C3.1.1.2.1", "baspiRef": "A11.1.2.1", "ta6Ref": "7.1.1", "title": "Has any part of the property (whether buildings or surrounding garden or land) ever been flooded?", @@ -21995,6 +20253,7 @@ }, "typeOfFlooding": { "ntsRef": "C3.1.1.3", + "ntslRef": "C3.1.1.3", "baspiRef": "A11.1.2.2", "rdsRef": "Sustainability/Environmental|Natural|Situational", "ta6Ref": "7.2", @@ -22014,6 +20273,7 @@ }, "details": { "ntsRef": "C3.1.1.4", + "ntslRef": "C3.1.1.4", "baspiRef": "A11.1.2.1", "ta6Ref": "7.1.2", "title": "Please state when the flooding occurred and identify the parts that flooded", @@ -22023,6 +20283,7 @@ }, "baspiRequired": ["typeOfFlooding", "details"], "ntsRequired": ["typeOfFlooding", "details"], + "ntslRequired": ["typeOfFlooding", "details"], "ta6Required": ["typeOfFlooding", "details"] } ] @@ -22811,12 +21072,15 @@ "coalMining": { "rdsRef": "Sustainability/Environmental|Natural|Situational", "ntsRef": "C6.1", + "ntslRef": "C6.1", "title": "Coal mining", "type": "object", "ntsRequired": ["riskIndicator"], + "ntslRequired": ["riskIndicator"], "properties": { "riskIndicator": { "ntsRef": "C6.1.1", + "ntslRef": "C6.1.1", "type": "string", "title": "Is the property impacted?", "ntsTitle": "To your knowledge, is the property impacted by coal mining?", @@ -22852,6 +21116,7 @@ }, "summary": { "ntsRef": "C6.1.1", + "ntslRef": "C6.1.1", "type": "string", "title": "Summary of risk", "ntsTitle": "Please provide details", @@ -22918,12 +21183,15 @@ "nonCoalMining": { "rdsRef": "Sustainability/Environmental|Natural|Situational", "ntsRef": "C6.2", + "ntslRef": "C6.2", "title": "Non-coal mining", "type": "object", "ntsRequired": ["riskIndicator"], + "ntslRequired": ["riskIndicator"], "properties": { "riskIndicator": { "ntsRef": "C6.2.1", + "ntslRef": "C6.2.1", "type": "string", "title": "Is the property impacted?", "ntsTitle": "To your knowledge, is the property impacted by types of mining other than coal?", @@ -22959,6 +21227,7 @@ }, "summary": { "ntsRef": "C6.2.2", + "ntslRef": "C6.2.2", "type": "string", "title": "Summary of risk", "ntsTitle:": "Please provide details", @@ -23019,19 +21288,23 @@ } } }, - "ntsRequired": ["summary"] + "ntsRequired": ["summary"], + "ntslRequired": ["summary"] } ] }, "coastalErosion": { "ntsRef": "C3.2", + "ntslRef": "C3.2", "rdsRef": "Sustainability/Environmental|Natural|Situational", "title": "Coastal erosion", "type": "object", "ntsRequired": ["riskIndicator"], + "ntslRequired": ["riskIndicator"], "properties": { "riskIndicator": { "ntsRef": "C3.2.1", + "ntslRef": "C3.2.1", "type": "string", "title": "Is the property impacted?", "ntsTitle": "To your knowledge, is the property impacted by coastal erosion?", @@ -23067,6 +21340,7 @@ }, "summary": { "ntsRef": "C3.2.2", + "ntslRef": "C3.2.2", "type": "string", "title": "Summary of risk", "ntsTitle:": "Please provide details", @@ -23127,7 +21401,8 @@ } } }, - "ntsRequired": ["summary"] + "ntsRequired": ["summary"], + "ntslRequired": ["summary"] } ] }, @@ -23548,10 +21823,7 @@ "yesNo": { "type": "string", "title": "", - "enum": [ - "Yes", - "No" - ] + "enum": ["Yes", "No"] } } } @@ -29960,7 +28232,7 @@ } ] }, - "lheLocalAuthorityReceivedANoticeOfDisposal": { + "theLocalAuthorityReceivedANoticeOfDisposal": { "con29RRef": "3.15(b)(ii)", "title": "Has the Local Authority received a notice of disposal?", "type": "object", @@ -30200,7 +28472,7 @@ ] }, "commonholdIndicator": { - "type":"boolean" + "type": "boolean" }, "titleRegistrationDetails": { "type": "object", @@ -30277,94 +28549,94 @@ ], "properties": { "agreedNoticeIndicator": { - "type":"boolean" + "type": "boolean" }, "bankruptcyIndicator": { - "type":"boolean" + "type": "boolean" }, "cautionIndicator": { - "type":"boolean" + "type": "boolean" }, "ccbiIndicator": { - "type":"boolean" + "type": "boolean" }, "chargeeIndicator": { - "type":"boolean" + "type": "boolean" }, "chargeIndicator": { - "type":"boolean" + "type": "boolean" }, "chargeRelatedRestrictionIndicator": { - "type":"boolean" + "type": "boolean" }, "chargeRestrictionIndicator": { - "type":"boolean" + "type": "boolean" }, "creditorsNoticeIndicator": { - "type":"boolean" + "type": "boolean" }, "deathOfProprietorIndicator": { - "type":"boolean" + "type": "boolean" }, "deedOfPostponementIndicator": { - "type":"boolean" + "type": "boolean" }, "discountChargeIndicator": { - "type":"boolean" + "type": "boolean" }, "equitableChargeIndicator": { - "type":"boolean" + "type": "boolean" }, "greenOutEntryIndicator": { - "type":"boolean" + "type": "boolean" }, "homeRightsChangeOfAddressIndicator": { - "type":"boolean" + "type": "boolean" }, "homeRightsIndicator": { - "type":"boolean" + "type": "boolean" }, "leaseHoldTitleIndicator": { - "type":"boolean" + "type": "boolean" }, "multipleChargeIndicator": { - "type":"boolean" + "type": "boolean" }, "nonChargeRestrictionIndicator": { - "type":"boolean" + "type": "boolean" }, "notedChargeIndicator": { - "type":"boolean" + "type": "boolean" }, "pricePaidIndicator": { - "type":"boolean" + "type": "boolean" }, "propertyDescriptionNotesIndicator": { - "type":"boolean" + "type": "boolean" }, "rentChargeIndicator": { - "type":"boolean" + "type": "boolean" }, "rightOfPreEmptionIndicator": { - "type":"boolean" + "type": "boolean" }, "scheduleOfLeasesIndicator": { - "type":"boolean" + "type": "boolean" }, "subChargeIndicator": { - "type":"boolean" + "type": "boolean" }, "unidentifiedEntryIndicator": { - "type":"boolean" + "type": "boolean" }, "unilateralNoticeBeneficiaryIndicator": { - "type":"boolean" + "type": "boolean" }, "unilateralNoticeIndicator": { - "type":"boolean" + "type": "boolean" }, "vendorsLienIndicator": { - "type":"boolean" + "type": "boolean" } } }, @@ -36480,8 +34752,7 @@ ] }, "planOnlyIndicator": { - "type": "string", - "enum": ["true", "false"] + "type": "boolean" }, "filedUnder": { "type": "string" diff --git a/src/schemas/v3/overlays/baspi.json b/src/schemas/v3/overlays/baspi.json index 3233b8f..fcb2f5f 100644 --- a/src/schemas/v3/overlays/baspi.json +++ b/src/schemas/v3/overlays/baspi.json @@ -215,7 +215,6 @@ "ownershipsToBeTransferred": { "baspiRef": "A1.3", "items": { - "baspiRef": "A1.3.0", "discriminator": { "propertyName": "ownershipType" }, @@ -1036,6 +1035,7 @@ ] } ], + "baspiRef": "A1.3.0", "required": [ "ownershipType" ], @@ -5909,7 +5909,6 @@ "namesOfLegalOwners": { "baspiRef": "B1.1", "items": { - "baspiRef": "B1.1", "discriminator": { "propertyName": "ownerType" }, @@ -5952,6 +5951,7 @@ ] } ], + "baspiRef": "B1.1", "required": [ "ownerType" ], diff --git a/src/schemas/v3/overlays/con29R.json b/src/schemas/v3/overlays/con29R.json index 9beea9b..976a25b 100644 --- a/src/schemas/v3/overlays/con29R.json +++ b/src/schemas/v3/overlays/con29R.json @@ -2876,7 +2876,7 @@ "yesNo" ] }, - "lheLocalAuthorityReceivedANoticeOfDisposal": { + "theLocalAuthorityReceivedANoticeOfDisposal": { "con29RRef": "3.15(b)(ii)", "discriminator": { "propertyName": "yesNo" diff --git a/src/schemas/v3/overlays/nts.json b/src/schemas/v3/overlays/nts.json index d45fc70..009c7a7 100644 --- a/src/schemas/v3/overlays/nts.json +++ b/src/schemas/v3/overlays/nts.json @@ -8,6 +8,7 @@ "propertyPack": { "ntsRef": "0", "required": [ + "priceInformation", "ownership", "councilTax", "energyEfficiency", @@ -235,7 +236,6 @@ "ownershipsToBeTransferred": { "ntsRef": "A3", "items": { - "ntsRef": "A3.1", "discriminator": { "propertyName": "ownershipType" }, @@ -546,6 +546,7 @@ ] } ], + "ntsRef": "A3.1", "required": [ "ownershipType" ], @@ -786,8 +787,7 @@ "ntsRef": "A1.2", "required": [ "isStandardForm", - "buildingSafety", - "accessibilityAndAdaptations" + "buildingSafety" ], "properties": { "isStandardForm": { diff --git a/src/schemas/v3/overlays/ntsl.json b/src/schemas/v3/overlays/ntsl.json new file mode 100644 index 0000000..1cd020c --- /dev/null +++ b/src/schemas/v3/overlays/ntsl.json @@ -0,0 +1,1661 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://trust.propdata.org.uk/schemas/v3/overlays/ntsl.json", + "required": [ + "propertyPack" + ], + "properties": { + "propertyPack": { + "ntslRef": "0", + "required": [ + "lettingInformation", + "councilTax", + "energyEfficiency", + "buildInformation", + "typeOfConstruction", + "electricity", + "connectivity", + "waterAndDrainage", + "heating", + "parking", + "listingAndConservation", + "rightsAndInformalArrangements", + "environmentalIssues", + "notices" + ], + "properties": { + "lettingInformation": { + "ntslRef": "A2", + "required": [ + "rent", + "rentFrequency" + ], + "properties": { + "rent": { + "ntslRef": "A2.1" + }, + "rentFrequency": { + "ntslRef": "A2.2" + }, + "securityDeposit": { + "ntslRef": "A3.1" + }, + "holdingDeposit": { + "ntslRef": "A3.2" + } + } + }, + "buildInformation": { + "ntslRef": "B1.1", + "required": [ + "building", + "roomDimensions" + ], + "properties": { + "building": { + "ntslRef": "B1.1.1", + "discriminator": { + "propertyName": "propertyType" + }, + "oneOf": [ + { + "properties": { + "propertyType": { + "enum": [ + "Other" + ] + }, + "otherType": { + "ntslRef": "B1.1.1.1" + } + }, + "required": [ + "otherType" + ] + }, + { + "properties": { + "propertyType": { + "enum": [ + "House", + "Bungalow" + ] + } + } + }, + { + "properties": { + "propertyType": { + "enum": [ + "Maisonette", + "Flat" + ] + }, + "numberOfFloors": { + "ntslRef": "B1.1.3" + }, + "entranceFloor": { + "ntslRef": "B1.1.4" + }, + "hasLift": { + "ntslRef": "B1.1.5" + }, + "overCommercialPremises": { + "ntslRef": "B1.1.6", + "discriminator": { + "propertyName": "isLocatedOverCommercialPremises" + }, + "oneOf": [ + { + "properties": { + "isLocatedOverCommercialPremises": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "isLocatedOverCommercialPremises": { + "enum": [ + "Yes" + ] + }, + "details": { + "ntslRef": "B1.1.6.2" + } + }, + "required": [ + "details" + ] + } + ], + "properties": { + "isLocatedOverCommercialPremises": { + "ntslRef": "B1.1.6.1" + } + } + } + }, + "required": [ + "numberOfFloors", + "entranceFloor", + "hasLift", + "overCommercialPremises" + ] + } + ], + "required": [ + "builtForm", + "propertyType" + ], + "properties": { + "builtForm": { + "ntslRef": "B1.1.2" + }, + "propertyType": { + "ntslRef": "B1.1.1.1" + } + } + }, + "roomDimensions": { + "ntslRef": "B2", + "discriminator": { + "propertyName": "hasFloorplan" + }, + "oneOf": [ + { + "properties": { + "hasFloorplan": { + "enum": [ + "Yes" + ] + }, + "attachments": { + "ntslRef": "B2.1.1" + } + } + }, + { + "properties": { + "hasFloorplan": { + "enum": [ + "No" + ] + }, + "rooms": { + "ntslRef": "B2.2", + "items": { + "required": [ + "roomName", + "length", + "width", + "units" + ], + "properties": { + "roomName": { + "ntslRef": "B2.2.1" + }, + "description": { + "ntslRef": "B2.2.2" + }, + "length": { + "ntslRef": "B2.2.3" + }, + "width": { + "ntslRef": "B2.2.4" + }, + "units": { + "ntslRef": "B2.2.5" + }, + "dimensionDetails": { + "ntslRef": "B2.6" + } + } + } + } + } + } + ], + "required": [ + "hasFloorplan" + ], + "properties": { + "hasFloorplan": { + "ntslRef": "B2.1" + } + } + } + } + }, + "parking": { + "ntslRef": "B4", + "required": [ + "parkingArrangements", + "disabledParking", + "controlledParking", + "electricVehicleChargingPoint" + ], + "properties": { + "parkingArrangements": { + "ntslRef": "B4.1", + "items": { + "ntslRef": "B4.1.1" + } + }, + "disabledParking": { + "ntslRef": "B4.2", + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "B4.2.1" + } + } + }, + "controlledParking": { + "ntslRef": "B4.3", + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "B4.3.1" + } + } + }, + "electricVehicleChargingPoint": { + "ntslRef": "B4.4", + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "B4.4.1" + } + } + } + } + }, + "listingAndConservation": { + "ntslRef": "C2.1", + "required": [ + "isListed", + "isConservationArea", + "hasTreePreservationOrder" + ], + "properties": { + "isListed": { + "ntslRef": "C2.1.1", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No", + "Not known" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "details": { + "ntslRef": "C2.1.1.2" + } + }, + "required": [ + "details" + ] + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "C2.1.1.1", + "enum": [ + "Yes", + "No" + ] + } + } + }, + "isConservationArea": { + "ntslRef": "C2.1.2", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No", + "Not known" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "details": { + "ntslRef": "C2.1.2.2" + } + }, + "required": [ + "details" + ] + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "C2.1.2.1", + "enum": [ + "Yes", + "No" + ] + } + } + }, + "hasTreePreservationOrder": { + "ntslRef": "C2.1.3", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No", + "Not known" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "workCarriedOut": { + "ntslRef": "C2.1.3.2", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "consentsObtained": { + "ntslRef": "C2.1.3.3" + } + }, + "required": [ + "consentsObtained" + ] + } + ], + "required": [ + "yesNo" + ] + } + } + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "C2.1.3.1", + "enum": [ + "Yes", + "No" + ] + } + } + } + } + }, + "typeOfConstruction": { + "ntslRef": "A1.2", + "required": [ + "isStandardForm", + "buildingSafety" + ], + "properties": { + "isStandardForm": { + "ntslRef": "A1.2.1", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + }, + "details": { + "ntslRef": "A1.2.1.2" + } + }, + "required": [ + "details" + ] + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "A1.2.1.1" + } + } + }, + "buildingSafety": { + "ntslRef": "C1", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "details": { + "ntslRef": "C1.2" + }, + "workAlreadyDone": { + "ntslRef": "C1.3" + }, + "workToBeDone": { + "ntslRef": "C1.4" + }, + "potentialCost": { + "ntslRef": "C1.5" + }, + "abilityToResideAtProperty": { + "ntslRef": "C1.6" + } + }, + "required": [ + "details", + "workAlreadyDone", + "workToBeDone", + "potentialCost", + "abilityToResideAtProperty" + ] + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "C1.1", + "enum": [ + "Yes", + "No" + ] + } + } + }, + "accessibilityAndAdaptations": { + "ntslRef": "C5" + } + } + }, + "energyEfficiency": { + "ntslRef": "A4", + "required": [ + "certificate" + ], + "properties": { + "certificate": { + "ntslRef": "A4.1", + "required": [ + "currentEnergyRating" + ], + "properties": { + "currentEnergyRating": { + "ntslRef": "A4.1.1" + } + } + } + } + }, + "councilTax": { + "ntslRef": "A1", + "required": [ + "councilTaxBand", + "councilTaxAffectingAlterations" + ], + "properties": { + "councilTaxBand": { + "ntslRef": "A1.1" + }, + "councilTaxAffectingAlterations": { + "ntslRef": "A1.2", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "details": { + "ntslRef": "A1.2.2" + }, + "attachments": { + "ntslRef": "A1.2.3" + } + }, + "required": [ + "details" + ] + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "A1.2.1" + } + } + } + } + }, + "notices": { + "ntslRef": "C4", + "required": [ + "neighbourDevelopment", + "planningApplication" + ], + "properties": { + "neighbourDevelopment": { + "ntslRef": "C4.1", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "details": { + "ntslRef": "C4.1.2" + } + }, + "required": [ + "details" + ] + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "C4.1.1" + } + } + }, + "planningApplication": { + "ntslRef": "C4.2", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "details": { + "ntslRef": "C4.2.2" + } + }, + "required": [ + "details" + ] + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "C4.2.1" + } + } + } + } + }, + "electricity": { + "ntslRef": "B3.1", + "required": [ + "mainsElectricity", + "solarPanels", + "otherSources" + ], + "properties": { + "mainsElectricity": { + "ntslRef": "B3.1", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "To be connected" + ] + } + } + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "B3.1.1", + "enum": [ + "Yes", + "No" + ] + } + } + }, + "solarPanels": { + "ntslRef": "B3.7", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "To be connected" + ] + } + } + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "B3.7.1", + "enum": [ + "Yes", + "No" + ] + } + } + }, + "otherSources": { + "ntslRef": "B3.8", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "details": { + "ntslRef": "3.8.2" + } + }, + "required": [ + "details" + ] + }, + { + "properties": { + "yesNo": { + "enum": [ + "To be connected" + ] + }, + "details": { + "ntslRef": "3.8.2" + } + } + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "B3.8.1", + "enum": [ + "Yes", + "No" + ] + } + } + } + } + }, + "waterAndDrainage": { + "ntslRef": "B3.2", + "required": [ + "water", + "drainage" + ], + "properties": { + "water": { + "ntslRef": "B3.2", + "required": [ + "mainsWater" + ], + "properties": { + "mainsWater": { + "ntslRef": "B3.2", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + }, + "details": { + "ntslRef": "3.2.2" + } + }, + "required": [ + "details" + ] + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "waterMeter": { + "ntslRef": "B3.2.1.1", + "discriminator": { + "propertyName": "isSupplyMetered" + }, + "oneOf": [ + { + "properties": { + "isSupplyMetered": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "isSupplyMetered": { + "enum": [ + "Yes" + ] + } + } + } + ], + "required": [ + "isSupplyMetered" + ], + "properties": { + "isSupplyMetered": { + "ntslRef": "3.2.3" + } + } + } + }, + "required": [ + "waterMeter" + ] + }, + { + "properties": { + "yesNo": { + "enum": [ + "To be connected" + ] + } + } + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "B3.2.1", + "enum": [ + "Yes", + "No" + ] + } + } + } + } + }, + "drainage": { + "ntslRef": "B3.3", + "required": [ + "mainsSurfaceWaterDrainage", + "mainsFoulDrainage" + ], + "properties": { + "mainsSurfaceWaterDrainage": { + "ntslRef": "B3.3.1", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No", + "Not known" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "To be connected" + ] + } + } + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "B3.3.1.1", + "enum": [ + "Yes", + "No" + ] + } + } + }, + "mainsFoulDrainage": { + "ntslRef": "B3.3.2", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "To be connected" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "No", + "Not known" + ] + }, + "offMainsDrainageSystem": { + "ntslRef": "B3.3.3", + "discriminator": { + "propertyName": "offMainsDrainageSystemType" + }, + "oneOf": [ + { + "properties": { + "offMainsDrainageSystemType": { + "enum": [ + "Sustainable Drainage System" + ] + } + } + }, + { + "properties": { + "offMainsDrainageSystemType": { + "enum": [ + "Septic tank" + ] + } + } + }, + { + "properties": { + "offMainsDrainageSystemType": { + "enum": [ + "Cesspit" + ] + } + } + }, + { + "properties": { + "offMainsDrainageSystemType": { + "enum": [ + "Sewerage treatment plant" + ] + } + } + }, + { + "properties": { + "offMainsDrainageSystemType": { + "enum": [ + "Other", + "Not known" + ] + }, + "details": { + "ntslRef": "B3.3.3.2" + } + }, + "required": [ + "details" + ] + } + ], + "required": [ + "offMainsDrainageSystemType" + ], + "properties": { + "offMainsDrainageSystemType": { + "ntslRef": "B3.3.3.1" + } + } + } + } + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "B3.3.2.1", + "enum": [ + "Yes", + "No" + ] + } + } + } + } + } + } + }, + "heating": { + "ntslRef": "B3.4", + "required": [ + "heatingSystem" + ], + "properties": { + "heatingSystem": { + "ntslRef": "B3.4.1", + "discriminator": { + "propertyName": "heatingType" + }, + "oneOf": [ + { + "properties": { + "heatingType": { + "enum": [ + "None", + "Room heaters only" + ] + } + } + }, + { + "properties": { + "heatingType": { + "enum": [ + "Central heating" + ] + }, + "centralHeatingDetails": { + "ntslRef": "B3.4.3", + "required": [ + "centralHeatingFuel" + ], + "properties": { + "centralHeatingFuel": { + "ntslRef": "B3.4.3.1", + "discriminator": { + "propertyName": "centralHeatingFuelType" + }, + "oneOf": [ + { + "properties": { + "centralHeatingFuelType": { + "enum": [ + "Mains gas" + ] + } + } + }, + { + "properties": { + "centralHeatingFuelType": { + "enum": [ + "Electricity" + ] + } + } + }, + { + "properties": { + "centralHeatingFuelType": { + "enum": [ + "Oil", + "LPG", + "Biomass" + ] + } + } + }, + { + "properties": { + "centralHeatingFuelType": { + "enum": [ + "Other" + ] + } + } + } + ], + "required": [ + "centralHeatingFuelType" + ], + "properties": { + "centralHeatingFuelType": { + "ntslRef": "B3.4.3.1.1" + } + } + } + } + } + }, + "required": [ + "centralHeatingDetails" + ] + }, + { + "properties": { + "heatingType": { + "enum": [ + "Community heating system" + ] + }, + "details": { + "ntslRef": "B3.4.4" + } + }, + "required": [ + "details" + ] + } + ], + "required": [ + "heatingType" + ], + "properties": { + "heatingType": { + "ntslRef": "B3.4.1" + } + } + }, + "otherHeatingFeatures": { + "ntslRef": "B3.4.2" + } + } + }, + "connectivity": { + "ntslRef": "B3", + "required": [ + "broadband" + ], + "properties": { + "telephone": { + "properties": { + "yesNo": { + "enum": [ + "Yes", + "No" + ] + } + } + }, + "cableSatelliteTV": { + "properties": { + "yesNo": { + "enum": [ + "Yes", + "No" + ] + } + } + }, + "broadband": { + "ntslRef": "B3.5", + "required": [ + "typeOfConnection" + ], + "properties": { + "typeOfConnection": { + "ntslRef": "B3.5.2" + } + } + }, + "mobilePhone": { + "ntslRef": "B3.6", + "properties": { + "knownSignalIssues": { + "ntslRef": "B3.6.1", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "details": { + "ntslRef": "B3.6.1.2" + } + }, + "required": [ + "details" + ] + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "B3.6.1.1" + } + } + } + } + } + } + }, + "rightsAndInformalArrangements": { + "ntslRef": "C2.2", + "required": [ + "rightsOrArrangements" + ], + "properties": { + "rightsOrArrangements": { + "ntslRef": "C2.2.1", + "required": [ + "publicRightOfWay" + ], + "properties": { + "publicRightOfWay": { + "ntslRef": "C2.2.1", + "discriminator": { + "propertyName": "yesNo" + }, + "oneOf": [ + { + "properties": { + "yesNo": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "yesNo": { + "enum": [ + "Yes" + ] + }, + "details": { + "ntslRef": "C2.2.1.2" + } + }, + "required": [ + "details" + ] + } + ], + "required": [ + "yesNo" + ], + "properties": { + "yesNo": { + "ntslRef": "C2.2.1.1" + } + } + } + } + } + } + }, + "environmentalIssues": { + "ntslRef": "C3.1", + "required": [ + "flooding", + "coalMining", + "nonCoalMining", + "coastalErosion" + ], + "properties": { + "flooding": { + "ntslRef": "C3.1.1", + "required": [ + "floodRisk", + "historicalFlooding" + ], + "properties": { + "floodRisk": { + "ntslRef": "C3.1.1.1", + "discriminator": { + "propertyName": "riskIndicator" + }, + "oneOf": [ + { + "properties": { + "riskIndicator": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "riskIndicator": { + "enum": [ + "Yes" + ] + }, + "summary": { + "ntslRef": "C3.1.1.2" + } + }, + "required": [ + "summary" + ] + } + ], + "required": [ + "riskIndicator" + ], + "properties": { + "riskIndicator": { + "ntslRef": "C3.1.1.1" + } + } + }, + "historicalFlooding": { + "ntslRef": "C3.1.1.2", + "discriminator": { + "propertyName": "hasBeenFlooded" + }, + "oneOf": [ + { + "properties": { + "hasBeenFlooded": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "hasBeenFlooded": { + "enum": [ + "Yes" + ] + }, + "typeOfFlooding": { + "ntslRef": "C3.1.1.3" + }, + "details": { + "ntslRef": "C3.1.1.4" + } + }, + "required": [ + "typeOfFlooding", + "details" + ] + } + ], + "required": [ + "hasBeenFlooded" + ], + "properties": { + "hasBeenFlooded": { + "ntslRef": "C3.1.1.2.1" + } + } + } + } + }, + "coalMining": { + "ntslRef": "C6.1", + "discriminator": { + "propertyName": "riskIndicator" + }, + "oneOf": [ + { + "properties": { + "riskIndicator": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "riskIndicator": { + "enum": [ + "Yes" + ] + }, + "summary": { + "ntslRef": "C6.1.1" + } + } + } + ], + "required": [ + "riskIndicator" + ], + "properties": { + "riskIndicator": { + "ntslRef": "C6.1.1" + } + } + }, + "nonCoalMining": { + "ntslRef": "C6.2", + "discriminator": { + "propertyName": "riskIndicator" + }, + "oneOf": [ + { + "properties": { + "riskIndicator": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "riskIndicator": { + "enum": [ + "Yes" + ] + }, + "summary": { + "ntslRef": "C6.2.2" + } + }, + "required": [ + "summary" + ] + } + ], + "required": [ + "riskIndicator" + ], + "properties": { + "riskIndicator": { + "ntslRef": "C6.2.1" + } + } + }, + "coastalErosion": { + "ntslRef": "C3.2", + "discriminator": { + "propertyName": "riskIndicator" + }, + "oneOf": [ + { + "properties": { + "riskIndicator": { + "enum": [ + "No" + ] + } + } + }, + { + "properties": { + "riskIndicator": { + "enum": [ + "Yes" + ] + }, + "summary": { + "ntslRef": "C3.2.2" + } + }, + "required": [ + "summary" + ] + } + ], + "required": [ + "riskIndicator" + ], + "properties": { + "riskIndicator": { + "ntslRef": "C3.2.1" + } + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/src/schemas/v3/overlays/piq.json b/src/schemas/v3/overlays/piq.json index 5294b60..35eae3a 100644 --- a/src/schemas/v3/overlays/piq.json +++ b/src/schemas/v3/overlays/piq.json @@ -2427,7 +2427,32 @@ "legalOwners": { "properties": { "namesOfLegalOwners": { - "piqRef": "B1.1" + "piqRef": "B1.1", + "items": { + "discriminator": { + "propertyName": "ownerType" + }, + "oneOf": [ + { + "properties": { + "ownerType": { + "enum": [ + "Private individual" + ] + } + } + }, + { + "properties": { + "ownerType": { + "enum": [ + "Organisation" + ] + } + } + } + ] + } } } }, diff --git a/src/schemas/v3/overlays/rds.json b/src/schemas/v3/overlays/rds.json index 960a7c1..ede308f 100644 --- a/src/schemas/v3/overlays/rds.json +++ b/src/schemas/v3/overlays/rds.json @@ -2665,7 +2665,32 @@ "legalOwners": { "properties": { "namesOfLegalOwners": { - "rdsRef": "RightsHolders" + "rdsRef": "RightsHolders", + "items": { + "discriminator": { + "propertyName": "ownerType" + }, + "oneOf": [ + { + "properties": { + "ownerType": { + "enum": [ + "Private individual" + ] + } + } + }, + { + "properties": { + "ownerType": { + "enum": [ + "Organisation" + ] + } + } + } + ] + } } } }, diff --git a/src/schemas/v3/overlays/ta10.json b/src/schemas/v3/overlays/ta10.json index 00b2ef8..4d72461 100644 --- a/src/schemas/v3/overlays/ta10.json +++ b/src/schemas/v3/overlays/ta10.json @@ -36,7 +36,8 @@ "fittedUnits", "outdoorArea", "televisionAndTelephone", - "stockOfFuel" + "stockOfFuel", + "otherItems" ], "properties": { "basicFittings": { @@ -69,11 +70,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.1c" } } }, @@ -86,21 +85,6 @@ }, "price": { "ta10Ref": "1.1b" - }, - "comments": { - "ta10Ref": "1.1c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.1c" } } } @@ -111,6 +95,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.1a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -124,11 +111,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.2c" } } }, @@ -141,21 +126,6 @@ }, "price": { "ta10Ref": "1.2b" - }, - "comments": { - "ta10Ref": "1.2c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.2c" } } } @@ -166,6 +136,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.2a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -179,11 +152,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.3c" } } }, @@ -196,21 +167,6 @@ }, "price": { "ta10Ref": "1.3b" - }, - "comments": { - "ta10Ref": "1.3c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.3c" } } } @@ -221,6 +177,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.3a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -234,11 +193,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.4c" } } }, @@ -251,21 +208,6 @@ }, "price": { "ta10Ref": "1.4b" - }, - "comments": { - "ta10Ref": "1.4c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.4c" } } } @@ -276,6 +218,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.4a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -289,11 +234,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.5c" } } }, @@ -306,21 +249,6 @@ }, "price": { "ta10Ref": "1.5b" - }, - "comments": { - "ta10Ref": "1.5c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.5c" } } } @@ -331,6 +259,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.5a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -344,11 +275,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.6c" } } }, @@ -361,21 +290,6 @@ }, "price": { "ta10Ref": "1.6b" - }, - "comments": { - "ta10Ref": "1.6c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.6c" } } } @@ -386,6 +300,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.6a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -399,11 +316,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.7c" } } }, @@ -416,21 +331,6 @@ }, "price": { "ta10Ref": "1.7b" - }, - "comments": { - "ta10Ref": "1.7c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.7c" } } } @@ -441,6 +341,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.7a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -454,11 +357,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.8c" } } }, @@ -471,21 +372,6 @@ }, "price": { "ta10Ref": "1.8b" - }, - "comments": { - "ta10Ref": "1.8c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.8c" } } } @@ -496,6 +382,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.8a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -509,11 +398,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.9c" } } }, @@ -526,21 +413,6 @@ }, "price": { "ta10Ref": "1.9b" - }, - "comments": { - "ta10Ref": "1.9c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.9c" } } } @@ -551,6 +423,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.9a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -564,11 +439,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.10c" } } }, @@ -581,21 +454,6 @@ }, "price": { "ta10Ref": "1.10b" - }, - "comments": { - "ta10Ref": "1.10c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.10c" } } } @@ -606,6 +464,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.10a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -619,11 +480,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.11c" } } }, @@ -636,21 +495,6 @@ }, "price": { "ta10Ref": "1.11b" - }, - "comments": { - "ta10Ref": "1.11c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.11c" } } } @@ -661,6 +505,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.11a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -674,11 +521,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.12c" } } }, @@ -691,21 +536,6 @@ }, "price": { "ta10Ref": "1.12b" - }, - "comments": { - "ta10Ref": "1.12c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.12c" } } } @@ -716,6 +546,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.12a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -729,11 +562,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.13c" } } }, @@ -746,21 +577,6 @@ }, "price": { "ta10Ref": "1.13b" - }, - "comments": { - "ta10Ref": "1.13c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.13c" } } } @@ -771,6 +587,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.13a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -784,11 +603,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.14c" } } }, @@ -801,21 +618,6 @@ }, "price": { "ta10Ref": "1.14b" - }, - "comments": { - "ta10Ref": "1.14c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.14c" } } } @@ -826,6 +628,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.14a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -839,11 +644,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "1.15c" } } }, @@ -856,21 +659,6 @@ }, "price": { "ta10Ref": "1.15b" - }, - "comments": { - "ta10Ref": "1.15c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "1.15c" } } } @@ -881,43 +669,53 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "1.15a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, "otherItems": { "ta10Ref": "1.16", "items": { - "required": [ - "itemName", - "isIncludedOrExcluded" - ], - "properties": { - "itemName": { - "ta10Ref": "1.16" - }, - "isIncludedOrExcluded": { - "ta10Ref": "1.16a" - } + "discriminator": { + "propertyName": "isIncludedOrExcluded" }, "oneOf": [ { "properties": { - "comments": { - "ta10Ref": "1.16c" + "isIncludedOrExcluded": { + "enum": [ + "Included" + ] } } }, { "properties": { + "isIncludedOrExcluded": { + "enum": [ + "Excluded" + ] + }, "price": { "ta10Ref": "1.16b" - }, - "comments": { - "ta10Ref": "1.16c" } } } - ] + ], + "required": [ + "itemName", + "isIncludedOrExcluded" + ], + "properties": { + "itemName": { + "ta10Ref": "1.16" + }, + "isIncludedOrExcluded": { + "ta10Ref": "1.16a" + } + } } } } @@ -943,6 +741,15 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -952,40 +759,11 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.1d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.1c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.1c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.1d" } } @@ -1004,57 +782,16 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.1d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.1c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.1c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.1d" } } } } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "2.1c" - } - } } ], "required": [ @@ -1063,6 +800,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "2.1a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -1072,6 +812,15 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -1081,40 +830,11 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.2d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.2c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.2c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.2d" } } @@ -1133,57 +853,16 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.2d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.2c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.2c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.2d" } } } } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "2.2c" - } - } } ], "required": [ @@ -1192,6 +871,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "2.2a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -1201,6 +883,15 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -1210,40 +901,11 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.3d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.3c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.3c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.3d" } } @@ -1262,57 +924,16 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.3d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.3c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.3c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.3d" } } } } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "2.3c" - } - } } ], "required": [ @@ -1321,6 +942,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "2.3a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -1330,6 +954,15 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -1339,40 +972,11 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.4d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.4c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.4c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.4d" } } @@ -1391,57 +995,16 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.4d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.4c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.4c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.4d" } } } } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "2.4c" - } - } } ], "required": [ @@ -1450,6 +1013,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "2.4a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -1459,6 +1025,15 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -1468,40 +1043,11 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.5d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.5c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.5c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.5d" } } @@ -1520,57 +1066,16 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.5d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.5c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.5c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.5d" } } } } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "2.5c" - } - } } ], "required": [ @@ -1579,6 +1084,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "2.5a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -1588,6 +1096,15 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -1597,40 +1114,11 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.6d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.6c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.6c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.6d" } } @@ -1649,57 +1137,16 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.6d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.6c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.6c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.6d" } } } } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "2.6c" - } - } } ], "required": [ @@ -1708,6 +1155,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "2.6a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -1717,6 +1167,15 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -1726,40 +1185,11 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.7d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.7c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.7c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.7d" } } @@ -1778,57 +1208,16 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.7d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.7c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.7c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.7d" } } } } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "2.7c" - } - } } ], "required": [ @@ -1837,6 +1226,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "2.7a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -1846,6 +1238,15 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -1855,40 +1256,11 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.8d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.8c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.8c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.8d" } } @@ -1907,57 +1279,16 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.8d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.8c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.8c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.8d" } } } } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "2.8c" - } - } } ], "required": [ @@ -1966,6 +1297,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "2.8a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -1975,6 +1309,15 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -1984,40 +1327,11 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.9d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.9c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.9c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.9d" } } @@ -2036,57 +1350,16 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.9d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.9c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.9c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.9d" } } } } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "2.9c" - } - } } ], "required": [ @@ -2095,6 +1368,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "2.9a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2104,6 +1380,15 @@ "propertyName": "isIncludedExcludedOrNone" }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -2113,40 +1398,11 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.10d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.10c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.10c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.10d" } } @@ -2165,57 +1421,16 @@ }, "fittedOrFreestanding": { "ta10Ref": "2.10d", - "discriminator": { - "propertyName": "isFittedOrFreestanding" - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "ta10Ref": "2.10c" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "ta10Ref": "2.10c" - } - } - } - ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.10d" } } } } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "2.10c" - } - } } ], "required": [ @@ -2224,62 +1439,56 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "2.10a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, "otherItems": { "ta10Ref": "2.11", "items": { - "required": [ - "isIncludedOrExcluded" - ], - "properties": { - "itemName": { - "ta10Ref": "2.11" - }, - "isIncludedOrExcluded": { - "ta10Ref": "2.11a" - } + "discriminator": { + "propertyName": "isIncludedOrExcluded" }, "oneOf": [ { "properties": { + "isIncludedOrExcluded": { + "enum": [ + "Included" + ] + }, "fittedOrFreestanding": { "ta10Ref": "2.11d", "discriminator": { - "propertyName": "isFittedOrFreestanding" + "propertyName": "fittedOrFreestanding" }, "oneOf": [ { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": [ "Fitted" ] - }, - "comments": { - "ta10Ref": "2.11c" } } }, { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": [ "Freestanding" ] - }, - "comments": { - "ta10Ref": "2.11c" } } } ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.11d" } } @@ -2288,45 +1497,44 @@ }, { "properties": { + "isIncludedOrExcluded": { + "enum": [ + "Excluded" + ] + }, "price": { "ta10Ref": "2.11b" }, "fittedOrFreestanding": { "ta10Ref": "2.11d", "discriminator": { - "propertyName": "isFittedOrFreestanding" + "propertyName": "fittedOrFreestanding" }, "oneOf": [ { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": [ "Fitted" ] - }, - "comments": { - "ta10Ref": "2.11c" } } }, { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": [ "Freestanding" ] - }, - "comments": { - "ta10Ref": "2.11c" } } } ], "required": [ - "isFittedOrFreestanding" + "fittedOrFreestanding" ], "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "ta10Ref": "2.11d" } } @@ -2335,12 +1543,25 @@ }, { "properties": { - "comments": { - "ta10Ref": "2.11c" + "isIncludedOrExcluded": { + "enum": [ + "None" + ] } } } - ] + ], + "required": [ + "isIncludedOrExcluded" + ], + "properties": { + "itemName": { + "ta10Ref": "2.11" + }, + "isIncludedOrExcluded": { + "ta10Ref": "2.11a" + } + } } } } @@ -2370,11 +1591,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "3.1c" } } }, @@ -2387,21 +1606,6 @@ }, "price": { "ta10Ref": "3.1b" - }, - "comments": { - "ta10Ref": "3.1c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "3.1c" } } } @@ -2412,6 +1616,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "3.1a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2425,11 +1632,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "3.2c" } } }, @@ -2442,21 +1647,6 @@ }, "price": { "ta10Ref": "3.2b" - }, - "comments": { - "ta10Ref": "3.2c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "3.2c" } } } @@ -2467,6 +1657,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "3.2a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2480,11 +1673,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "3.3c" } } }, @@ -2495,23 +1686,8 @@ "Excluded" ] }, - "price": { - "ta10Ref": "3.3b" - }, - "comments": { - "ta10Ref": "3.3c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "3.3c" + "price": { + "ta10Ref": "3.3b" } } } @@ -2522,6 +1698,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "3.3a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2535,11 +1714,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "3.4c" } } }, @@ -2552,21 +1729,6 @@ }, "price": { "ta10Ref": "3.4b" - }, - "comments": { - "ta10Ref": "3.4c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "3.4c" } } } @@ -2577,6 +1739,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "3.4a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2590,11 +1755,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "3.5c" } } }, @@ -2607,21 +1770,6 @@ }, "price": { "ta10Ref": "3.5b" - }, - "comments": { - "ta10Ref": "3.5c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "3.5c" } } } @@ -2632,6 +1780,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "3.5a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2645,11 +1796,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "3.6c" } } }, @@ -2662,21 +1811,6 @@ }, "price": { "ta10Ref": "3.6b" - }, - "comments": { - "ta10Ref": "3.6c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "3.6c" } } } @@ -2687,6 +1821,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "3.6a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2700,11 +1837,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "3.7c" } } }, @@ -2717,21 +1852,6 @@ }, "price": { "ta10Ref": "3.7b" - }, - "comments": { - "ta10Ref": "3.7c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "3.7c" } } } @@ -2742,6 +1862,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "3.7a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2755,11 +1878,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "3.8c" } } }, @@ -2772,21 +1893,6 @@ }, "price": { "ta10Ref": "3.8b" - }, - "comments": { - "ta10Ref": "3.8c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "3.8c" } } } @@ -2797,6 +1903,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "3.8a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2810,11 +1919,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "3.9c" } } }, @@ -2827,21 +1934,6 @@ }, "price": { "ta10Ref": "3.9b" - }, - "comments": { - "ta10Ref": "3.9c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "3.9c" } } } @@ -2852,6 +1944,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "3.9a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2865,11 +1960,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "3.10c" } } }, @@ -2882,21 +1975,6 @@ }, "price": { "ta10Ref": "3.10b" - }, - "comments": { - "ta10Ref": "3.10c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "3.10c" } } } @@ -2907,6 +1985,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "3.10a" + }, + "comments": { + "ta10Ref": "1.1c" } } } @@ -2934,11 +2015,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "4.1c" } } }, @@ -2951,21 +2030,6 @@ }, "price": { "ta10Ref": "4.1b" - }, - "comments": { - "ta10Ref": "4.1c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "4.1c" } } } @@ -2976,6 +2040,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "4.1a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -2989,11 +2056,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "4.2c" } } }, @@ -3006,21 +2071,6 @@ }, "price": { "ta10Ref": "4.2b" - }, - "comments": { - "ta10Ref": "4.2c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "4.2c" } } } @@ -3031,6 +2081,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "4.2a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3044,11 +2097,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "4.3c" } } }, @@ -3061,21 +2112,6 @@ }, "price": { "ta10Ref": "4.3b" - }, - "comments": { - "ta10Ref": "4.3c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "4.3c" } } } @@ -3086,6 +2122,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "4.3a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3099,11 +2138,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "4.4c" } } }, @@ -3116,21 +2153,6 @@ }, "price": { "ta10Ref": "4.4b" - }, - "comments": { - "ta10Ref": "4.4c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "4.4c" } } } @@ -3141,6 +2163,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "4.4a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3154,11 +2179,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "4.5c" } } }, @@ -3171,21 +2194,6 @@ }, "price": { "ta10Ref": "4.5b" - }, - "comments": { - "ta10Ref": "4.5c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "4.5c" } } } @@ -3196,6 +2204,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "4.5a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3209,11 +2220,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "4.6c" } } }, @@ -3226,21 +2235,6 @@ }, "price": { "ta10Ref": "4.6b" - }, - "comments": { - "ta10Ref": "4.6c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "4.6c" } } } @@ -3251,6 +2245,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "4.6a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3264,11 +2261,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "4.7c" } } }, @@ -3281,21 +2276,6 @@ }, "price": { "ta10Ref": "4.7b" - }, - "comments": { - "ta10Ref": "4.7c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "4.7c" } } } @@ -3306,43 +2286,53 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "4.7a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, "otherRooms": { "ta10Ref": "4.8", "items": { - "required": [ - "itemName", - "isIncludedOrExcluded" - ], - "properties": { - "itemName": { - "ta10Ref": "4.8" - }, - "isIncludedOrExcluded": { - "ta10Ref": "4.8a" - } + "discriminator": { + "propertyName": "isIncludedOrExcluded" }, "oneOf": [ { "properties": { - "comments": { - "ta10Ref": "4.8c" + "isIncludedOrExcluded": { + "enum": [ + "Included" + ] } } }, { "properties": { + "isIncludedOrExcluded": { + "enum": [ + "Excluded" + ] + }, "price": { "ta10Ref": "4.8b" - }, - "comments": { - "ta10Ref": "4.8c" } } } - ] + ], + "required": [ + "itemName", + "isIncludedOrExcluded" + ], + "properties": { + "itemName": { + "ta10Ref": "4.8" + }, + "isIncludedOrExcluded": { + "ta10Ref": "4.8a" + } + } } } } @@ -3376,11 +2366,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.1c" } } }, @@ -3393,21 +2381,6 @@ }, "price": { "ta10Ref": "5.1b" - }, - "comments": { - "ta10Ref": "5.1c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.1c" } } } @@ -3418,6 +2391,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.1a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3431,11 +2407,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.2c" } } }, @@ -3448,21 +2422,6 @@ }, "price": { "ta10Ref": "5.2b" - }, - "comments": { - "ta10Ref": "5.2c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.2c" } } } @@ -3473,6 +2432,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.2a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3486,11 +2448,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.3c" } } }, @@ -3503,21 +2463,6 @@ }, "price": { "ta10Ref": "5.3b" - }, - "comments": { - "ta10Ref": "5.3c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.3c" } } } @@ -3528,6 +2473,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.3a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3541,11 +2489,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.4c" } } }, @@ -3558,21 +2504,6 @@ }, "price": { "ta10Ref": "5.4b" - }, - "comments": { - "ta10Ref": "5.4c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.4c" } } } @@ -3583,6 +2514,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.4a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3596,11 +2530,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.5c" } } }, @@ -3613,21 +2545,6 @@ }, "price": { "ta10Ref": "5.5b" - }, - "comments": { - "ta10Ref": "5.5c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.5c" } } } @@ -3638,6 +2555,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.5a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3651,11 +2571,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.6c" } } }, @@ -3668,21 +2586,6 @@ }, "price": { "ta10Ref": "5.6b" - }, - "comments": { - "ta10Ref": "5.6c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.6c" } } } @@ -3693,6 +2596,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.6a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3706,11 +2612,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.7c" } } }, @@ -3723,21 +2627,6 @@ }, "price": { "ta10Ref": "5.7b" - }, - "comments": { - "ta10Ref": "5.7c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.7c" } } } @@ -3748,43 +2637,53 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.7a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, "otherRooms": { "ta10Ref": "5.8", "items": { - "required": [ - "itemName", - "isIncludedOrExcluded" - ], - "properties": { - "itemName": { - "ta10Ref": "5.8" - }, - "isIncludedOrExcluded": { - "ta10Ref": "5.8a" - } + "discriminator": { + "propertyName": "isIncludedOrExcluded" }, "oneOf": [ { "properties": { - "comments": { - "ta10Ref": "5.8c" + "isIncludedOrExcluded": { + "enum": [ + "Included" + ] } } }, { "properties": { + "isIncludedOrExcluded": { + "enum": [ + "Excluded" + ] + }, "price": { "ta10Ref": "5.8b" - }, - "comments": { - "ta10Ref": "5.8c" } } } - ] + ], + "required": [ + "itemName", + "isIncludedOrExcluded" + ], + "properties": { + "itemName": { + "ta10Ref": "5.8" + }, + "isIncludedOrExcluded": { + "ta10Ref": "5.8a" + } + } } } } @@ -3811,11 +2710,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.12c" } } }, @@ -3828,21 +2725,6 @@ }, "price": { "ta10Ref": "5.12b" - }, - "comments": { - "ta10Ref": "5.12c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.12c" } } } @@ -3853,6 +2735,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.12a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3866,11 +2751,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.13c" } } }, @@ -3883,21 +2766,6 @@ }, "price": { "ta10Ref": "5.13b" - }, - "comments": { - "ta10Ref": "5.13c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.13c" } } } @@ -3908,6 +2776,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.13a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3921,11 +2792,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.14c" } } }, @@ -3938,21 +2807,6 @@ }, "price": { "ta10Ref": "5.14b" - }, - "comments": { - "ta10Ref": "5.14c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.14c" } } } @@ -3963,6 +2817,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.14a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -3976,11 +2833,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.15c" } } }, @@ -3993,21 +2848,6 @@ }, "price": { "ta10Ref": "5.15b" - }, - "comments": { - "ta10Ref": "5.15c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.15c" } } } @@ -4018,6 +2858,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.15a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4031,11 +2874,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.16c" } } }, @@ -4048,21 +2889,6 @@ }, "price": { "ta10Ref": "5.16b" - }, - "comments": { - "ta10Ref": "5.16c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.16c" } } } @@ -4073,6 +2899,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.16a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4086,26 +2915,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" - ] - }, - "comments": { - "ta10Ref": "5.17c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "Excluded" + "Included", + "None" ] - }, - "price": { - "ta10Ref": "5.17b" - }, - "comments": { - "ta10Ref": "5.17c" } } }, @@ -4113,11 +2925,11 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "None" + "Excluded" ] }, - "comments": { - "ta10Ref": "5.17c" + "price": { + "ta10Ref": "5.17b" } } } @@ -4128,6 +2940,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.17a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4141,11 +2956,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "5.18c" } } }, @@ -4158,21 +2971,6 @@ }, "price": { "ta10Ref": "5.18b" - }, - "comments": { - "ta10Ref": "5.18c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "5.18c" } } } @@ -4183,43 +2981,53 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "5.18a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, "otherRooms": { "ta10Ref": "5.19", "items": { - "required": [ - "itemName", - "isIncludedOrExcluded" - ], - "properties": { - "itemName": { - "ta10Ref": "5.19" - }, - "isIncludedOrExcluded": { - "ta10Ref": "5.19a" - } + "discriminator": { + "propertyName": "isIncludedOrExcluded" }, "oneOf": [ { "properties": { - "comments": { - "ta10Ref": "5.19c" + "isIncludedOrExcluded": { + "enum": [ + "Included" + ] } } }, { "properties": { + "isIncludedOrExcluded": { + "enum": [ + "Excluded" + ] + }, "price": { "ta10Ref": "5.19b" - }, - "comments": { - "ta10Ref": "5.19c" } } } - ] + ], + "required": [ + "itemName", + "isIncludedOrExcluded" + ], + "properties": { + "itemName": { + "ta10Ref": "5.19" + }, + "isIncludedOrExcluded": { + "ta10Ref": "5.19a" + } + } } } } @@ -4248,11 +3056,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "6.1c" } } }, @@ -4265,21 +3071,6 @@ }, "price": { "ta10Ref": "6.1b" - }, - "comments": { - "ta10Ref": "6.1c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "6.1c" } } } @@ -4290,6 +3081,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "6.1a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4303,11 +3097,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "6.2c" } } }, @@ -4320,21 +3112,6 @@ }, "price": { "ta10Ref": "6.2b" - }, - "comments": { - "ta10Ref": "6.2c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "6.2c" } } } @@ -4345,6 +3122,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "6.2a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4358,11 +3138,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "6.3c" } } }, @@ -4375,21 +3153,6 @@ }, "price": { "ta10Ref": "6.3b" - }, - "comments": { - "ta10Ref": "6.3c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "6.3c" } } } @@ -4400,6 +3163,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "6.3a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4413,11 +3179,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "6.4c" } } }, @@ -4430,21 +3194,6 @@ }, "price": { "ta10Ref": "6.4b" - }, - "comments": { - "ta10Ref": "6.4c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "6.4c" } } } @@ -4455,6 +3204,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "6.4a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4468,11 +3220,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "6.5c" } } }, @@ -4485,21 +3235,6 @@ }, "price": { "ta10Ref": "6.5b" - }, - "comments": { - "ta10Ref": "6.5c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "6.5c" } } } @@ -4510,6 +3245,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "6.5a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4523,11 +3261,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "6.6c" } } }, @@ -4540,21 +3276,6 @@ }, "price": { "ta10Ref": "6.6b" - }, - "comments": { - "ta10Ref": "6.6c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "6.6c" } } } @@ -4565,6 +3286,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "6.6a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4578,11 +3302,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "6.7c" } } }, @@ -4595,21 +3317,6 @@ }, "price": { "ta10Ref": "6.7b" - }, - "comments": { - "ta10Ref": "6.7c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "6.7c" } } } @@ -4620,43 +3327,53 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "6.7a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, "otherRooms": { "ta10Ref": "6.8", "items": { - "required": [ - "itemName", - "isIncludedOrExcluded" - ], - "properties": { - "itemName": { - "ta10Ref": "6.8" - }, - "isIncludedOrExcluded": { - "ta10Ref": "6.8a" - } + "discriminator": { + "propertyName": "isIncludedOrExcluded" }, "oneOf": [ { "properties": { - "comments": { - "ta10Ref": "6.8c" + "isIncludedOrExcluded": { + "enum": [ + "Included" + ] } } }, { "properties": { + "isIncludedOrExcluded": { + "enum": [ + "Excluded" + ] + }, "price": { "ta10Ref": "6.8b" - }, - "comments": { - "ta10Ref": "6.8c" } } } - ] + ], + "required": [ + "itemName", + "isIncludedOrExcluded" + ], + "properties": { + "itemName": { + "ta10Ref": "6.8" + }, + "isIncludedOrExcluded": { + "ta10Ref": "6.8a" + } + } } } } @@ -4683,11 +3400,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "7.1c" } } }, @@ -4700,21 +3415,6 @@ }, "price": { "ta10Ref": "7.1b" - }, - "comments": { - "ta10Ref": "7.1c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "7.1c" } } } @@ -4725,6 +3425,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "7.1a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4738,11 +3441,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "7.2c" } } }, @@ -4755,21 +3456,6 @@ }, "price": { "ta10Ref": "7.2b" - }, - "comments": { - "ta10Ref": "7.2c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "7.2c" } } } @@ -4780,6 +3466,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "7.2a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4793,26 +3482,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" - ] - }, - "comments": { - "ta10Ref": "7.3c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "Excluded" + "Included", + "None" ] - }, - "price": { - "ta10Ref": "7.3b" - }, - "comments": { - "ta10Ref": "7.3c" } } }, @@ -4820,11 +3492,11 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "None" + "Excluded" ] }, - "comments": { - "ta10Ref": "7.3c" + "price": { + "ta10Ref": "7.3b" } } } @@ -4835,6 +3507,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "7.3a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4848,11 +3523,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "7.4c" } } }, @@ -4865,21 +3538,6 @@ }, "price": { "ta10Ref": "7.4b" - }, - "comments": { - "ta10Ref": "7.4c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "7.4c" } } } @@ -4890,6 +3548,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "7.4a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4903,11 +3564,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "7.5c" } } }, @@ -4920,21 +3579,6 @@ }, "price": { "ta10Ref": "7.5b" - }, - "comments": { - "ta10Ref": "7.5c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "7.5c" } } } @@ -4945,6 +3589,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "7.5a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -4958,11 +3605,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "7.6c" } } }, @@ -4975,21 +3620,6 @@ }, "price": { "ta10Ref": "7.6b" - }, - "comments": { - "ta10Ref": "7.6c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "7.6c" } } } @@ -5000,6 +3630,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "7.6a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5013,11 +3646,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "7.7c" } } }, @@ -5030,21 +3661,6 @@ }, "price": { "ta10Ref": "7.7b" - }, - "comments": { - "ta10Ref": "7.7c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "7.7c" } } } @@ -5055,43 +3671,53 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "7.7a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, "otherRooms": { "ta10Ref": "7.8", "items": { - "required": [ - "itemName", - "isIncludedOrExcluded" - ], - "properties": { - "itemName": { - "ta10Ref": "7.8" - }, - "isIncludedOrExcluded": { - "ta10Ref": "7.8a" - } + "discriminator": { + "propertyName": "isIncludedOrExcluded" }, "oneOf": [ { "properties": { - "comments": { - "ta10Ref": "7.8c" + "isIncludedOrExcluded": { + "enum": [ + "Included" + ] } } }, { "properties": { + "isIncludedOrExcluded": { + "enum": [ + "Excluded" + ] + }, "price": { "ta10Ref": "7.8b" - }, - "comments": { - "ta10Ref": "7.8c" } } } - ] + ], + "required": [ + "itemName", + "isIncludedOrExcluded" + ], + "properties": { + "itemName": { + "ta10Ref": "7.8" + }, + "isIncludedOrExcluded": { + "ta10Ref": "7.8a" + } + } } } } @@ -5123,11 +3749,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.1c" } } }, @@ -5140,21 +3764,6 @@ }, "price": { "ta10Ref": "8.1b" - }, - "comments": { - "ta10Ref": "8.1c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.1c" } } } @@ -5165,6 +3774,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.1a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5178,11 +3790,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.2c" } } }, @@ -5195,21 +3805,6 @@ }, "price": { "ta10Ref": "8.2b" - }, - "comments": { - "ta10Ref": "8.2c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.2c" } } } @@ -5220,6 +3815,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.2a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5233,11 +3831,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.3c" } } }, @@ -5250,21 +3846,6 @@ }, "price": { "ta10Ref": "8.3b" - }, - "comments": { - "ta10Ref": "8.3c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.3c" } } } @@ -5275,6 +3856,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.3a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5288,11 +3872,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.4c" } } }, @@ -5305,21 +3887,6 @@ }, "price": { "ta10Ref": "8.4b" - }, - "comments": { - "ta10Ref": "8.4c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.4c" } } } @@ -5330,6 +3897,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.4a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5343,11 +3913,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.5c" } } }, @@ -5360,21 +3928,6 @@ }, "price": { "ta10Ref": "8.5b" - }, - "comments": { - "ta10Ref": "8.5c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.5c" } } } @@ -5385,6 +3938,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.5a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5398,11 +3954,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.6c" } } }, @@ -5415,21 +3969,6 @@ }, "price": { "ta10Ref": "8.6b" - }, - "comments": { - "ta10Ref": "8.6c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.6c" } } } @@ -5440,6 +3979,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.6a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5453,11 +3995,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.7c" } } }, @@ -5470,21 +4010,6 @@ }, "price": { "ta10Ref": "8.7b" - }, - "comments": { - "ta10Ref": "8.7c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.7c" } } } @@ -5495,6 +4020,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.7a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5508,11 +4036,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.8c" } } }, @@ -5524,22 +4050,7 @@ ] }, "price": { - "ta10Ref": "8.8b" - }, - "comments": { - "ta10Ref": "8.8c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.8c" + "ta10Ref": "8.8b" } } } @@ -5550,6 +4061,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.8a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5563,11 +4077,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.9c" } } }, @@ -5580,21 +4092,6 @@ }, "price": { "ta10Ref": "8.9b" - }, - "comments": { - "ta10Ref": "8.9c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.9c" } } } @@ -5605,6 +4102,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.9a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5618,11 +4118,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.10c" } } }, @@ -5635,21 +4133,6 @@ }, "price": { "ta10Ref": "8.10b" - }, - "comments": { - "ta10Ref": "8.10c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.10c" } } } @@ -5660,6 +4143,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.10a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5673,11 +4159,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.11c" } } }, @@ -5690,21 +4174,6 @@ }, "price": { "ta10Ref": "8.11b" - }, - "comments": { - "ta10Ref": "8.11c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.11c" } } } @@ -5715,6 +4184,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.11a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5728,11 +4200,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "8.12c" } } }, @@ -5745,21 +4215,6 @@ }, "price": { "ta10Ref": "8.12b" - }, - "comments": { - "ta10Ref": "8.12c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "8.12c" } } } @@ -5770,43 +4225,53 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "8.12a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, "otherItems": { "ta10Ref": "8.13", "items": { - "required": [ - "itemName", - "isIncludedOrExcluded" - ], - "properties": { - "itemName": { - "ta10Ref": "8.13" - }, - "isIncludedOrExcluded": { - "ta10Ref": "8.13a" - } + "discriminator": { + "propertyName": "isIncludedOrExcluded" }, "oneOf": [ { "properties": { - "comments": { - "ta10Ref": "8.13c" + "isIncludedOrExcluded": { + "enum": [ + "Included" + ] } } }, { "properties": { + "isIncludedOrExcluded": { + "enum": [ + "Excluded" + ] + }, "price": { "ta10Ref": "8.13b" - }, - "comments": { - "ta10Ref": "8.13c" } } } - ] + ], + "required": [ + "itemName", + "isIncludedOrExcluded" + ], + "properties": { + "itemName": { + "ta10Ref": "8.13" + }, + "isIncludedOrExcluded": { + "ta10Ref": "8.13a" + } + } } } } @@ -5830,11 +4295,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "9.1c" } } }, @@ -5847,21 +4310,6 @@ }, "price": { "ta10Ref": "9.1b" - }, - "comments": { - "ta10Ref": "9.1c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "9.1c" } } } @@ -5872,6 +4320,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "9.1a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5885,11 +4336,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "9.2c" } } }, @@ -5902,21 +4351,6 @@ }, "price": { "ta10Ref": "9.2b" - }, - "comments": { - "ta10Ref": "9.2c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "9.2c" } } } @@ -5927,6 +4361,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "9.2a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5940,11 +4377,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "9.3c" } } }, @@ -5957,21 +4392,6 @@ }, "price": { "ta10Ref": "9.3b" - }, - "comments": { - "ta10Ref": "9.3c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "9.3c" } } } @@ -5982,6 +4402,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "9.3a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -5995,11 +4418,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "9.4c" } } }, @@ -6012,21 +4433,6 @@ }, "price": { "ta10Ref": "9.4b" - }, - "comments": { - "ta10Ref": "9.4c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "9.4c" } } } @@ -6037,6 +4443,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "9.4a" + }, + "comments": { + "ta10Ref": "1.1c" } } } @@ -6060,11 +4469,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "10.1c" } } }, @@ -6077,21 +4484,6 @@ }, "price": { "ta10Ref": "10.1b" - }, - "comments": { - "ta10Ref": "10.1c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "10.1c" } } } @@ -6102,6 +4494,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "10.1a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -6115,11 +4510,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "10.2c" } } }, @@ -6132,21 +4525,6 @@ }, "price": { "ta10Ref": "10.2b" - }, - "comments": { - "ta10Ref": "10.2c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "10.2c" } } } @@ -6157,6 +4535,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "10.2a" + }, + "comments": { + "ta10Ref": "1.1c" } } }, @@ -6170,11 +4551,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "ta10Ref": "10.3c" } } }, @@ -6187,21 +4566,6 @@ }, "price": { "ta10Ref": "10.3b" - }, - "comments": { - "ta10Ref": "10.3c" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "ta10Ref": "10.3c" } } } @@ -6212,6 +4576,9 @@ "properties": { "isIncludedExcludedOrNone": { "ta10Ref": "10.3a" + }, + "comments": { + "ta10Ref": "1.1c" } } } @@ -6223,37 +4590,44 @@ "otherItems": { "ta10Ref": "11.1", "items": { - "required": [ - "itemName", - "isIncludedOrExcluded" - ], - "properties": { - "itemName": { - "ta10Ref": "11.1" - }, - "isIncludedOrExcluded": { - "ta10Ref": "11.1a" - } + "discriminator": { + "propertyName": "isIncludedOrExcluded" }, "oneOf": [ { "properties": { - "comments": { - "ta10Ref": "11.1c" + "isIncludedOrExcluded": { + "enum": [ + "Included" + ] } } }, { "properties": { + "isIncludedOrExcluded": { + "enum": [ + "Excluded" + ] + }, "price": { "ta10Ref": "11.1b" - }, - "comments": { - "ta10Ref": "11.1c" } } } - ] + ], + "required": [ + "itemName", + "isIncludedOrExcluded" + ], + "properties": { + "itemName": { + "ta10Ref": "11.1" + }, + "isIncludedOrExcluded": { + "ta10Ref": "11.1a" + } + } } } } diff --git a/src/schemas/v3/overlays/ta7.json b/src/schemas/v3/overlays/ta7.json index 3db5ec6..cbfc656 100644 --- a/src/schemas/v3/overlays/ta7.json +++ b/src/schemas/v3/overlays/ta7.json @@ -36,7 +36,6 @@ "ownershipsToBeTransferred": { "ta7Ref": "1", "items": { - "ta7Ref": "1", "discriminator": { "propertyName": "ownershipType" }, @@ -1339,6 +1338,7 @@ } } ], + "ta7Ref": "1", "required": [ "ownershipType" ], diff --git a/src/schemas/v3/pdtf-transaction.json b/src/schemas/v3/pdtf-transaction.json index 5345274..47f21ac 100644 --- a/src/schemas/v3/pdtf-transaction.json +++ b/src/schemas/v3/pdtf-transaction.json @@ -19,8 +19,14 @@ "type": "string", "enum": [ "active", - "cancelled", - "completed" + "For sale", + "Under offer", + "Sold subject to contract", + "Contracts exchanged", + "Completed", + "Cancelled", + "To let", + "Let agreed" ] }, "participants": { @@ -118,7 +124,9 @@ "Buyer's Agent", "Surveyor", "Mortgage Broker", - "Lender" + "Lender", + "Landlord", + "Tenant" ] }, "externalIds": { @@ -351,6 +359,35 @@ } } }, + "lettingInformation": { + "title": "Letting information", + "type": "object", + "properties": { + "rent": { + "title": "Rent", + "type": "number", + "minimum": 1 + }, + "rentFrequency": { + "title": "Rent frequency", + "type": "string", + "enum": [ + "Yearly", + "Quarterly", + "Monthly", + "Weekly" + ] + }, + "securityDeposit": { + "title": "Security deposit", + "type": "number" + }, + "holdingDeposit": { + "title": "Holding deposit", + "type": "number" + } + } + }, "summaryDescription": { "title": "Summary description", "type": "string" @@ -7575,7 +7612,7 @@ }, "buildingSafety": { "title": "Are you aware of any building safety issues?", - "description": "For example issues related to unsafe cladding, integrity of building materials used in construction (e.g. asbestos), risk of collapse (e.g. damaged roofs or strucutural failures), at-risk wooden decking for external structures (including balconies), lack of emergency lighting where required or insufficient fire/smoke alarm systems", + "description": "For example issues related to unsafe cladding, integrity of building materials used in construction (e.g. asbestos), risk of collapse (e.g. damaged roofs or structural failures), at-risk wooden decking for external structures (including balconies), lack of emergency lighting where required or insufficient fire/smoke alarm systems", "type": "object", "properties": { "yesNo": { @@ -7697,7 +7734,6 @@ "items": { "type": "string", "enum": [ - "None", "Level access", "Ramped access", "Lift access", @@ -10074,6 +10110,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10081,12 +10121,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10100,23 +10137,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10134,6 +10154,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10141,12 +10165,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10160,23 +10181,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10194,6 +10198,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10201,12 +10209,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10220,23 +10225,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10254,6 +10242,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10261,12 +10253,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10280,23 +10269,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10314,6 +10286,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10321,12 +10297,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10340,23 +10313,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10374,6 +10330,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10381,12 +10341,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10400,23 +10357,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10434,6 +10374,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10441,12 +10385,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10460,23 +10401,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10494,6 +10418,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10501,12 +10429,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10520,23 +10445,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10554,6 +10462,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10561,12 +10473,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10580,23 +10489,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10614,6 +10506,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10621,12 +10517,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10640,23 +10533,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10674,6 +10550,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10681,12 +10561,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10700,23 +10577,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10734,6 +10594,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10741,12 +10605,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10760,23 +10621,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10794,6 +10638,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10801,12 +10649,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10820,23 +10665,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10854,6 +10682,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10861,12 +10693,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10880,23 +10709,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10914,6 +10726,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -10921,12 +10737,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -10940,23 +10753,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -10988,10 +10784,6 @@ "enum": [ "Included" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -11005,10 +10797,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -11034,9 +10822,22 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -11047,7 +10848,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11055,35 +10856,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] + } } } }, @@ -11101,7 +10874,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11109,48 +10882,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" + } } } } @@ -11168,9 +10900,22 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -11181,7 +10926,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11189,35 +10934,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] + } } } }, @@ -11235,7 +10952,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11243,48 +10960,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" + } } } } @@ -11302,9 +10978,22 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -11315,7 +11004,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11323,35 +11012,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] + } } } }, @@ -11369,7 +11030,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11377,48 +11038,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" + } } } } @@ -11436,9 +11056,22 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -11449,7 +11082,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11457,35 +11090,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] + } } } }, @@ -11503,7 +11108,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11511,48 +11116,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" + } } } } @@ -11570,9 +11134,22 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -11583,7 +11160,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11591,35 +11168,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] + } } } }, @@ -11637,7 +11186,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11645,48 +11194,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" + } } } } @@ -11704,9 +11212,22 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -11717,7 +11238,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11725,35 +11246,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] + } } } }, @@ -11771,7 +11264,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11779,48 +11272,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" + } } } } @@ -11838,9 +11290,22 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -11851,7 +11316,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11859,35 +11324,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] + } } } }, @@ -11905,7 +11342,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -11913,48 +11350,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" + } } } } @@ -11972,6 +11368,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -11979,48 +11379,7 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" - ] - }, - "fittedOrFreestanding": { - "type": "object", - "properties": { - "isFittedOrFreestanding": { - "title": "Fitted, Freestanding", - "type": "string", - "enum": [ - "Fitted", - "Freestanding" - ] - } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } + "None" ] } } @@ -12029,53 +11388,21 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Excluded" + "Included" ] }, - "price": { - "title": "Price", - "type": "number" - }, "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ "Fitted", "Freestanding" - ] - } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } + ] } - ] + } } } }, @@ -12083,12 +11410,25 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "None" + "Excluded" ] }, - "comments": { - "title": "Comments", - "type": "string" + "price": { + "title": "Price", + "type": "number" + }, + "fittedOrFreestanding": { + "type": "object", + "properties": { + "fittedOrFreestanding": { + "title": "Fitted, Freestanding", + "type": "string", + "enum": [ + "Fitted", + "Freestanding" + ] + } + } } } } @@ -12106,9 +11446,22 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -12119,7 +11472,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -12127,35 +11480,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] + } } } }, @@ -12173,7 +11498,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -12181,48 +11506,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" + } } } } @@ -12240,9 +11524,22 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ + { + "properties": { + "isIncludedExcludedOrNone": { + "enum": [ + "None" + ] + } + } + }, { "properties": { "isIncludedExcludedOrNone": { @@ -12253,7 +11550,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -12261,35 +11558,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] + } } } }, @@ -12307,7 +11576,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -12315,48 +11584,7 @@ "Freestanding" ] } - }, - "oneOf": [ - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Fitted" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isFittedOrFreestanding": { - "enum": [ - "Freestanding" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - } - ] - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" + } } } } @@ -12392,7 +11620,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -12404,27 +11632,19 @@ "oneOf": [ { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": [ "Fitted" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": [ "Freestanding" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -12446,7 +11666,7 @@ "fittedOrFreestanding": { "type": "object", "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "title": "Fitted, Freestanding", "type": "string", "enum": [ @@ -12458,27 +11678,19 @@ "oneOf": [ { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": [ "Fitted" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, { "properties": { - "isFittedOrFreestanding": { + "fittedOrFreestanding": { "enum": [ "Freestanding" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -12492,10 +11704,6 @@ "enum": [ "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -12520,6 +11728,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -12527,12 +11739,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -12546,23 +11755,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -12580,6 +11772,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -12587,12 +11783,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -12606,23 +11799,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -12640,6 +11816,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -12647,12 +11827,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -12666,23 +11843,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -12700,6 +11860,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -12707,12 +11871,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -12726,23 +11887,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -12760,6 +11904,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -12767,12 +11915,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -12786,23 +11931,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -12820,6 +11948,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -12827,12 +11959,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -12846,23 +11975,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -12880,6 +11992,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -12887,12 +12003,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -12906,23 +12019,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -12940,6 +12036,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -12947,12 +12047,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -12966,23 +12063,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13000,6 +12080,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13007,12 +12091,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13026,23 +12107,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13060,6 +12124,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13067,12 +12135,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13086,23 +12151,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13126,6 +12174,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13133,12 +12185,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13152,23 +12201,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13186,6 +12218,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13193,12 +12229,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13212,23 +12245,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13246,6 +12262,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13253,12 +12273,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13267,28 +12284,11 @@ "isIncludedExcludedOrNone": { "enum": [ "Excluded" - ] - }, - "price": { - "title": "Price", - "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" + ] + }, + "price": { + "title": "Price", + "type": "number" } } } @@ -13306,6 +12306,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13313,12 +12317,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13332,23 +12333,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13366,6 +12350,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13373,12 +12361,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13392,23 +12377,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13426,6 +12394,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13433,12 +12405,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13452,23 +12421,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13486,6 +12438,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13493,12 +12449,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13512,23 +12465,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13560,10 +12496,6 @@ "enum": [ "Included" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13577,10 +12509,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13609,6 +12537,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13616,12 +12548,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13635,23 +12564,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13669,6 +12581,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13676,12 +12592,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13695,23 +12608,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13729,6 +12625,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13736,12 +12636,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13755,23 +12652,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13789,6 +12669,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13796,12 +12680,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13815,23 +12696,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13849,6 +12713,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13856,12 +12724,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13875,23 +12740,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13909,6 +12757,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13916,12 +12768,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13935,23 +12784,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -13969,6 +12801,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -13976,12 +12812,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -13995,23 +12828,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14043,10 +12859,6 @@ "enum": [ "Included" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14060,10 +12872,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14088,6 +12896,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14095,29 +12907,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "Excluded" + "Included", + "None" ] - }, - "price": { - "title": "Price", - "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14125,12 +12917,12 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "None" + "Excluded" ] }, - "comments": { - "title": "Comments", - "type": "string" + "price": { + "title": "Price", + "type": "number" } } } @@ -14148,6 +12940,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14155,12 +12951,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14174,23 +12967,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14208,6 +12984,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14215,12 +12995,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14234,23 +13011,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14268,6 +13028,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14275,12 +13039,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14294,23 +13055,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14328,6 +13072,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14335,12 +13083,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14354,23 +13099,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14388,6 +13116,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14395,12 +13127,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14414,23 +13143,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14448,6 +13160,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14455,12 +13171,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14474,23 +13187,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14522,10 +13218,6 @@ "enum": [ "Included" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14539,10 +13231,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14570,6 +13258,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14577,12 +13269,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14596,23 +13285,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14630,6 +13302,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14637,12 +13313,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14656,23 +13329,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14690,6 +13346,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14697,12 +13357,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14716,23 +13373,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14750,6 +13390,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14757,12 +13401,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14776,23 +13417,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14810,6 +13434,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14817,12 +13445,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14836,23 +13461,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -14870,36 +13478,20 @@ "Excluded", "None" ] - } - }, - "oneOf": [ - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "Included" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } }, + "comments": { + "title": "Comments", + "type": "string" + } + }, + "oneOf": [ { "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Excluded" + "Included", + "None" ] - }, - "price": { - "title": "Price", - "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14907,12 +13499,12 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "None" + "Excluded" ] }, - "comments": { - "title": "Comments", - "type": "string" + "price": { + "title": "Price", + "type": "number" } } } @@ -14930,6 +13522,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -14937,12 +13533,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -14956,23 +13549,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15004,10 +13580,6 @@ "enum": [ "Included" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15021,10 +13593,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15050,6 +13618,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15057,12 +13629,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15076,23 +13645,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15110,6 +13662,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15117,12 +13673,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15136,23 +13689,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15170,6 +13706,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15177,12 +13717,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15196,23 +13733,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15230,6 +13750,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15237,12 +13761,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15256,23 +13777,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15290,6 +13794,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15297,12 +13805,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15316,23 +13821,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15350,6 +13838,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15357,12 +13849,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15376,23 +13865,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15410,6 +13882,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15417,12 +13893,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15436,23 +13909,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15484,10 +13940,6 @@ "enum": [ "Included" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15501,10 +13953,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15529,36 +13977,20 @@ "Excluded", "None" ] - } - }, - "oneOf": [ - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "Included" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } }, + "comments": { + "title": "Comments", + "type": "string" + } + }, + "oneOf": [ { "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Excluded" + "Included", + "None" ] - }, - "price": { - "title": "Price", - "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15566,12 +13998,12 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "None" + "Excluded" ] }, - "comments": { - "title": "Comments", - "type": "string" + "price": { + "title": "Price", + "type": "number" } } } @@ -15589,6 +14021,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15596,12 +14032,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15615,23 +14048,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15649,6 +14065,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15656,12 +14076,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15675,23 +14092,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15709,6 +14109,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15716,12 +14120,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15735,23 +14136,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15769,6 +14153,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15776,12 +14164,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15795,23 +14180,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15829,6 +14197,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15836,12 +14208,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15855,23 +14224,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15889,6 +14241,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15896,12 +14252,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15915,23 +14268,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -15949,6 +14285,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -15956,12 +14296,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -15975,23 +14312,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16009,6 +14329,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16016,12 +14340,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16035,23 +14356,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16069,6 +14373,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16076,29 +14384,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" - ] - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "Excluded" - ] - }, - "price": { - "title": "Price", - "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" + "Included", + "None" + ] } } }, @@ -16106,12 +14394,12 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "None" + "Excluded" ] }, - "comments": { - "title": "Comments", - "type": "string" + "price": { + "title": "Price", + "type": "number" } } } @@ -16129,6 +14417,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16136,12 +14428,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16155,23 +14444,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16189,6 +14461,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16196,12 +14472,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16215,23 +14488,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16263,10 +14519,6 @@ "enum": [ "Included" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16280,10 +14532,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16308,6 +14556,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16315,12 +14567,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16334,23 +14583,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16368,6 +14600,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16375,12 +14611,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16394,23 +14627,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16428,6 +14644,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16435,12 +14655,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16454,23 +14671,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16488,6 +14688,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16495,12 +14699,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16514,23 +14715,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16554,6 +14738,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16561,12 +14749,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16580,23 +14765,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16614,6 +14782,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16621,12 +14793,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16640,23 +14809,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16674,6 +14826,10 @@ "Excluded", "None" ] + }, + "comments": { + "title": "Comments", + "type": "string" } }, "oneOf": [ @@ -16681,12 +14837,9 @@ "properties": { "isIncludedExcludedOrNone": { "enum": [ - "Included" + "Included", + "None" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16700,23 +14853,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" - } - } - }, - { - "properties": { - "isIncludedExcludedOrNone": { - "enum": [ - "None" - ] - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -16754,10 +14890,6 @@ "enum": [ "Included" ] - }, - "comments": { - "title": "Comments", - "type": "string" } } }, @@ -16771,10 +14903,6 @@ "price": { "title": "Price", "type": "number" - }, - "comments": { - "title": "Comments", - "type": "string" } } } @@ -27357,7 +25485,7 @@ } ] }, - "lheLocalAuthorityReceivedANoticeOfDisposal": { + "theLocalAuthorityReceivedANoticeOfDisposal": { "title": "Has the Local Authority received a notice of disposal?", "type": "object", "properties": { @@ -33338,11 +31466,7 @@ ] }, "planOnlyIndicator": { - "type": "string", - "enum": [ - "true", - "false" - ] + "type": "boolean" }, "filedUnder": { "type": "string" diff --git a/src/schemas/v3/skeleton.json b/src/schemas/v3/skeleton.json index d35163f..379d025 100644 --- a/src/schemas/v3/skeleton.json +++ b/src/schemas/v3/skeleton.json @@ -64,6 +64,12 @@ "priceQualifier": {}, "disposal": {} }, + "lettingInformation": { + "rent": {}, + "rentFrequency": {}, + "securityDeposit": {}, + "holdingDeposit": {} + }, "summaryDescription": {}, "marketingTenure": {}, "media": { @@ -1447,110 +1453,97 @@ "otherItems": { "itemName": {}, "isIncludedOrExcluded": {}, - "comments": {}, "price": {} } }, "kitchen": { "hob": { "isIncludedExcludedOrNone": {}, + "comments": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} }, "extractorHood": { "isIncludedExcludedOrNone": {}, + "comments": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} }, "ovenGrill": { "isIncludedExcludedOrNone": {}, + "comments": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} }, "cooker": { "isIncludedExcludedOrNone": {}, + "comments": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} }, "microwave": { "isIncludedExcludedOrNone": {}, + "comments": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} }, "refrigeratorFridgeFreezer": { "isIncludedExcludedOrNone": {}, + "comments": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} }, "freezer": { "isIncludedExcludedOrNone": {}, + "comments": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} }, "dishwasher": { "isIncludedExcludedOrNone": {}, + "comments": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} }, "tumbleDryer": { "isIncludedExcludedOrNone": {}, + "comments": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} }, "washingMachine": { "isIncludedExcludedOrNone": {}, + "comments": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} }, "otherItems": { "itemName": {}, "isIncludedOrExcluded": {}, "fittedOrFreestanding": { - "isFittedOrFreestanding": {}, - "comments": {} + "fittedOrFreestanding": {} }, - "price": {}, - "comments": {} + "price": {} } }, "bathroom": { @@ -1644,7 +1637,6 @@ "otherRooms": { "itemName": {}, "isIncludedOrExcluded": {}, - "comments": {}, "price": {} } }, @@ -1688,7 +1680,6 @@ "otherRooms": { "itemName": {}, "isIncludedOrExcluded": {}, - "comments": {}, "price": {} } }, @@ -1731,7 +1722,6 @@ "otherRooms": { "itemName": {}, "isIncludedOrExcluded": {}, - "comments": {}, "price": {} } } @@ -1775,7 +1765,6 @@ "otherRooms": { "itemName": {}, "isIncludedOrExcluded": {}, - "comments": {}, "price": {} } }, @@ -1818,7 +1807,6 @@ "otherRooms": { "itemName": {}, "isIncludedOrExcluded": {}, - "comments": {}, "price": {} } }, @@ -1886,7 +1874,6 @@ "otherItems": { "itemName": {}, "isIncludedOrExcluded": {}, - "comments": {}, "price": {} } }, @@ -1933,7 +1920,6 @@ "otherItems": { "itemName": {}, "isIncludedOrExcluded": {}, - "comments": {}, "price": {} } }, @@ -3326,7 +3312,7 @@ "yesNo": {}, "details": {} }, - "lheLocalAuthorityReceivedANoticeOfDisposal": { + "theLocalAuthorityReceivedANoticeOfDisposal": { "yesNo": {}, "details": {} }, diff --git a/src/tests/v3/transactionSchema.test.js b/src/tests/v3/transactionSchema.test.js index a366d0a..184c7fc 100644 --- a/src/tests/v3/transactionSchema.test.js +++ b/src/tests/v3/transactionSchema.test.js @@ -43,6 +43,32 @@ test("sample is valid NTS", () => { expect(isValid).toBe(true); }); +test("sample is not valid NTSL (lettings)", () => { + const validator = getValidator(schemaId, ["ntsl2023"]); + const isValid = validator(exampleTransaction); + expect(isValid).toBe(false); + expect(validator.errors[0].message).toBe( + "must have required property 'lettingInformation'" + ); +}); + +test("sample is valid NTSL if we change it accordingly", () => { + const validator = getValidator(schemaId, ["ntsl2023"]); + const clonedExampleTransaction = JSON.parse( + JSON.stringify(exampleTransaction) + ); + clonedExampleTransaction.propertyPack.lettingInformation = { + rent: 3500, + rentFrequency: "Monthly", + securityDeposit: 5000, + }; + delete clonedExampleTransaction.propertyPack.priceInformation; + delete clonedExampleTransaction.propertyPack.ownership; + const isValid = validator(clonedExampleTransaction); + if (!isValid) console.log(validator.errors); + expect(isValid).toBe(true); +}); + test("invalid sample is invalid", () => { const clonedExampleTransaction = JSON.parse( JSON.stringify(exampleTransaction) diff --git a/src/utils/extractOverlay.js b/src/utils/extractOverlay.js index 5595a23..4f4d5e3 100644 --- a/src/utils/extractOverlay.js +++ b/src/utils/extractOverlay.js @@ -9,6 +9,7 @@ const combinedSchema = require("../schemas/v3/combined.json"); const extractFields = [ "baspi", "nts", + "ntsl", "ta6", "ta7", "ta10", @@ -22,14 +23,6 @@ const extractFields = [ "oc1", ]; -const overlayIncludeProperties = [ - // "title", - // "description", - // "enum", - "discriminator", - // "minItems", -]; - const flattenSkeleton = (schema) => { if (!schema) return undefined; let returnStructure = {}; @@ -64,43 +57,60 @@ const extractOverlay = (sourceSchema, ref) => { if (path === "/") path = ""; if (element[refName]) { jp.set(returnSchema, `${path}/${refName}`, element[refName]); - overlayIncludeProperties.forEach((property) => { - if (element[property]) { - jp.set(returnSchema, `${path}/${property}`, element[property]); - } - }); - - const { discriminator } = element; - if (discriminator) { - const { propertyName } = discriminator; - element.oneOf.forEach((item, index) => { - const discriminatorProperty = item.properties[propertyName]; - // copy const discriminator as-is - if (discriminatorProperty.const) { + + if (element.discriminator) { + jp.set(returnSchema, `${path}/discriminator`, element.discriminator); + const { propertyName } = element.discriminator; + element.oneOf.forEach((oneOf, index) => { + const discriminatorProperty = oneOf.properties[propertyName]; + // must be an enum + const discriminatorEnumPath = `${path}/oneOf/${index}/properties/${propertyName}/enum`; + // if a refEnum use that + const refEnum = `${ref}Enum`; + if (discriminatorProperty[refEnum]) { + jp.set( + returnSchema, + discriminatorEnumPath, + discriminatorProperty[refEnum] + ); + } else { + // use the base enum + jp.set( + returnSchema, + discriminatorEnumPath, + discriminatorProperty.enum + ); + } + }); + } + + // also handle discriminator properties nested in items + if (element.items?.discriminator) { + jp.set( + returnSchema, + `${path}/items/discriminator`, + element.items.discriminator + ); + const { propertyName } = element.items.discriminator; + element.items.oneOf.forEach((oneOf, index) => { + const discriminatorProperty = oneOf.properties[propertyName]; + // must be an enum + const discriminatorEnumPath = `${path}/items/oneOf/${index}/properties/${propertyName}/enum`; + // if a refEnum use that + const refEnum = `${ref}Enum`; + if (discriminatorProperty[refEnum]) { jp.set( returnSchema, - `${path}/oneOf/${index}/properties/${propertyName}/const`, - discriminatorProperty.const + discriminatorEnumPath, + discriminatorProperty[refEnum] ); } else { - // must be an enum - const discriminatorEnumPath = `${path}/oneOf/${index}/properties/${propertyName}/enum`; - // if a refEnum use that - const refEnum = `${ref}Enum`; - if (discriminatorProperty[refEnum]) { - jp.set( - returnSchema, - discriminatorEnumPath, - discriminatorProperty[refEnum] - ); - } else { - // use the base enum - jp.set( - returnSchema, - discriminatorEnumPath, - discriminatorProperty.enum - ); - } + // use the base enum + jp.set( + returnSchema, + discriminatorEnumPath, + discriminatorProperty.enum + ); } }); }