Fix geos polygon for geocontraint

.github/workflows/test_runner.yml

@@ -6,7 +6,7 @@ jobs:
 
   ci_tests:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
@@ -22,91 +22,91 @@ jobs:
       id: extract_branch
 
     - name: Starting Docker compose
-      run: docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml up -d
+      run: docker compose -f docker-compose.${{ matrix.qgis_version }}.yml up -d
 
     - name: Copying code into the container
       run: |
-          docker cp ./ "$(docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml ps -q g3w-suite)":/code
+          docker cp ./ "$(docker compose -f docker-compose.${{ matrix.qgis_version }}.yml ps -q g3w-suite)":/code
 
     - name: Installing Python requirements
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r requirements_docker.txt && pip3 install -r requirements_huey.txt"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r requirements_docker.txt && pip3 install -r requirements_huey.txt"
 
     - name: Installing Caching Python requirements
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/caching/requirements.txt"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/caching/requirements.txt"
 
     - name: Installing Filemanager Python requirements
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/filemanager/requirements.txt"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/filemanager/requirements.txt"
 
     - name: Installing Qplotly Python requirements
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/qplotly/requirements.txt"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/qplotly/requirements.txt"
 
     - name: Installing Openrouteservice Python requirements
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/openrouteservice/requirements.txt && pip3 install -r g3w-admin/openrouteservice/requirements_testing.txt"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/openrouteservice/requirements.txt && pip3 install -r g3w-admin/openrouteservice/requirements_testing.txt"
 
     - name: Building g3w-suite
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "/code/ci_scripts/build_suite.sh"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "/code/ci_scripts/build_suite.sh"
 
     - name: Setting up g3w-suite
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "/code/ci_scripts/setup_suite.sh"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "/code/ci_scripts/setup_suite.sh"
 
     - name: Starting Django
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py runserver 0.0.0.0:8000" &
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py runserver 0.0.0.0:8000" &
 
     - name: Waiting for Django
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "wait-for-it -h localhost -p 8000 -t 240"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "wait-for-it -h localhost -p 8000 -t 240"
 
     - name:  Running g3w-admin core tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test core"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test core"
 
     - name:  Running g3w-admin qdjango tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test qdjango"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test qdjango"
 
     - name:  Running g3w-admin usersmanage tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test usersmanage"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test usersmanage"
 
     - name:  Running g3w-admin client tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test client"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test client"
 
     - name:  Running g3w-admin editing tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test editing.tests"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test editing.tests"
 
     - name:  Running g3w-admin caching tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test caching"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test caching"
 
     - name:  Running g3w-admin filemanager tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test filemanager"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test filemanager"
 
     - name:  Running g3w-admin qplotly tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test qplotly"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test qplotly"
 
     - name:  Running g3w-admin openrouteservice tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test openrouteservice"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test openrouteservice"
 
     - name:  Running g3w-admin qtimeseries tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test qtimeseries"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test qtimeseries"
 
     - name:  Running g3w-admin about tests
       run: |
-        docker-compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test about"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/g3w-admin && python3 manage.py test about"
 
     - name: Setup tmate session
       if: ${{ failure() }}

README.md

@@ -15,16 +15,16 @@ Software releases follow theese main branches as described in the compatibility
 
 | Branch     | Python         | Django         | QGIS          | [client] | First release | Status         |
 |------------|----------------|----------------|---------------|----------|---------------|----------------|
-| [dev]      | 3.10           | 3.2            | 3.28          | dev      | Unreleased    | ⚠️️ Unstable    |
-| [v.3.6.x]  | 3.10           | 3.2            | 3.28          | 3.8.7    | May 2023      | 🪲️ Bug fixing  |
-| [v.3.5.x]  | 3.10           | 2.2            | 3.22          | 3.7      | Nov 2022      | 🪲️ Bug fixing  |
+| [dev]      | 3.10           | 3.2            | 3.28          | dev      | Unreleased    | ⚠️️ Unstable     |
+| [v.3.6.x]  | 3.10           | 3.2            | 3.28          | 3.8.16   | January 2024  | 🪲️ Bug fixing   |
+| [v.3.5.x]  | 3.10           | 2.2            | 3.22          | 3.7      | Nov 2022      | 🪲️ Bug fixing   |
 | [v.3.4.x]  | 3.8            | 2.2            | 3.22          | 3.4      | Mar 2022      | 🚨 End of Life |
 | [v.3.3.x]  | 3.6            | 2.2            | 3.16          | 3.3      | Sep 2021      | 🚨 End of Life | 
 | [v.3.2.x]  | 3.6            | 2.2            | 3.16          | 3.2      | Apr 2021      | 🚨 End of Life |
 | [v.3.1.x]  | 3.6            | 2.2            | 3.10          | 3.1      | Nov 2020      | 🚨 End of Life |
-| [v.3.0.x]  | 3.6            | 2.2            | 3.10           | 3.0      | Nov 2020      | 🚨 End of Life |
-| [dj22-py3] | 3.6            | 2.2            | [🔗]         |          |               | 🚨 End of Life |
-| [py2]      | 2.7            | 1.11           | [🔗]         |          |               | 🚨 End of Life |
+| [v.3.0.x]  | 3.6            | 2.2            | 3.10          | 3.0      | Nov 2020      | 🚨 End of Life |
+| [dj22-py3] | 3.6            | 2.2            | [🔗]          |          |               | 🚨 End of Life |
+| [py2]      | 2.7            | 1.11           | [🔗]          |          |               | 🚨 End of Life |
 
 [dev]: https://github.com/g3w-suite/g3w-admin/tree/dev
 [v.3.6.x]: https://github.com/g3w-suite/g3w-admin/tree/v.3.6.x

g3w-admin/about/api/filters.py

@@ -34,7 +34,7 @@ def filter_queryset(self, request, queryset, view):
 
 
 class UserProjectFilter(BaseFilterBackend):
-    """A filter backend for portal module for qdjango project"""
+    """A filter backend for about module for qdjango project"""
 
     def filter_queryset(self, request, queryset, view):
         """
@@ -47,20 +47,24 @@ def filter_queryset(self, request, queryset, view):
 
 
 class GroupProjectFilter(BaseFilterBackend):
-    """A filter backend for portal module for qdjango project , filter by group"""
+    """A filter backend for about module for qdjango project , filter by group"""
 
     def filter_queryset(self, request, queryset, view):
         """
         Return a filtered queryset by group_id
         """
+
         if 'group_id' in view.kwargs:
             queryset = queryset.filter(group_id=view.kwargs['group_id']).order_by('order')
 
+        if resolve(request.path_info).url_name == 'about-group-without-macrogroup-api-list':
+            queryset = queryset.filter(macrogroups__pk=None)
+
         return queryset
 
 
 class MacroGroupGroupFilter(BaseFilterBackend):
-    """A filter backend for portal module for group, filter by macrogroup"""
+    """A filter backend for about module for group, filter by macrogroup"""
 
     def filter_queryset(self, request, queryset, view):
         """
@@ -70,14 +74,14 @@ def filter_queryset(self, request, queryset, view):
             queryset = queryset.filter(macrogroups__pk=view.kwargs['macrogroup_id'])
 
         # check for group without macrogroup
-        if resolve(request.path_info).url_name == 'portal-group-without-macrogroup-api-list':
+        if resolve(request.path_info).url_name == 'about-group-without-macrogroup-api-list':
             queryset = queryset.filter(macrogroups__pk=None)
 
         return queryset
 
 
 class PanoramicProjectFilter(BaseFilterBackend):
-    """A filter backend for portal module for qdjango project , filter by not panoramic"""
+    """A filter backend for about module for qdjango project , filter by not panoramic"""
 
     def filter_queryset(self, request, queryset, view):
 

g3w-admin/about/tests/test_api.py

@@ -92,6 +92,11 @@ def setUpTestData(cls):
 
         cls.project_group2.save()
 
+        cls.project_group3 = CoreGroup(name='Group3', title='Group3', header_logo_img='',
+                                       srid=G3WSpatialRefSys.objects.get(auth_srid=3857))
+
+        cls.project_group3.save()
+
         # create macrogroups
         cls.macrogroup = MacroGroup(title='Macrogroup1', logo_img='macrogroup.png')
         cls.macrogroup.save()
@@ -173,7 +178,7 @@ def test_group(self):
         response = client.get(url)
         self.assertEqual(response.status_code, 200)
         jcontent = json.loads(response.content)
-        self.assertEqual(len(jcontent), 2)
+        self.assertEqual(len(jcontent), 3)
         feature = jcontent[0]
         self.assertIn('edit_url', feature)
         group = CoreGroup.objects.filter(pk=feature['id'])[0]
@@ -318,7 +323,7 @@ def test_macrogroup(self):
         response = client.get(url)
         self.assertEqual(response.status_code, 200)
         jcontent = json.loads(response.content)
-        self.assertEqual(len(jcontent), 2)
+        self.assertEqual(len(jcontent), 1)
 
         # ad new group without macrogroup
         new_group = CoreGroup(name='Group33', title='Group33', header_logo_img='',
@@ -328,8 +333,8 @@ def test_macrogroup(self):
         response = client.get(url)
         self.assertEqual(response.status_code, 200)
         jcontent = json.loads(response.content)
-        self.assertEqual(len(jcontent), 3)
-        self.assertEqual(jcontent[2]['name'], 'Group33')
+        self.assertEqual(len(jcontent), 2)
+        self.assertEqual(jcontent[1]['name'], 'Group33')
 
         client.logout()
 

g3w-admin/base/__init__.py

@@ -13,4 +13,4 @@
     logger.warning('Celery could not be imported, this might be ok if there are no custom suite modules that require Celery')
 
 
-__version__ = (3, 6, 0, 'unstable', 0)
+__version__ = (3, 6, 0, 'stable', 0)

g3w-admin/caching/tests/test_api.py

@@ -80,6 +80,8 @@ def test_tilestache_api(self):
         client = Client()
         layer = Layer.objects.get(project=self.project.instance, qgs_layer_id='spatialite_points20190604101052075')
         assign_perm('view_project', self.anonymoususer, self.project.instance)
+        for l in self.project.instance.layer_set.all():
+            assign_perm("view_layer", self.anonymoususer, l)
 
         # active caching for layer
         cachinglayer = G3WCachingLayer.objects.create(app_name='qdjango', layer_id=layer.pk)

g3w-admin/core/api/base/vector.py

@@ -2,6 +2,7 @@
 import deprecation
 
 from qgis.core import QgsWkbTypes
+from core.utils.qgisapi import get_layer_fids_from_server_fids
 
 class MetadataVectorLayer(object):
     """
@@ -33,5 +34,5 @@ def get_feature(self, pk):
         """
         Returns a (possibly invalid) single feature from QGIS layer
         """
-
-        return self.qgis_layer.getFeature(int(pk))
+        pk = get_layer_fids_from_server_fids([str(pk)], self.qgis_layer)[0]
+        return self.qgis_layer.getFeature(pk)

g3w-admin/core/api/base/views.py

@@ -484,7 +484,8 @@ def response_data_mode(self, request, export_features=False):
         # --------------------------------------
         # IDEA:     for big data it'll be iterate over features to get unique
         #           c++ iteration is fast. Instead memory layer with too many features can be a problem.
-        if 'unique' in request.query_params:
+        if 'unique' in self.request_data:
+
 
             vl = QgsVectorLayer(QgsWkbTypes.displayString(self.metadata_layer.qgis_layer.wkbType()),
                                 "temporary_vector", "memory")
@@ -498,7 +499,7 @@ def response_data_mode(self, request, export_features=False):
 
             uniques = vl.uniqueValues(
                 self.metadata_layer.qgis_layer.fields().indexOf(
-                    request.query_params.get('unique'))
+                    self.request_data.get('unique'))
             )
 
             values = []
@@ -642,6 +643,9 @@ def get_response(self, request, mode_call=None, project_type=None, layer_id=None
         # set reprojecting status
         self.set_reprojecting_status()
 
+        # Get request data by GET or POST method
+        self.request_data = request.query_params if request.method == 'GET' else request.data
+
         # get results
         response = self.get_response_data(request)
 

g3w-admin/core/api/filters.py

@@ -81,11 +81,18 @@ def apply_filter(self, request, metadata_layer, qgis_feature_request, view):
 
         qgis_layer = metadata_layer.qgis_layer
 
-        if request.query_params.get('search'):
+        # Try to get param from GET
+        search_value = request.query_params.get('search')
+
+        if not search_value:
+            # Try to get from POST
+            search_value = request.data.get('search')
+
+        if search_value:
 
             search_parts = []
 
-            for search_term in request.query_params.get('search').split(','):
+            for search_term in search_value.split(','):
 
                 search_term = self._quote_value('%' + search_term + '%')
                 exp_template = '{field_name} ILIKE ' + search_term
@@ -114,11 +121,18 @@ def apply_filter(self, request, metadata_layer, qgis_feature_request, view):
 
         qgis_layer = metadata_layer.qgis_layer
 
-        if request.query_params.get('ordering') is not None:
+        # Try to get param from GET
+        ordering_value = request.query_params.get('ordering')
+
+        if not ordering_value:
+            # Try to get from POST
+            ordering_value = request.data.get('ordering')
+
+        if ordering_value is not None:
 
             ordering_rules = []
 
-            for ordering in request.query_params.get('ordering').split(','):
+            for ordering in ordering_value.split(','):
                 ascending = True
                 if ordering.startswith('-'):
                     ordering = ordering[1:]
@@ -127,8 +141,10 @@ def apply_filter(self, request, metadata_layer, qgis_feature_request, view):
                 if not self._is_valid_field(qgis_layer, ordering, view):
                     continue
 
+                # Because the fields inside a QGIS expression must be declared inside
+                # the expression string with the double brackets ("field_name")
                 ordering_rules.append(QgsFeatureRequest.OrderByClause(
-                    ordering, ascending))
+                    f'"{ordering}"', ascending))
 
             if ordering_rules:
                 order_by = QgsFeatureRequest.OrderBy(ordering_rules)
@@ -215,8 +231,13 @@ def apply_filter(self, request, metadata_layer, qgis_feature_request, view):
 
         qgis_layer = metadata_layer.qgis_layer
 
+        # Try to get param from GET
         suggest_value = request.query_params.get('suggest')
 
+        if not suggest_value:
+            # Try to get from POST
+            suggest_value = request.data.get('suggest')
+
         if suggest_value:
 
             # get field and value

g3w-admin/core/api/serializers.py

@@ -258,6 +258,9 @@ def to_representation(self, instance):
         if layout_right_panel:
             ret['layout']['rightpanel'] = layout_right_panel
 
+        # Macrogroups
+        ret['macrogroup_id'] = [macrogroup.id for macrogroup in instance.macrogroups.all()]
+
         return ret
 
     class Meta: