Commit c9eec930 authored by Irving David's avatar Irving David

Cambiada la forma de consultar el tipo de proceso seleccionado

parent b92c545d
...@@ -15,7 +15,7 @@ all_process = Process.objects.filter(status=True) ...@@ -15,7 +15,7 @@ all_process = Process.objects.filter(status=True)
platforms = [] platforms = []
for each_process in all_process: for each_process in all_process:
platforms.append((each_process.platform_id,each_process.name)) platforms.append((each_process.id,each_process.name))
#ALOS, A3, AIRSAR, AS, ERS-1, E1, ERS-2, E2, JERS-1, J1, RADARSAT-1, R1, SEASAT, SS, Sentinel-1A, SA, Sentinel-1B, SB, SMAP, SP, UAVSAR, UA. #ALOS, A3, AIRSAR, AS, ERS-1, E1, ERS-2, E2, JERS-1, J1, RADARSAT-1, R1, SEASAT, SS, Sentinel-1A, SA, Sentinel-1B, SB, SMAP, SP, UAVSAR, UA.
......
...@@ -58,6 +58,7 @@ class Process(models.Model): ...@@ -58,6 +58,7 @@ class Process(models.Model):
description = models.TextField(default="") description = models.TextField(default="")
command = models.CharField(max_length=100, default='') command = models.CharField(max_length=100, default='')
parameters = models.TextField(default="") parameters = models.TextField(default="")
type = models.CharField(max_length=50)
class Search(models.Model): class Search(models.Model):
......
...@@ -104,13 +104,22 @@ def productList(request): ...@@ -104,13 +104,22 @@ def productList(request):
description = req['area_description'][0] description = req['area_description'][0]
print(search_name)
cloud_percentage = "[0 TO " + req['cloudPercentage'][0] + "]" cloud_percentage = "[0 TO " + req['cloudPercentage'][0] + "]"
process_info = Process.objects.values('name', 'platform_id', 'productLevel','type','platform__name').filter(id = process)
#print(process_info)
platform_name = process_info[0]['platform__name'] # Sentinel-2 ó Sentinel-1
product_type = process_info[0]['type'] # S2MSI1C o S2MSI2A
platform_id = process_info[0]['platform_id']
#print(platform_name)
#print(product_type)
## ----- aqui llamada a api sentinel ## ----- aqui llamada a api sentinel
## ----- antes consultar en DB si no se tiene ya el producto ## ----- antes consultar en DB si no se tiene ya el producto
date = ("".join(init_date.split('-')), "".join(end_date.split('-'))) date = ("".join(init_date.split('-')), "".join(end_date.split('-')))
params = {"platformname": "Sentinel-2"} params = {"platformname": platform_name}
# if cloud_percentage.strip(): # if cloud_percentage.strip():
# params['cloudcoverpercentage'] = cloud_percentage # params['cloudcoverpercentage'] = cloud_percentage
...@@ -120,19 +129,19 @@ def productList(request): ...@@ -120,19 +129,19 @@ def productList(request):
pol_bbox = polygonToBox.getWKTPolygonBoundingBox(area, True) pol_bbox = polygonToBox.getWKTPolygonBoundingBox(area, True)
##producttype: ##producttype:
type = " " type = product_type
print(process) #print(process)
if process == str(1): #~ if process == str(1):
type = "S2MSI1C" #~ type = "S2MSI1C"
if process == str(2): #~ if process == str(2):
type = "S2MSI2A" #~ type = "S2MSI2A"
## requesting producto to sentinel api ## requesting producto to sentinel api
##products = sentinel.getProducts(pol_bbox, date, params) ##products = sentinel.getProducts(pol_bbox, date, params)
products = sentinel.getProducts(pol_bbox, date, products = sentinel.getProducts(pol_bbox, date,
{"platformname": "Sentinel-2", "producttype": type, "cloudcoverpercentage": cloud_percentage},"Contains") ##intenta obtener los productos que contienen el polígono {"platformname": platform_name, "producttype": type, "cloudcoverpercentage": cloud_percentage},"Contains") ##intenta obtener los productos que contienen el polígono
if len(products) <= 0: if len(products) <= 0:
products = sentinel.getProducts(pol_bbox, date, {"platformname": "Sentinel-2", "producttype": type,"cloudcoverpercentage": cloud_percentage}) ## si no hay que contengan el polígono busca los que lo intersecan products = sentinel.getProducts(pol_bbox, date, {"platformname": platform_name, "producttype": type,"cloudcoverpercentage": cloud_percentage}) ## si no hay que contengan el polígono busca los que lo intersecan
##-- ##--
...@@ -169,7 +178,7 @@ def productList(request): ...@@ -169,7 +178,7 @@ def productList(request):
}) })
# Se tiene que pasar a Search el objeto completo correspondiente al process # Se tiene que pasar a Search el objeto completo correspondiente al process
index = Process.objects.filter(platform_id=process) index = Process.objects.filter(platform_id=platform_id)
proceso = index[0] proceso = index[0]
if (len(catalog) != 0): if (len(catalog) != 0):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment