Skip to content
Snippets Groups Projects
Commit 6c7c7c06 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Upgraded to OpenLayers 3.10.1, had to adapt to minor API changes

parent 94cb62f8
Branches
No related tags found
No related merge requests found
.ol-attribution{position:absolute;text-align:right;bottom:0;right:0;font-family:'Lucida Grande',Verdana,Geneva,Lucida,Arial,Helvetica,sans-serif;padding:6px}.ol-attribution a{text-decoration:none}.ol-attribution{color:#000}.ol-attribution:not([ie8andbelow]){color:#eee;background:rgba(0,60,136,0.3)}.ol-attribution a{color:#7b98bc}.ol-attribution a:not([ie8andbelow]){color:white}.ol-attribution ul{margin:0;padding:0;font-size:10px;line-height:12px}.ol-attribution li{display:inline;list-style:none;line-height:inherit}.ol-attribution li:not(:last-child):after{content:"\002003"}.ol-attribution-bing-tos{float:right;padding-top:2px;white-space:nowrap}.ol-full-screen{background:#eee;border-radius:4px;padding:2px;position:absolute;right:8px;top:8px}.ol-full-screen:not([ie8andbelow]){background:rgba(255,255,255,0.4)}@media print{.ol-full-screen{display:none}}.ol-full-screen a{background:#7b98bc;color:white;display:block;font-family:'Lucida Grande',Verdana,Geneva,Lucida,Arial,Helvetica,sans-serif;font-size:18px;font-weight:bold;height:22px;line-height:19px;margin:1px;padding:0;text-align:center;text-decoration:none;width:22px}.ol-full-screen a:not([ie8andbelow]){background:rgba(0,60,136,0.5)}a.ol-full-screen-false:after{content:"\002194"}a.ol-full-screen-true:after{content:"\0000d7"}.ol-full-screen div{border-radius:2px}.ol-full-screen div a{border-radius:2px}.ol-full-screen a:hover{background:#4c6079}.ol-full-screen a:hover:not([ie8andbelow]){background:rgba(0,60,136,0.7)}.ol-logo{bottom:0;left:0;padding:2px;position:absolute}.ol-logo ul{margin:0;padding:0}.ol-logo ul li{display:inline;list-style:none}.ol-mouse-position{top:8px;right:8px;position:absolute}.ol-scale-line{background:#95b9e6;border-radius:4px;bottom:8px;left:8px;padding:2px;position:absolute}.ol-scale-line:not([ie8andbelow]){background:rgba(0,60,136,0.3)}.ol-scale-line-inner{border:1px solid #eee;border-top:none;color:#eee;font-size:10px;font-family:'Lucida Grande',Verdana,Geneva,Lucida,Arial,Helvetica,sans-serif;text-align:center;margin:1px;padding:0 2px}.ol-unsupported{display:none}.ol-viewport .ol-unselectable{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}.ol-zoom{position:absolute;top:8px;left:8px;background-color:#eee;border-radius:4px;padding:2px}.ol-zoom:not([ie8andbelow]){background-color:rgba(255,255,255,0.4)}@media print{.ol-zoom{display:none}}.ol-zoom a{display:block;margin:1px;padding:0;color:white;font-size:18px;font-family:'Lucida Grande',Verdana,Geneva,Lucida,Arial,Helvetica,sans-serif;font-weight:bold;text-decoration:none;text-align:center;height:22px;width:22px;line-height:19px;background-color:#7b98bc}.ol-zoom a:not([ie8andbelow]){background-color:rgba(0,60,136,0.5)}.ol-touch .ol-zoom a{font-size:20px;height:30px;width:30px;line-height:26px}.ol-zoom a:hover{color:#fff;text-decoration:none;background-color:#4c6079}.ol-zoom a:hover:not([ie8andbelow]){background-color:rgba(0,60,136,0.7)}.ol-zoom-in{border-radius:2px 2px 0 0}.ol-zoom-out{border-radius:0 0 2px 2px}.ol-zoomslider{position:absolute;top:67px;left:8px;background:#eee;border-radius:4px;width:28px;height:200px;outline:none;overflow:hidden;padding:0;margin:0}.ol-zoomslider:not([ie8andbelow]){background:rgba(255,255,255,0.4)}.ol-zoomslider-thumb{position:absolute;display:block;padding:0;margin:2px;background:#7b98bc;border-radius:2px;outline:none;overflow:hidden;height:20px;width:24px}.ol-zoomslider-thumb:not([ie8andbelow]){background:rgba(0,60,136,0.5)}.ol-zoom-extent{position:absolute;background:#eee;border-radius:4px;left:8px;padding:2px;top:65px}.ol-zoom-extent:not([ie8andbelow]){background:rgba(255,255,255,0.4)}@media print{.ol-zoom-extent{display:none}}.ol-zoom-extent a{display:block;margin:1px;padding:0;color:white;font-size:16px;font-family:'Lucida Grande',Verdana,Geneva,Lucida,Arial,Helvetica,sans-serif;font-weight:bold;text-decoration:none;text-align:center;height:22px;width:22px;background-color:#7b98bc;border-radius:2px}.ol-zoom-extent a:not([ie8andbelow]){background-color:rgba(0,60,136,0.5)}.ol-touch .ol-zoom-extent a{font-size:20px;height:30px;width:30px;line-height:26px}.ol-zoom-extent a:hover{background-color:#4c6079}.ol-zoom-extent a:hover:not([ie8andbelow]){background-color:rgba(0,60,136,0.7)}.ol-zoom-extent a:after{content:"E"}
\ No newline at end of file
.ol-mouse-position{top:8px;right:8px;position:absolute}.ol-scale-line{background:#95b9e6;background:rgba(0,60,136,.3);border-radius:4px;bottom:8px;left:8px;padding:2px;position:absolute}.ol-scale-line-inner{border:1px solid #eee;border-top:none;color:#eee;font-size:10px;text-align:center;margin:1px;will-change:contents,width}.ol-overlay-container{will-change:left,right,top,bottom}.ol-unsupported{display:none}.ol-viewport .ol-unselectable{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent}.ol-control{position:absolute;background-color:#eee;background-color:rgba(255,255,255,.4);border-radius:4px;padding:2px}.ol-control:hover{background-color:rgba(255,255,255,.6)}.ol-zoom{top:.5em;left:.5em}.ol-rotate{top:.5em;right:.5em;transition:opacity .25s linear,visibility 0s linear}.ol-rotate.ol-hidden{opacity:0;visibility:hidden;transition:opacity .25s linear,visibility 0s linear .25s}.ol-zoom-extent{top:4.643em;left:.5em}.ol-full-screen{right:.5em;top:.5em}@media print{.ol-control{display:none}}.ol-control button{display:block;margin:1px;padding:0;color:#fff;font-size:1.14em;font-weight:700;text-decoration:none;text-align:center;height:1.375em;width:1.375em;line-height:.4em;background-color:#7b98bc;background-color:rgba(0,60,136,.5);border:none;border-radius:2px}.ol-control button::-moz-focus-inner{border:none;padding:0}.ol-zoom-extent button{line-height:1.4em}.ol-compass{display:block;font-weight:400;font-size:1.2em;will-change:transform}.ol-touch .ol-control button{font-size:1.5em}.ol-touch .ol-zoom-extent{top:5.5em}.ol-control button:focus,.ol-control button:hover{text-decoration:none;background-color:#4c6079;background-color:rgba(0,60,136,.7)}.ol-zoom .ol-zoom-in{border-radius:2px 2px 0 0}.ol-zoom .ol-zoom-out{border-radius:0 0 2px 2px}.ol-attribution{text-align:right;bottom:.5em;right:.5em;max-width:calc(100% - 1.3em)}.ol-attribution ul{margin:0;padding:0 .5em;font-size:.7rem;line-height:1.375em;color:#000;text-shadow:0 0 2px #fff}.ol-attribution li{display:inline;list-style:none;line-height:inherit}.ol-attribution li:not(:last-child):after{content:" "}.ol-attribution img{max-height:2em;max-width:inherit}.ol-attribution button,.ol-attribution ul{display:inline-block}.ol-attribution.ol-collapsed ul{display:none}.ol-attribution.ol-logo-only ul{display:block}.ol-attribution:not(.ol-collapsed){background:rgba(255,255,255,.8)}.ol-attribution.ol-uncollapsible{bottom:0;right:0;border-radius:4px 0 0;height:1.1em;line-height:1em}.ol-attribution.ol-logo-only{background:0 0;bottom:.4em;height:1.1em;line-height:1em}.ol-attribution.ol-uncollapsible img{margin-top:-.2em;max-height:1.6em}.ol-attribution.ol-logo-only button,.ol-attribution.ol-uncollapsible button{display:none}.ol-zoomslider{top:4.5em;left:.5em;width:24px;height:200px}.ol-zoomslider-thumb{position:absolute;background:#7b98bc;background:rgba(0,60,136,.5);border-radius:2px;cursor:pointer;height:10px;width:22px;margin:3px}.ol-touch .ol-zoomslider{top:5.5em;width:2.052em}.ol-touch .ol-zoomslider-thumb{width:1.8em}.ol-overviewmap{left:.5em;bottom:.5em}.ol-overviewmap.ol-uncollapsible{bottom:0;left:0;border-radius:0 4px 0 0}.ol-overviewmap .ol-overviewmap-map,.ol-overviewmap button{display:inline-block}.ol-overviewmap .ol-overviewmap-map{border:1px solid #7b98bc;height:150px;margin:2px;width:150px}.ol-overviewmap:not(.ol-collapsed) button{bottom:1px;left:2px;position:absolute}.ol-overviewmap.ol-collapsed .ol-overviewmap-map,.ol-overviewmap.ol-uncollapsible button{display:none}.ol-overviewmap:not(.ol-collapsed){background:rgba(255,255,255,.8)}.ol-overviewmap-box{border:2px dotted rgba(0,60,136,.7)}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
......@@ -55,7 +55,7 @@ function initMap(center, zoomLevel, displayMarker)
// Setting zoom and center for the map (need to do this after creating map. so that we kan transform our
// center to correct map projection)
var view = new ol.View2D({
var view = new ol.View({
center: centerPosition,
zoom:zoomLevel
});
......
......@@ -49,9 +49,10 @@ function initMap(center, zoomLevel, organizationId, currentWeatherStationId)
// The weather station layer
var weatherStationLayer = new ol.layer.Vector({
source: new ol.source.KML({
source: new ol.source.Vector({
url: "/rest/weatherstations/kml/" + organizationId + (currentWeatherStationId > 0 ? "?excludeWeatherStationId=" + currentWeatherStationId : ""),
projection: "EPSG:3857"
projection: "EPSG:3857",
format: new ol.format.KML()
})
});
......@@ -75,7 +76,7 @@ function initMap(center, zoomLevel, organizationId, currentWeatherStationId)
// Setting zoom and center for the map (need to do this after creating map. so that we kan transform our
// center to correct map projection)
var view = new ol.View2D({
var view = new ol.View({
center: centerPosition,
zoom:zoomLevel
});
......
......@@ -44,9 +44,10 @@ function initMap(center, zoomLevel, organizationId)
// The weather station layer
var weatherStationLayer = new ol.layer.Vector({
source: new ol.source.KML({
source: new ol.source.Vector({
url: "/rest/weatherstations/kml/" + organizationId,
projection: "EPSG:3857"
format: new ol.format.KML(),
projection: ol.proj.get("EPSG:3857")
})
});
......@@ -67,7 +68,7 @@ function initMap(center, zoomLevel, organizationId)
// Setting zoom and center for the map (need to do this after creating map. so that we kan transform our
// center to correct map projection)
var view = new ol.View2D({
var view = new ol.View({
center: centerPosition,
zoom:zoomLevel
});
......
......@@ -45,9 +45,10 @@ function initMap(center, zoomLevel, organizationId, highlightWeatherStationId)
// The weather station layer
var weatherStationLayer = new ol.layer.Vector({
source: new ol.source.KML({
source: new ol.source.Vector({
url: "/rest/weatherstations/kml/" + organizationId + (highlightWeatherStationId !== null ? "?highlightWeatherStationId=" + highlightWeatherStationId : ""),
projection: "EPSG:3857"
projection: "EPSG:3857",
format: new ol.format.KML()
})
});
......@@ -68,7 +69,7 @@ function initMap(center, zoomLevel, organizationId, highlightWeatherStationId)
// Setting zoom and center for the map (need to do this after creating map. so that we kan transform our
// center to correct map projection)
var view = new ol.View2D({
var view = new ol.View({
center: centerPosition,
zoom:zoomLevel
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment