@pdtf/schemas 2.0.0-15 → 2.0.0-17

package/index.js

@@ -48,15 +48,17 @@ const combinedSchema = require("./src/schemas/v2/combined.json");
 const v2CoreSchema = require("./src/schemas/v2/pdtf-transaction.json");
 
 const baspiOverlay = require("./src/schemas/v2/overlays/baspi.json");
-// const ta6Overlay = require("./src/schemas/v2/overlays/ta6.json");
-// const ta7Overlay = require("./src/schemas/v2/overlays/ta7.json");
-// const lpe1Overlay = require("./src/schemas/v2/overlays/lpe1.json");
-// const fme1Overlay = require("./src/schemas/v2/overlays/fme1.json");
-// const llc1Overlay = require("./src/schemas/v2/overlays/llc1.json");
-// const con29ROverlay = require("./src/schemas/v2/overlays/con29R.json");
-// const con29DWOverlay = require("./src/schemas/v2/overlays/con29DW.json");
-// const rdsOverlay = require("./src/schemas/v2/overlays/rds.json");
-// const oc1Overlay = require("./src/schemas/v2/overlays/oc1.json");
+const ta6Overlay = require("./src/schemas/v2/overlays/ta6.json");
+const ta7Overlay = require("./src/schemas/v2/overlays/ta7.json");
+const ta10Overlay = require("./src/schemas/v2/overlays/ta10.json");
+const lpe1Overlay = require("./src/schemas/v2/overlays/lpe1.json");
+const fme1Overlay = require("./src/schemas/v2/overlays/fme1.json");
+const llc1Overlay = require("./src/schemas/v2/overlays/llc1.json");
+const ntsOverlay = require("./src/schemas/v2/overlays/nts.json");
+const con29ROverlay = require("./src/schemas/v2/overlays/con29R.json");
+const con29DWOverlay = require("./src/schemas/v2/overlays/con29DW.json");
+const rdsOverlay = require("./src/schemas/v2/overlays/rds.json");
+const oc1Overlay = require("./src/schemas/v2/overlays/oc1.json");
 
 const overlays = { baspiV4: baspiOverlay, null: {} };
 
@@ -245,4 +247,16 @@ module.exports = {
   getTitleAtPath,
   verifiedClaimsSchema,
   validateVerifiedClaims,
+  baspiOverlay,
+  ta6Overlay,
+  ta7Overlay,
+  ta10Overlay,
+  lpe1Overlay,
+  fme1Overlay,
+  llc1Overlay,
+  ntsOverlay,
+  con29ROverlay,
+  con29DWOverlay,
+  rdsOverlay,
+  oc1Overlay,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pdtf/schemas",
-  "version": "2.0.0-15",
+  "version": "2.0.0-17",
   "description": "Property Data Trust Framework Schemas and Utilities",
   "main": "index.js",
   "directories": {

package/src/examples/v2/exampleTransaction.json

@@ -277,39 +277,40 @@
         }
       },
       "waterAndDrainage": {
-        "mainsWater": {
-          "maintenanceAgreements": {
-            "yesNo": "No"
-          },
-          "yesNo": "To be connected",
-          "dateToBeConnected": "2022-12-15",
-          "supplier": "Northumbria Water"
+        "water": {
+          "mainsWater": {
+            "yesNo": "To be connected",
+            "dateToBeConnected": "2022-12-15",
+            "supplier": "Northumbria Water"
+          }
         },
-        "mainsSurfaceWaterDrainage": {
-          "maintenanceAgreements": {
-            "yesNo": "No"
+        "drainage": {
+          "mainsSurfaceWaterDrainage": {
+            "yesNo": "Yes"
           },
-          "yesNo": "Yes"
-        },
-        "mainsFoulDrainage": {
-          "yesNo": "No",
-          "sustainableDrainageSystem": { "yesNo": "No" },
-          "septicTank": {
-            "yesNo": "Yes",
-            "details": "Last emptied on 1 Jan 2022",
-            "dateReplaced": "2022-01-01",
-            "dateLastEmptied": "2022-01-01"
-          },
-          "cesspit": { "yesNo": "No" },
-          "sewerageTreatmentPlant": { "yesNo": "No" },
-          "otherConnectedProperties": { "yesNo": "No" },
-          "yearSystemInstalled": 1980,
-          "plantOnOtherLand": { "yesNo": "No" },
-          "plantRegistered": { "yesNo": "No" },
-          "plantDrainsIntoWaterway": {
-            "yesNo": "Yes",
-            "dischargeCompliesWithGBR": "Yes"
+          "mainsFoulDrainage": {
+            "yesNo": "No",
+            "sustainableDrainageSystem": { "yesNo": "No" },
+            "septicTank": {
+              "yesNo": "Yes",
+              "details": "Last emptied on 1 Jan 2022",
+              "dateReplaced": "2022-01-01",
+              "dateLastEmptied": "2022-01-01"
+            },
+            "cesspit": { "yesNo": "No" },
+            "sewerageTreatmentPlant": { "yesNo": "No" },
+            "otherConnectedProperties": { "yesNo": "No" },
+            "yearSystemInstalled": 1980,
+            "plantOnOtherLand": { "yesNo": "No" },
+            "plantRegistered": { "yesNo": "No" },
+            "plantDrainsIntoWaterway": {
+              "yesNo": "Yes",
+              "dischargeCompliesWithGBR": "Yes"
+            }
           }
+        },
+        "maintenanceAgreements": {
+          "yesNo": "No"
         }
       },
       "connectedUtilities": {
@@ -438,21 +439,11 @@
           "hasBeenFlooded": "Yes",
           "details": "Minor basement flood",
           "typeOfFlooding": {
-            "groundWater": {
-              "yesNo": "No"
-            },
-            "sewer": {
-              "yesNo": "Yes"
-            },
-            "surfaceWater": {
-              "yesNo": "No"
-            },
-            "coastal": {
-              "yesNo": "No"
-            },
-            "river": {
-              "yesNo": "No"
-            },
+            "groundWater": "No",
+            "sewer": "Yes",
+            "surfaceWater": "No",
+            "coastal": "No",
+            "river": "No",
             "other": {
               "yesNo": "No"
             }