Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
79ac654a
Commit
79ac654a
authored
Aug 02, 2016
by
Matija Obreza
Browse files
Use Esri.WorldGrayCanvas tiles for maps
parent
9752fe77
Changes
4
Hide whitespace changes
Inline
Side-by-side
.project
View file @
79ac654a
...
...
@@ -5,6 +5,11 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>
org.eclipse.wst.common.project.facet.core.builder
</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>
org.eclipse.jdt.core.javabuilder
</name>
<arguments>
...
...
@@ -25,5 +30,6 @@
<nature>
org.springframework.ide.eclipse.core.springnature
</nature>
<nature>
org.eclipse.jdt.core.javanature
</nature>
<nature>
org.eclipse.m2e.core.maven2Nature
</nature>
<nature>
org.eclipse.wst.common.project.facet.core.nature
</nature>
</natures>
</projectDescription>
src/main/webapp/WEB-INF/jsp/accession/details.jsp
View file @
79ac654a
...
...
@@ -731,11 +731,9 @@
<script
type=
"text/javascript"
>
jQuery
(
document
).
ready
(
function
()
{
var
map
=
L
.
map
(
'
map
'
).
setView
([
$
{
accessionGeo
.
latitude
},
$
{
accessionGeo
.
longitude
}],
2
);
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
L
.
tileLayer
(
'
http://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}
'
,
{
attribution
:
'
Tiles © Esri — Esri, DeLorme, NAVTEQ
'
,
maxZoom
:
16
}).
addTo
(
map
);
var
marker
=
L
.
marker
([
$
{
accessionGeo
.
latitude
},
$
{
accessionGeo
.
longitude
}]).
addTo
(
map
);
});
...
...
src/main/webapp/WEB-INF/jsp/accession/map.jsp
View file @
79ac654a
...
...
@@ -37,8 +37,8 @@
<ul
class=
"dropdown-menu"
>
<li>
<label
class=
"label-map-provider"
><input
class=
"map-provider"
value=
"mapQuest"
name=
"provider"
style=
'margin-right: 10px;margin-left: 5px'
type=
'radio'
>
MapQuest
</label>
<!--
<label class="label-map-provider"><input class="map-provider" value="mapQuest" name="provider" style='margin-right: 10px;margin-left: 5px'
type='radio'>MapQuest</label>
-->
<label
class=
"label-map-provider"
><input
name=
"provider"
value=
"openstreetmap"
class=
"map-provider"
style=
'margin-right: 10px;margin-left: 5px'
type=
'radio'
>
Openstreetmap
</label>
<label
class=
"label-map-provider"
><input
name=
"provider"
value=
"esriGray"
class=
"map-provider"
style=
'margin-right: 10px;margin-left: 5px'
...
...
@@ -133,12 +133,12 @@
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
'
,
{
/*
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
}),
}),
*/
esriGray
:
L
.
tileLayer
(
'
https://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}
'
,
{
attribution
:
'
Tiles © Esri — Esri, DeLorme, NAVTEQ
'
,
maxZoom
:
16
...
...
@@ -215,9 +215,9 @@
topPane
.
appendChild
(
mapProviders
[
cookieUtils
.
getCookie
(
'
mapProviders
'
)].
getContainer
());
mapProviders
[
cookieUtils
.
getCookie
(
'
mapProviders
'
)].
setZIndex
(
0
);
}
else
{
mapProviders
.
mapQuest
.
addTo
(
map
);
mapProviders
.
esriGray
.
addTo
(
map
);
topPane
.
appendChild
(
mapProviders
[
cookieUtils
.
getCookie
(
'
mapProviders
'
)].
getContainer
());
mapProviders
.
mapQuest
.
setZIndex
(
0
);
mapProviders
.
esriGray
.
setZIndex
(
0
);
}
});
...
...
src/main/webapp/WEB-INF/jsp/index.jsp
View file @
79ac654a
...
...
@@ -205,21 +205,6 @@
messages
:
{
noResults
:
''
,
results
:
function
()
{}
},
select
:
function
(
event
,
ui
)
{
document
.
location
.
pathname
=
'
/acn/t/
'
+
ui
.
item
.
value
;
}
});
});
/* var map = L.map('globalmap', {minZoom:2, maxZoom:2, dragging:false, zoomControl:false, keyboard:false}).setView([20,0], 2);
L.tileLayer('https://otile{s}-s.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
attribution: "MapQuest",
styleId: 22677,
noWrap: true,
subdomains: ['1','2','3','4'],
opacity: 0.6
}).addTo(map);
L.tileLayer("{s}/explore/tile/{z}/{x}/{y}?filter={}", {
attribution: "<a href='${props.baseUrl}'>Genesys</a>",
styleId: 22677,
noWrap: true,
subdomains: [${props.tileserverCdn}]
}).addTo(map); */
});
</script>
</content>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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