Merge pull request #39 from OpenEnergyPlatform/develop

Merge minor bugfixes into master
OpenEnergyPlatform · Aug 25, 2020 · 406a5b2 · 406a5b2
2 parents d4e63bf + 203245f
commit 406a5b2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/metadata/latest/example.json b/metadata/latest/example.json
@@ -17,12 +17,12 @@
     "publicationDate": "2018-06-12",
     "context": {
         "homepage": "https://reiner-lemoine-institut.de/szenariendb/",
-        "documentation": "https://github.com/OpenEnergyPlatform/organisation/wiki/metadata",
-        "sourceCode": "https://github.com/OpenEnergyPlatform/examples/tree/master/metadata",
+        "documentation": "https://github.com/OpenEnergyPlatform/oemetadata/blob/develop/metadata/latest/metadata_key_description.md",
+        "sourceCode": "https://github.com/OpenEnergyPlatform/oemetadata",
         "contact": "https://github.com/Ludee",
         "grantNo": "03ET4057",
         "fundingAgency": "Bundesministerium für Wirtschaft und Energie",
-        "fundingAgencyLogo": "https://www.innovation-beratung-foerderung.de/INNO/Redaktion/DE/Bilder/Titelbilder/titel_foerderlogo_bmwi.jpg?__blob=poster&v=2",
+        "fundingAgencyLogo": "https://www.innovation-beratung-foerderung.de/INNO/Redaktion/DE/Bilder/Titelbilder/titel_foerderlogo_bmwi.jpg?__blob=normal&v=3",
         "publisherLogo": "https://reiner-lemoine-institut.de//wp-content/uploads/2015/09/rlilogo.png"
     },
     "spatial": {
@@ -244,8 +244,8 @@
         }
     ],
     "review": {
-        "path": "https://github.com/OpenEnergyPlatform/data-preprocessing/wiki",
-        "badge": "platin"
+        "path": "https://github.com/OpenEnergyPlatform/data-preprocessing/issues/58",
+        "badge": "Platinum"
     },
     "metaMetadata": {
         "metadataVersion": "OEP-1.4.0",
@@ -256,12 +256,12 @@
         }
     },
     "_comment": {
-        "metadata": "Metadata documentation and explanation (https://github.com/OpenEnergyPlatform/organisation/wiki/metadata)",
-        "dates": "Dates and time must follow the ISO8601 including time zone (YYYY-MM-DD or YYYY-MM-DDThh:mm:ss±hh)",
+        "metadata": "Metadata development and documentation (https://github.com/OpenEnergyPlatform/oemetadata)",
+        "dates": "Dates and time must follow the ISO 8601 standard including time zone (YYYY-MM-DD or YYYY-MM-DDThh:mm:ss±hh)",
         "units": "Use a space between numbers and units (100 m)",
         "languages": "Languages must follow the IETF (BCP47) format (en-GB, en-US, de-DE)",
-        "licenses": "License name must follow the SPDX License List (https://spdx.org/licenses/)",
-        "review": "Following the OEP Data Review (https://github.com/OpenEnergyPlatform/data-preprocessing/wiki)",
-        "null": "If not applicable use (null)"
+        "licenses": "License name must be an identifier from SPDX License List (https://spdx.org/licenses/)",
+        "review": "Follow the OEP Data Review (https://github.com/OpenEnergyPlatform/data-preprocessing/blob/master/data-review/manual/review_manual.md)",
+        "null": "If any value is not applicable use 'null' without any quotation marks. However, if there are no foreignKeys, drop the entire structure contained and only leave \"foreignKeys\": []"
     }
-}
+}
diff --git a/metadata/latest/metadata_key_description.md b/metadata/latest/metadata_key_description.md
@@ -23,7 +23,7 @@ This pages describes the OEP Metadata version 1.4.0 You can have a look at an em
 | 8.4 | contact | Reference to the creator or maintainer of the data set | [email protected] | 
 | 8.5 | grantNo | In a publicly funded Project: the identifying grant number | 01AB2345 | 
 | 8.6 | fundingAgency | In a funded Project: The name of the funding agency | Bundesministerium für Wirtschaft und Energie | 
-| 8.7 | fundingAgencyLogo | In a publicly funded Project: A link to the Logo of the funding agency | https://www.innovation-beratung-foerderung.de/INNO/Redaktion/DE/Bilder/Titelbilder/titel_foerderlogo_bmwi.jpg?__blob=poster&v=2 | 
+| 8.7 | fundingAgencyLogo | In a publicly funded Project: A link to the Logo of the funding agency | https://www.innovation-beratung-foerderung.de/INNO/Redaktion/DE/Bilder/Titelbilder/titel_foerderlogo_bmwi.jpg?__blob=normal&v=3 | 
 | 8.8 | publisherLogo | Link to the logo of the publishing institution | https://reiner-lemoine-institut.de//wp-content/uploads/2015/09/rlilogo.png | 
 | 9 | spatial | Object. Contains name-value-pairs describing the spatial context of the contained data. | |
 | 9.1 | location | In the case of data where the location can be described as a point. May come as coordinates, URI or addresses with street, house number and zip code | 52.433509, 13.535855 |
@@ -82,7 +82,7 @@ This pages describes the OEP Metadata version 1.4.0 You can have a look at an em
 | 14.7.2 | decimalSeparator | Symbol used to separate the integer part from the fractional part of a number written in decimal form. Depending on language and region this symbol can be "." or ",". | . |
 | 15. | review | Data uploaded through the OEP needs to go through review. The review will cover the areas described here: https://github.com/OpenEnergyPlatform/data-preprocessing/wiki and carried out by a team of the platform. The review itself is documented at the specified path and a badge is rewarded with regards to completeness. |  |
 | 15.1 | path | A URL or path string, that should be a permanent http(s) address directly linking to the documented review. | https://www.example.com |
-| 15.2 | badge | A badge of either Bronze, Silver, Gold or Platin is used to label the given metadata based on its quality. | Platin |
+| 15.2 | badge | A badge of either Bronze, Silver, Gold or Platinum is used to label the given metadata based on its quality. | Platinum |
 | 16 | metaMetadata | Object. Description about the metadata themselves, their format, version and license. These fields should already be provided when you’re filling out your metadata. ||
 | 16.1 | metadataVersion | Type and version number of the metadata | OEP-1.4 |
 | 16.2 | metadataLicense | Object describing the license of the provided metadata ||
@@ -96,4 +96,4 @@ This pages describes the OEP Metadata version 1.4.0 You can have a look at an em
 | 17.4 | languages | Comment on language format | Languages must follow the IETF (BCP47) format (en-GB, en-US, de-DE) |
 | 17.5 | licenses | Reference to license format | License name must follow the SPDX License List (https://spdx.org/licenses/) |
 | 17.6 | review | Reference to review documentation | Following the OEP Data Review (https://github.com/OpenEnergyPlatform/data-preprocessing/wiki) |
-| 17.7 | ... | Feel free to add more descriptive comments. Like "none" | If a field is not applicable just enter "none" |
+| 17.7 | ... | Feel free to add more descriptive comments. Like "none" | If a field is not applicable just enter "none" |
diff --git a/metadata/latest/schema.json b/metadata/latest/schema.json
@@ -555,7 +555,7 @@
                     ]
                 },
                 "badge": {
-                    "description": "A badge of either Bronze, Silver, Gold or Platin is used to label the given metadata based on its quality. Example: Platin",
+                    "description": "A badge of either Bronze, Silver, Gold or Platinum is used to label the given metadata based on its quality. Example: Platinum",
                     "type": [
                         "string",
                         "null"
@@ -611,7 +611,7 @@
             "type": "object",
             "properties": {
                 "metadata": {
-                    "description": "Reference to the metadata documentation in use. Example: Metadata documentation and explanation (https://github.com/OpenEnergyPlatform/organisation/wiki/metadata)",
+                    "description": "Reference to the metadata documentation in use. Example: Metadata documentation and explanation (https://github.com/OpenEnergyPlatform/oemetadata/blob/develop/metadata/latest/metadata_key_description.md)",
                     "type": [
                         "string",
                         "null"
@@ -663,4 +663,4 @@
         }
     },
     "additionalProperties": false
-}
+}
diff --git a/metadata/latest/template.json b/metadata/latest/template.json
@@ -148,12 +148,12 @@
         }
     },
     "_comment": {
-        "metadata": "Metadata documentation and explanation (https://github.com/OpenEnergyPlatform/organisation/wiki/metadata)",
-        "dates": "Dates and time must follow the ISO8601 including time zone (YYYY-MM-DD or YYYY-MM-DDThh:mm:ss±hh)",
+        "metadata": "Metadata development and documentation (https://github.com/OpenEnergyPlatform/oemetadata)",
+        "dates": "Dates and time must follow the ISO 8601 standard including time zone (YYYY-MM-DD or YYYY-MM-DDThh:mm:ss±hh)",
         "units": "Use a space between numbers and units (100 m)",
         "languages": "Languages must follow the IETF (BCP47) format (en-GB, en-US, de-DE)",
-        "licenses": "License name must follow the SPDX License List (https://spdx.org/licenses/)",
-        "review": "Following the OEP Data Review (https://github.com/OpenEnergyPlatform/data-preprocessing/wiki)",
-        "null": "If not applicable use (null)"
+        "licenses": "License name must be an identifier from SPDX License List (https://spdx.org/licenses/)",
+        "review": "Follow the OEP Data Review (https://github.com/OpenEnergyPlatform/data-preprocessing/blob/master/data-review/manual/review_manual.md)",
+        "null": "If any value is not applicable use 'null' without any quotation marks. However, if there are no foreignKeys, drop the entire structure contained and only leave \"foreignKeys\": []"
     }
-}
+}