Merge pull request #80 from AlexIvanHoward/main

Updates according to BCA discussion

Schemas/protobufs/ab_identification.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package base;
+
+message Identification {
+	string system = 1; //The name of the identification system, e.g. "South African National Natural Persons Registry".
+	string version = 2; //The version of the identification system in use here, if relevant, e.g. "1.4".
+	string identifier = 3; //The value of the thing in question according to the system and version identified above, e.g. "9111258877414".
+}

Schemas/protobufs/b_location.proto

@@ -14,7 +14,8 @@ message Area {
 }
 
 message Location {
-  Coordinate lat_long = 1;
+  repeated Identification identifications = 1;
+  Coordinate lat_long = 2;
   Area area = 3;
   string country = 4;
   string state = 5; // or province, prefecture

Schemas/protobufs/c2_control.proto

@@ -7,6 +7,7 @@ package base;
 import "i_state.proto"; // TODO: We'll have to move this definition of Control to after the definition of state...
 
 message Control {
+  repeated Identification identifications = 1;
   string mode = 1; // binding (obligatory) or non-binding (non-obligatory)
   google.protobuf.Any subject = 2;
   google.protobuf.Any value =  3;

Schemas/protobufs/c_parameter.proto

@@ -10,7 +10,7 @@ import "aa_classification.proto";
 //Pass by value version:
 
 message Parameter {
- string label = 2;
+ repeated Identification identifications = 1;
  string definition = 3;
  string unit_of_measure = 7;
  string rationale = 8;
@@ -22,8 +22,7 @@ message Parameter {
 /* Pass by reference version:
 
 message Parameter {
- string identifier = 1;
- string label = 2;
+ repeated Identification identifications = 1;
  string definition = 3;
  string unit_of_measure = 7;
  string rationale = 8;

Schemas/protobufs/d_environment.proto

@@ -11,9 +11,9 @@ import "c_parameter.proto";
 // Pass by value version:
 
 message Environment {
+  repeated Identification identifications = 1;
   string description = 2; 
-  Location location = 6; 
-  repeated Parameter parameters = 5; // The defining parameters of the environment.
+  repeated Parameter parameters = 5; // The defining parameters of the environment. Location will typically be one of them.
   repeated Environment environments = 7;
 }
 //TODO. Location is actually a special type of parameter... OR is it a control in this case, as in the Environment is restricted to this Location?
@@ -22,10 +22,9 @@ message Environment {
 /* Pass by reference version:
 
 message Environment {
-  string identifier = 1;
+  repeated Identification identifications = 1;
   string description = 2; 
-  Location location = 6; //TODO. Location is actually a special type of parameter...
-  repeated string ids_parameters = 5; // The defining parameters of the environment.
+  repeated string ids_parameters = 5; // The defining parameters of the environment. Location will typically be one of them.
   repeated string ids_environments = 7;
 }
 

Schemas/protobufs/e_accounting_period.proto

@@ -6,5 +6,5 @@ import "a_date_time.proto";
 
 message AccountingPeriod {
 	Period period = 1;
-	string label = 3;
+	repeated Identification identifications = 1;
 }

Schemas/protobufs/g2_instrument.proto

@@ -11,7 +11,7 @@ import "g_agent.proto";
 // Pass by value version:
 
 message Instrument {
- string label = 2;
+ repeated Identification identifications = 1;
  string description = 3;
  repeated Classification classifications = 4;
  string make = 7;
@@ -24,8 +24,7 @@ message Instrument {
 /* Pass by reference version:
 
 message Instrument {
- string identifier = 1;
- string label = 2;
+ repeated Identification identifications = 1;
  string description = 3;
  repeated Classification classifications = 4;
  string make = 7;

Schemas/protobufs/g_agent.proto

@@ -18,7 +18,7 @@ enum AgentType {
 // Pass by value version:
 
 message Agent {
-  string identifier = 1; // e.g., full name and surname or ID number.
+  repeated Identification identifications = 1; // e.g., full name and surname or ID number.
   AgentType type_agent = 2;
   repeated Classification classifications = 3; 
   repeated Agent agents = 4; 
@@ -28,7 +28,7 @@ message Agent {
 /* Pass by reference version:
 
 message Agent {
-  string identifier = 1;
+  repeated Identification identifications = 1;
   repeated Classification classifications = 3; 
   repeated string ids_agents = 4; 
 //  repeated Credential credentials = 5;

Schemas/protobufs/h_activity.proto

@@ -16,6 +16,7 @@ import "g1_agent_role.proto";
 // Pass by value version:
 
 message Activity {
+  repeated Identification identifications = 1;
   string description = 2;
   repeated AgentRole agents = 3;
   Modality modality = 11;
@@ -32,7 +33,7 @@ message Activity {
 /* Pass by reference version:
 
 message Activity {
-  string identifier = 1;
+  repeated Identification identifications = 1;
   string description = 2;
   repeated AgentRole agents = 3;
   Modality modality = 11;

Schemas/protobufs/i_state.proto

@@ -13,6 +13,7 @@ import "g2_instrument.proto";
 // Pass by value version:
 
 message State {
+    repeated Identification identifications = 1;
 	Parameter parameter = 1; // Via an Environment object, i.e. Environment.parameters[4].
 	Activity provenance = 5; // The activity through which the value of the state was determined.
 	Modality modality = 3; // I.e., counterfactual or real.
@@ -24,7 +25,7 @@ message State {
 /* Pass by reference version:
 
 message State {
-	string identifier = 6;
+	repeated Identification identifications = 1;
 	string id_parameter = 1; 
 	string id_activity_provenance = 5;
 	Modality modality = 3; // I.e., counterfactual or real.

Schemas/protobufs/j_state_diff.proto

@@ -7,14 +7,15 @@ import "i_state.proto";
 // Pass by value version:
 
 message StateDiff {
+    repeated Identification identifications = 1;
 	State state_1 = 2;
 	State state_2 = 3;
 }
 
 / * Pass by reference version:
 
 message StateDiff {
-	string identifier = 1;
+	repeated Identification identifications = 1;
 	string id_state_1 = 2;
 	string id_state_2 = 3;
 }

Schemas/protobufs/jj_claim_and_attestation.proto

@@ -1,4 +1,5 @@
 message Claim {
+    repeated Identification identifications = 1;
 	Agent claimant = 1;
 	google.protobuf.Any subject = 2;
 	google.protobuf.Any verb = 3;
@@ -8,6 +9,7 @@ message Claim {
 
 
 message Attestation {
+    repeated Identification identifications = 1;
 	string description = 1;	
  	google.protobuf.Any subject = 2; // Claim.subject
 	google.protobuf.Any content = 3;

Schemas/protobufs/k_impact_claim.proto

@@ -23,6 +23,7 @@ enum ImpactPathwayPosition {
 // Pass by value version:
 
 message ImpactClaim {
+  repeated Identification identifications = 1;
   Agent claimant = 2;
   Period accounting_period = 3;
   repeated Activity activities = 7;
@@ -35,7 +36,7 @@ message ImpactClaim {
 /* Pass by reference version: 
 
 message ImpactClaim {
-  string identifier = 1;
+  repeated Identification identifications = 1;
   string id_agent_claimant = 2;
   Period accounting_period = 3;
   repeated string ids_activities = 7;