Merge branch 'develop' into feature/annotation_leaflet

.github/workflows/starter.yaml

@@ -133,4 +133,4 @@ jobs:
 
       - name: Run tests
         run: |
-          docker exec -i openatlas /bin/bash -c "cd /var/www/openatlas/tests && nosetests3 -c .noserc --verbosity=2 --nologcapture --nocapture && echo passed"
+          docker exec -i openatlas /bin/bash -c "cd /var/www/openatlas/tests && nosetests3 -c .noserc --nologcapture --nocapture && echo passed"

openatlas/api/endpoints/iiif.py

@@ -216,7 +216,6 @@ def get_manifest_version_2(id_: int) -> dict[str, Any]:
                 "@value": entity.description or '',
                 "@language": "en"}],
             "license": get_license_name(entity),
-            "attribution": "By OpenAtlas",
             "logo": get_logo(),
             "sequences": [
                 IIIFSequenceV2.build_sequence(get_metadata(entity))],

openatlas/api/formats/geojson.py

@@ -3,10 +3,10 @@
 from flask import g
 
 from openatlas.api.resources.util import (
-    link_parser_check,
+    get_location_link, link_parser_check,
     replace_empty_list_values_in_dict_with_none)
 from openatlas.api.resources.model_mapper import \
-    flatten_list_and_remove_duplicates
+    flatten_list_and_remove_duplicates, get_all_links_of_entities
 from openatlas.models.entity import Entity
 from openatlas.models.gis import Gis
 from openatlas.models.link import Link
@@ -16,7 +16,11 @@ def get_geojson(
         entities: list[Entity],
         parser: dict[str, Any]) -> dict[str, Any]:
     out = []
+    links = get_all_links_of_entities([e.id for e in entities], 'P53')
     for entity in entities:
+        if entity.class_.view == 'place':
+            entity_links = [l_ for l_ in links if l_.domain.id == entity.id]
+            entity.types.update(get_location_link(entity_links).range.types)
         if geoms := [get_geojson_dict(entity, parser, geom)
                      for geom in get_geom(entity, parser)]:
             out.extend(geoms)
@@ -48,10 +52,13 @@ def get_geojson_v2(
              if link_.property.code
              in ['P53', 'P74', 'OA8', 'OA9', 'P7', 'P26', 'P27']]
     for entity in entities:
+        entity_links = [
+            link_ for link_ in links if link_.domain.id == entity.id]
+        if entity.class_.view == 'place':
+            entity.types.update(get_location_link(entity_links).range.types)
         if geom := get_geoms_as_collection(
                 entity,
-                [link_.range.id for link_ in links
-                 if link_.domain.id == entity.id],
+                [l_.range.id for l_ in entity_links],
                 parser):
             out.append(get_geojson_dict(entity, parser, geom))
     return {'type': 'FeatureCollection', 'features': out}

openatlas/api/formats/linked_places.py

@@ -4,9 +4,9 @@
 
 from openatlas import app
 from openatlas.api.resources.util import (
-    get_geometric_collection, get_license_name, get_reference_systems,
-    replace_empty_list_values_in_dict_with_none, to_camel_case, date_to_str,
-    get_crm_relation, get_location_id)
+    get_geometric_collection, get_license_name, get_location_link,
+    get_reference_systems, replace_empty_list_values_in_dict_with_none,
+    to_camel_case, date_to_str, get_crm_relation)
 from openatlas.models.entity import Entity
 from openatlas.models.link import Link
 from openatlas.display.util import get_file_path
@@ -103,8 +103,7 @@ def get_lp_file(links_inverse: list[Link]) -> list[dict[str, str]]:
 def get_lp_types(entity: Entity, links: list[Link]) -> list[dict[str, Any]]:
     types = []
     if entity.class_.view == 'place':
-        location = Entity.get_by_id(get_location_id(links), types=True)
-        entity.types.update(location.types)
+        entity.types.update(get_location_link(links).range.types)
     for type_ in entity.types:
         type_dict = {
             'identifier': url_for(

openatlas/api/openapi.json

@@ -88,8 +88,7 @@
   ],
   "paths": {
     "/entity/{entityId}": {
-      "get":
-        {
+      "get": {
         "tags": [
           "Entity Endpoint"
         ],
@@ -978,21 +977,16 @@
         }
       }
     },
-    "/display/{filename}": {
+    "/display/{entityID}": {
       "get": {
         "tags": [
           "Image Endpoints"
         ],
-        "description": "Retrieves the image connected to the requested ID or filename, if it has a licence.",
+        "description": "Retrieves the image connected to the requested ID or entityID, if it has a licence.",
         "operationId": "DisplayImage",
         "parameters": [
           {
-            "in": "path",
-            "name": "filename",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
+            "$ref": "#/components/parameters/entityId"
           },
           {
             "in": "query",
@@ -1031,6 +1025,52 @@
         }
       }
     },
+    "/iiif_manifest/{version}/{entityId}": {
+      "get": {
+        "tags": [
+          "Image Endpoints"
+        ],
+        "description": "Retrieves the manifest of the IIIF image.",
+        "operationId": "IIIFManifest",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "version",
+            "required": true,
+            "schema": {
+              "enum": [
+                2
+              ]
+            }
+          },
+          {
+            "$ref": "#/components/parameters/entityId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "image/jpeg": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "image/png": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Something went wrong. Please consult the error message."
+          }
+        }
+      }
+    },
     "/licensed_file_overview/": {
       "get": {
         "tags": [
@@ -1258,58 +1298,57 @@
         "content": {
           "application/json": {
             "schema": {
-          "type": "object",
-          "properties": {
-            "entityName": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "entityDescription": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "entityAliases": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "entityCidocClass": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "entitySystemClass": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "entityID": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "typeID": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "valueTypeID": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "typeIDWithSubs": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "typeName": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "beginFrom": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "beginTo": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "endFrom": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "endTo": {
-              "$ref": "#/components/schemas/searchCriteria"
-            },
-            "relationToID": {
-              "$ref": "#/components/schemas/searchCriteria"
+              "type": "object",
+              "properties": {
+                "entityName": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "entityDescription": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "entityAliases": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "entityCidocClass": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "entitySystemClass": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "entityID": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "typeID": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "valueTypeID": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "typeIDWithSubs": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "typeName": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "beginFrom": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "beginTo": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "endFrom": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "endTo": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                },
+                "relationToID": {
+                  "$ref": "#/components/schemas/searchCriteria"
+                }
+              }
             }
           }
         }
-          }
-        }
-
       },
       "limit": {
         "name": "limit",

openatlas/api/resources/util.py

@@ -217,6 +217,10 @@ def get_location_id(links: list[Link]) -> int:
     return [l_.range.id for l_ in links if l_.property.code == 'P53'][0]
 
 
+def get_location_link(links: list[Link]) -> Link:
+    return [l_ for l_ in links if l_.property.code == 'P53'][0]
+
+
 def get_geoms_by_entity(
         location_id: int,
         centroid: Optional[bool] = False) -> dict[str, Any]:

openatlas/static/manual/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 910e00fd5bab3d3ebb74912af2151662
+config: 4fd9d0494c6b9a3491317c7c01426b29
 tags: 645f666f9bcd5a90fca523b33c5a78b7