Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GeoInt_SIDT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mario Chirinos Colunga
GeoInt_SIDT
Commits
9e8f9db8
Commit
9e8f9db8
authored
Jan 24, 2019
by
Emmanuel René Huchim Puc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge headers deleted
parent
ef6c8b1a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
30 deletions
+18
-30
urls.py
catalog/urls.py
+0
-6
views.py
catalog/views.py
+18
-24
No files found.
catalog/urls.py
View file @
9e8f9db8
...
...
@@ -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
]
catalog/views.py
View file @
9e8f9db8
...
...
@@ -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)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment