From 7add8bd7b4cb1287c2df70a6032ab0049c0d6fc2 Mon Sep 17 00:00:00 2001 From: Lynn Foster Date: Fri, 13 Sep 2019 12:02:27 -0500 Subject: [PATCH 1/2] fixes for consistency 1 --- schemas/Action.json | 4 ++-- schemas/Agent.json | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/schemas/Action.json b/schemas/Action.json index 400024b..9bae683 100644 --- a/schemas/Action.json +++ b/schemas/Action.json @@ -5,8 +5,8 @@ "description": "An action verb defining the kind of event, commitment, or intent.", "type": "object", "properties": { - "name": { - "description": "An informal or formal textual identifier for an action. Does not imply uniqueness.", + "label": { + "description": "A unique verb which defines the action.", "type": "string", "enum": ["dropoff", "pickup", "consume", "use", "work", "cite", "produce", "accept", "modify", "pass", "fail", "deliver-service", "transfer-all-rights", "transfer-custody", "transfer-complete", "move", "raise", "lower"] }, diff --git a/schemas/Agent.json b/schemas/Agent.json index d46f4f1..388cc24 100644 --- a/schemas/Agent.json +++ b/schemas/Agent.json @@ -14,11 +14,6 @@ "type": "string", "format": "uri" }, - "url": { - "description": "Optional email address contact for this agent.", - "type": "string", - "format": "uri" - }, "primaryLocation": { "description": "The main place an agent is located, often an address where activities occur and mail can be sent. This is usually a mappable geographic location. It also could be a website address, as in the case of agents who have no physical location.", "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/SpatialThing.json" From 0838f060bd81ba37c1cf0aff2952fae646eaac11 Mon Sep 17 00:00:00 2001 From: Lynn Foster Date: Wed, 18 Sep 2019 13:20:37 -0500 Subject: [PATCH 2/2] fixes from yeff's review --- schemas/AgentRelationship.json | 4 ++++ schemas/AgentRelationshipRole.json | 4 ++++ schemas/Claim.json | 3 ++- schemas/Commitment.json | 8 +++++++- schemas/EconomicEvent.json | 3 ++- schemas/EconomicResource.json | 2 +- schemas/Intent.json | 12 +++++++++++- schemas/Process.json | 4 ++++ schemas/ProposedIntent.json | 4 ---- schemas/RecipeFlow.json | 4 ---- 10 files changed, 35 insertions(+), 13 deletions(-) diff --git a/schemas/AgentRelationship.json b/schemas/AgentRelationship.json index 005eff8..0f2307f 100644 --- a/schemas/AgentRelationship.json +++ b/schemas/AgentRelationship.json @@ -17,6 +17,10 @@ "description": "The object of a relationship between 2 agents. For example, if Mary is a member of a group, then the group is the object.", "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/Agent.json" }, + "inScopeOf": { + "description": "Grouping around something to create a boundary or context.", + "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/Agent.json" + }, "note": { "description": "A textual comment or description.", "type": "string" diff --git a/schemas/AgentRelationshipRole.json b/schemas/AgentRelationshipRole.json index 90b4c91..a0e5503 100644 --- a/schemas/AgentRelationshipRole.json +++ b/schemas/AgentRelationshipRole.json @@ -12,6 +12,10 @@ "inverseLabel": { "description": "The human readable name of the role, from the object to the subject. For example, 'has member'.", "type": "string" + }, + "note": { + "description": "A textual comment or description.", + "type": "string" } }, "required": ["label"] diff --git a/schemas/Claim.json b/schemas/Claim.json index 38f7b27..edda3b3 100644 --- a/schemas/Claim.json +++ b/schemas/Claim.json @@ -65,7 +65,8 @@ }, "agreedIn": { "description": "Reference to an agreement between agents which specifies the rules or policies or calculations which govern this claim.", - "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/Agreement.json" + "type": "string", + "format": "uri" } }, "required": ["action"] diff --git a/schemas/Commitment.json b/schemas/Commitment.json index c13c8ca..dea4a25 100644 --- a/schemas/Commitment.json +++ b/schemas/Commitment.json @@ -78,6 +78,11 @@ "type": "string", "format": "date-time" }, + "created": { + "description": "The creation time of the commitment.", + "type": "string", + "format": "date-time" + }, "finished": { "description": "The commitment is complete or not. This is irrespective of if the original goal has been met, and indicates that no more will be done.", "type": "boolean" @@ -108,7 +113,8 @@ }, "agreedIn": { "description": "Reference to an agreement between agents which specifies the rules or policies or calculations which govern this commitment.", - "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/Agreement.json" + "type": "string", + "format": "uri" } }, "required": ["action"] diff --git a/schemas/EconomicEvent.json b/schemas/EconomicEvent.json index 36a88ce..7ef41a1 100644 --- a/schemas/EconomicEvent.json +++ b/schemas/EconomicEvent.json @@ -100,7 +100,8 @@ }, "agreedIn": { "description": "Reference to an agreement between agents which specifies the rules or policies or calculations which govern this economic event.", - "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/Agreement.json" + "type": "string", + "format": "uri" } }, "required": ["action"] diff --git a/schemas/EconomicResource.json b/schemas/EconomicResource.json index 2af40f8..d8c70df 100644 --- a/schemas/EconomicResource.json +++ b/schemas/EconomicResource.json @@ -51,7 +51,7 @@ }, "currentLocation": { "description": "The current place an economic resource is located. Could be at any level of granularity, from a town to an address to a warehouse location. Should be mappable.", - "type": "string" + "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/SpatialThing.json" }, "image": { "description": "The uri to an image relevant to the item, such as a photo, diagram, etc.", diff --git a/schemas/Intent.json b/schemas/Intent.json index f41b3d7..271dc50 100644 --- a/schemas/Intent.json +++ b/schemas/Intent.json @@ -5,6 +5,10 @@ "description": "A planned economic flow, which can lead to economic events (sometimes through commitments).", "type": "object", "properties": { + "name": { + "description": "An informal or formal textual identifier for the intent. Does not imply uniqueness.", + "type": "string" + }, "action": { "description": "Relates an intent to a verb, such as consume, produce, work, improve, etc.", "type": "string" @@ -82,6 +86,11 @@ "description": "The place where an intent occurs. Usually mappable.", "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/SpatialThing.json" }, + "image": { + "description": "The uri to an image relevant to the item, such as a photo, diagram, etc.", + "type": "string", + "format": "uri" + }, "note": { "description": "A textual comment or description.", "type": "string" @@ -96,7 +105,8 @@ }, "agreedIn": { "description": "Reference to an agreement between agents which specifies the rules or policies or calculations which govern this intent.", - "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/Agreement.json" + "type": "string", + "format": "uri" } }, "required": ["action"] diff --git a/schemas/Process.json b/schemas/Process.json index 534aa58..232ff7e 100644 --- a/schemas/Process.json +++ b/schemas/Process.json @@ -49,6 +49,10 @@ "description": "The process with its inputs and outputs is part of the plan.", "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/Plan.json" }, + "nestedIn": { + "description": "The process with its inputs and outputs is part of the scenario.", + "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/Scenario.json" + }, "finished": { "description": "The process is complete or not. This is irrespective of if the original goal has been met, and indicates that no more will be done.", "type": "boolean" diff --git a/schemas/ProposedIntent.json b/schemas/ProposedIntent.json index 7189073..1b7c7d5 100644 --- a/schemas/ProposedIntent.json +++ b/schemas/ProposedIntent.json @@ -16,10 +16,6 @@ "reciprocal": { "description": "This is a reciprocal intent of this proposal, not primary. Not meant to be used for intent matching.", "type": "boolean" - }, - "note": { - "description": "A textual comment or description.", - "type": "string" } }, "required": ["publishes", "publishedIn"] diff --git a/schemas/RecipeFlow.json b/schemas/RecipeFlow.json index 6219d7c..cb615f3 100644 --- a/schemas/RecipeFlow.json +++ b/schemas/RecipeFlow.json @@ -5,10 +5,6 @@ "description": "The specification of a resource inflow to, or outflow from, a recipe process.", "type": "object", "properties": { - "name": { - "description": "An informal or formal textual identifier for the item. Does not imply uniqueness.", - "type": "string" - }, "action": { "description": "Relates a process input or output to a verb, such as consume, produce, work, modify, etc.", "$ref": "https://raw.githubusercontent.com/valueflows/valueflows/master/json-schemas/Action.json"