Skip to content

Commit

Permalink
Merge pull request #534 from openlayers/prepare_1_33_release
Browse files Browse the repository at this point in the history
Prepare 1.33 release
  • Loading branch information
gberaudo authored Dec 7, 2017
2 parents 9bc1bd7 + 7423c18 commit ec8161f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
4 changes: 2 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Changelog

# v 1.33
# v 1.33 - 2017-12-07

* Changes
* Animate olcs.contrib.Manager#toggle3d.
* Add support for Overlay synchronization, see example Overlays.
* Port to OpenLayers 4.6.2 and Cesium 1.39.
* Port to OpenLayers 4.6.2 and Cesium 1.40.
* Restore OpenLayers events propagation.
* Workaround camera sinking under the terrain and finally jumping above it.
See https://github.com/AnalyticalGraphicsInc/cesium/issues/5999. The
Expand Down
7 changes: 1 addition & 6 deletions examples/vectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ goog.require('ol.format.GPX');
goog.require('ol.geom.Polygon');
goog.require('ol.interaction.DragAndDrop');
goog.require('ol.geom.MultiPolygon');
goog.require('ol.layer.Image');
goog.require('ol.layer.Vector');
goog.require('ol.source.ImageVector');


const iconFeature = new ol.Feature({
Expand Down Expand Up @@ -234,12 +232,9 @@ const vectorSource2 = new ol.source.Vector({
features: [iconFeature, textFeature, cervinFeature, cartographicRectangle,
cartographicRectangle2]
});
const imageVectorSource = new ol.source.ImageVector({
const vectorLayer2 = new ol.layer.Vector({
source: vectorSource2
});
const vectorLayer2 = new ol.layer.Image({
source: imageVectorSource
});

const dragAndDropInteraction = new ol.interaction.DragAndDrop({
formatConstructors: [
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ol-cesium",
"version": "1.32.0",
"version": "1.33.0",
"description": "OpenLayers Cesium integration library",
"scripts": {},
"main": "./dist/olcesium.js",
Expand All @@ -17,7 +17,7 @@
"htmlparser2": "3.9.2"
},
"devDependencies": {
"@camptocamp/cesium": "1.39.1",
"@camptocamp/cesium": "1.40.0",
"@camptocamp/closure-util": "1.26.0",
"@mapbox/geojsonhint": "2.0.1",
"eslint": "4.12.0",
Expand Down

0 comments on commit ec8161f

Please sign in to comment.