Fixes #27, fixes #20, adds more NTS Refs

Property-Data-Trust-Framework · Nov 25, 2022 · e36fac0 · e36fac0
1 parent 5c5ef0e
commit e36fac0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pdtf/schemas",
-  "version": "0.11.0-5",
+  "version": "0.11.0-6",
   "description": "Property Data Trust Framework Schemas and Utilities",
   "main": "index.js",
   "directories": {

diff --git a/src/examples/exampleTransaction.json b/src/examples/exampleTransaction.json
@@ -487,37 +487,7 @@
     "titlesToBeSold": [
       {
         "titleNumber": "HD221222",
-        "titleExtents": [
-          {
-            "type": "Feature",
-            "properties": {
-              "POLY_ID": 19851403,
-              "TITLE_NO": "HD221222",
-              "INSERT": "2016-02-05T13:36:55",
-              "UPDATE": "2016-02-05T13:36:55",
-              "REC_STATUS": "A"
-            },
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [-2.578781821932439, 51.48576411094672],
-                  [-2.578669662492341, 51.48572105544199],
-                  [-2.5786421470447154, 51.48570905261714],
-                  [-2.5785524174118404, 51.48567442829361],
-                  [-2.5785328794340825, 51.48566688186638],
-                  [-2.5785279074169107, 51.4856723013566],
-                  [-2.5784923376884157, 51.48570664492474],
-                  [-2.5785118756765826, 51.48571419135863],
-                  [-2.578603776881019, 51.48574970415372],
-                  [-2.578629846557485, 51.48576126454427],
-                  [-2.578738400129546, 51.48580388830907],
-                  [-2.578781821932439, 51.48576411094672]
-                ]
-              ]
-            }
-          }
-        ],
+        "titleExtents": "{'type':'Polygon','coordinates':[[[-2.5787833768108985,51.48576273335823],[-2.578739952913823,51.48580251052463],[-2.578631396439736,51.48575988696783],[-2.578605326085179,51.48574832663401],[-2.578513422397467,51.48571281401381],[-2.578493883879733,51.48570526761721],[-2.578529455342914,51.48567092421916],[-2.578534427612858,51.485665504755744],[-2.578553966121065,51.485673051145575],[-2.5786436981835235,51.48570767529821],[-2.578671214351269,51.48571967806404],[-2.5787833768108985,51.48576273335823]]]}",
         "registerExtract": {
           "OCSummaryData": {
             "Title": {

diff --git a/src/schemas/v1/legal-information.json b/src/schemas/v1/legal-information.json
@@ -775,7 +775,7 @@
             "yesNo": {
               "type": "string",
               "title": "",
-              "enum": ["No", "Yes"]
+              "enum": ["Yes", "No"]
             }
           },
           "required": ["yesNo"],
@@ -819,7 +819,7 @@
             "yesNo": {
               "type": "string",
               "title": "",
-              "enum": ["No", "Yes"]
+              "enum": ["Yes", "No"]
             }
           },
           "required": ["yesNo"],

diff --git a/src/schemas/v1/material-facts.json b/src/schemas/v1/material-facts.json
@@ -261,6 +261,7 @@
               "enum": ["Leasehold"]
             },
             "sharedOwnership": {
+              "ntsRef": "A1.7",
               "title": "Shared ownership",
               "type": "object",
               "properties": {
@@ -286,20 +287,20 @@
                       "enum": ["Yes"]
                     },
                     "sharedOwnershipPercentage": {
-                      "ntsRef": "A1.7",
+                      "ntsRef": "A1.7.1",
                       "title": "Shared ownership percentage",
                       "type": "integer",
                       "minimum": 5,
                       "exclusiveMaximum": 100
                     },
                     "sharedOwnershipRent": {
-                      "ntsRef": "A1.7",
+                      "ntsRef": "A1.7.2",
                       "title": "Shared ownership rent (£)",
                       "type": "number",
                       "minimum": 0
                     },
                     "sharedOwnershipRentFrequency": {
-                      "ntsRef": "A1.7",
+                      "ntsRef": "A1.7.3",
                       "title": "Shared ownership rent frequency",
                       "type": "string",
                       "enum": ["Yearly", "Monthly", "Weekly"]

diff --git a/src/schemas/v1/pdtf-transaction.json b/src/schemas/v1/pdtf-transaction.json
@@ -17,8 +17,7 @@
     },
     "transactionId": {
       "title": "UUID for the transaction",
-      "type": "string",
-      "format": "uuid"
+      "type": "string"
     },
     "status": {
       "type": "string",
@@ -133,11 +132,8 @@
               "titleExtents": {
                 "RDSRef": "",
                 "title": "Title Extents",
-                "description": "One or more index polygons describing indicative location of registered title from National Polygon Dataset",
-                "type": "array",
-                "items": {
-                  "$ref": "https://geojson.org/schema/GeoJSON.json"
-                }
+                "description": "One or more index polygons describing indicative location of registered title from National Polygon Dataset, JSON.stringified to ensure compatibility",
+                "type": "string"
               },
               "registerExtract": {
                 "title": "HMLR Register Extract",