c2cgeoportal-geoportal 2.9rc23__py3-none-any.whl → 2.9rc25__py3-none-any.whl

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml

@@ -75,7 +75,7 @@ services:
       - PGOPTIONS
 
   mapserver:
-    image: camptocamp/mapserver:8.0-gdal3.6
+    image: camptocamp/mapserver:8.2-gdal3.8
     user: www-data
     restart: unless-stopped
     entrypoint: []

c2cgeoportal_geoportal/views/profile.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2023, Camptocamp SA
+# Copyright (c) 2012-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -25,20 +25,26 @@
 # of the authors and should not be interpreted as representing official policies,
 # either expressed or implied, of the FreeBSD Project.
 
-
+import json
+import logging
 import math
+import urllib.parse
 from decimal import Decimal
+from json.decoder import JSONDecodeError
 from typing import Any
 
 import geojson
 import pyramid.request
-from pyramid.httpexceptions import HTTPNotFound
+import requests
+from pyramid.httpexceptions import HTTPBadRequest, HTTPInternalServerError, HTTPNotFound
 from pyramid.i18n import TranslationStringFactory
 from pyramid.view import view_config
 
 from c2cgeoportal_geoportal.lib.common_headers import Cache, set_common_headers
 from c2cgeoportal_geoportal.views.raster import Raster
 
+_LOG = logging.getLogger(__name__)
+
 _ = TranslationStringFactory("c2cgeoportal")
 
 
@@ -48,6 +54,41 @@ class Profile(Raster):
     def __init__(self, request: pyramid.request.Request):
         Raster.__init__(self, request)
 
+    @staticmethod
+    def _to_filtered(points: list[dict[str, Any]], layers: list[str]) -> list[dict[str, Any]]:
+        profile = []
+        for point in points:
+            filtered_alts = {key: value for key, value in point["alts"].items() if key in layers}
+            profile.append(
+                {
+                    "dist": point["dist"],
+                    "values": filtered_alts,
+                    "x": point["easting"],
+                    "y": point["northing"],
+                }
+            )
+        return profile
+
+    def _get_profile_service_data(
+        self, layers: list[str], geom: dict[str, Any], rasters: dict[str, Any], nb_points: int
+    ) -> list[dict[str, Any]]:
+        request = f"{rasters[layers[0]]['url']}/profile.json?{urllib.parse.urlencode({'geom': geom, 'nbPoints': nb_points, 'distinct_points': 'true'})}"
+        response = requests.get(request, timeout=10)
+        if not response.ok:
+            _LOG.error("profile request %s failed with status code %s", request, response.status_code)
+            raise HTTPInternalServerError(
+                f"Failed to fetch profile data from internal request: \
+                {response.status_code} {response.reason}"
+            )
+
+        try:
+            points = json.loads(response.content)
+        except (TypeError, JSONDecodeError) as exc:
+            _LOG.exception("profile request %s failed", request)
+            raise HTTPInternalServerError("Failed to decode JSON response from internal request") from exc
+
+        return self._to_filtered(points, layers)
+
     @view_config(route_name="profile.json", renderer="fast_json")  # type: ignore
     def json(self) -> dict[str, Any]:
         """Answer to /profile.json."""
@@ -58,6 +99,9 @@ class Profile(Raster):
     def _compute_points(self) -> tuple[list[str], list[dict[str, Any]]]:
         """Compute the alt=fct(dist) array."""
         geom = geojson.loads(self.request.params["geom"], object_hook=geojson.GeoJSON.to_instance)
+        nb_points = int(self.request.params["nbPoints"])
+        coords = []
+        service_results: list[dict[str, Any]] = []
 
         layers: list[str]
         if "layers" in self.request.params:
@@ -73,26 +117,47 @@ class Profile(Raster):
             layers = list(rasters.keys())
             layers.sort()
 
-        points: list[dict[str, Any]] = []
+        service_layers = [layer for layer in layers if rasters[layer].get("type") == "external_url"]
 
-        dist = 0
-        prev_coord = None
-        coords = self._create_points(geom.coordinates, int(self.request.params["nbPoints"]))
-        for coord in coords:
-            if prev_coord is not None:
-                dist += self._dist(prev_coord, coord)
-
-            values = {}
-            for ref in list(rasters.keys()):
-                value = self._get_raster_value(self.rasters[ref], ref, coord[0], coord[1])
-                values[ref] = value
-
-            # 10cm accuracy is enough for distances
-            rounded_dist = Decimal(str(dist)).quantize(Decimal("0.1"))
-            points.append({"dist": rounded_dist, "values": values, "x": coord[0], "y": coord[1]})
-            prev_coord = coord
-
-        return layers, points
+        if len(service_layers) > 0:
+            urls = [rasters[layer]["url"] for layer in service_layers]
+            if len(set(urls)) != 1:
+                raise HTTPBadRequest("All service layers must have the same URL.")
+            service_results = self._get_profile_service_data(service_layers, geom, rasters, nb_points)
+            if len(service_layers) < len(layers):
+                coords = [(point["x"], point["y"]) for point in service_results]
+            else:
+                return layers, service_results
+
+        if len(service_results) == 0:
+            points: list[dict[str, Any]] = []
+
+            dist = 0
+            prev_coord = None
+            coords = self._create_points(geom.coordinates, nb_points)
+            for coord in coords:
+                if prev_coord is not None:
+                    dist += self._dist(prev_coord, coord)
+                _LOG.info("new dist %s", dist)
+
+                values = {}
+                for ref in list(rasters.keys()):
+                    value = self._get_raster_value(self.rasters[ref], ref, coord[0], coord[1])
+                    values[ref] = value
+                _LOG.info("values %s", values)
+
+                # 10cm accuracy is enough for distances
+                rounded_dist = Decimal(str(dist)).quantize(Decimal("0.1"))
+                points.append({"dist": rounded_dist, "values": values, "x": coord[0], "y": coord[1]})
+                prev_coord = coord
+            return layers, points
+        else:
+            additional_layers = [layer for layer in layers if layer not in service_layers]
+            for point in service_results:
+                for ref in additional_layers:
+                    value = self._get_raster_value(self.rasters[ref], ref, point["x"], point["y"])
+                    point["values"][ref] = value
+            return layers, service_results
 
     @staticmethod
     def _dist(coord1: tuple[float, float], coord2: tuple[float, float]) -> float:

c2cgeoportal_geoportal/views/raster.py

@@ -27,16 +27,20 @@
 
 
 import decimal
+import json
 import logging
 import math
 import os
 import traceback
+import urllib.parse
+from json.decoder import JSONDecodeError
 from typing import TYPE_CHECKING, Any
 
 import numpy
 import pyramid.request
+import requests
 import zope.event.classhandler
-from pyramid.httpexceptions import HTTPBadRequest, HTTPNotFound
+from pyramid.httpexceptions import HTTPBadRequest, HTTPInternalServerError, HTTPNotFound
 from pyramid.view import view_config
 from rasterio.io import DatasetReader
 
@@ -95,10 +99,21 @@ class Raster:
                     raise HTTPNotFound(f"Layer {layer} not found")
         else:
             rasters = self.rasters
+            layers = list(rasters.keys())
+            layers.sort()
+
+        result: dict[str, Any] = {}
+
+        service_layers = [layer for layer in layers if rasters[layer].get("type") == "external_url"]
+
+        if len(service_layers) > 0:
+            for layer in service_layers:
+                service_result: dict[str, Any] = self._get_service_data(layer, lat, lon, rasters)
+                result.update(service_result)
 
-        result = {}
         for ref in list(rasters.keys()):
-            result[ref] = self._get_raster_value(rasters[ref], ref, lon, lat)
+            if ref not in service_layers:
+                result[ref] = self._get_raster_value(rasters[ref], ref, lon, lat)
 
         set_common_headers(self.request, "raster", Cache.PUBLIC_NO)
         return result
@@ -181,6 +196,31 @@ class Raster:
 
         return result
 
+    def _get_service_data(
+        self, layer: str, lat: float, lon: float, rasters: dict[str, Any]
+    ) -> dict[str, Any]:
+        request = (
+            f"{rasters[layer]['url']}/height?{urllib.parse.urlencode({'easting': lon, 'northing': lat})}"
+        )
+        _LOG.info("Doing height request to %s", request)
+        response = requests.get(request, timeout=10)
+        if not response.ok:
+            _LOG.error("Elevation request %s failed with status code %s", request, response.status_code)
+            raise HTTPInternalServerError(
+                f"Failed to fetch elevation data from the internal request: \
+                {response.status_code} {response.reason}"
+            )
+
+        try:
+            result = json.loads(response.content).get(rasters[layer]["elevation_name"])
+        except (TypeError, JSONDecodeError) as exc:
+            _LOG.exception("Height request to %s failed", request)
+            raise HTTPInternalServerError("Failed to decode JSON response from the internal request") from exc
+
+        set_common_headers(self.request, "raster", Cache.PUBLIC_NO)
+
+        return {layer: result}
+
     @staticmethod
     def _round(value: numpy.float32, round_to: float) -> decimal.Decimal | None:
         if value is not None:

{c2cgeoportal_geoportal-2.9rc23.dist-info → c2cgeoportal_geoportal-2.9rc25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-geoportal
-Version: 2.9rc23
+Version: 2.9rc25
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

{c2cgeoportal_geoportal-2.9rc23.dist-info → c2cgeoportal_geoportal-2.9rc25.dist-info}/RECORD

@@ -68,7 +68,7 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile,sha256
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/README.rst,sha256=QJcaUtT05atb5x8SJYflSt0YIJkbAz0Zh39_FYtyFks,423
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build,sha256=CjYe1cIL-TsKPbdxy1zStTUEGguILXpyUC63X2_Cy8c,7010
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-db.yaml,sha256=sNzJxDQX54WfKgJhhVhDm4a05z3Rz1j6Oocl1QHzeyQ,518
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml,sha256=VdRZO71CRtmyBzhUXXtwZ1HBpLPT_58BhQUFKKgxkeI,13680
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml,sha256=nNwk7HpCQduiQNBRqIInMZe5weLNDelc5ItiRBk8WJY,13680
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-qgis.yaml,sha256=YE44s31kI79j5ypud4RS69sSDGFH1ROHNNAkyWxZ4jk,576
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml,sha256=X5vtxQ0pvLy6FSrooVmt90j4C4YNxtkSKzbPDOb4uB8,2615
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.yaml,sha256=ZpQ33JhdBxkoUNBV9kB5f07p8DpqgvJ3-Mp0SzLnJ6w,2380
@@ -164,9 +164,9 @@ c2cgeoportal_geoportal/views/memory.py,sha256=ttkX7DVcnlA1KsTtQEGZv66qGbjVFbeJGb
 c2cgeoportal_geoportal/views/ogcproxy.py,sha256=2i3cuZ2cRybEH-DvAQbrLnUxd9y3B0iKnwkpaJvhwSc,5215
 c2cgeoportal_geoportal/views/pdfreport.py,sha256=nJ_V4Z74YHtYFw1ZIAJer8iz5KMedHPPbgBUy2qkpCU,9616
 c2cgeoportal_geoportal/views/printproxy.py,sha256=b-fNcRPNFYXouTmLNnDeja45APFQoA6i9fU3h5kcE6g,5928
-c2cgeoportal_geoportal/views/profile.py,sha256=lKMBzrt0wVtUyDghgtbiocn4yUajAOOGL9LyuDtM5Ns,5375
+c2cgeoportal_geoportal/views/profile.py,sha256=dELL7AGEBIW2h705-7wlZDZvQmUF9TkzRFQkPDc_NK8,8425
 c2cgeoportal_geoportal/views/proxy.py,sha256=BCjFtnsrIQ2U30wk08YFLyt3Cq0yX3Rtwv5y7hCNpJ0,10390
-c2cgeoportal_geoportal/views/raster.py,sha256=94rMGBQ7zHTvlKewBl-18LdoYRdLjW4880XlODDvhsE,7535
+c2cgeoportal_geoportal/views/raster.py,sha256=0PbYbdud1nHYH5zq_sbQYmsCjwlWVFVQjDo0xkfc2fs,9236
 c2cgeoportal_geoportal/views/resourceproxy.py,sha256=S8PEqBpeJKsoLJlzA5lsqQoVDvh8pu5FEPh4OhJQU0Y,3183
 c2cgeoportal_geoportal/views/shortener.py,sha256=54HNEDpueIdsKIpbWuk1MDpFC2gyo01MoAXc0uMVcl8,6167
 c2cgeoportal_geoportal/views/theme.py,sha256=aX2v3p9R9be7u4YL_avHQ7ixQKO7FRMDinxiNzY4MSA,55884
@@ -185,8 +185,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=SzILSSzIuilzIkUYVPZiVzLwW1du
 tests/test_raster.py,sha256=82NJ2MXgZlMqs0ytN-VgNw376iURdk4PkAg__dyh5ns,11948
 tests/test_wmstparsing.py,sha256=xjA8nJuXFl3H5Bfs4sJw_8qX8E8qvAALK7Hs2-DTP2A,9054
 tests/xmlstr.py,sha256=rkTKSU4FGjupBKLx75H8o-goB0KbQrxDvdpc6xVX_uQ,5985
-c2cgeoportal_geoportal-2.9rc23.dist-info/METADATA,sha256=QIjmnka0rABffGX40rjx-taT2yzOYS4ubeX8q0USir0,1886
-c2cgeoportal_geoportal-2.9rc23.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9rc23.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9rc23.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9rc23.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9rc25.dist-info/METADATA,sha256=cwecgRAPmB-M7kAR7suaW8YbzJoy2SOjnWyZyMKEa3k,1886
+c2cgeoportal_geoportal-2.9rc25.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9rc25.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9rc25.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9rc25.dist-info/RECORD,,