Merge pull request #527 from EOxServer/django4-ubuntu22

Django4 ubuntu22
EOxServer · Aug 3, 2022 · fcff932 · fcff932
2 parents e3f0e36 + 0b0b7dc
commit fcff932
Show file tree

Hide file tree

Showing 33 changed files with 375 additions and 372 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,13 +17,13 @@ jobs:
         - os: ubuntu
           python: py3
           db: postgis
-          django: "2.2.17"
+          django: "3.2.12"
           python_bin: python3
           pip_bin: pip3
         - os: ubuntu
           python: py3
           db: spatialite
-          django: "2.2.17"
+          django: "3.2.12"
           python_bin: python3
           pip_bin: pip3
           latest: true

diff --git a/autotest/autotest/expected/WCS10GetCoverageMosaicTestCase.tif b/autotest/autotest/expected/WCS10GetCoverageMosaicTestCase.tif
diff --git a/autotest/autotest/expected/WCS20GetCoverageMultipartMosaicTestCase.xml b/autotest/autotest/expected/WCS20GetCoverageMultipartMosaicTestCase.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<wcseo:RectifiedStitchedMosaic xmlns:crs="http://www.opengis.net/wcs/crs/1.0" xmlns:eop="http://www.opengis.net/eop/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:int="http://www.opengis.net/wcs/interpolation/1.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:om="http://www.opengis.net/om/2.0" xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:rsub="http://www.opengis.net/wcs/range-subsetting/1.0" xmlns:scal="http://www.opengis.net/wcs/scaling/1.0" xmlns:swe="http://www.opengis.net/swe/2.0" xmlns:wcs="http://www.opengis.net/wcs/2.0" xmlns:wcseo="http://www.opengis.net/wcs/wcseo/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" gml:id="mosaic_MER_FRS_1P_reduced_RGB" xsi:schemaLocation="http://www.opengis.net/wcs/wcseo/1.0 http://schemas.opengis.net/wcs/wcseo/1.0/wcsEOAll.xsd">
+<wcseo:RectifiedStitchedMosaic xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:wcs="http://www.opengis.net/wcs/2.0" xmlns:crs="http://www.opengis.net/wcs/crs/1.0" xmlns:rsub="http://www.opengis.net/wcs/range-subsetting/1.0" xmlns:wcseo="http://www.opengis.net/wcs/wcseo/1.0" xmlns:om="http://www.opengis.net/om/2.0" xmlns:eop="http://www.opengis.net/eop/2.0" xmlns:swe="http://www.opengis.net/swe/2.0" xmlns:int="http://www.opengis.net/wcs/interpolation/1.0" xmlns:scal="http://www.opengis.net/wcs/scaling/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" gml:id="mosaic_MER_FRS_1P_reduced_RGB" xsi:schemaLocation="http://www.opengis.net/wcs/wcseo/1.0 http://schemas.opengis.net/wcs/wcseo/1.0/wcsEOAll.xsd">
   <gml:boundedBy>
-    <gml:Envelope axisLabels="lat long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326" uomLabels="deg deg" srsDimension="2">
+    <gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/4326" axisLabels="lat long" uomLabels="deg deg" srsDimension="2">
       <gml:lowerCorner>32.19025000 -3.75000000</gml:lowerCorner>
       <gml:upperCorner>46.26864500 28.26345500</gml:upperCorner>
     </gml:Envelope>
@@ -16,7 +16,7 @@
       </gml:limits>
       <gml:axisLabels>lat long</gml:axisLabels>
       <gml:origin>
-        <gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="mosaic_MER_FRS_1P_reduced_RGB_grid_origin">
+        <gml:Point gml:id="mosaic_MER_FRS_1P_reduced_RGB_grid_origin" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
           <gml:pos>46.26864500 -3.75000000</gml:pos>
         </gml:Point>
       </gml:origin>
@@ -26,7 +26,7 @@
   </gml:domainSet>
   <gml:rangeSet>
     <gml:File>
-      <gml:rangeParameters xlink:href="cid:coverage/mosaic_MER_FRS_1P_reduced_RGB.tif" xlink:arcrole="fileReference" xlink:role="http://www.opengis.net/spec/GMLCOV_geotiff-coverages/1.0/conf/geotiff-coverage"/>
+      <gml:rangeParameters xlink:arcrole="fileReference" xlink:href="cid:coverage/mosaic_MER_FRS_1P_reduced_RGB.tif" xlink:role="http://www.opengis.net/spec/GMLCOV_geotiff-coverages/1.0/conf/geotiff-coverage"/>
       <gml:fileReference>cid:coverage/mosaic_MER_FRS_1P_reduced_RGB.tif</gml:fileReference>
       <gml:fileStructure/>
       <gml:mimeType>image/tiff</gml:mimeType>
@@ -107,7 +107,7 @@
           <om:featureOfInterest>
             <eop:Footprint gml:id="footprint_mosaic_MER_FRS_1P_reduced_RGB">
               <eop:multiExtentOf>
-                <gml:MultiSurface srsName="EPSG:4326" gml:id="multisurface_mosaic_MER_FRS_1P_reduced_RGB">
+                <gml:MultiSurface gml:id="multisurface_mosaic_MER_FRS_1P_reduced_RGB" srsName="EPSG:4326">
                   <gml:surfaceMember>
                     <gml:Polygon gml:id="polygon_mosaic_MER_FRS_1P_reduced_RGB">
                       <gml:exterior>
@@ -145,12 +145,12 @@
       <wcseo:contributingFootprint>
         <eop:Footprint gml:id="footprint_mosaic_MER_FRS_1PNPDE20060830_100949_000001972050_00423_23523_0079_RGB_reduced">
           <eop:multiExtentOf>
-            <gml:MultiSurface srsName="EPSG:4326" gml:id="multisurface_mosaic_MER_FRS_1PNPDE20060830_100949_000001972050_00423_23523_0079_RGB_reduced">
+            <gml:MultiSurface gml:id="multisurface_mosaic_MER_FRS_1PNPDE20060830_100949_000001972050_00423_23523_0079_RGB_reduced" srsName="EPSG:4326">
               <gml:surfaceMember>
                 <gml:Polygon gml:id="polygon_mosaic_MER_FRS_1PNPDE20060830_100949_000001972050_00423_23523_0079_RGB_reduced">
                   <gml:exterior>
                     <gml:LinearRing>
-                      <gml:posList>46.21844540 -0.76977182 46.08290644 0.28854736 45.73636264 2.73341976 45.39947038 4.81565704 45.00948175 6.89477580 44.75018472 8.15491357 44.41952395 9.63424584 44.12134692 10.93930058 43.56727383 10.80473516 42.57173907 10.57063808 41.23523866 10.25693665 39.70883235 9.91089156 38.21169287 9.57121933 37.04263450 9.31468907 35.93773536 9.06576263 34.61206991 8.77892566 34.57526978 9.01378494 33.80781071 8.72828748 32.26454058 8.17446335 32.47445746 7.34665831 32.91472091 5.48900098 33.32929472 3.59491271 33.71894897 1.67956167 34.08288220 -0.25621348 34.34057243 -1.74408369 34.60294796 -3.43798101 35.20050022 -3.31213803 36.75709370 -2.96861379 38.05579573 -2.68201025 39.51733580 -2.35075851 41.30092068 -1.94206931 42.94621606 -1.55385952 44.59251101 -1.16699520 46.21844540 -0.76977182</gml:posList>
+                      <gml:posList>45.73636264 2.73341976 45.39947038 4.81565704 45.00948175 6.89477580 44.75018472 8.15491357 44.41952395 9.63424584 44.12134692 10.93930058 43.56727383 10.80473516 42.57173907 10.57063808 41.23523866 10.25693665 39.70883235 9.91089156 38.21169287 9.57121933 37.04263450 9.31468907 35.93773536 9.06576263 34.61206991 8.77892566 34.57526978 9.01378494 33.80781071 8.72828748 32.26454058 8.17446335 32.47445746 7.34665831 32.91472091 5.48900098 33.32929472 3.59491271 33.71894897 1.67956167 34.08288220 -0.25621348 34.34057243 -1.74408369 34.60294796 -3.43798101 35.20050022 -3.31213803 36.75709370 -2.96861379 38.05579573 -2.68201025 39.51733580 -2.35075851 41.30092068 -1.94206931 42.94621606 -1.55385952 44.59251101 -1.16699520 46.21844540 -0.76977182 46.08290644 0.28854736 45.73636264 2.73341976</gml:posList>
                     </gml:LinearRing>
                   </gml:exterior>
                 </gml:Polygon>
@@ -165,12 +165,12 @@
       <wcseo:contributingFootprint>
         <eop:Footprint gml:id="footprint_mosaic_MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_RGB_reduced">
           <eop:multiExtentOf>
-            <gml:MultiSurface srsName="EPSG:4326" gml:id="multisurface_mosaic_MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_RGB_reduced">
+            <gml:MultiSurface gml:id="multisurface_mosaic_MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_RGB_reduced" srsName="EPSG:4326">
               <gml:surfaceMember>
                 <gml:Polygon gml:id="polygon_mosaic_MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_RGB_reduced">
                   <gml:exterior>
                     <gml:LinearRing>
-                      <gml:posList>46.21538204 11.45216500 46.07713899 12.56460057 45.89816055 13.88709473 45.84534235 14.22429484 45.81257656 14.21561994 45.24715363 14.07617623 44.51595976 13.90424434 43.87974151 13.74919568 43.45033849 13.64731130 42.58703007 13.44209395 41.77310107 13.24929786 41.22475430 13.12570424 40.08542606 12.86188600 39.17961905 12.65848899 38.33876790 12.46575223 37.45661550 12.27368152 36.49644382 12.06089217 35.40430193 11.81895212 34.61257555 11.64834432 34.45020900 12.70232861 34.28672806 13.69270832 34.08615888 14.83709047 33.85125931 16.11996945 33.61599428 17.30723909 33.32950225 18.72098518 32.93741535 20.49034151 32.90760933 20.61720732 32.26692668 20.38639122 32.47301341 19.56420468 32.79995703 18.20809219 33.15675497 16.63597483 33.49010597 15.04583040 33.80242022 13.46867305 34.11762771 11.78865628 34.40475933 10.10198646 34.61206991 8.77892566 35.93773536 9.06576263 37.04263450 9.31468907 38.21169287 9.57121933 39.70883235 9.91089156 41.23523866 10.25693665 42.57173907 10.57063808 43.56727383 10.80473516 44.65704022 11.06940218 45.55003942 11.28225456 46.21538204 11.45216500</gml:posList>
+                      <gml:posList>46.07713899 12.56460057 45.89816055 13.88709473 45.84534235 14.22429484 45.81257656 14.21561994 45.24715363 14.07617623 44.51595976 13.90424434 43.87974151 13.74919568 43.45033849 13.64731130 42.58703007 13.44209395 41.77310107 13.24929786 41.22475430 13.12570424 40.08542606 12.86188600 39.17961905 12.65848899 38.33876790 12.46575223 37.45661550 12.27368152 36.49644382 12.06089217 35.40430193 11.81895212 34.61257555 11.64834432 34.45020900 12.70232861 34.28672806 13.69270832 34.08615888 14.83709047 33.85125931 16.11996945 33.61599428 17.30723909 33.32950225 18.72098518 32.93741535 20.49034151 32.90760933 20.61720732 32.26692668 20.38639122 32.47301341 19.56420468 32.79995703 18.20809219 33.15675497 16.63597483 33.49010597 15.04583040 33.80242022 13.46867305 34.11762771 11.78865628 34.40475933 10.10198646 34.61206991 8.77892566 35.93773536 9.06576263 37.04263450 9.31468907 38.21169287 9.57121933 39.70883235 9.91089156 41.23523866 10.25693665 42.57173907 10.57063808 43.56727383 10.80473516 44.65704022 11.06940218 45.55003942 11.28225456 46.21538204 11.45216500 46.07713899 12.56460057</gml:posList>
                     </gml:LinearRing>
                   </gml:exterior>
                 </gml:Polygon>
@@ -185,7 +185,7 @@
       <wcseo:contributingFootprint>
         <eop:Footprint gml:id="footprint_mosaic_MER_FRS_1PNPDE20060816_090929_000001972050_00222_23322_0058_RGB_reduced">
           <eop:multiExtentOf>
-            <gml:MultiSurface srsName="EPSG:4326" gml:id="multisurface_mosaic_MER_FRS_1PNPDE20060816_090929_000001972050_00222_23322_0058_RGB_reduced">
+            <gml:MultiSurface gml:id="multisurface_mosaic_MER_FRS_1PNPDE20060816_090929_000001972050_00222_23322_0058_RGB_reduced" srsName="EPSG:4326">
               <gml:surfaceMember>
                 <gml:Polygon gml:id="polygon_mosaic_MER_FRS_1PNPDE20060816_090929_000001972050_00222_23322_0058_RGB_reduced_1">
                   <gml:exterior>

diff --git a/autotest/autotest/expected/WCS20GetCoverageMultipartSubsetDatasetTestCase.xml b/autotest/autotest/expected/WCS20GetCoverageMultipartSubsetDatasetTestCase.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<wcseo:RectifiedDataset xmlns:crs="http://www.opengis.net/wcs/crs/1.0" xmlns:eop="http://www.opengis.net/eop/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:int="http://www.opengis.net/wcs/interpolation/1.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:om="http://www.opengis.net/om/2.0" xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:rsub="http://www.opengis.net/wcs/range-subsetting/1.0" xmlns:scal="http://www.opengis.net/wcs/scaling/1.0" xmlns:swe="http://www.opengis.net/swe/2.0" xmlns:wcs="http://www.opengis.net/wcs/2.0" xmlns:wcseo="http://www.opengis.net/wcs/wcseo/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" gml:id="MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed" xsi:schemaLocation="http://www.opengis.net/wcs/wcseo/1.0 http://schemas.opengis.net/wcs/wcseo/1.0/wcsEOAll.xsd">
+<wcseo:RectifiedDataset xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:wcs="http://www.opengis.net/wcs/2.0" xmlns:crs="http://www.opengis.net/wcs/crs/1.0" xmlns:rsub="http://www.opengis.net/wcs/range-subsetting/1.0" xmlns:wcseo="http://www.opengis.net/wcs/wcseo/1.0" xmlns:om="http://www.opengis.net/om/2.0" xmlns:eop="http://www.opengis.net/eop/2.0" xmlns:swe="http://www.opengis.net/swe/2.0" xmlns:int="http://www.opengis.net/wcs/interpolation/1.0" xmlns:scal="http://www.opengis.net/wcs/scaling/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" gml:id="MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed" xsi:schemaLocation="http://www.opengis.net/wcs/wcseo/1.0 http://schemas.opengis.net/wcs/wcseo/1.0/wcsEOAll.xsd">
   <gml:boundedBy>
-    <gml:Envelope axisLabels="lat long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326" uomLabels="deg deg" srsDimension="2">
+    <gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/4326" axisLabels="lat long" uomLabels="deg deg" srsDimension="2">
       <gml:lowerCorner>36.80671547 11.62685243</gml:lowerCorner>
       <gml:upperCorner>39.97509154 14.79734005</gml:upperCorner>
     </gml:Envelope>
@@ -16,7 +16,7 @@
       </gml:limits>
       <gml:axisLabels>lat long</gml:axisLabels>
       <gml:origin>
-        <gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/4326" gml:id="MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed_grid_origin">
+        <gml:Point gml:id="MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed_grid_origin" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
           <gml:pos>39.97509154 11.62685243</gml:pos>
         </gml:Point>
       </gml:origin>
@@ -26,7 +26,7 @@
   </gml:domainSet>
   <gml:rangeSet>
     <gml:File>
-      <gml:rangeParameters xlink:href="cid:coverage/MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed.tif" xlink:arcrole="fileReference" xlink:role="http://www.opengis.net/spec/GMLCOV_geotiff-coverages/1.0/conf/geotiff-coverage"/>
+      <gml:rangeParameters xlink:arcrole="fileReference" xlink:href="cid:coverage/MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed.tif" xlink:role="http://www.opengis.net/spec/GMLCOV_geotiff-coverages/1.0/conf/geotiff-coverage"/>
       <gml:fileReference>cid:coverage/MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed.tif</gml:fileReference>
       <gml:fileStructure/>
       <gml:mimeType>image/tiff</gml:mimeType>
@@ -330,12 +330,12 @@
           <om:featureOfInterest>
             <eop:Footprint gml:id="footprint_MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed">
               <eop:multiExtentOf>
-                <gml:MultiSurface srsName="EPSG:4326" gml:id="multisurface_MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed">
+                <gml:MultiSurface gml:id="multisurface_MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed" srsName="EPSG:4326">
                   <gml:surfaceMember>
                     <gml:Polygon gml:id="polygon_MER_FRS_1PNPDE20060822_092058_000001972050_00308_23408_0077_uint16_reduced_compressed">
                       <gml:exterior>
                         <gml:LinearRing>
-                          <gml:posList>32.86873456 17.90504573 33.15675497 16.63597483 33.49010597 15.04583040 33.54552905 14.76594908 33.70107953 14.76594908 33.70107953 17.90504573 32.86873456 17.90504573</gml:posList>
+                          <gml:posList>33.15675497 16.63597483 33.49010597 15.04583040 33.54552905 14.76594908 33.70107953 14.76594908 33.70107953 17.90504573 32.86873456 17.90504573 33.15675497 16.63597483</gml:posList>
                         </gml:LinearRing>
                       </gml:exterior>
                     </gml:Polygon>
@@ -373,4 +373,4 @@
       </wcseo:EOMetadata>
     </gmlcov:Extension>
   </gmlcov:metadata>
-</wcseo:RectifiedDataset>
+</wcseo:RectifiedDataset>