Merge pull request #48 from thegetty/fix_geometry

fix geometry, rebuild TSV

cromulent/data/crm_vocab.tsv

@@ -164,11 +164,11 @@ P48_has_preferred_identifier	property	preferred_identifier	has preferred identif
 P48i_is_preferred_identifier_of	property	preferred_identifier_of	is preferred identifier of		P1i_identifies	E42_Identifier	E1_CRM_Entity	P48_has_preferred_identifier	10000	0	0
 P49_has_former_or_current_keeper	property	former_or_current_keeper	has former or current keeper	This property identifies the E39 Actor or Actors who have or have had custody of an instance of E18 Physical Thing at\nsome time. This property leaves open the question if parts of this physical thing have\nbeen added or removed during the time-spans it has been under the custody of this\nactor, but it is required that at least a part which can unambiguously be identified as\nrepresenting the whole has been under this custody for its whole time. The way, in\nwhich a representative part is defined, should ensure that it is unambiguous who keeps\na part and who the whole and should be consistent with the identity criteria of the kept\ninstance of E18 Physical Thing.\nThe distinction with P50 has current keeper (is current keeper of) is that P49 has former or current\nkeeper (is former or current keeper of) leaves open the question as to whether the specified keepers are\ncurrent.\nP49 has former or current keeper (is former or current keeper of) is a shortcut for the more detailed\npath from E18 Physical Thing through P30 transferred custody of (custody transferred through), E10\nTransfer of Custody, P28 custody surrendered by (surrendered custody through) or P29 custody\nreceived by (received custody through) to E39 Actor.		E18_Physical_Thing	E39_Actor	P49i_is_former_or_current_keeper_of	10000	0	0
 P49i_is_former_or_current_keeper_of	property	former_or_current_keeper_of	is former or current keeper of			E39_Actor	E18_Physical_Thing	P49_has_former_or_current_keeper	10000	0	0
-P50_has_current_keeper	property	current_keeper	has current keeper	This property identifies the E39 Actor or Actors who had custody of an instance of E18 Physical Thing at the time of validity of the record or database containing the statement that uses this property.\n P50 has current keeper (is current keeper of) is a shortcut for the more detailed path from E18 Physical Thing through P30 transferred custody of (custody transferred through), E10 Transfer of Custody, P29 custody received by (received custody through) to E39 Actor.	P49_has_former_or_current_keeper	E18_Physical_Thing	E39_Actor	P50i_is_current_keeper_of	10000	1	0
+P50_has_current_keeper	property	current_keeper	has current keeper	This property identifies the E39 Actor or Actors who had custody of an instance of E18 Physical Thing at the time of validity of the record or database containing the statement that uses this property.\n P50 has current keeper (is current keeper of) is a shortcut for the more detailed path from E18 Physical Thing through P30 transferred custody of (custody transferred through), E10 Transfer of Custody, P29 custody received by (received custody through) to E39 Actor.	P49_has_former_or_current_keeper	E18_Physical_Thing	E39_Actor	P50i_is_current_keeper_of	10000	1	1
 P50i_is_current_keeper_of	property	current_keeper_of	is current keeper of		P49i_is_former_or_current_keeper_of	E39_Actor	E18_Physical_Thing	P50_has_current_keeper	10000	1	1
 P51_has_former_or_current_owner	property	former_or_current_owner	has former or current owner	This property identifies the E39 Actor that is or has been the legal owner (i.e. title holder) of an instance of E18 Physical Thing at some time.\nThe distinction with P52 has current owner (is current owner of) is that P51 has former or current owner (is former or current owner of) does not indicate whether the specified owners are current. P51 has former or current owner (is former or current owner of) is a shortcut for the more detailed path from E18 Physical Thing through P24 transferred title of (changed ownership through), E8 Acquisition, P23 transferred title from (surrendered title through), or P22 transferred title to (acquired title through) to E39 Actor.		E18_Physical_Thing	E39_Actor	P51i_is_former_or_current_owner_of	10000	0	0
 P51i_is_former_or_current_owner_of	property	former_or_current_owner_of	is former or current owner of			E39_Actor	E18_Physical_Thing	P51_has_former_or_current_owner	10000	0	0
-P52_has_current_owner	property	current_owner	has current owner	This property identifies the E21 Person, E74 Group or E40 Legal Body that was the owner of an instance of E18 Physical Thing at the time of validity of the record or database containing the statement that uses this property.\nP52 has current owner (is current owner of) is a shortcut for the more detailed path from E18 Physical Thing through P24 transferred title of (changed ownership through), E8 Acquisition, P22 transferred title to (acquired title through) to E39 Actor, if and only if this acquisition event is the most recent.	P51_has_former_or_current_owner	E18_Physical_Thing	E39_Actor	P52i_is_current_owner_of	10000	1	0
+P52_has_current_owner	property	current_owner	has current owner	This property identifies the E21 Person, E74 Group or E40 Legal Body that was the owner of an instance of E18 Physical Thing at the time of validity of the record or database containing the statement that uses this property.\nP52 has current owner (is current owner of) is a shortcut for the more detailed path from E18 Physical Thing through P24 transferred title of (changed ownership through), E8 Acquisition, P22 transferred title to (acquired title through) to E39 Actor, if and only if this acquisition event is the most recent.	P51_has_former_or_current_owner	E18_Physical_Thing	E39_Actor	P52i_is_current_owner_of	10000	1	1
 P52i_is_current_owner_of	property	current_owner_of	is current owner of		P51i_is_former_or_current_owner_of	E39_Actor	E18_Physical_Thing	P52_has_current_owner	10000	1	1
 P53_has_former_or_current_location	property	former_or_current_location	has former or current location	This property allows an instance of E53 Place to be associated as the former or current location of an instance of E18 Physical Thing.\nIn the case of E19 Physical Objects, the property does not allow any indication of the Time-Span during which the Physical Object was located at this Place, nor if this is the current location.\nIn the case of immobile objects, the Place would normally correspond to the Place of creation.\nP53 has former or current location (is former or current location of) is a shortcut. A more detailed representation can make use of the fully developed (i.e. indirect) path from E19 Physical Object through P25 moved (moved by), E9 Move, P26 moved to (was destination of) or P27 moved from (was origin of) to E53 Place.		E18_Physical_Thing	E53_Place	P53i_is_former_or_current_location_of	10000	0	0
 P53i_is_former_or_current_location_of	property	former_or_current_location_of	is former or current location of			E53_Place	E18_Physical_Thing	P53_has_former_or_current_location	10000	0	0
@@ -412,7 +412,7 @@ la:has_member	property	member	has member			la:Set	E1_CRM_Entity	https://linked.a
 la:member_of	property	member_of	member of			E1_CRM_Entity	la:Set	https://linked.art/ns/terms/has_member	10000	1	1
 la:related_to	property	related_to	related to			la:Relationship	E1_CRM_Entity		10000	1	0
 la:related_from	property	related_from	related from			la:Relationship	E1_CRM_Entity		10000	1	0
-geo:SP5_Geometric_Place_Expression	class	Geometry	Geometry	Scope note: This class comprises definitions of places by quantitative expressions. An instance of SP5 Geometric Place Expression can be seen as a prescription of how to find the location meant by this expression in the real world (S), which is based on measuring where the quantities referred to in the expression lead to, beginning from the reference points of the respective reference system.	E73_Information_Object|E47_Spatial_Coordinates	1
+geo:SP5_Geometric_Place_Expression	class	Geometry	Geometry	Scope note: This class comprises definitions of places by quantitative expressions. An instance of SP5 Geometric Place Expression can be seen as a prescription of how to find the location meant by this expression in the real world (S), which is based on measuring where the quantities referred to in the expression lead to, beginning from the reference points of the respective reference system.	E41_Appellation	1
 geo:SP4_Spatial_Coordinate_Reference_System	class	CoordinateSystem	Spatial Coordinate Reference System	Scope note: This class compromises systems that are used to describe locations in a SP3 Reference Space (S). An instance of SP4 Spatial Coordinate Reference System is composed of two parts: The first is a Coordinate System which is a set of coordinate axes with specified units of measurement and axis directions. The second part is a set of reference features at rest in the Reference Space it describes in the real world that relate the Coordinate System to real world locations (U) and fix it with respect to the reference object of its Reference Space.	E29_Design_or_Procedure	1
 geo:Q9_is_expressed_in_terms_of	property	Q9_is_expressed_in_terms_of	expressed in terms of	Scope note:        This property defines the coordinate reference system in terms of which a geometric place expression is formulated.		geo:SP5_Geometric_Place_Expression	geo:SP4_Spatial_Coordinate_Reference_System	http://www.ics.forth.gr/isl/CRMgeo/Q9i_terms_express	10000	1	0
 geo:Q9i_terms_express	property	Q9i_terms_express	terms express			geo:SP4_Spatial_Coordinate_Reference_System	geo:SP5_Geometric_Place_Expression	http://www.ics.forth.gr/isl/CRMgeo/Q9_is_expressed_in_terms_of	10000	1	0
@@ -425,5 +425,5 @@ skos:closeMatch	property	close_match	closeMatch	Close Match, good for some uses
 rdfs:seeAlso	property	see_also	seeAlso	A related resource, that is machine readable and related to the current resource.		E1_CRM_Entity	E73_Information_Object		10000	1	1
 dcterms:relation	property	related	relation	Related resources, with no further similarity semantics defined		E1_CRM_Entity	E1_CRM_Entity		10000	1	1
 schema:genre	property	style	genre	Shortcut for Genre or Style		E73_Information_Object	E55_Type		10000	1	1
-dcterms:conformsTo	property	conforms_to	conformsTo	Some thing conforms to some standard		E71_Man-Made_Thing	E73_Information_Object		10000	1	0
+dcterms:conformsTo	property	conforms_to	conformsTo	Some thing conforms to some standard		E71_Man-Made_Thing	E73_Information_Object		10000	1	1
 dc:format	property	format	format	The media type of the information object		E73_Information_Object	xsd:string		10000	1	0

tests/test_model.py

@@ -299,10 +299,14 @@ def test_multiplicity(self):
 		model.factory.process_multiplicity = True
 		who = model.Actor()
 		mmo = model.ManMadeObject()
+		prod = model.Production()
+		mmo.produced_by = prod
 		who.current_owner_of = mmo
 		mmo.current_owner = who
-		self.assertEqual(mmo.current_owner, who)
+		self.assertEqual(mmo.current_owner, [who])
 		self.assertEqual(who.current_owner_of, [mmo])		
+		self.assertEqual(mmo.produced_by, prod)
+
 
 
 
@@ -383,6 +387,5 @@ def test_validate_multiplicity(self):
 		self.assertEqual(who.born, [b1, b2])
 
 
-
 if __name__ == '__main__':
 	unittest.main()

utils/data/linkedart_crm_enhancements.xml

@@ -6,8 +6,10 @@
   <rdfs:Class rdf:about="http://www.ics.forth.gr/isl/CRMgeo/SP5_Geometric_Place_Expression">
     <rdfs:label xml:lang="en">Geometry</rdfs:label>
     <rdfs:comment>Scope note: This class comprises definitions of places by quantitative expressions. An instance of SP5 Geometric Place Expression can be seen as a prescription of how to find the location meant by this expression in the real world (S), which is based on measuring where the quantities referred to in the expression lead to, beginning from the reference points of the respective reference system.</rdfs:comment>
-    <rdfs:subClassOf rdf:resource="E73_Information_Object"/>
-    <rdfs:subClassOf rdf:resource="E47_Spatial_Coordinates"/>
+    <!-- This subclass is derived from P168 being a subProperty of P1 -->
+    <!-- Thus, for P168 to refer to an SP5, it must at least be an E41 -->
+    <!-- Decision in Berlin, Nov 2018, 42nd Mtg of SIG -->
+    <rdfs:subClassOf rdf:resource="E41_Appellation"/>
   </rdfs:Class>
 
   <rdfs:Class rdf:about="http://www.ics.forth.gr/isl/CRMgeo/SP4_Spatial_Coordinate_Reference_System">