namespace refactoring and cleanup

2 files changed, 18 insertions, 18 deletions

diff --git a/bsie/extractor/image/colors_spatial.py b/bsie/extractor/image/colors_spatial.py
index 34cd615..e6661a9 100644
--- a/bsie/extractor/image/colors_spatial.py
+++ b/bsie/extractor/image/colors_spatial.py
@@ -14,8 +14,7 @@ from bsie.utils import bsfs, node, ns
 from .. import base
 
 # constants
-FEATURE_NAME = ns.bsf + 'ColorsSpatial'
-PREDICATE_NAME = ns.bse + 'colors_spatial'
+FEATURE_NAME = ns.bsf.ColorsSpatial()
 
 # exports
 __all__: typing.Sequence[str] = (
@@ -58,16 +57,17 @@ class ColorsSpatial(base.Extractor):
             'exp': exp,
             })
         # determine symbol names
-        instance_name = FEATURE_NAME[uuid]
-        predicate_name = PREDICATE_NAME[uuid]
+        instance_name = getattr(FEATURE_NAME, uuid)
+        predicate_name = getattr(ns.bse, 'colors_spatial_' + uuid)
         # get vector dimension
         dimension = self.dimension(width, height, exp)
         # initialize parent with the schema
         super().__init__(bsfs.schema.from_string(base.SCHEMA_PREAMBLE + f'''
-            <{FEATURE_NAME}> rdfs:subClassOf bsfs:Feature ;
+            <{FEATURE_NAME}> rdfs:subClassOf bsa:Feature ;
                 # annotations
                 rdfs:label "Spatially dominant colors"^^xsd:string ;
                 schema:description "Domiant colors of subregions in an image."^^xsd:string ;
+                bsfs:distance <https://schema.bsfs.io/core/distance#euclidean> ;
                 bsfs:dtype xsd:integer .
 
             <{instance_name}> rdfs:subClassOf <{FEATURE_NAME}> ;
@@ -78,7 +78,7 @@ class ColorsSpatial(base.Extractor):
                 <{FEATURE_NAME}/args#exp> "{exp}"^^xsd:float .
 
             <{predicate_name}> rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range <{instance_name}> ;
                 bsfs:unique "true"^^xsd:boolean .
 
diff --git a/bsie/extractor/image/photometrics.py b/bsie/extractor/image/photometrics.py
index c5254ab..42eb3c8 100644
--- a/bsie/extractor/image/photometrics.py
+++ b/bsie/extractor/image/photometrics.py
@@ -41,51 +41,51 @@ class Exif(base.Extractor):
     def __init__(self):
         super().__init__(bsfs.schema.from_string(base.SCHEMA_PREAMBLE + '''
             #bse:t_capture rdfs:subClassOf bsfs:Predicate ;
-            #    rdfs:domain bsfs:File ;
+            #    rdfs:domain bsn:Entity ;
             #    rdfs:range xsd:float ;
             #    bsfs:unique "true"^^xsd:boolean .
             bse:exposure rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:float ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:aperture rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:float ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:iso rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:integer ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:focal_length rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:float ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:width rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:integer ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:height rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:integer ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:orientation rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:integer ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:orientation_label rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:string ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:altitude rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:float ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:latitude rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:float ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:longitude rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:File ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:float ;
                 bsfs:unique "true"^^xsd:boolean .
             '''))