From 31599667f575a2c866a31bc973a2597fc6fc6408 Mon Sep 17 00:00:00 2001
From: Jose Manuel Cantera <josemanuel.cantera@fiware.org>
Date: Mon, 19 Nov 2018 18:31:01 +0100
Subject: [PATCH] Fix common schema. At last

---
 schema/common.json | 302 ++++++++++++++++++++++-----------------------
 1 file changed, 149 insertions(+), 153 deletions(-)

diff --git a/schema/common.json b/schema/common.json
index 4ba40d8..94a301f 100644
--- a/schema/common.json
+++ b/schema/common.json
@@ -1,154 +1,150 @@
 {
-  "$schema": "http://json-schema.org/schema#",
-  "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json",
-  "title": "NGSI-LD Common Definitions",
-  "description": "NGSI-LD Common",
-  "definitions": {
-    "Name": {
-      "type": "string",
-      "pattern": "^(\\d|[a-zA-Z]|_)+$",
-      "minLength": 1,
-      "description": "NGSI-LD Name"
-    },
-    "observedAt": {
-      "type": "string",
-      "format": "date-time"
-    },
-    "createdAt": {
-      "type": "string",
-      "format": "date-time"
-    },
-    "modifiedAt": {
-      "type": "string",
-      "format": "date-time"
-    },
-    "LdContext": {
-      "anyOf": [
-        {
-          "type": "object"
-        },
-        {
-          "type": "string",
-          "format": "uri"
-        },
-        {
-          "type": "array",
-          "minItems": 1,
-          "items": {
-            "anyOf": [
-              {
-                "type": "string",
-                "format": "uri"
-              },
-              {
-                "type": "object"
-              }
-            ]
-          }
-        }
-      ]
-    },
-    "Endpoint": {
-      "type": "object",
-      "required": [
-        "uri"
-      ],
-      "properties": {
-        "uri": {
-          "type": "string",
-          "format": "uri"
-        },
-        "accept": {
-          "type": "string",
-          "enum": [
-            "application/json",
-            "application/ld+json"
-          ]
-        }
-      }
-    },
-    "EntityInfo": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "format": "uri"
-        },
-        "type": {
-          "$ref": "#/definitions/Name"
-        },
-        "idPattern": {
-          "type": "string",
-          "format": "regex"
-        }
-      },
-      "required": [
-        "type"
-      ]
-    }
-  },
-  "ProblemDetails": {
-    "type": "object",
-    "properties": {
-      "type": {
-        "type": "string",
-        "format": "uri"
-      },
-      "title": {
-        "type": "string"
-      },
-      "detail": {
-        "type": "string"
-      }
-    },
-    "required": [
-      "type"
-    ]
-  },
-  "georel": {
-    "anyOf": [
-      {
-        "type": "string",
-        "enum": [
-          "equals",
-          "disjoint",
-          "intersects",
-          "within",
-          "contains",
-          "overlaps"
-        ]
-      },
-      {
-        "type": "string",
-        "pattern": "^near;((maxDistance==\\d+)|(minDistance==\\d+))$"
-      }
-    ]
-  },
-  "coordinates": {
-    "oneOf": [
-      {
-        "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#/definitions/position"
-      },
-      {
-        "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#/definitions/positionArray"
-      },
-      {
-        "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#/definitions/lineString"
-      },
-      {
-        "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#/definitions/polygon"
-      }
-    ]
-  },
-  "geometry": {
-    "type": "string",
-    "enumeration": [
-      "Point",
-      "MultiPoint",
-      "LineString",
-      "MultiLineString",
-      "Polygon",
-      "MultiPolygon"
-    ]
-  }
-}
+	"$schema": "http://json-schema.org/schema#",
+	"id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json",
+	"title": "NGSI-LD Common Definitions",
+	"description": "NGSI-LD Common",
+	"definitions": {
+		"Name": {
+			"type": "string",
+			"pattern": "^(\\d|[a-zA-Z]|_)+$",
+			"minLength": 1,
+			"description": "NGSI-LD Name"
+		},
+		"observedAt": {
+			"type": "string",
+			"format": "date-time"
+		},
+		"createdAt": {
+			"type": "string",
+			"format": "date-time"
+		},
+		"modifiedAt": {
+			"type": "string",
+			"format": "date-time"
+		},
+		"LdContext": {
+			"anyOf": [{
+					"type": "object"
+				},
+				{
+					"type": "string",
+					"format": "uri"
+				},
+				{
+					"type": "array",
+					"minItems": 1,
+					"items": {
+						"anyOf": [{
+								"type": "string",
+								"format": "uri"
+							},
+							{
+								"type": "object"
+							}
+						]
+					}
+				}
+			]
+		},
+		"Endpoint": {
+			"type": "object",
+			"required": [
+				"uri"
+			],
+			"properties": {
+				"uri": {
+					"type": "string",
+					"format": "uri"
+				},
+				"accept": {
+					"type": "string",
+					"enum": [
+						"application/json",
+						"application/ld+json"
+					]
+				}
+			}
+		},
+		"EntityInfo": {
+			"type": "object",
+			"properties": {
+				"id": {
+					"type": "string",
+					"format": "uri"
+				},
+				"type": {
+					"$ref": "#/definitions/Name"
+				},
+				"idPattern": {
+					"type": "string",
+					"format": "regex"
+				}
+			},
+			"required": [
+				"type"
+			]
+		},
+		"ProblemDetails": {
+			"type": "object",
+			"properties": {
+				"type": {
+					"type": "string",
+					"format": "uri"
+				},
+				"title": {
+					"type": "string"
+				},
+				"detail": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"type"
+			]
+		},
+		"georel": {
+			"anyOf": [{
+					"type": "string",
+					"enum": [
+						"equals",
+						"disjoint",
+						"intersects",
+						"within",
+						"contains",
+						"overlaps"
+					]
+				},
+				{
+					"type": "string",
+					"pattern": "^near;((maxDistance==\\d+)|(minDistance==\\d+))$"
+				}
+			]
+		},
+		"coordinates": {
+			"oneOf": [{
+					"$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#/definitions/position"
+				},
+				{
+					"$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#/definitions/positionArray"
+				},
+				{
+					"$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#/definitions/lineString"
+				},
+				{
+					"$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#/definitions/polygon"
+				}
+			]
+		},
+		"geometry": {
+			"type": "string",
+			"enumeration": [
+				"Point",
+				"MultiPoint",
+				"LineString",
+				"MultiLineString",
+				"Polygon",
+				"MultiPolygon"
+			]
+		}
+	}
+}
\ No newline at end of file
-- 
GitLab