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
81bdd0f1
Commit
81bdd0f1
authored
Mar 20, 2019
by
Emmanuel René Huchim Puc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
draw wkt on minimap
parent
7678218b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
7 deletions
+18
-7
minimap.js
reports/static/reports/js/minimap.js
+15
-2
sclData.html
reports/templates/sclData.html
+1
-0
views.py
reports/views.py
+2
-5
No files found.
reports/static/reports/js/minimap.js
View file @
81bdd0f1
...
...
@@ -8,10 +8,23 @@ const mapbox = new ol.layer.Tile({
})
});
// add wkt polygon
const
format
=
new
ol
.
format
.
WKT
();
const
feature
=
format
.
readFeature
(
polygon
,
{
dataProjection
:
'EPSG:4326'
,
featureProjection
:
'EPSG:3857'
});
var
vector
=
new
ol
.
layer
.
Vector
({
name
:
'polygon'
,
source
:
new
ol
.
source
.
Vector
({
features
:
[
feature
]
})
});
// create map
const
map
=
new
ol
.
Map
({
target
:
'minimap'
,
layers
:
[
mapbox
],
layers
:
[
mapbox
,
vector
],
view
:
new
ol
.
View
({
center
:
ol
.
proj
.
fromLonLat
([
-
99.19
,
19.61
]),
zoom
:
4
,
...
...
@@ -68,7 +81,7 @@ function addImageLayer(labelDate) {
function
removeImageLayers
()
{
var
imageLayers
=
map
.
getLayers
().
getArray
().
slice
();
imageLayers
.
forEach
(
layer
=>
{
if
(
layer
.
get
(
'name'
)
!=
'mapbox'
)
{
if
(
layer
.
get
(
'name'
)
!=
'mapbox'
&&
layer
.
get
(
'name'
)
!=
'polygon'
)
{
map
.
removeLayer
(
layer
)
}
})
...
...
reports/templates/sclData.html
View file @
81bdd0f1
...
...
@@ -384,6 +384,7 @@
let
oldLabel
=
"{{defaultDataSet}}"
;
let
labels
=
{{
labels
}};
var
config
=
{{
graphData
}};
let
polygon
=
"{{polygon}}"
config
.
options
=
{
responsive
:
true
,
...
...
reports/views.py
View file @
81bdd0f1
...
...
@@ -92,8 +92,6 @@ def report_L2ASCL(request, report, purchase_id):
#PDFGenerator(request, path, reporteDir,)
return
render
(
request
,
template
,
{
"graphData"
:
json
.
dumps
(
graphData
),
"report_name"
:
"SCL Image Classification Data(Km²)"
,
"startDate"
:
startDate
,
"endDate"
:
endDate
,
...
...
@@ -102,7 +100,8 @@ def report_L2ASCL(request, report, purchase_id):
"SCL_PATH"
:
SCL_path
,
'dafaultLabel'
:
defaultLabel
,
'defaultDataSet'
:
defaultDataset
,
"folders"
:
folders
,
"zone"
:
reporteDir
,
"purchaseID"
:
purchase_id
,
"labels"
:
graphData
[
'data'
][
'labels'
]})
"labels"
:
graphData
[
'data'
][
'labels'
],
"polygon"
:
dataProduct
[
'wkt'
]})
# -------------------------------------------------------------------------------def Reports(request):
...
...
@@ -272,8 +271,6 @@ def tiles(request, purchase_id, report, layer_type, date, z, x, y):
date
,
layer_type
[:
3
],
layer_class
,
z
,
x
,
y
)
print
(
os
.
path
.
exists
(
image_path
))
if
not
os
.
path
.
exists
(
image_path
):
# raise Http404
return
HttpResponse
(
None
,
content_type
=
"image/png"
)
...
...
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