merge headers deleted

parent ef6c8b1a
......@@ -11,12 +11,6 @@ urlpatterns = [
url(r'^imgrequest/$', views.requestToImage, name='img-rqst'),
url(r'^cartrequest/$', views.saveInCart, name='cart-rqst'),
url(r'^fromcartrqst/$', views.getFromCart, name='from-cart-rqst'),
<<<<<<< HEAD
# url(r'^scl/$', views.L2ASCL_data, name='L2ASCL-data'),
=======
url(r'^purchcartrqst/$', views.purchaseProduct, name='purch-prod-rqst'),
url(r'^scl/$', views.L2ASCL_data, name='L2ASCL-data')
>>>>>>> ad233d589b10f9ad3e86a5f5e5201c7abf763f77
]
......@@ -202,7 +202,7 @@ def getFromCart(request):
})
return JsonResponse({'product_list': prod_list})
<<<<<<< HEAD
##-------------------------------------------------------------------------------
#def L2ASCL_data(request):
# with open("/home/mario/NAS_MarioCh/mario_repsat_test/T15QZD_sclData.json") as f:
......@@ -218,7 +218,8 @@ def getFromCart(request):
# 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"]
# 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()
......@@ -238,7 +239,6 @@ def getFromCart(request):
#-------------------------------------------------------------------------------
def wsReportImages(request):
print(request.GET)
=======
#-------------------------------------------------------------------------------
def purchaseProduct(request):
......@@ -267,11 +267,6 @@ def L2ASCL_data(request):
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()] })
>>>>>>> ad233d589b10f9ad3e86a5f5e5201c7abf763f77
#-------------------------------------------------------------------------------
# def purchaseProduct(request):
# """
......@@ -332,4 +327,3 @@ def L2ASCL_data(request):
# return HttpResponse(status=204)
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