Skip to content

Commit

Permalink
Merge pull request #676 from openlayers/prepare_for_v2.5_release
Browse files Browse the repository at this point in the history
Prepare for v2.5 release
  • Loading branch information
gberaudo authored Nov 9, 2018
2 parents 76d66b1 + 158bdba commit e547919
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

# v 2.5
# v 2.5 - 2018-11-09

* Breaking changes
* Icons are now anchored as specified in the OpenLayers style.
Expand Down
3 changes: 2 additions & 1 deletion examples/fillstyle.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ const vectorSource = new olSourceVector({
});

const vectorLayer = new olLayerVector({
source: vectorSource
source: vectorSource,
altitudeMode: 'clampToGround'
});

const image = new Image();
Expand Down
5 changes: 2 additions & 3 deletions examples/oldfashioned.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<html>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.1.3/css/ol.css" type="text/css">
<link rel="stylesheet" href="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.3.0/css/ol.css" type="text/css">
<link rel="stylesheet" href="../olcs.css" type="text/css">
<style>
#map { height: 300px; width: 500px }
</style>
<script src="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.1.3/build/ol.js"></script>
<script src="../ol.js"></script>
<script src="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.3.0/build/ol.js"></script>
<script src="../olcesium.js"></script>
<script src="../node_modules/@camptocamp/cesium/Build/CesiumUnminified/Cesium.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ol-cesium",
"version": "2.4.0",
"version": "2.5.0",
"description": "OpenLayers Cesium integration library",
"scripts": {
"build-examples": "cross-env NODE_ENV=production TARGET=examples webpack --progress --bail",
Expand Down
7 changes: 4 additions & 3 deletions src/olcs/core/OLImageryProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,13 @@ class OLImageryProvider /* should not extend Cesium.ImageryProvider */ {
* @override
*/
getTileCredits(x, y, level) {
const olExtent = this.map_.getView().calculateExtent(this.map_.getSize());
const extent = this.map_.getView().calculateExtent(this.map_.getSize());
const center = this.map_.getView().getCenter();
const zoom = this.tilingScheme_ instanceof Cesium.GeographicTilingScheme ? level + 1 : level;

const frameState = {
viewState: {zoom},
extent: olExtent
viewState: {zoom, center},
extent,
};

const attributionsFunction = this.source_.getAttributions();
Expand Down

0 comments on commit e547919

Please sign in to comment.