Merge branch 'refs/heads/develop' into feature/femcare-import

Author: BernhardKoschicek

install/4_data_type.sql

@@ -193,38 +193,6 @@ INSERT INTO model.link (property_code, range_id, domain_id) VALUES
   ('P127', (SELECT id FROM model.entity WHERE name='Human remains' AND cidoc_class_code = 'E55'), (SELECT id FROM model.entity WHERE name='Upper Body')),
   ('P127', (SELECT id FROM model.entity WHERE name='Human remains' AND cidoc_class_code = 'E55'), (SELECT id FROM model.entity WHERE name='Lower Body'));
 
-INSERT INTO model.entity (cidoc_class_code, openatlas_class_name, name, description) VALUES
-  ('E53', 'administrative_unit', 'Administrative unit', 'Hierarchy of administrative units like "Austria", "Germany", "Italy" and their respective subunits like "Lower Austria", "Styria" and their subunits etc.'),
-  ('E53', 'administrative_unit', 'Austria', Null),
-  ('E53', 'administrative_unit', 'Wien', Null),
-  ('E53', 'administrative_unit', 'Niederösterreich', Null),
-  ('E53', 'administrative_unit', 'Germany', Null),
-  ('E53', 'administrative_unit', 'Italy', Null),
-  ('E53', 'administrative_unit', 'Czech Republic', Null),
-  ('E53', 'administrative_unit', 'Slovakia', Null),
-  ('E53', 'administrative_unit', 'Slovenia', Null);
-INSERT INTO model.link (property_code, range_id, domain_id) VALUES
-  ('P89', (SELECT id FROM model.entity WHERE name='Administrative unit'), (SELECT id FROM model.entity WHERE name='Austria')),
-  ('P89', (SELECT id FROM model.entity WHERE name='Administrative unit'), (SELECT id FROM model.entity WHERE name='Italy')),
-  ('P89', (SELECT id FROM model.entity WHERE name='Administrative unit'), (SELECT id FROM model.entity WHERE name='Germany')),
-  ('P89', (SELECT id FROM model.entity WHERE name='Administrative unit'), (SELECT id FROM model.entity WHERE name='Czech Republic')),
-  ('P89', (SELECT id FROM model.entity WHERE name='Administrative unit'), (SELECT id FROM model.entity WHERE name='Slovakia')),
-  ('P89', (SELECT id FROM model.entity WHERE name='Administrative unit'), (SELECT id FROM model.entity WHERE name='Slovenia')),
-  ('P89', (SELECT id FROM model.entity WHERE name='Austria'), (SELECT id FROM model.entity WHERE name='Wien')),
-  ('P89', (SELECT id FROM model.entity WHERE name='Austria'), (SELECT id FROM model.entity WHERE name='Niederösterreich'));
-
-INSERT INTO model.entity (cidoc_class_code, openatlas_class_name, name, description) VALUES
-  ('E53', 'administrative_unit', 'Historical place', 'Hierarchy of historical places respectively historical administrative units like: Duchy of Bavaria, Lombard Kingdom etc.'),
-  ('E53', 'administrative_unit', 'Carantania', Null),
-  ('E53', 'administrative_unit', 'Marcha Orientalis', Null),
-  ('E53', 'administrative_unit', 'Comitatus Iauntal', Null),
-  ('E53', 'administrative_unit', 'Kingdom of Serbia', Null);
-INSERT INTO model.link (property_code, range_id, domain_id) VALUES
-  ('P89', (SELECT id FROM model.entity WHERE name='Historical place'), (SELECT id FROM model.entity WHERE name='Carantania')),
-  ('P89', (SELECT id FROM model.entity WHERE name='Historical place'), (SELECT id FROM model.entity WHERE name='Marcha Orientalis')),
-  ('P89', (SELECT id FROM model.entity WHERE name='Historical place'), (SELECT id FROM model.entity WHERE name='Comitatus Iauntal')),
-  ('P89', (SELECT id FROM model.entity WHERE name='Historical place'), (SELECT id FROM model.entity WHERE name='Kingdom of Serbia'));
-
 INSERT INTO model.entity (cidoc_class_code, openatlas_class_name, name) VALUES
   ('E55', 'type', 'Source translation'),
   ('E55', 'type', 'Original Text'),
@@ -340,7 +308,6 @@ INSERT INTO model.link (property_code, domain_id, range_id) VALUES
 INSERT INTO web.hierarchy (id, name, category, multiple, directional) VALUES
   ((SELECT id FROM model.entity WHERE name='Actor function'), 'Actor function', 'standard', False, False),
   ((SELECT id FROM model.entity WHERE name='Actor relation'), 'Actor relation', 'standard', False, True),
-  ((SELECT id FROM model.entity WHERE name='Administrative unit'), 'Administrative unit', 'place', True, False),
   ((SELECT id FROM model.entity WHERE name='Artifact'), 'Artifact', 'standard', False, False),
   ((SELECT id FROM model.entity WHERE name='Bibliography'), 'Bibliography', 'standard', False, False),
   ((SELECT id FROM model.entity WHERE name='Dimensions'), 'Dimensions', 'value', True, False),
@@ -350,7 +317,6 @@ INSERT INTO web.hierarchy (id, name, category, multiple, directional) VALUES
   ((SELECT id FROM model.entity WHERE name='External reference match'), 'External reference match', 'system', False, False),
   ((SELECT id FROM model.entity WHERE name='Feature'), 'Feature', 'standard', False, False),
   ((SELECT id FROM model.entity WHERE name='Features for sexing'), 'Features for sexing', 'tools', False, False),
-  ((SELECT id FROM model.entity WHERE name='Historical place'), 'Historical place', 'place', True, False),
   ((SELECT id FROM model.entity WHERE name='Human remains' AND cidoc_class_code = 'E55'), 'Human remains', 'standard', False, False),
   ((SELECT id FROM model.entity WHERE name='Involvement'), 'Involvement', 'standard', False, False),
   ((SELECT id FROM model.entity WHERE name='License'), 'License', 'standard', False, False),
@@ -386,7 +352,6 @@ INSERT INTO model.openatlas_class (name, cidoc_class_code, new_types_allowed, wr
   ('stratigraphic_unit',   'E18', true,  'contributor', (SELECT id FROM model.entity WHERE name = 'Stratigraphic unit' AND cidoc_class_code = 'E55' ORDER BY id ASC LIMIT 1));
 
 INSERT INTO web.hierarchy_openatlas_class (hierarchy_id, openatlas_class_name) VALUES
-  ((SELECT id FROM web.hierarchy WHERE name='Administrative unit'), 'place'),
   ((SELECT id FROM web.hierarchy WHERE name='Artifact'), 'artifact'),
   ((SELECT id FROM web.hierarchy WHERE name='Bibliography'), 'bibliography'),
   ((SELECT id FROM web.hierarchy WHERE name='Dimensions'), 'artifact'),
@@ -398,7 +363,6 @@ INSERT INTO web.hierarchy_openatlas_class (hierarchy_id, openatlas_class_name) V
   ((SELECT id FROM web.hierarchy WHERE name='Event'), 'production'),
   ((SELECT id FROM web.hierarchy WHERE name='External reference'), 'external_reference'),
   ((SELECT id FROM web.hierarchy WHERE name='Feature'), 'feature'),
-  ((SELECT id FROM web.hierarchy WHERE name='Historical place'), 'place'),
   ((SELECT id FROM web.hierarchy WHERE name='Human remains'), 'human_remains'),
   ((SELECT id FROM web.hierarchy WHERE name='License'), 'file'),
   ((SELECT id FROM web.hierarchy WHERE name='Place'), 'place'),

install/data_test.sql

@@ -40,3 +40,21 @@ UPDATE web.settings SET value = 'https://frontend-demo.openatlas.eu/entity/' WHE
 INSERT INTO web.hierarchy_openatlas_class (hierarchy_id, openatlas_class_name) VALUES
   ((SELECT id FROM web.hierarchy WHERE name='Dimensions'), 'place');
 
+-- Custom place hierarchy: Administrative Unit
+INSERT INTO model.entity (cidoc_class_code, openatlas_class_name, name, description) VALUES
+  ('E53', 'administrative_unit', 'Administrative unit', 'Hierarchy of administrative units'),
+  ('E53', 'administrative_unit', 'Austria', Null),
+  ('E53', 'administrative_unit', 'Wien', Null),
+  ('E53', 'administrative_unit', 'Italy', Null);
+
+INSERT INTO model.link (property_code, range_id, domain_id) VALUES
+  ('P89', (SELECT id FROM model.entity WHERE name='Administrative unit'), (SELECT id FROM model.entity WHERE name='Austria')),
+  ('P89', (SELECT id FROM model.entity WHERE name='Administrative unit'), (SELECT id FROM model.entity WHERE name='Italy')),
+  ('P89', (SELECT id FROM model.entity WHERE name='Austria'), (SELECT id FROM model.entity WHERE name='Wien'));
+
+INSERT INTO web.hierarchy (id, name, category, multiple, directional) VALUES
+  ((SELECT id FROM model.entity WHERE name='Administrative unit'), 'Administrative unit', 'place', True, False);
+
+INSERT INTO web.hierarchy_openatlas_class (hierarchy_id, openatlas_class_name) VALUES
+  ((SELECT id FROM web.hierarchy WHERE name='Administrative unit'), 'place');
+

openatlas/api/endpoints/endpoint.py

@@ -380,7 +380,7 @@ def get_linked_places_entity(self, _id: int) -> dict[str, Any]:
                 feature['depictions'] = get_lp_file(entity)
             else:
                 feature['depictions'] = [
-                    get_lp_file(link.domain) for link in links_inverse
+                    get_lp_file(link.domain, entity) for link in links_inverse
                     if link.domain.class_.name == 'file']
         return {
             'type': 'FeatureCollection',

openatlas/api/formats/linked_places.py

@@ -78,12 +78,15 @@ def get_lp_time(entity: Entity | Link) -> Optional[dict[str, Any]]:
             'comment': entity.dates.end_comment}}
 
 
-def get_lp_file(file: Entity) -> dict[str, Any]:
+def get_lp_file(
+        file: Entity,
+        entity: Optional[Entity] = None) -> dict[str, Any]:
     url = 'N/A'
     mime_type = None
     if path := get_file_path(file.id):
         url = url_for('api.display', filename=path.stem, _external=True)
         mime_type, _ = mimetypes.guess_type(path)
+    main_image = entity.get_profile_image_id() == file.id if entity else False
     data = {
         '@id': url_for('api.entity', id_=file.id, _external=True),
         'title': file.name,
@@ -92,6 +95,7 @@ def get_lp_file(file: Entity) -> dict[str, Any]:
         'licenseHolder': file.license_holder,
         'publicShareable': file.public,
         'mimetype': mime_type,
+        'mainImage': main_image,
         'url': url}
     data.update(get_iiif_manifest_and_path(file.id))
     return data

openatlas/api/formats/presentation_view.py

@@ -66,7 +66,8 @@ def get_file_dict(
         'publicShareable': link.domain.public,
         'mimetype': mime_type,
         'fromSuperEntity': root,
-        'url': url}
+        'url': url,
+        'mainImage': link.range.get_profile_image_id() == link.domain.id}
     data.update(get_iiif_manifest_and_path(link.domain.id))
     if overlay:
         data.update({'overlay': overlay.bounding_box})

openatlas/api/openapi.json

@@ -3,7 +3,7 @@
   "info": {
     "title": "OpenAtlas API",
     "description": "An API that allows user to access data from an OpenAtlas instance.",
-    "version": "0.4.12a",
+    "version": "0.4.12b",
     "contact": {
       "name": "OpenAtlas",
       "url": "https://openatlas.eu",
@@ -5399,6 +5399,9 @@
                       },
                       "IIIFManifest": {
                         "type": "string"
+                      },
+                      "mainImage": {
+                        "type": "boolean"
                       }
                     }
                   }

openatlas/api/resources/templates.py

@@ -98,7 +98,8 @@ def linked_places_template(parser: Parser) -> dict[str, Type[String]]:
         'url': fields.String,
         'mimetype': fields.String,
         'IIIFBasePath': fields.String,
-        'IIIFManifest': fields.String}
+        'IIIFManifest': fields.String,
+        'mainImage': fields.Boolean,}
     links = {
         'referenceURL': fields.String,
         'id': fields.String,
@@ -228,6 +229,7 @@ def presentation_template() -> dict[str, Any]:
         'fromSuperEntity': fields.Boolean,
         'IIIFManifest': fields.String,
         'IIIFBasePath': fields.String,
+        'mainImage': fields.Boolean,
         'overlay': fields.String}
     relation_types = {
         'property': fields.String,

openatlas/display/display.py

@@ -53,7 +53,7 @@ def get_type_data(self) -> dict[str, Any]:
             if self.entity.standard_type \
                     and type_.id == self.entity.standard_type.id:
                 continue  # Standard type is already included
-            title = " > ".join([g.types[i].name for i in type_.root])
+            title = ' > '.join([g.types[i].name for i in type_.root])
             html = f'<span title="{title}">{link(type_)}</span>'
             if type_.category == 'value':
                 html += f' {float(value):g} {type_.description or ''}'

openatlas/forms/add_fields.py

@@ -200,17 +200,18 @@ def add_relations(
                         'name_inverse',
                         StringField(_('inverse')))
             else:  # It's a root type (hierarchy)
-                if entity.category == 'custom':
+                if entity.category in ('custom', 'place'):
                     form.multiple = BooleanField(
                         _('multiple'),
                         description=_('tooltip hierarchy multiple'))
-                # noinspection PyTypeChecker
-                form.classes = SelectMultipleField(
-                    _('classes'),
-                    description=_('tooltip hierarchy forms'),
-                    choices=Entity.get_class_choices(entity),
-                    option_widget=widgets.CheckboxInput(),
-                    widget=widgets.ListWidget(prefix_label=False))
+                if entity.category in ('custom', 'value'):
+                    # noinspection PyTypeChecker
+                    form.classes = SelectMultipleField(
+                        _('classes'),
+                        description=_('tooltip hierarchy forms'),
+                        choices=Entity.get_class_choices(entity),
+                        option_widget=widgets.CheckboxInput(),
+                        widget=widgets.ListWidget(prefix_label=False))
         elif relation.multiple:
             selection: Any = []
             if entity.id:
@@ -288,11 +289,9 @@ def selection_available(
 def add_date_fields(
         form_class: Any,
         item: Optional[Entity | Link] = None) -> None:
-    if item \
-            and isinstance(item, Entity) \
-            and item.class_.group['name'] == 'type' \
-            and not item.root:
-        return
+    if isinstance(item, Entity) and item.class_.group['name'] == 'type' and (
+            (item.id and not item.root) or (not item.id and item.category)):
+        return  # No dates because it's a type hierarchy
     validator_second = [OptionalValidator(), NumberRange(min=0, max=59)]
     validator_minute = [OptionalValidator(), NumberRange(min=0, max=59)]
     validator_hour = [OptionalValidator(), NumberRange(min=0, max=23)]

openatlas/forms/display.py

@@ -55,8 +55,6 @@ def html_form(
             continue
         if field.type in ['TreeField', 'TreeMultiField', 'ValueTypeRootField']:
             type_ = g.types[field.type_id]
-            if not type_.subs:
-                continue
             label = type_.name
             if type_.category == 'standard' and type_.name != 'License':
                 label = _('type')