Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit 10c2be2e authored by Emmanuel René Huchim Puc's avatar Emmanuel René Huchim Puc
Browse files
Options

states added

parent c185dd49
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 25 deletions
catalog/management/commands/addState.py
View file @ 10c2be2e
......@@ -12,18 +12,18 @@ class Command(BaseCommand):
pList = Polygon.objects.all()
state_parser = {
'01': "Aguascalientes", '02': "Baja California", '03': "Baja California Sur", '04': "Campeche",
'05': "Coahuila", '06': "Colima", '07': "Chiapas", '08': "Chihuahua",
'09': "Ciudad de México",'10': "Durango", '11': "Guanajuato", '12': "Guerrero",
'13': "Hidalgo", '14': "Jalisco", '15': "México", '16': "Michoacán",
'17': "Morelos", '18': "Nayarit", '19': "Nuevo León", '20': "Oaxaca",
'21': "Puebla", '22': "Querétaro", '23': "Quintana Roo", '24': "San Luis Potosí",
'25': "Sinaloa", '26': "Sonora", '27': "Tabasco", '28': "Tamaulipas",
'29': "Tlaxcala", '30': "Veracruz", '31': "Yucatán", '32': "Zacatecas"
'01': "Aguascalientes", '02': "Baja California", '03': "Baja California Sur", '04': "Campeche",
'05': "Coahuila de Zaragoza", '06': "Colima", '07': "Chiapas", '08': "Chihuahua",
'09': "Ciudad de México", '10': "Durango", '11': "Guanajuato", '12': "Guerrero",
'13': "Hidalgo", '14': "Jalisco", '15': "México", '16': "Michoacán de Ocampo",
'17': "Morelos", '18': "Nayarit", '19': "Nuevo León", '20': "Oaxaca",
'21': "Puebla", '22': "Querétaro", '23': "Quintana Roo", '24': "San Luis Potosí",
'25': "Sinaloa", '26': "Sonora", '27': "Tabasco", '28': "Tamaulipas",
'29': "Tlaxcala", '30': "Veracruz de Ignacio de la Llave", '31': "Yucatán", '32': "Zacatecas"
}
for p in pList:
j = json.loads(p.json_info)
j['properties']['ENT_NAME'] = state_parser[j['properties']['CVE_ENT']]
p.json_info = json.dumps(j, ensure_ascii=True)
p.save()
\ No newline at end of file
p.save()
catalog/management/commands/populate_db.py
View file @ 10c2be2e
......@@ -16,6 +16,7 @@
from django.core.management.base import BaseCommand, CommandError
from catalog.models import Polygon
import json, unicodedata
from shapely.geometry import shape
class Command(BaseCommand):
......@@ -29,6 +30,17 @@ class Command(BaseCommand):
## base geojson files path
base_path = options['geojson_path'][0]
states_names = {
'01': "Aguascalientes", '02': "Baja California", '03': "Baja California Sur", '04': "Campeche",
'05': "Coahuila de Zaragoza", '06': "Colima", '07': "Chiapas", '08': "Chihuahua",
'09': "Ciudad de México", '10': "Durango", '11': "Guanajuato", '12': "Guerrero",
'13': "Hidalgo", '14': "Jalisco", '15': "México", '16': "Michoacán de Ocampo",
'17': "Morelos", '18': "Nayarit", '19': "Nuevo León", '20': "Oaxaca",
'21': "Puebla", '22': "Querétaro", '23': "Quintana Roo", '24': "San Luis Potosí",
'25': "Sinaloa", '26': "Sonora", '27': "Tabasco", '28': "Tamaulipas",
'29': "Tlaxcala", '30': "Veracruz de Ignacio de la Llave", '31': "Yucatán", '32': "Zacatecas"
}
## =========================================================================================
## =========================================================================================
"""
......@@ -37,16 +49,38 @@ class Command(BaseCommand):
"""
## loading files
for index in range(1,33):
print ("Index: ", index)
with open(base_path + str(index) + ".geojson") as f:
# load data
data = json.load(f)
print ("Index: ", index)
for feat in data['features']:
polygon = Polygon(
name = self.strip_accents(feat['properties']['NOMGEO'].lower()),
json_info = json.dumps(feat, ensure_ascii=True)
)
polygon.save()
feature = data['features'][0]
# update name
feature['properties']['NOMGEO'] = states_names[feature['properties']['CVE_ENT']]
# data to save
geometry = shape(feature['geometry'])
# create polygon
polygon = Polygon(
name = self.strip_accents(feature['properties']['NOMGEO'].lower()),
json_info = json.dumps(feature, ensure_ascii=True),
wkt_polygon = geometry.wkt,
CVE_ENT = feature['properties']['CVE_ENT']
)
# save to db
polygon.save()
# for feat in data['features']:
# polygon = Polygon(
# name = self.strip_accents(feat['properties']['NOMGEO'].lower()),
# json_info = json.dumps(feat, ensure_ascii=True)
# )
#
# polygon.save()
## =========================================================================================
## =========================================================================================
......
catalog/views.py
View file @ 10c2be2e
......@@ -104,16 +104,16 @@ def productList(request):
description = req['area_description'][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)
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']
platform_id = process_info[0]['platform_id']
#print(platform_name)
#print(product_type)
## ----- aqui llamada a api sentinel
## ----- antes consultar en DB si no se tiene ya el producto
......@@ -223,10 +223,15 @@ class SearchSubmitView(View):
for polygon in polygonList:
polygonInfo = json.loads(polygon.json_info)
if 'ENT_NAME' in polygonInfo['properties']:
state_name = polygonInfo['properties']['ENT_NAME']
else:
state_name = ""
data_list.append({
'id': str(polygon.id),
'city': polygonInfo['properties']['NOMGEO'],
'state': polygonInfo['properties']['ENT_NAME'],
'state': state_name,
'geojson': polygonInfo,
'wkt_polygon': polygon.wkt_polygon,
'description': polygon.description,
......@@ -602,7 +607,7 @@ def Pay(request):
#print(SENTINEL_PATH + "/tools/L2ASCL_AreaProcessing.sh " + purchase_dir + "/ 0 > " + purchase_dir + "/L2ASCL_AreaProcessing.log")
#f.open(purchase_dir + "/L2ASCL_AreaProcessing.log","w")
#subprocess.call("L2ASCL_AreaProcessing.sh " + purchase_dir + "/ 0 > " + purchase_dir + "/L2ASCL_AreaProcessing.log",shell=True)
subprocess.Popen("L2ASCL_AreaProcessing.sh " + purchase_dir + "/ 0 > " + purchase_dir + "/L2ASCL_AreaProcessing.log",shell=True)
subprocess.Popen("L2ASCL_AreaProcessing.sh " + purchase_dir + "/ 0 > " + purchase_dir + "/L2ASCL_AreaProcessing.log",shell=True)
......
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