Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
21
Issues
21
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
f53dd92e
Commit
f53dd92e
authored
Dec 02, 2015
by
Alexander Basov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed map layers list
parent
a4571148
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
44 additions
and
57 deletions
+44
-57
src/main/webapp/WEB-INF/jsp/accession/map.jsp
src/main/webapp/WEB-INF/jsp/accession/map.jsp
+44
-57
No files found.
src/main/webapp/WEB-INF/jsp/accession/map.jsp
View file @
f53dd92e
...
...
@@ -32,9 +32,16 @@
<ul
class=
"nav nav-pills "
>
<li
style=
"margin-left: 5px"
class=
"active dropdown form-horizontal pull-right"
>
<a
id=
"get-providers
"
href=
"#"
><spring:message
code=
"mapproviders.list"
/></a>
<a
class=
"dropdown-toggle"
data-toggle=
"dropdown
"
href=
"#"
><spring:message
code=
"mapproviders.list"
/></a>
<ul
id=
"enabled-providers"
class=
"dropdown-menu"
></ul>
<ul
class=
"dropdown-menu"
>
<li>
<label><input
class=
"map-provider"
name=
"provider"
style=
'margin-right: 10px;margin-left: 5px'
type=
'radio'
>
MapQuest
</label>
<label><input
name=
"provider"
class=
"map-provider"
style=
'margin-right: 10px;margin-left: 5px'
type=
'radio'
>
Openstreetmap
</label>
</li>
</ul>
</li>
...
...
@@ -110,40 +117,33 @@
Openstreetmap
:
L
.
tileLayer
(
'
https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png
'
,
{
attribution
:
'
© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>
'
}),
OpenMapSurfer_Grayscale
:
L
.
tileLayer
(
'
http://openmapsurfer.uni-hd.de/tiles/roadsg/x={x}&y={y}&z={z}
'
,
{
maxZoom
:
19
,
attribution
:
'
Imagery from <a target="_blank" href="http://giscience.uni-hd.de/">GIScience Research Group, University of Heidelberg</a>, Map data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>
'
}),
/*
OpenMapSurfer_Grayscale: L.tileLayer('http://openmapsurfer.uni-hd.de/tiles/roadsg/x={x}&y={y}&z={z}', {
maxZoom: 19,
attribution: 'Imagery from <a target="_blank" href="http://giscience.uni-hd.de/">GIScience Research Group, University of Heidelberg</a>, Map data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
}),*/
MapQuest
:
L
.
tileLayer
(
'
https://otile{s}-s.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png
'
,
{
attribution
:
"
MapQuest
"
,
styleId
:
22677
,
subdomains
:
[
'
1
'
,
'
2
'
,
'
3
'
,
'
4
'
],
opacity
:
0.6
}),
Stamen_TonerLines
:
L
.
tileLayer
(
'
https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lines/{z}/{x}/{y}.png
'
,
{
attribution
:
'
Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> — Map data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>
'
,
subdomains
:
'
abcd
'
,
opacity
:
0.3
,
minZoom
:
0
,
maxZoom
:
20
,
ext
:
'
png
'
}),
Acetate_labels
:
L
.
tileLayer
(
'
http://a{s}.acetate.geoiq.com/tiles/acetate-labels/{z}/{x}/{y}.png
'
,
{
attribution
:
'
©2012 Esri & Stamen, Data from OSM and Natural Earth
'
,
subdomains
:
'
0123
'
,
opacity
:
0.6
,
minZoom
:
2
,
maxZoom
:
18
})
/*Stamen_TonerLines: L.tileLayer('https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lines/{z}/{x}/{y}.png', {
attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> — Map data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>',
subdomains: 'abcd',
opacity: 0.3,
minZoom: 0,
maxZoom: 20,
ext: 'png'
}),
Acetate_labels: L.tileLayer('http://a{s}.acetate.geoiq.com/tiles/acetate-labels/{z}/{x}/{y}.png', {
attribution: '©2012 Esri & Stamen, Data from OSM and Natural Earth',
subdomains: '0123',
opacity: 0.6,
minZoom: 2,
maxZoom: 18
})*/
};
for
(
var
key
in
mapProviders
){
var
li
=
"
<li><label class='map-provider'><input style='margin-right: 10px;margin-left: 5px' type='checkbox'>
"
+
key
+
"
</label></li>
"
;
$
(
'
#enabled-providers
'
).
append
(
li
);
}
$
(
'
#get-providers
'
).
on
(
'
click
'
,
function
(){
$
(
'
#enabled-providers
'
).
toggle
();
});
var
cookieUtils
=
{
getCookie
:
function
(
name
)
{
...
...
@@ -186,44 +186,31 @@
})
}
};
// cookieUtils.deleteCookie('mapProviders');
if
(
cookieUtils
.
getCookie
(
'
mapProviders
'
)
&&
cookieUtils
.
getCookie
(
'
mapProviders
'
)
!=
''
){
cookieUtils
.
getCookie
(
'
mapProviders
'
).
split
(
'
,
'
).
forEach
(
function
(
provider
){
[].
forEach
.
call
(
$
(
'
.map-provider
'
),
function
(
li
){
if
(
$
(
li
).
text
()
==
provider
){
$
(
li
).
find
(
'
input:checkbox
'
).
prop
(
'
checked
'
,
true
);
}
else
{
$
(
li
).
find
(
'
input:checkbox
'
).
prop
(
'
checked
'
,
false
);
}
});
mapProviders
[
provider
].
addTo
(
map
);
});
}
else
{
if
(
cookieUtils
.
getCookie
(
'
mapProviders
'
)
&&
cookieUtils
.
getCookie
(
'
mapProviders
'
)
!=
''
)
{
mapProviders
[
cookieUtils
.
getCookie
(
'
mapProviders
'
)].
addTo
(
map
);
}
else
{
mapProviders
.
MapQuest
.
addTo
(
map
);
}
$
(
document
).
on
(
'
cookieUpdate
'
,
function
()
{
for
(
var
key
in
mapProviders
)
{
$
(
document
).
on
(
'
cookieUpdate
'
,
function
()
{
for
(
var
key
in
mapProviders
)
{
map
.
removeLayer
(
mapProviders
[
key
]);
}
if
(
cookieUtils
.
getCookie
(
'
mapProviders
'
)){
cookieUtils
.
getCookie
(
'
mapProviders
'
).
split
(
'
,
'
).
forEach
(
function
(
provider
){
mapProviders
[
provider
].
addTo
(
map
);
});
}
else
{
if
(
cookieUtils
.
getCookie
(
'
mapProviders
'
))
{
mapProviders
[
cookieUtils
.
getCookie
(
'
mapProviders
'
)].
addTo
(
map
);
}
else
{
mapProviders
.
MapQuest
.
addTo
(
map
);
}
});
$
(
"
body
"
).
on
(
"
click
"
,
"
.map-provider
"
,
function
(
e
)
{
var
title
=
$
(
this
).
text
();
var
providers
=
cookieUtils
.
getCookie
(
'
mapProviders
'
)
&&
cookieUtils
.
getCookie
(
'
mapProviders
'
)
!=
''
?
cookieUtils
.
getCookie
(
'
mapProviders
'
).
split
(
'
,
'
):[];
if
(
$
(
this
).
find
(
"
input:checkbox
"
).
is
(
"
:checked
"
))
{
providers
.
push
(
title
);
cookieUtils
.
setCookie
(
'
mapProviders
'
,
providers
,
0
);
var
providerName
=
$
(
this
).
parent
().
text
();
console
.
log
(
$
(
this
).
parent
().
text
());
console
.
log
(
providerName
);
if
(
$
(
this
).
is
(
"
:checked
"
))
{
cookieUtils
.
setCookie
(
'
mapProviders
'
,
providerName
,
0
);
$
(
document
).
trigger
(
'
cookieUpdate
'
);
}
else
{
provider
s
.
splice
(
providers
.
indexOf
(
title
),
1
)
;
cookieUtils
.
setCookie
(
'
mapProviders
'
,
provider
s
,
0
);
provider
Name
=
''
;
cookieUtils
.
setCookie
(
'
mapProviders
'
,
provider
Name
,
0
);
$
(
document
).
trigger
(
'
cookieUpdate
'
);
}
...
...
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