From bc55979110c7afd59bd889ad4bb3f7676f09e139 Mon Sep 17 00:00:00 2001 From: Zulfikar Akbar Muzakki Date: Mon, 16 Dec 2024 09:40:25 +0700 Subject: [PATCH 1/2] Get latest reference layer instead of first --- django_project/cplus_api/api_views/layer.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/django_project/cplus_api/api_views/layer.py b/django_project/cplus_api/api_views/layer.py index df6e5cb..093078a 100644 --- a/django_project/cplus_api/api_views/layer.py +++ b/django_project/cplus_api/api_views/layer.py @@ -813,12 +813,14 @@ def get(self, request, *args, **kwargs): try: reference_layer = get_object_or_404( InputLayer, - component_type=InputLayer.ComponentTypes.REFERENCE_LAYER + component_type=InputLayer.ComponentTypes.REFERENCE_LAYER, + file__isnull=False ) except MultipleObjectsReturned: reference_layer = InputLayer.objects.filter( component_type=InputLayer.ComponentTypes.REFERENCE_LAYER - ).first() + ).last() + breakpoint() if reference_layer.is_available(): basename = os.path.basename(reference_layer.file.name) file_path = os.path.join( @@ -863,6 +865,7 @@ def get(self, request, *args, **kwargs): expanded_polygon.extent, settings.TEMPORARY_LAYER_DIR ) + breakpoint() # Create temporary layer object TemporaryLayer.objects.create( From 222c076600c3dc4bab40c26bab6107adde8465d7 Mon Sep 17 00:00:00 2001 From: Zulfikar Akbar Muzakki Date: Mon, 16 Dec 2024 09:48:04 +0700 Subject: [PATCH 2/2] remove breakpoints --- django_project/cplus_api/api_views/layer.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/django_project/cplus_api/api_views/layer.py b/django_project/cplus_api/api_views/layer.py index 093078a..6c1cae7 100644 --- a/django_project/cplus_api/api_views/layer.py +++ b/django_project/cplus_api/api_views/layer.py @@ -820,7 +820,6 @@ def get(self, request, *args, **kwargs): reference_layer = InputLayer.objects.filter( component_type=InputLayer.ComponentTypes.REFERENCE_LAYER ).last() - breakpoint() if reference_layer.is_available(): basename = os.path.basename(reference_layer.file.name) file_path = os.path.join( @@ -865,7 +864,6 @@ def get(self, request, *args, **kwargs): expanded_polygon.extent, settings.TEMPORARY_LAYER_DIR ) - breakpoint() # Create temporary layer object TemporaryLayer.objects.create(