modular

Author: mattiagiupponi

docker-compose.yml

@@ -142,8 +142,8 @@ services:
     healthcheck:
       test: "pg_isready -d postgres -U postgres"
     # uncomment to enable remote connections to postgres
-    #ports:
-    #  - "5432:5432"
+    ports:
+      - "5432:5432"
 
   # Vanilla Redis service. This is needed by celery
   redis:

geonode/base/models.py

@@ -62,6 +62,7 @@
 from geonode import GeoNodeException
 
 from geonode.base import enumerations
+from geonode.geoserver.ows import _wms_link
 from geonode.singleton import SingletonModel
 from geonode.groups.conf import settings as groups_settings
 from geonode.base.bbox_utils import BBOXHelper, polygon_from_bbox
@@ -952,6 +953,13 @@ def compact_permission_labels(cls):
     def raw_abstract(self):
         return self._remove_html_tags(self.abstract)
 
+    @property
+    def can_be_downloaded(self):
+        return self.subtype in ["vector", "raster", "vector_time"]
+
+    def can_have_wfs_links(self):
+        return self.subtype == "vector"
+    
     @property
     def raw_purpose(self):
         return self._remove_html_tags(self.purpose)
@@ -1913,6 +1921,19 @@ def get_linked_resources(self, as_target: bool = False):
             if as_target
             else LinkedResource.get_linked_resources(source=self)
         )
+    
+    def prepare_wms_links(self, wms_url, identifier, bbox, srid, height, width):
+        types = [
+            ("jpg", _("JPEG"), "image/jpeg"),
+            ("pdf", _("PDF"), "application/pdf"),
+            ("png", _("PNG"), "image/png"),
+        ]
+        output = []
+        for ext, name, mime in types:
+            url = _wms_link(wms_url, identifier, mime, height, width, srid, bbox)
+            output.append((ext, name, mime, url))
+        return output
+
 
 
 class LinkManager(models.Manager):

geonode/geoserver/helpers.py

@@ -1012,7 +1012,7 @@ def set_attributes_from_geoserver(layer, overwrite=False):
                 f"Error while retrieving info for {layer.subtype} '{layer.alternate or layer.typename}'", exc_info=True
             )
             attribute_map = []
-    elif layer.subtype in {"vector", "tileStore", "remote", "wmsStore", "vector_time"}:
+    elif layer.subtype in WPS_ACCEPTABLE_FORMATS.values():
         typename = layer.alternate if layer.alternate else layer.typename
         logger.info(f"Getting WFS info for {layer.subtype} '{typename}'")
         dft_url_path = re.sub(r"\/wms\/?$", "/", server_url)

geonode/geoserver/ows.py

@@ -354,16 +354,3 @@ def _wms_link(wms_url, identifier, mime, height, width, srid=None, bbox=None):
         wms_params["bbox"] = bbox
     _query_separator = "?" if not wms_url.endswith("?") else ""
     return f"{wms_url}{_query_separator}{urlencode(wms_params)}"
-
-
-def wms_links(wms_url, identifier, bbox, srid, height, width):
-    types = [
-        ("jpg", _("JPEG"), "image/jpeg"),
-        ("pdf", _("PDF"), "application/pdf"),
-        ("png", _("PNG"), "image/png"),
-    ]
-    output = []
-    for ext, name, mime in types:
-        url = _wms_link(wms_url, identifier, mime, height, width, srid, bbox)
-        output.append((ext, name, mime, url))
-    return output

geonode/layers/download_handler.py

@@ -75,7 +75,7 @@ def download_url(self):
         resource = self.get_resource()
         if not resource:
             return None
-        if resource.subtype not in ["vector", "raster", "vector_time"]:
+        if not resource.can_be_downloaded:
             logger.info("Download URL is available only for datasets that have been harvested and copied locally")
             return None
 
@@ -117,7 +117,7 @@ def process_dowload(self, resource=None):
             logger.error("The format provided is not valid for the selected resource")
             return JsonResponse({"error": "The format provided is not valid for the selected resource"}, status=500)
 
-        _format = "application/zip" if resource.is_vector() else "image/tiff"
+        _format = resource.download_format()
         # getting default payload
         tpl = get_template("geoserver/dataset_download.xml")
         ctx = {"alternate": resource.alternate, "download_format": download_format or _format}

geonode/layers/models.py

@@ -394,11 +394,15 @@ def get_linked_resources(self, as_target: bool = False):
 
     @property
     def download_url(self):
-        if self.subtype not in ["vector", "raster", "vector_time"]:
+        if self.can_be_downloaded:
             logger.info("Download URL is available only for datasets that have been harvested and copied locally")
             return None
         return build_absolute_uri(reverse("dataset_download", args=(self.alternate,)))
 
+    @property
+    def download_format(self):
+        return "application/zip" if self.is_vector() else "image/tiff"
+
     @property
     def maplayers(self):
         from geonode.maps.models import MapLayer

geonode/utils.py

@@ -1211,7 +1211,7 @@ def set_resource_default_links(instance, layer, prune=False, **kwargs):
         logger.debug(" -- Resource Links[Prune old links]...done!")
 
     if check_ogc_backend(geoserver.BACKEND_PACKAGE):
-        from geonode.geoserver.ows import wcs_links, wfs_links, wms_links
+        from geonode.geoserver.ows import wcs_links, wfs_links
         from geonode.geoserver.helpers import ogc_server_settings, gs_catalog
 
         # Compute parameters for the new links
@@ -1273,7 +1273,7 @@ def set_resource_default_links(instance, layer, prune=False, **kwargs):
         # Set download links for WMS, WCS or WFS and KML
         logger.debug(" -- Resource Links[Set download links for WMS, WCS or WFS and KML]...")
         instance_ows_url = f"{instance.ows_url}?" if instance.ows_url else f"{ogc_server_settings.public_url}ows?"
-        links = wms_links(instance_ows_url, instance.alternate, bbox, srid, height, width)
+        links = instance.prepare_wms_links(instance_ows_url, instance.alternate, bbox, srid, height, width)
 
         for ext, name, mime, wms_url in links:
             try:
@@ -1452,7 +1452,7 @@ def set_resource_default_links(instance, layer, prune=False, **kwargs):
                         ),
                     )
 
-                if instance.subtype == "vector":
+                if instance.can_have_wfs_links:
                     ogc_wfs_url = instance.ows_url or urljoin(ogc_server_settings.public_url, "ows")
                     ogc_wfs_name = f"OGC WFS: {instance.workspace} Service"
                     if (