Commit b5eb2435 authored by Giuseppe Tropea's avatar Giuseppe Tropea
Browse files

Merge branch 'fix/schema-update-and-unit-code' into 'master' 

fix: JSON schema update and missing unit code

See merge request NGSI-LD/NGSI-LD!8
parents 2ab12055 a98bf36e

schema/Entity.json

+18 −5
Original line number Original line Diff line number Diff line
@@ -19,13 +19,26 @@ 
        },

        },

        "value": {

        "value": {

          "oneOf": [

          "oneOf": [

            "string",

            {

            "number",

              "type": "string"

            "boolean",

            },

            "array",

            {

            "object"

              "type": "number"

            },

            {

              "type": "boolean"

            },

            {

              "type": "array"

            },

            {

              "type": "object"

            }

          ]

          ]

        },

        },

        "unitCode": {

          "$ref": "https://forge.etsi.org/rep/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/unitCode"

        },

        "observedAt": {

        "observedAt": {

          "$ref": "https://forge.etsi.org/rep/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/observedAt"

          "$ref": "https://forge.etsi.org/rep/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/observedAt"

        },

        },

schema/common.json

+3 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,9 @@ 
      "type": "string",

      "type": "string",

      "pattern": "^((\\d|[a-zA-Z]|_)+(:(\\d|[a-zA-Z]|_)+)?(#\\d+)?)$|^(@context)$"

      "pattern": "^((\\d|[a-zA-Z]|_)+(:(\\d|[a-zA-Z]|_)+)?(#\\d+)?)$|^(@context)$"

    },

    },

    "unitCode": {

      "type": "string"

    },

    "observedAt": {

    "observedAt": {

      "type": "string",

      "type": "string",

      "format": "date-time"

      "format": "date-time"