From 0678c93f1b032d1afe9081797c160e49a3c4c0ae Mon Sep 17 00:00:00 2001
From: henlein <50662522+henlein@users.noreply.github.com>
Date: Mon, 1 Mar 2021 10:20:35 +0100
Subject: [PATCH] Feature Generalisation

Change some SpatialEntities to Entities
(SpatialEntities inherits from Entities)
---
 .../resources/desc/type/IsoSpaceTypeSystem.xml     | 10 +++++-----
 .../resources/desc/type/IsoSpaceV2TypeSystem.xml   | 14 ++++++++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/desc/type/IsoSpaceTypeSystem.xml b/src/main/resources/desc/type/IsoSpaceTypeSystem.xml
index 76961cb28..7099ca28f 100644
--- a/src/main/resources/desc/type/IsoSpaceTypeSystem.xml
+++ b/src/main/resources/desc/type/IsoSpaceTypeSystem.xml
@@ -137,24 +137,24 @@
         <featureDescription>
           <name>beginID</name>
           <description/>
-          <rangeTypeName>org.texttechnologylab.annotation.semaf.isospace.SpatialEntity</rangeTypeName>
+          <rangeTypeName>org.texttechnologylab.annotation.semaf.isospace.Entity</rangeTypeName>
         </featureDescription>
         <featureDescription>
           <name>endID</name>
           <description/>
-          <rangeTypeName>org.texttechnologylab.annotation.semaf.isospace.SpatialEntity</rangeTypeName>
+          <rangeTypeName>org.texttechnologylab.annotation.semaf.isospace.Entity</rangeTypeName>
         </featureDescription>
         <featureDescription>
           <name>midIDs</name>
           <description/>
           <rangeTypeName>uima.cas.FSList</rangeTypeName>
-          <elementType>org.texttechnologylab.annotation.semaf.isospace.SpatialEntity</elementType>
+          <elementType>org.texttechnologylab.annotation.semaf.isospace.Entity</elementType>
         </featureDescription>
         <featureDescription>
           <name>midID_array</name>
           <description/>
           <rangeTypeName>uima.cas.FSArray</rangeTypeName>
-          <elementType>org.texttechnologylab.annotation.semaf.isospace.SpatialEntity</elementType>
+          <elementType>org.texttechnologylab.annotation.semaf.isospace.lEntity</elementType>
         </featureDescription>
       </features>
     </typeDescription>
@@ -187,7 +187,7 @@
          <featureDescription>
           <name>motion_goal</name>
           <description/>
-          <rangeTypeName>org.texttechnologylab.annotation.semaf.isospace.SpatialEntity</rangeTypeName>
+          <rangeTypeName>org.texttechnologylab.annotation.semaf.isospace.Entity</rangeTypeName>
         </featureDescription>
       </features>
     </typeDescription>
diff --git a/src/main/resources/desc/type/IsoSpaceV2TypeSystem.xml b/src/main/resources/desc/type/IsoSpaceV2TypeSystem.xml
index c0e81ba62..34c208892 100644
--- a/src/main/resources/desc/type/IsoSpaceV2TypeSystem.xml
+++ b/src/main/resources/desc/type/IsoSpaceV2TypeSystem.xml
@@ -23,24 +23,24 @@
         <featureDescription>
           <name>startID</name>
           <description/>
-          <rangeTypeName>org.texttechnologylab.annotation.semaf.isospace.SpatialEntity</rangeTypeName>
+          <rangeTypeName>org.texttechnologylab.annotation.semaf.isospace.Entity</rangeTypeName>
         </featureDescription>
         <featureDescription>
           <name>midIDs</name>
           <description/>
           <rangeTypeName>uima.cas.FSList</rangeTypeName>
-          <elementType>org.texttechnologylab.annotation.semaf.isospace.SpatialEntity</elementType>
+          <elementType>org.texttechnologylab.annotation.semaf.isospace.Entity</elementType>
         </featureDescription>
         <featureDescription>
           <name>midID_array</name>
           <description/>
           <rangeTypeName>uima.cas.FSArray</rangeTypeName>
-          <elementType>org.texttechnologylab.annotation.semaf.isospace.SpatialEntity</elementType>
+          <elementType>org.texttechnologylab.annotation.semaf.isospace.Entity</elementType>
         </featureDescription>
         <featureDescription>
           <name>endID</name>
           <description/>
-          <rangeTypeName>org.texttechnologylab.annotation.semaf.isospace.SpatialEntity</rangeTypeName>
+          <rangeTypeName>org.texttechnologylab.annotation.semaf.isospace.Entity</rangeTypeName>
         </featureDescription>
         <featureDescription>
           <name>spatial_relator</name>
@@ -54,6 +54,12 @@
           <rangeTypeName>uima.cas.FSArray</rangeTypeName>
           <elementType>org.texttechnologylab.annotation.semaf.isospace.SpatialSignal</elementType>
         </featureDescription>
+        <featureDescription>
+          <name>spatial_relator_signal_array</name>
+          <description/>
+          <rangeTypeName>uima.cas.FSArray</rangeTypeName>
+          <elementType>org.texttechnologylab.annotation.semaf.isospace.SRelation</elementType>
+        </featureDescription>
       </features>
     </typeDescription>
     <typeDescription>