Merge pull request #29 from thegetty/phase

Phase
thegetty · Sep 5, 2018 · 95b583b · 95b583b
2 parents 2676e86 + e4e3244
commit 95b583b
Show file tree

Hide file tree

Showing 9 changed files with 451 additions and 220 deletions.
diff --git a/cromulent/data/cidoc-extension.json b/cromulent/data/cidoc-extension.json
@@ -14,18 +14,6 @@
       "@context": {}, 
       "@id": "crm:E3_Condition_State"
     }, 
-    "Period": {
-      "@context": {}, 
-      "@id": "crm:E4_Period"
-    }, 
-    "Event": {
-      "@context": {}, 
-      "@id": "crm:E5_Event"
-    }, 
-    "Destruction": {
-      "@context": {}, 
-      "@id": "crm:E6_Destruction"
-    }, 
     "Move": {
       "@context": {}, 
       "@id": "crm:E9_Move"
@@ -149,23 +137,7 @@
     "Date": {
       "@context": {}, 
       "@id": "crm:E50_Date"
-    }, 
-    "ContactPoint": {
-      "@context": {}, 
-      "@id": "crm:E51_Contact_Point"
-    }, 
-    "Birth": {
-      "@context": {}, 
-      "@id": "crm:E67_Birth"
-    }, 
-    "Dissolution": {
-      "@context": {}, 
-      "@id": "crm:E68_Dissolution"
-    }, 
-    "Death": {
-      "@context": {}, 
-      "@id": "crm:E69_Death"
-    }, 
+    },  
     "Thing": {
       "@context": {}, 
       "@id": "crm:E70_Thing"
@@ -517,13 +489,23 @@
     "current_or_former_residence_of": {
       "@id": "crm:P74i_is_current_or_former_residence_of", 
       "@type": "@id"
+    },  
+    "brought_into_existence": {
+      "@id": "crm:P92_brought_into_existence", 
+      "@type": "@id", 
+      "@container": "@set"
     }, 
-    "contact_point": {
-      "@id": "crm:P76_has_contact_point", 
+    "brought_into_existence_by": {
+      "@id": "crm:P92i_was_brought_into_existence_by", 
       "@type": "@id"
     }, 
-    "provides_access_to": {
-      "@id": "crm:P76i_provides_access_to", 
+    "took_out_of_existence": {
+      "@id": "crm:P93_took_out_of_existence", 
+      "@type": "@id", 
+      "@container": "@set"
+    }, 
+    "taken_out_of_existence_by": {
+      "@id": "crm:P93i_was_taken_out_of_existence_by", 
       "@type": "@id"
     }, 
     "time_identified_by": {
@@ -593,30 +575,7 @@
       "@id": "crm:P97i_was_father_for", 
       "@type": "@id"
     }, 
-    "brought_into_life": {
-      "@id": "crm:P98_brought_into_life", 
-      "@type": "@id"
-    }, 
-    "born": {
-      "@id": "crm:P98i_was_born", 
-      "@type": "@id"
-    }, 
-    "dissolved": {
-      "@id": "crm:P99_dissolved", 
-      "@type": "@id"
-    }, 
-    "dissolved_by": {
-      "@id": "crm:P99i_was_dissolved_by", 
-      "@type": "@id"
-    }, 
-    "death_of": {
-      "@id": "crm:P100_was_death_of", 
-      "@type": "@id"
-    }, 
-    "died_in": {
-      "@id": "crm:P100i_died_in", 
-      "@type": "@id"
-    }, 
+
     "as_general_use": {
       "@id": "crm:P101_had_as_general_use", 
       "@type": "@id"

diff --git a/cromulent/data/crm-profile.json b/cromulent/data/crm-profile.json
@@ -40,7 +40,7 @@
   "E47_Spatial_Coordinates": 0, 
   "E48_Place_Name": 0, 
   "E49_Time_Appellation": 0, 
-  "E4_Period": 2, 
+  "E4_Period": 1, 
   "E50_Date": 0, 
   "E51_Contact_Point": 1, 
   "E52_Time-Span": 1, 
@@ -50,15 +50,15 @@
   "E56_Language": 1, 
   "E57_Material": 1, 
   "E58_Measurement_Unit": 1, 
-  "E5_Event": 2, 
-  "E63_Beginning_of_Existence": 1, 
-  "E64_End_of_Existence": 1, 
+  "E5_Event": 1, 
+  "E63_Beginning_of_Existence": 2, 
+  "E64_End_of_Existence": 2, 
   "E65_Creation": 1, 
   "E66_Formation": 1, 
-  "E67_Birth": 0, 
-  "E68_Dissolution": 0, 
-  "E69_Death": 0, 
-  "E6_Destruction": 0, 
+  "E67_Birth": 1, 
+  "E68_Dissolution": 1, 
+  "E69_Death": 1, 
+  "E6_Destruction": 1, 
   "E70_Thing": 0, 
   "E71_Man-Made_Thing": 0, 
   "E72_Legal_Object": 0, 
@@ -86,18 +86,18 @@
   "E97_Monetary_Amount": 1, 
   "E98_Currency": 1, 
   "E9_Move": 1,
-  "crmgeo:SP5_Geometric_Place_Expression": 1,
-  "crmgeo:SP4_Spatial_Coordinate_Reference_System": 1, 
+  "geo:SP5_Geometric_Place_Expression": 1,
+  "geo:SP4_Spatial_Coordinate_Reference_System": 1,
+  "geo:SP6_Declarative_Place": 1,
+  "la:Phase": 1, 
   "la:Name": 1,
-  "la:EndingActivity": 1,
-  "la:TransformingActivity": 1,
   "la:PropertyInterest": 1,
   "la:Payment": 1, 
   "la:Relationship": 1,
   "ore:Aggregation": 1,
   "ore:Proxy": 1,
-  "P100_was_death_of": 0, 
-  "P100i_died_in": 0, 
+  "P100_was_death_of": [1,0], 
+  "P100i_died_in": [1,0], 
   "P101_had_as_general_use": 0, 
   "P101i_was_use_of": 0, 
   "P102_has_title": 0, 
@@ -176,8 +176,8 @@
   "P138_represents": [1,1], 
   "P138i_has_representation": [1,1], 
   "P139_has_alternative_form": [1,1], 
-  "P13_destroyed": 0, 
-  "P13i_was_destroyed_by": 0, 
+  "P13_destroyed": [1,0], 
+  "P13i_was_destroyed_by": [1,0], 
   "P140_assigned_attribute_to": [1,0], 
   "P140i_was_attributed_by": [1,1], 
   "P141_assigned": [1,0], 
@@ -401,6 +401,15 @@
   "la:interest_part_of": [1,0],
   "la:related_to": [1,0],
   "la:related_from": [1,0],
+  "la:initiated": [1,1],
+  "la:initiated_by": [1,1],
+  "la:terminated": [1,1],
+  "la:terminated_by": [1,1],
+  "la:has_phase": [1,1],
+  "la:phase_of": [1,0],
+  "la:related_entity": [1,0],
+  "la:related_entity_of": [1,1],
+  "la:relationship": [1,0],
   "rdf:value": [1,0],
   "rdfs:seeAlso": [1,1], 
   "rdfs:label": [1,0], 
@@ -409,5 +418,11 @@
   "ore:aggregates": [1,1],
   "ore:isAggregatedBy": [1,1],
   "ore:proxyIn": [1,0],
-  "ore:proxyFor": [1,0]
+  "ore:proxyFor": [1,0],
+  "geo:Q9_is_expressed_in_terms_of": [1,0],
+  "geo:Q9i_terms_express": [1,0],
+  "geo:Q11_approximates": [1,0],
+  "geo:Q11i_is_approximated_by": [1,1],
+  "sci:O13_triggers": [1,1],
+  "sci:O13i_is_triggered_by": [1,1]
 }