Merge branch 'dev' of http://gitlab.geoint.mx/mario.chirinos/GeoInt_SIDT into dev

catalog/forms.py

@@ -5,9 +5,10 @@ import datetime
 #from django.contrib.auth.models import User
 #from buscador.models import Investigador, Reto
 platforms = [
-    ("vegIndex","Vegetation index"),
+    ("sentinel2","Classification scene"),
     ("waterBodies","Water bodies"),
-    ("urbanSprawl","Urban sprawl")
+    ("urbanSprawl","Urban sprawl"),
+    ("vegIndex","Vegetation index")
 ]
 #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.
 class ASFSearchForm(forms.Form):

catalog/management/commands/findProdcuts.py

+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from catalog.models import Product_l1c, Product_l2a
+
+sys.path.append('../')
+from geosentinel import APISentinel, polygonToBox
+
+
+class Command(BaseCommand):
+
+	def add_arguments(self, parser):
+		parser.add_argument('products', nargs=1, type=str)
+
+	def handle(self, *args, **options):
+		options['products']
+		products = options['products'].split()
+		pl1c = Product_l1c.objects.all().filter(identifier_in=products)
+		pl2a = Product_l1c.objects.all().filter(identifier_in=pl1c)
+		
+		fileList = [ p.file_path for p in pl2a]
+		print fileList
+#		sentinel = APISentinel.APISentinel('emmhp',  'geoemm29')
+#		Product_l2a.objects().all().filter()
+
+#		date   = ("".join(init_date.split('-')), "".join(end_date.split('-')))
+#		params = {"platformname": "Sentinel-2"}
+#		pol_bbox = polygonToBox.getWKTPolygonBoundingBox(area, True)
+#		products = sentinel.getProducts(pol_bbox, date, params)

catalog/migrations/0010_process.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.18 on 2019-02-05 16:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0009_auto_20180831_2103'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Process',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('tag', models.CharField(max_length=50)),
+            ],
+        ),
+    ]

catalog/models.py

@@ -48,6 +48,12 @@ class CartProduct(models.Model):
     purchased   = models.NullBooleanField()
 
 
+# modelo para los procesos del sizebar del view map
+class Process(models.Model):
+    tag         = models.CharField(max_length=50)
+
+
+
 # class Purchase(models.Model):
 #     user      = models.ForeignKey(User, on_delete=models.CASCADE)
 #     pur_date  = models.DateTimeField(auto_now=True)                 ## transaction date

catalog/static/catalog/adminlte/dist/css/skins/_all-skins.css

@@ -1295,6 +1295,9 @@
   margin: 0 1px;
   background: #2c3b41;
 }
+ul.treeview-menu.sidebar-form span{
+  color: white;
+}
 .skin-yellow .sidebar a {
   color: #b8c7ce;
 }

catalog/static/catalog/js/dataRetrieval.js

@@ -84,16 +84,16 @@ function drawPolygon(element) {
             osmap.removePolygon();
 
             // draw wkt polygon
-            osmap.addWKTPolygon(polygon.wkt_polygon);
+            // osmap.addWKTPolygon(polygon.wkt_polygon);
 
             // format coords to draw
-            // var coords = osmap.formatCoords(polygon.geojson.geometry.coordinates);
+            var coords = osmap.formatCoords(polygon.geojson.geometry.coordinates);
 
             // get the biggest area
             // var biggest = osmap.getBiggestPolygon(coords);
 
             // draw coordsR
-            // osmap.addPolygon(biggest);
+            osmap.addPolygon(coords);
         }
     })
 }
@@ -157,7 +157,7 @@ function drawApiResponse(element) {
             console.log("footprint:\n", data.product.footprint);
             if (!prevfeature.has(data.uuid)){
                 element.style.textDecoration = 'underline';
-                prevfeature.set(data.uuid, osmap.addfootprint(data.product.footprint, prevfeature)); 
+                prevfeature.set(data.uuid, osmap.addfootprint(data.product.footprint, prevfeature));
             }else{
                 if (prevfeature.length != 0){
                     element.style.textDecoration = 'none';
@@ -165,7 +165,7 @@ function drawApiResponse(element) {
                     prevfeature.delete(data.uuid);
                 }
             }
-            
+
         }
     }
 }
@@ -253,7 +253,7 @@ $(document).ready(function () {
     var pol_element = document.getElementById('polygon-list');
 
     var typingTimer;
-    var typingInterval      = 800;  //milliseconds
+    var typingInterval      = 300;  //milliseconds
     var productListGlobe    = [];
     var cartProductList     = [];   // this array represent DB where products will be stored
     var productsToObtain    = [];
@@ -279,6 +279,15 @@ $(document).ready(function () {
         }
     });
 
+    // disable enter in search input
+    $('#ajax-input').on('keyup keypress', function(event) {
+      var keyCode = event.keyCode || event.which;
+      if (keyCode === 13) {
+        event.preventDefault();
+        return false;
+      }
+    });
+
     // var PRODUCT_IN_LIST = false;
 
     // function for making POST request to productList in view.py
@@ -338,7 +347,6 @@ $(document).ready(function () {
 
                         });
 
-                        console.log("DD: ", data);
                         productListGlobe.push(data);
                     });
 

catalog/urls.py

@@ -12,5 +12,4 @@ urlpatterns = [
     url(r'^cartrequest/$', views.saveInCart, name='cart-rqst'),
     url(r'^fromcartrqst/$', views.getFromCart, name='from-cart-rqst'),
     url(r'^purchcartrqst/$', views.purchaseProduct, name='purch-prod-rqst'),
-    url(r'^scl/$', views.L2ASCL_data, name='L2ASCL-data')
 ]

catalog/views.py

@@ -90,12 +90,12 @@ def productList(request):
     catalog = []
     for p in products:
         # img_link = products[p]['link_icon']
-        # img_link = img_link[:img_link.find("/")+2] + "emmhp:geoemm29@" + img_link[img_link.find("/")+2:]        
+        # img_link = img_link[:img_link.find("/")+2] + "emmhp:geoemm29@" + img_link[img_link.find("/")+2:]
 
         if products[p].get('tileid') is None:
             titleid = products[p]['title'].split("_")
             products[p]['tileid'] = titleid[5][1:]
-        
+
         catalog.append({
             'process'          : process,
             'start_date'       : init_date,
@@ -267,11 +267,11 @@ def purchaseProduct(request):
     ## TODO: Add product L1C to Cart DB after product download. ##
 
 #-------------------------------------------------------------------------------
-def L2ASCL_data(request):
-    with open("/home/mchc/data.json") as f:
-    	json_data = json.load(f)
-    	print(json_data)
-    return render(request, 'L2ASCL_data.html', {"labels":",".join([k for k in json_data]), "vegetation":[v["4"] for k,v in json_data.items()] })
+# def L2ASCL_data(request):
+#     with open("/home/ulises/REPSAT_NAS/mario_repsat_test/T15QZD_sclData.json") as f:
+#     	json_data = json.load(f)
+#     	print(json_data)
+#     return render(request, 'L2ASCL_data.html', {"labels":",".join([k for k in json_data]), "vegetation":[v["4"] for k,v in json_data.items()] })
 #-------------------------------------------------------------------------------
 # def purchaseProduct(request):
 #     """

geosentinel

-/home/emmanuelhp/Documentos/GeoSentinel/geosentinel
\ No newline at end of file
+/home/luis/django-apps/GeoSentinel/geosentinel
\ No newline at end of file

reports/urls.py

 from django.conf.urls import url
 
 from . import views
-
+from reports import views
 
 urlpatterns = [
 
-	url(r'^$', views.report_L2ASCL, name='report'),
-	url(r'^(?P<report>\w+)$', views.report_L2ASCL, name='report'),
+    url(r'^(?P<report>[\w\-]+)/$', views.report_L2ASCL, name='report'),
 
 ]
-

reports/views.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import io
+from django.http import FileResponse
+from reportlab.pdfgen import canvas
 from django.shortcuts import render
 
 # Create your views here.
 from collections import OrderedDict
 import json
-#-------------------------------------------------------------------------------
-def report_L2ASCL(request, report=0):
-	with open("/home/mario/NAS_MarioCh/mario_repsat_test/T15QZD_sclData.json") as f:
-		json_data = OrderedDict(json.load(f))
-		graphData = dict()
-		graphData['type']="line"
-
-		data=dict()
-		data['labels'] = [ k for k,v in sorted(json_data.items()) ]
-#		data['click']="chartOnClick"
-		data['datasets'] = list()
-		labels  = set()
-		for d in json_data:
-			labels |= set(json_data[d].keys())
-		labels.remove('date')
-
-		labelNames = ["No Data", "Saturated", "Shadows", "Cloud Shadows", "Vegetation", "Not-Vegetated", "Whater", "Unclassified", "Cloud Medium Probablilty", "Cloud Hight Probablilty", "Thin Cirrus", "Snow"]
-		colors = ["Black", "Red", "DarkGray", "Brown", "Green", "Yellow", "Blue", "Grey", "LightGray", "White", "Aqua", "Pink"]
-		for l in labels:
-			item = dict()
-			item['label'] = labelNames[int(l)]
-			if l == "0":
-				item['hidden'] = "true"
-			item['data'] = [ v[l] * 60*60/1000000. for k,v in sorted(json_data.items()) if l in v]
-			item['backgroundColor']=colors[int(l)]
-			data['datasets'].append(item)
-
-		graphData['data']=data
-
-#		graphData['options']['responsive']=True
-#		graphData['options']['maintainAspectRatio']=False
-		print( json.dumps(graphData).encode("utf-8"))
-	return render(request, 'L2ASCL_data.html', {"graphData":json.dumps(graphData).encode("utf-8")})
+
+
+# -------------------------------------------------------------------------------
+from reportlab.pdfgen import canvas
+
+from GeoInt_SIDT import settings
+
+
+def report_L2ASCL(request, report):
+    with open("/home/ulises/REPSAT_NAS/mario_repsat_test/"+report+".json") as f:
+        json_data = OrderedDict(json.load(f))
+        graphData = dict()
+        graphData['type'] = "line"
+
+        data = dict()
+        data['labels'] = [k for k, v in sorted(json_data.items())]
+        #		data['click']="chartOnClick"
+        data['datasets'] = list()
+        labels = set()
+        for d in json_data:
+            labels |= set(json_data[d].keys())
+        labels.remove('date')
+
+        labelNames = ["No Data", "Saturated", "Shadows", "Cloud Shadows", "Vegetation", "Not-Vegetated", "Whater",
+                      "Unclassified", "Cloud Medium Probablilty", "Cloud Hight Probablilty", "Thin Cirrus", "Snow"]
+        colors = ["Black", "Red", "DarkGray", "Brown", "Green", "Yellow", "Blue", "Grey", "LightGray", "White", "Aqua",
+                  "Pink"]
+        for l in labels:
+            item = dict()
+            item['label'] = labelNames[int(l)]
+            # item['fill'] = "false"
+            if l == "0":
+                item['hidden'] = "true"
+            item['data'] = [v[l] * 60 * 60 / 1000000. for k, v in sorted(json_data.items()) if l in v]
+            item['backgroundColor'] = colors[int(l)]
+            data['datasets'].append(item)
+
+        graphData['data'] = data
+        #print(settings.BASE_URL)
+        #		graphData['options']['responsive']=True
+        #		graphData['options']['maintainAspectRatio']=False
+        #print(json.dumps(graphData).encode("utf-8"))
+
+    return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData), "report_name": report})
+# -------------------------------------------------------------------------------