Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "One-dimensionalization of data models" #617

Open
wants to merge 1 commit into
base: data-model-separation
Choose a base branch
from
Open

Revert "One-dimensionalization of data models" #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Specification/BrAPI-Schema/BrAPI-Common/ExternalReference.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$defs": {
"ExternalReference": {
"properties": {
"externalReferenceDbId": {
"referenceId": {
"description": "The external reference ID. Could be a simple string or a URI.",
"type": [
"null",
Expand Down
36 changes: 1 addition & 35 deletions Specification/BrAPI-Schema/BrAPI-Common/GeoJSON.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@
"type": "object",
"description": "One geometry as defined by GeoJSON (RFC 7946). All coordinates are decimal values on the WGS84 geographic coordinate reference system.\n\nCopied from RFC 7946 Section 3.1.1\n\nA position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or\neasting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.",
"properties": {
"geoJSONDbId": {
"description": "Unique identifier for the geometry",
"type": [
"null",
"string"
]
},
"geometry": {
"description": "A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.",
"$ref": "GeoJSONGeometry.json#/$defs/GeoJSONGeometry"
Expand All @@ -21,35 +14,8 @@
"default": "Feature",
"example": "Feature",
"description": "The literal string \"Feature\""
},
"image": {
"description": "Geometry associated with an image",
"$ref": "../BrAPI-Phenotyping/Image.json#/$defs/Image",
"relationshipType": "many-to-one",
"referencedAttribute": "imageLocation"
},
"observation": {
"description": "Geometry associated with an image",
"$ref": "../BrAPI-Phenotyping/Observation.json#/$defs/Observation",
"relationshipType": "many-to-one",
"referencedAttribute": "geoCoordinates"
},
"observationUnit": {
"description": "Geometry associated with an image",
"$ref": "../BrAPI-Phenotyping/ObservationUnit.json#/$defs/ObservationUnitPosition",
"relationshipType": "many-to-one",
"referencedAttribute": "geoCoordinates"
},
"germplasmOrigin": {
"description": "Geometry associated with an image",
"$ref": "../BrAPI-Germplasm/Germplasm.json#/$defs/GermplasmOrigin",
"relationshipType": "many-to-one",
"referencedAttribute": "coordinates"
}
},
"required": [
"geoJSONDbId"
]
}
}
},
"$id": "https://brapi.org/Specification/BrAPI-Schema/BrAPI-Common/GeoJSON.json",
Expand Down
34 changes: 0 additions & 34 deletions Specification/BrAPI-Schema/BrAPI-Common/SourceGermplasm.json
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions Specification/BrAPI-Schema/BrAPI-Common/Species.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Specification/BrAPI-Schema/BrAPI-Common/TraitDataType.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"example": "Numerical"
}
},
"$id": "https://brapi.org/Specification/BrAPI-Schema/Components/Common/TraitDataType.json",
"$id": "https://brapi.org/Specification/BrAPI-Schema/Components/Common/AdditionalInfo.json",
"$schema": "http://json-schema.org/draft/2020-12/schema"
}
18 changes: 2 additions & 16 deletions Specification/BrAPI-Schema/BrAPI-Common/Variable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,9 @@
"$defs": {
"Variable": {
"properties": {
"variableDbId": {
"description": "Unique identifier for the Variable",
"type": [
"null",
"string"
]
},
"additionalInfo": {
"description": "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestricted by the BrAPI specification.",
"$ref": "../BrAPI-Common/AdditionalInfo.json#/$defs/AdditionalInfo",
"relationshipType": "one-to-one"
"$ref": "../BrAPI-Common/AdditionalInfo.json#/$defs/AdditionalInfo"
},
"commonCropName": {
"description": "Crop name (examples: \"Maize\", \"Wheat\")",
Expand Down Expand Up @@ -48,10 +40,8 @@
},
"externalReferences": {
"description": "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.",
"relationshipType": "one-to-many",
"items": {
"$ref": "../BrAPI-Common/ExternalReference.json#/$defs/ExternalReference",
"description": "ExternalReferences"
"$ref": "../BrAPI-Common/ExternalReference.json#/$defs/ExternalReference"
},
"title": "ExternalReferences",
"type": [
Expand Down Expand Up @@ -82,17 +72,14 @@
},
"method": {
"description": "A description of the way an Observation should be collected. \n<br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ",
"relationshipType": "one-to-one",
"$ref": "../BrAPI-Phenotyping/Method.json#/$defs/Method"
},
"ontologyReference": {
"description": "MIAPPE V1.1\n\n(DM-85) Variable accession number - Accession number of the variable in the Crop Ontology\n\n(DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).\n\n(DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).\n\n(DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).",
"relationshipType": "one-to-one",
"$ref": "../BrAPI-Phenotyping/OntologyReference.json#/$defs/OntologyReference"
},
"scale": {
"description": "A Scale describes the units and acceptable values for an ObservationVariable. \n<br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Scale \"inches\" or \"pixels\".",
"relationshipType": "one-to-one",
"$ref": "../BrAPI-Phenotyping/Scale.json#/$defs/Scale"
},
"scientist": {
Expand Down Expand Up @@ -129,7 +116,6 @@
},
"trait": {
"description": "A Trait describes what property is being observed. \n<br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ",
"relationshipType": "one-to-one",
"$ref": "../BrAPI-Phenotyping/Trait.json#/$defs/Trait"
}
},
Expand Down
7 changes: 2 additions & 5 deletions Specification/BrAPI-Schema/BrAPI-Core/List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"properties": {
"additionalInfo": {
"description": "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestricted by the BrAPI specification.",
"$ref": "../BrAPI-Common/AdditionalInfo.json#/$defs/AdditionalInfo",
"relationshipType": "one-to-one"
"$ref": "../BrAPI-Common/AdditionalInfo.json#/$defs/AdditionalInfo"
},
"data": {
"description": "The array of DbIds of the BrAPI objects contained in a List",
Expand Down Expand Up @@ -36,10 +35,8 @@
},
"externalReferences": {
"description": "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.",
"relationshipType": "one-to-many",
"items": {
"$ref": "../BrAPI-Common/ExternalReference.json#/$defs/ExternalReference",
"description": "ExternalReferences"
"$ref": "../BrAPI-Common/ExternalReference.json#/$defs/ExternalReference"
},
"title": "ExternalReferences",
"type": [
Expand Down
8 changes: 2 additions & 6 deletions Specification/BrAPI-Schema/BrAPI-Core/Location.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
},
"additionalInfo": {
"description": "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestricted by the BrAPI specification.",
"$ref": "../BrAPI-Common/AdditionalInfo.json#/$defs/AdditionalInfo",
"relationshipType": "one-to-one"
"$ref": "../BrAPI-Common/AdditionalInfo.json#/$defs/AdditionalInfo"
},
"coordinateDescription": {
"description": "Describes the precision and landmarks of the coordinate values used for a Location. (ex. the site, the nearest town, a 10 kilometers radius circle, +/- 20 meters, etc)",
Expand All @@ -30,7 +29,6 @@
},
"coordinates": {
"description": "One geometry as defined by GeoJSON (RFC 7946). All coordinates are decimal values on the WGS84 geographic coordinate reference system.\n\nCopied from RFC 7946 Section 3.1.1\n\nA position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or\neasting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.",
"relationshipType": "one-to-one",
"$ref": "../BrAPI-Common/GeoJSON.json#/$defs/GeoJSON"
},
"countryCode": {
Expand Down Expand Up @@ -71,10 +69,8 @@
},
"externalReferences": {
"description": "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.",
"relationshipType": "one-to-many",
"items": {
"$ref": "../BrAPI-Common/ExternalReference.json#/$defs/ExternalReference",
"description": "ExternalReferences"
"$ref": "../BrAPI-Common/ExternalReference.json#/$defs/ExternalReference"
},
"title": "ExternalReferences",
"type": [
Expand Down
7 changes: 2 additions & 5 deletions Specification/BrAPI-Schema/BrAPI-Core/Person.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"properties": {
"additionalInfo": {
"description": "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestricted by the BrAPI specification.",
"$ref": "../BrAPI-Common/AdditionalInfo.json#/$defs/AdditionalInfo",
"relationshipType": "one-to-one"
"$ref": "../BrAPI-Common/AdditionalInfo.json#/$defs/AdditionalInfo"
},
"description": {
"description": "description of this person",
Expand All @@ -23,10 +22,8 @@
},
"externalReferences": {
"description": "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.",
"relationshipType": "one-to-many",
"items": {
"$ref": "../BrAPI-Common/ExternalReference.json#/$defs/ExternalReference",
"description": "ExternalReferences"
"$ref": "../BrAPI-Common/ExternalReference.json#/$defs/ExternalReference"
},
"title": "ExternalReferences",
"type": [
Expand Down
7 changes: 2 additions & 5 deletions Specification/BrAPI-Schema/BrAPI-Core/Program.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
},
"additionalInfo": {
"description": "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestricted by the BrAPI specification.",
"$ref": "../BrAPI-Common/AdditionalInfo.json#/$defs/AdditionalInfo",
"relationshipType": "one-to-one"
"$ref": "../BrAPI-Common/AdditionalInfo.json#/$defs/AdditionalInfo"
},
"commonCropName": {
"description": "Common name for the crop which this program is for",
Expand All @@ -31,10 +30,8 @@
},
"externalReferences": {
"description": "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.",
"relationshipType": "one-to-many",
"items": {
"$ref": "../BrAPI-Common/ExternalReference.json#/$defs/ExternalReference",
"description": "ExternalReferences"
"$ref": "../BrAPI-Common/ExternalReference.json#/$defs/ExternalReference"
},
"title": "ExternalReferences",
"type": [
Expand Down
Loading