Commit 3d223c5e authored by canterafonsj's avatar canterafonsj
Browse files

Getting even closer

parent b2d625ae
Loading
Loading
Loading
Loading
+15 −23
Original line number Original line Diff line number Diff line
@@ -4,18 +4,6 @@
  "title": "NGSI-LD Entity",
  "title": "NGSI-LD Entity",
  "description": "NGSI-LD Entity",
  "description": "NGSI-LD Entity",
  "definitions": {
  "definitions": {
    "observedAt": {
      "type": "string",
      "format": "date-time"
    },
    "createdAt": {
      "type": "string",
      "format": "date-time"
    },
    "modifiedAt": {
      "type": "string",
      "format": "date-time"
    },
    "datasetId": {
    "datasetId": {
      "type": "string",
      "type": "string",
      "format": "uri"
      "format": "uri"
@@ -35,13 +23,13 @@
          "type": "any"
          "type": "any"
        },
        },
        "observedAt": {
        "observedAt": {
          "$ref": "#/definitions/observedAt"
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/observedAt"
        },
        },
        "createdAt": {
        "createdAt": {
          "$ref": "#/definitions/createdAt"
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/createdAt"
        },
        },
        "modifiedAt": {
        "modifiedAt": {
          "$ref": "#/definitions/modifiedAt"
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/modifiedAt"
        },
        },
        "datasetId": {
        "datasetId": {
          "$ref": "#/definitions/datasetId"
          "$ref": "#/definitions/datasetId"
@@ -77,13 +65,13 @@
          "format": "uri"
          "format": "uri"
        },
        },
        "observedAt": {
        "observedAt": {
          "$ref": "#/definitions/observedAt"
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/observedAt"
        },
        },
        "createdAt": {
        "createdAt": {
          "$ref": "#/definitions/createdAt"
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/createdAt"
        },
        },
        "modifiedAt": {
        "modifiedAt": {
          "$ref": "#/definitions/modifiedAt"
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/modifiedAt"
        },
        },
        "datasetId": {
        "datasetId": {
          "$ref": "#/definitions/datasetId"
          "$ref": "#/definitions/datasetId"
@@ -117,11 +105,14 @@
        "value": {
        "value": {
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#"
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#"
        },
        },
        "observedAt": {
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/observedAt"
        },
        "createdAt": {
        "createdAt": {
          "$ref": "#/definitions/createdAt"
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/createdAt"
        },
        },
        "modifiedAt": {
        "modifiedAt": {
          "$ref": "#/definitions/modifiedAt"
          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/modifiedAt"
        },
        },
        "datasetId": {
        "datasetId": {
          "$ref": "#/definitions/datasetId"
          "$ref": "#/definitions/datasetId"
@@ -154,7 +145,8 @@
    },
    },
    "type": {
    "type": {
      "type": "string",
      "type": "string",
      "description": "NGSI Entity type"
      "description": "NGSI Entity type",
      "minLength": 1
    },
    },
    "@context": {
    "@context": {
      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/LdContext"
      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/LdContext"
@@ -169,10 +161,10 @@
      "$ref": "#/definitions/GeoProperty"
      "$ref": "#/definitions/GeoProperty"
    },
    },
    "createdAt": {
    "createdAt": {
      "$ref": "#/definitions/createdAt"
      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/createdAt"
    },
    },
    "modifiedAt": {
    "modifiedAt": {
      "$ref": "#/definitions/modifiedAt"
      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/modifiedAt"
    }
    }
  },
  },
  "required": [
  "required": [
+6 −0
Original line number Original line Diff line number Diff line
@@ -174,6 +174,12 @@
      "type": "string"
      "type": "string"
    }
    }
  },
  },
  "createdAt": {
    "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/createdAt"
  },
  "modifiedAt": {
    "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/modifiedAt"
  },
  "required": [
  "required": [
    "id",
    "id",
    "type"
    "type"
+13 −13
Original line number Original line Diff line number Diff line
@@ -4,6 +4,18 @@
  "title": "NGSI-LD Common Definitions",
  "title": "NGSI-LD Common Definitions",
  "description": "NGSI-LD Common",
  "description": "NGSI-LD Common",
  "definitions": {
  "definitions": {
    "observedAt": {
      "type": "string",
      "format": "date-time"
    },
    "createdAt": {
      "type": "string",
      "format": "date-time"
    },
    "modifiedAt": {
      "type": "string",
      "format": "date-time"
    },
    "LdContext": {
    "LdContext": {
      "anyOf": [
      "anyOf": [
        {
        {
@@ -30,19 +42,6 @@
        }
        }
      ]
      ]
    },
    },
    "Dates": {
      "type": "object",
      "properties": {
        "createdAt": {
          "type": "string",
          "format": "date-time"
        },
        "modifiedAt": {
          "type": "string",
          "format": "date-time"
        }
      }
    },
    "Endpoint": {
    "Endpoint": {
      "type": "object",
      "type": "object",
      "required": [
      "required": [
@@ -80,3 +79,4 @@
      }
      }
    }
    }
  }
  }
}