From dd409fd77d364ffe2db427b0fbb3c0ecbc30dd9e Mon Sep 17 00:00:00 2001 From: Lynn Foster Date: Sun, 28 Nov 2021 13:29:20 -0600 Subject: [PATCH 1/2] add toLocation to EconomicEvent --- lib/schemas/bridging/observation.geolocation.gql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/schemas/bridging/observation.geolocation.gql b/lib/schemas/bridging/observation.geolocation.gql index 4bb99b0..212d4f4 100644 --- a/lib/schemas/bridging/observation.geolocation.gql +++ b/lib/schemas/bridging/observation.geolocation.gql @@ -12,6 +12,9 @@ type EconomicEvent { "The place where an economic event occurs. Usually mappable." atLocation: SpatialThing + + "The new location of the receiver resource." + toLocation: SpatialThing } type EconomicResource { -- GitLab From 9ec16d34b3ac88a1bfb91822a69e7d2ce9347b72 Mon Sep 17 00:00:00 2001 From: pospi Date: Sun, 12 Dec 2021 10:08:19 +1000 Subject: [PATCH 2/2] fix geolocation parameters being present in records without geo module enabled --- lib/schemas/agent.gql | 12 ----------- lib/schemas/bridging/agent.geolocation.gql | 20 +++++++++++++++++++ .../bridging/observation.geolocation.gql | 13 ++++++++++++ lib/schemas/bridging/planning.geolocation.gql | 20 +++++++++++++++++++ lib/schemas/bridging/proposal.geolocation.gql | 10 ++++++++++ lib/schemas/observation.gql | 6 ------ lib/schemas/planning.gql | 12 ----------- lib/schemas/proposal.gql | 6 ------ 8 files changed, 63 insertions(+), 36 deletions(-) diff --git a/lib/schemas/agent.gql b/lib/schemas/agent.gql index 74608fe..2bd8b9c 100644 --- a/lib/schemas/agent.gql +++ b/lib/schemas/agent.gql @@ -159,9 +159,6 @@ input AgentCreateParams { # implements AgentParams "The uri to an image relevant to the agent, such as a logo, avatar, photo, etc." image: URI - "(`SpatialThing`) 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." - primaryLocation: ID - "A textual description or comment." note: String } @@ -175,9 +172,6 @@ input AgentUpdateParams { # implements UpdateParams & AgentParams "The uri to an image relevant to the agent, such as a logo, avatar, photo, etc." image: URI - "(`SpatialThing`) 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." - primaryLocation: ID - "A textual description or comment." note: String } @@ -190,9 +184,6 @@ input OrganizationCreateParams { # implements AgentParams "The uri to an image relevant to the agent, such as a logo, avatar, photo, etc." image: URI - "(`SpatialThing`) 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." - primaryLocation: ID - "References one or more concepts in a common taxonomy or other classification scheme for purposes of categorization or grouping." classifiedAs: [URI!] @@ -209,9 +200,6 @@ input OrganizationUpdateParams { # implements UpdateParams & AgentParams "The uri to an image relevant to the agent, such as a logo, avatar, photo, etc." image: URI - "(`SpatialThing`) 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." - primaryLocation: ID - "References one or more concepts in a common taxonomy or other classification scheme for purposes of categorization or grouping." classifiedAs: [URI!] diff --git a/lib/schemas/bridging/agent.geolocation.gql b/lib/schemas/bridging/agent.geolocation.gql index da1df58..13546bd 100644 --- a/lib/schemas/bridging/agent.geolocation.gql +++ b/lib/schemas/bridging/agent.geolocation.gql @@ -25,3 +25,23 @@ type Organization implements Agent { type SpatialThing { agents: [Agent!] } + +input AgentCreateParams { + "(`SpatialThing`) 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." + primaryLocation: ID +} + +input AgentUpdateParams { + "(`SpatialThing`) 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." + primaryLocation: ID +} + +input OrganizationCreateParams { + "(`SpatialThing`) 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." + primaryLocation: ID +} + +input OrganizationUpdateParams { + "(`SpatialThing`) 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." + primaryLocation: ID +} diff --git a/lib/schemas/bridging/observation.geolocation.gql b/lib/schemas/bridging/observation.geolocation.gql index 212d4f4..2fef8ac 100644 --- a/lib/schemas/bridging/observation.geolocation.gql +++ b/lib/schemas/bridging/observation.geolocation.gql @@ -26,3 +26,16 @@ type SpatialThing { economicResources: [EconomicResource!] economicEvents: [EconomicEvent!] } + +input EconomicEventCreateParams { + "(`SpatialThing`) The place where an economic event occurs. Usually mappable." + atLocation: ID + + "(`SpatialThing`) The new location of the receiver resource." + toLocation: ID +} + +input EconomicResourceCreateParams { + "(`SpatialThing`) 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. Usually mappable." + currentLocation: ID +} diff --git a/lib/schemas/bridging/planning.geolocation.gql b/lib/schemas/bridging/planning.geolocation.gql index 369dc7b..ec8f4bf 100644 --- a/lib/schemas/bridging/planning.geolocation.gql +++ b/lib/schemas/bridging/planning.geolocation.gql @@ -23,3 +23,23 @@ type SpatialThing { commitments: [Commitment!] intents: [Intent!] } + +input IntentCreateParams { + "(`SpatialThing`) The place where an intent occurs. Usually mappable." + atLocation: ID +} + +input IntentUpdateParams { + "(`SpatialThing`) The place where an intent occurs. Usually mappable." + atLocation: ID +} + +input CommitmentCreateParams { + "(`SpatialThing`) The place where an commitment occurs. Usually mappable." + atLocation: ID +} + +input CommitmentUpdateParams { + "(`SpatialThing`) The place where an commitment occurs. Usually mappable." + atLocation: ID +} diff --git a/lib/schemas/bridging/proposal.geolocation.gql b/lib/schemas/bridging/proposal.geolocation.gql index de7d4c0..7801a1b 100644 --- a/lib/schemas/bridging/proposal.geolocation.gql +++ b/lib/schemas/bridging/proposal.geolocation.gql @@ -13,3 +13,13 @@ type Proposal { "Location or area where the proposal is valid." eligibleLocation: SpatialThing } + +input ProposalCreateParams { + "(`SpatialThing`) The location at which this proposal is eligible." + eligibleLocation: ID +} + +input ProposalUpdateParams { + "(`SpatialThing`) The location at which this proposal is eligible." + eligibleLocation: ID +} diff --git a/lib/schemas/observation.gql b/lib/schemas/observation.gql index 99e8d55..b026bd2 100644 --- a/lib/schemas/observation.gql +++ b/lib/schemas/observation.gql @@ -226,9 +226,6 @@ input EconomicEventCreateParams { "The amount and unit of the work or use or citation effort-based action. This is often a time duration, but also could be cycle counts or other measures of effort or usefulness." effortQuantity: IMeasure - "(`SpatialThing`) The place where an economic event occurs. Usually mappable." - atLocation: ID - "The beginning of the economic event." hasBeginning: DateTime @@ -304,9 +301,6 @@ input EconomicResourceCreateParams { "(`EconomicResource`) Used when a stock economic resource contains items also defined as economic resources." containedIn: ID - "(`SpatialThing`) 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. Usually mappable." - currentLocation: ID - "A textual description or comment." note: String } diff --git a/lib/schemas/planning.gql b/lib/schemas/planning.gql index 6c099bb..8f04589 100644 --- a/lib/schemas/planning.gql +++ b/lib/schemas/planning.gql @@ -258,9 +258,6 @@ input IntentCreateParams { "Grouping around something to create a boundary or context, used for documenting, accounting, planning." inScopeOf: [ID!] - "(`SpatialThing`) The place where an intent occurs. Usually mappable." - atLocation: ID - "Reference to an agreement between agents which specifies the rules or policies or calculations which govern this intent." agreedIn: URI @@ -325,9 +322,6 @@ input IntentUpdateParams { "Grouping around something to create a boundary or context, used for documenting, accounting, planning." inScopeOf: [ID!] - "(`SpatialThing`) The place where an intent occurs. Usually mappable." - atLocation: ID - "Reference to an agreement between agents which specifies the rules or policies or calculations which govern this intent." agreedIn: URI } @@ -387,9 +381,6 @@ input CommitmentCreateParams { "(`Plan`) Represents a desired deliverable expected from this plan." independentDemandOf: ID - "(`SpatialThing`) The place where an commitment occurs. Usually mappable." - atLocation: ID - "Reference to an agreement between agents which specifies the rules or policies or calculations which govern this commitment." agreedIn: URI @@ -445,9 +436,6 @@ input CommitmentUpdateParams { "(`Plan`) Represents a desired deliverable expected from this plan." independentDemandOf: ID - "(`SpatialThing`) The place where an commitment occurs. Usually mappable." - atLocation: ID - "Reference to an agreement between agents which specifies the rules or policies or calculations which govern this commitment." agreedIn: URI diff --git a/lib/schemas/proposal.gql b/lib/schemas/proposal.gql index ac3b1fc..60f77c9 100644 --- a/lib/schemas/proposal.gql +++ b/lib/schemas/proposal.gql @@ -73,9 +73,6 @@ input ProposalCreateParams { "The end time of proposal publication." hasEnd: DateTime - "(`SpatialThing`) The location at which this proposal is eligible." - eligibleLocation: ID - "Grouping around something to create a boundary or context, used for documenting, accounting, planning." inScopeOf: [ID!] @@ -101,9 +98,6 @@ input ProposalUpdateParams { "The end time of proposal publication." hasEnd: DateTime - "(`SpatialThing`) The location at which this proposal is eligible." - eligibleLocation: ID - "Grouping around something to create a boundary or context, used for documenting, accounting, planning." inScopeOf: [ID!] -- GitLab