General Farm Updates

globalcoffeeplatform · Jul 26, 2022 · 6bfd020 · 6bfd020
1 parent 6ca3759
commit 6bfd020
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 29 deletions.
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
@@ -1,8 +1,7 @@
 {
   "ExpandedNodes": [
     "",
-    "\\generator",
-    "\\schema"
+    "\\generator"
   ],
   "SelectedNode": "\\generator\\Generator.sln",
   "PreviewInSolutionExplorer": false

diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/schema/address.json b/schema/address.json
@@ -35,14 +35,12 @@
     "adminAreaLevel2/state/province": {
       "title": "Admin Area Level 2 (state or province)",
       "description": "State Name in ISO 3166-1 Alpha-2 Format. ISO codes of province for a country can be found here https://www.iso.org/obp/ui/#search.",
-      "type": "string",
-      "examples": "BI-RY"
+      "type": "string"
     },
     "adminAreaLevel1/countryName": {
       "title": "Admin Area Level 1 (country name)",
       "description": "Country Name in ISO 3166-1 Alpha-2 Format. List of ISO code of countries can be found here https://www.iso.org/obp/ui/#search.",
-      "type": "string",
-      "examples": "BI"
+      "type": "string"
     }
   },
   "definitions": {

diff --git a/schema/farm-location.json b/schema/farm-location.json
@@ -10,7 +10,7 @@
   ],
   "properties": {
     "coordinates": {
-      "title": "Front door geolocation, using custom schema",
+      "title": "Coordinate of the fram either captured at the gate/entry or middle of the farm.",
       "description": "Latitude and Longitude Information",
       "type": "array",
       "items": {
@@ -38,16 +38,16 @@
         "maxItems": 2
       }
     },
-    "geoLocation": {
-      "title": "Front door geolocation, using GeoJson schema",
-      "$ref": "./point.json",
-      "additionalProperties": false
-    },
-    "farmShape2": {
-      "title": "Shape of the farm, using GeoJson schema",
-      "$ref": "./polygon.json",
-      "additionalProperties": false
-    },
+    //"geoLocation": {
+    //  "title": "Front door geolocation, using GeoJson schema",
+    //  "$ref": "./point.json",
+    //  "additionalProperties": false
+    //},
+    //"farmShape2": {
+    //  "title": "Shape of the farm, using GeoJson schema",
+    //  "$ref": "./polygon.json",
+    //  "additionalProperties": false
+    //},
     "positionTakenAt": {
       "title": "The position was taken at ..",
       "type": "string",

diff --git a/schema/farmData.schema.json b/schema/farmData.schema.json
@@ -246,18 +246,18 @@
                     "title": "Location of the farm",
                     "description": "GPS should be captured for each farm plot if possible. GPS readings should be taken outside of buildings and away from significant tree coverage to avoid interference in the signal. GPS should be captured in the middle of the plot, and/or near the entrance to any main building (if there is one). Where the main residence or other buildings are not located on the farm plot, GPS should be taken in the middle of the plot.",
                     "$ref": "./farm-location.json"
-                },
-                "thirdPartyIds": {
-                    "title": "Third-party identifier",
-                    "description": "When this dataset is reused by another organisation that needs to use their own Global Unique Identifier, the original identifier can be saved here, to track history and origin.",
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-                        "$ref": "./global-unique-id.json"
-                    },
-                    "additionalItems": false,
-                    "additionalProperties": false
                 }
+                //"thirdPartyIds": {
+                //    "title": "Third-party identifier",
+                //    "description": "When this dataset is reused by another organisation that needs to use their own Global Unique Identifier, the original identifier can be saved here, to track history and origin.",
+                //    "type": "array",
+                //    "uniqueItems": true,
+                //    "items": {
+                //        "$ref": "./global-unique-id.json"
+                //    },
+                //    "additionalItems": false,
+                //    "additionalProperties": false
+                //}
             }
         },
         "social-farm": {

diff --git a/schema/poverty-level.json b/schema/poverty-level.json
@@ -11,7 +11,7 @@
   "properties": {
     "totalHouseholdIncome": {
       "title": "Total household income",
-      "description": "Total household income in USD",
+      "description": "Total household income in Local Currency",
       "type": "number",
       "minimum": 0
     },