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
0fd631be
Commit
0fd631be
authored
Feb 05, 2019
by
Luis Ernesto Dominguez Uriostegui
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab.geoint.mx/mario.chirinos/GeoInt_SIDT
into dev
parents
dcac1d5c
1a31a798
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
dataRetrieval.js
catalog/static/catalog/js/dataRetrieval.js
+5
-6
map.html
catalog/templates/map.html
+0
-1
views.py
catalog/views.py
+2
-2
No files found.
catalog/static/catalog/js/dataRetrieval.js
View file @
0fd631be
...
...
@@ -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
);
}
})
}
...
...
@@ -148,7 +148,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'
;
...
...
@@ -156,7 +156,7 @@ function drawApiResponse(element) {
prevfeature
.
delete
(
data
.
uuid
);
}
}
}
}
}
...
...
@@ -322,7 +322,6 @@ $(document).ready(function () {
});
console
.
log
(
"DD: "
,
data
);
productListGlobe
.
push
(
data
);
});
...
...
catalog/templates/map.html
View file @
0fd631be
...
...
@@ -342,7 +342,6 @@
mes_anterior
=
'0'
+
mes_anterior
;
//agrega cero si el menor de 10
document
.
getElementById
(
'id_start'
).
value
=
ano_anterior
+
"-"
+
mes_anterior
+
"-"
+
dia_anterior
;
document
.
getElementById
(
'text'
).
innerHTML
=
ano_anterior
+
"-"
+
mes_anterior
+
"-"
+
dia_anterior
;
</script>
<script>
...
...
catalog/views.py
View file @
0fd631be
...
...
@@ -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
,
...
...
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