Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
15 changes: 15 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,19 @@
"Colour",
"Hanek",
"Santamouris",
"pywincalc",
"THMX",
"opticalc",
"clearlite",
"planibel",
"deconstructable",
"photopic",
"IGSDB",
"igsdb",
"IGDB",
"igdb",
"CGDB",
"cgdb",
"AERC",
"ASHRAE",
"ASTM",
Expand Down Expand Up @@ -81,9 +94,11 @@
"POSIX",
"Retrolux",
"Revit",
"revit",
"Riba",
"SHGC",
"SPARQL",
"sparql",
"Soleil",
"Subtag",
"UNECE",
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ and this project adheres to
- Upgrade development packages to latest versions [#285](https://github.com/building-envelope-data/api/pull/285)
- Use JSON Schema Draft 2020-12 and upgrade tooling [#307](https://github.com/building-envelope-data/api/pull/307)
- Simplify the structure of optical datasets [#354](https://github.com/building-envelope-data/api/pull/354)
-
- Extend BED-JSON to include everything from LBNL-JSON [#352](https://github.com/building-envelope-data/api/pull/352)
-
-
-
Expand Down
4 changes: 2 additions & 2 deletions docs/diagrams/src/opticalData/opticalDataPointSchema.plantuml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
,
"":
{
"Circular polarization": ["leftHanded", "rightHanded"]
"circular polarization": ["leftHanded", "rightHanded"]
}

}
Expand Down Expand Up @@ -165,7 +165,7 @@
"illuminant": ["A", "D65"]
},
"colorRenderingIndices": {
"Ra": { "number": "numberBetweenZeroAndOneHundredWithUncertainty"},
"ra": { "number": "numberBetweenZeroAndOneHundredWithUncertainty"},
"observer": ["twoDegrees", "tenDegrees"],
"illuminant": ["A", "D65"]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
,
"":
{
"Circular polarization": ["leftHanded", "rightHanded"]
"circular polarization": ["leftHanded", "rightHanded"]
}

}
Expand Down Expand Up @@ -99,7 +99,7 @@
"illuminant": ["A", "D65"]
},
"colorRenderingIndices": {
"Ra": "numberBetweenZeroAndOneHundredWithUncertainty",
"ra": "numberBetweenZeroAndOneHundredWithUncertainty",
"observer": ["twoDegrees", "tenDegrees"],
"illuminant": ["A", "D65"]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,15 @@
"angleDependency": [
{
"incidence": 0,
"IAM": 1
"incidenceAngleModifier": 1
},
{
"incidence": 60,
"IAM": 0.924
"incidenceAngleModifier": 0.924
},
{
"incidence": 90,
"IAM": 0
"incidenceAngleModifier": 0
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions examples/dbe/optical/ColorRenderingIndexCIELAB.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
"colorTransmittance": {
"colorRenderingIndices": [
{
"Ra": 97,
"ra": 97,
"observer": "twoDegrees",
"illuminant": "D65"
},
{
"Raout-in": 95,
"raOutIn": 95,
"observer": "tenDegrees",
"illuminant": "A"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/dbe/photovoltaic/bipvInverterBuildingNatIse.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"safety": {
"electric": {
"IPcode": [
"ipCode": [
{
"standard": ["EN IEC 60529"],
"firstDigit": "6",
Expand All @@ -77,7 +77,7 @@
},
"efficiencies": {
"maximum": 0.961,
"European": 0.954
"european": 0.954
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions examples/dbe/photovoltaic/bipvModuleBuildingNatIse.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@
"angleDependency": [
{
"incidence": 0,
"IAM": 1
"incidenceAngleModifier": 1
},
{
"incidence": 60,
"IAM": 0.924
"incidenceAngleModifier": 0.924
},
{
"incidence": 90,
"IAM": 0
"incidenceAngleModifier": 0
}
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,15 @@
"angleDependency": [
{
"incidence": 0,
"IAM": 1
"incidenceAngleModifier": 1
},
{
"incidence": 60,
"IAM": 0.924
"incidenceAngleModifier": 0.924
},
{
"incidence": 90,
"IAM": 0
"incidenceAngleModifier": 0
}
]
},
Expand Down
6 changes: 3 additions & 3 deletions examples/dbe/photovoltaic/bipvModuleSunovationUnit.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@
"angleDependency": [
{
"incidence": 0,
"IAM": 1
"incidenceAngleModifier": 1
},
{
"incidence": 60,
"IAM": 0.924
"incidenceAngleModifier": 0.924
},
{
"incidence": 90,
"IAM": 0
"incidenceAngleModifier": 0
}
]
},
Expand Down
6 changes: 3 additions & 3 deletions examples/dbe/photovoltaic/photovoltaicWithOptical.json
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,15 @@
"angleDependency": [
{
"incidence": 0,
"IAM": 1
"incidenceAngleModifier": 1
},
{
"incidence": 60,
"IAM": 0.924
"incidenceAngleModifier": 0.924
},
{
"incidence": 90,
"IAM": 0
"incidenceAngleModifier": 0
}
]
},
Expand Down
8 changes: 4 additions & 4 deletions examples/dsb/simpleBuildingExample.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"id": "8ca1102b-264a-4023-8351-5897ec38e388",
"name": "The name of the building.",
"description": "A simple example for data about a building.",
"IFC": {
"ifc": {
"full": {
"id": {
"value": "8ca1102b-264a-4023-8351-5897ec38e388",
Expand All @@ -15,7 +15,7 @@
"createdAt": "2018-09-01T12:00:00+01:00"
}
},
"Revit": {
"revit": {
"full": {
"id": {
"value": "8ca1102b-264a-4023-8351-5897ec38e388",
Expand All @@ -26,8 +26,8 @@
"createdAt": "2018-09-01T12:00:00+01:00"
}
},
"LinkedData": {
"SPARQL": {
"linkedData": {
"sparql": {
"webAddress": "http://www.owner034.com/kdje102b-264a-4023-8351-5897ec38e388"
}
}
Expand Down
10 changes: 5 additions & 5 deletions schemas/building.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
},
"minItems": 1
},
"BIMmanager": {
"bimManager": {
"$ref": "stakeholder.json",
"description": "The BIM manager MUST guarantee the uniqueness of the decentral identifiers. She is responsible for the database of the building at the moment indicated by the timestamp of this data."
},
Expand Down Expand Up @@ -174,7 +174,7 @@
"$ref": "common.json#/$defs/approvals",
"description": "If the dataset for this building has been approved by an institution, this approval is specified here."
},
"IFC": {
"ifc": {
"title": "The data about a building can be stored in the open source format Industry Foundation Classes (IFC).",
"type": "object",
"properties": {
Expand Down Expand Up @@ -212,7 +212,7 @@
"minProperties": 1,
"required": []
},
"Revit": {
"revit": {
"title": "The data about a building can be stored in the closed source format of Autodesk Revit.",
"type": "object",
"properties": {
Expand Down Expand Up @@ -250,11 +250,11 @@
"minProperties": 1,
"required": []
},
"LinkedData": {
"linkedData": {
"title": "The data about a building can be stored as linked building data.",
"type": "object",
"properties": {
"SPARQL": {
"sparql": {
"title": "The SPARQL endpoint which can be used to access the data about the building.",
"type": "object",
"properties": {
Expand Down
6 changes: 3 additions & 3 deletions schemas/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -227,17 +227,17 @@
"title": "The current-voltage characteristic can be important for example for photovoltaics.",
"type": "object",
"properties": {
"I": {
"i": {
"$ref": "number.json#/$defs/ampere",
"description": "The electric current in amperes."
},
"V": {
"v": {
"$ref": "number.json#/$defs/volt",
"description": "The electric potential difference in volts."
}
},
"additionalProperties": false,
"required": ["I", "V"]
"required": ["i", "v"]
},
"approvals": {
"title": "Institutions can approve data with cryptographic signatures which among other things can be used to ensure integrity and authenticity of data. The same data may be approved by several institutions.",
Expand Down
33 changes: 33 additions & 0 deletions schemas/number.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,39 @@
"minimum": -180,
"maximum": 180
},
"integerOrNull": {
"title": "Some servers return `null` when they do not have a value",
"oneOf": [
{
"type": "integer"
},
{
"type": "null"
}
]
},
"numberOrNull": {
"title": "Some servers return `null` when they do not have a value",
"oneOf": [
{
"type": "number"
},
{
"type": "null"
}
]
},
"stringOrNull": {
"title": "Some servers return `null` when they do not have a value",
"oneOf": [
{
"type": "string"
},
{
"type": "null"
}
]
},
"meterWithUncertainty": {
"$ref": "#/$defs/numberWithUncertainty",
"description": "Meter is the SI unit for length. With this type, the uncertainty can be defined."
Expand Down
Loading