Merge pull request #28 from VDVde/revert-4-Fix-issues-#2-#3

Revert "Add v1.1 JSON schemas fixing issues #2 and #3"
VDVde · Jul 8, 2024 · dec81bb · dec81bb
2 parents 3198377 + 3f9b706
commit dec81bb
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 60 deletions.
diff --git a/v1.1/MessageStructure.json b/v1.1/MessageStructure.json
@@ -1,59 +1,59 @@
-{
-   "$schema": "http://json-schema.org/draft-04/schema#",
-   "$id": "urn:VDV463:1:0:0:MessageStructure",
-   "comment": "VDV463 1.0.0 FINAL",
-   "title": "MessageStructure",
-   "type": "array",
-   "additionalProperties": false,
-   "description": "This type represents a generic message structure associated with the VDV463.",
-   "items": [
-      {
-         "type": "integer",
-         "additionalProperties": false,
-         "description": "This type represents the message type.",
-         "enum": [
-            1,
-            2,
-            3
-         ]
-      },
-      {
-         "type": "string",
-         "additionalProperties": false,
-         "description": "This type represents the source of the data of the message."
-      },
-      {
-         "description": "This type represents an unique identifier for the presystemId.",
-         "type": "string",
-         "additionalProperties": false
-      },
-      {
-         "type": "string",
-         "additionalProperties": false,
-         "description": "This type represents the current timestamp of the message.",
-         "format": "date-time"
-      },
-      {
-         "type": "string",
-         "additionalProperties": false,
-         "description": "This type represents the unique identifier of the message.",
-         "format": "uuid"
-      },
-      {
-         "type": "string",
-         "additionalProperties": false,
-         "description": "This type represents the action of the message.",
-         "enum": [
-            "BootNotification",
-            "ProvideChargingRequests",
-            "ProvideChargingInformation"
-         ]
-      },
-      {
-         "type": "object",
-         "description": "This type represents the payload of the message which is specified in separate JSON schemas."
-      }
-   ],
-   "minItems": 7,
-   "maxItems": 7
-}
+{
+   "$schema": "http://json-schema.org/draft-04/schema#",
+   "$id": "urn:VDV463:1:0:0:MessageStructure",
+   "comment": "VDV463 1.0.0 FINAL",
+   "title": "MessageStructure",
+   "type": "array",
+   "additionalProperties": false,
+   "description": "This type represents a generic message structure associated with the VDV463.",
+   "items": [
+      {
+         "type": "integer",
+         "additionalProperties": false,
+         "description": "This type represents the message type.",
+         "enum": [
+            1,
+            2,
+            3
+         ]
+      },
+      {
+         "type": "string",
+         "additionalProperties": false,
+         "description": "This type represents the source of the data of the message."
+      },
+      {
+         "description": "This type represents an unique identifier for the presystemId.",
+         "type": "string",
+         "additionalProperties": false
+      },
+      {
+         "type": "string",
+         "additionalProperties": false,
+         "description": "This type represents the current timestamp of the message.",
+         "format": "date-time"
+      },
+      {
+         "type": "string",
+         "additionalProperties": false,
+         "description": "This type represents the unique identifier of the message.",
+         "format": "uuid"
+      },
+      {
+         "type": "string",
+         "additionalProperties": false,
+         "description": "This type represents the action of the message.",
+         "enum": [
+            "BootNotification",
+            "ProvideChargingRequests",
+            "ProvideChargingInformation"
+         ]
+      },
+      {
+         "type": "object",
+         "description": "This type represents the payload of the message which is specified in separate JSON schemas."
+      }
+   ],
+   "minItems": 7,
+   "maxItems": 7
+}
diff --git a/v1.1/ProvideChargingInformationRequest.json b/v1.1/ProvideChargingInformationRequest.json
@@ -81,6 +81,15 @@
 				"Faulted"
 			]
 		},
+		"ChargingStationStatus": {
+			"type": "string",
+			"additionalProperties": false,
+			"enum": [
+				"Available",
+				"Unavailable",
+				"Faulted"
+			]
+		},
 		"ChargingPointFaultInfo": {
 			"description": "This type represents information regarding a fault at the charging point.",
 			"type": "object",
@@ -458,7 +467,7 @@
 					"type": "number",
 					"additionalProperties": false
 				},
-				"presentPowerLimit": {
+				"presentPower": {
 					"type": "number",
 					"additionalProperties": false
 				},
@@ -553,6 +562,9 @@
 				"chargingStationId": {
 					"$ref": "#/definitions/UniqueIdentifier"
 				},
+				"chargingStationStatus": {
+					"$ref": "#/definitions/ChargingStationStatus"
+				},
 				"chargingPointInfoList": {
 					"type": "array",
 					"items": {
@@ -570,6 +582,7 @@
 			},
 			"required": [
 				"chargingStationId",
+				"chargingStationStatus",
 				"chargingPointInfoList"
 			],
 			"additionalProperties": false