Skip to content

Commit

Permalink
Merge pull request #155 from gberaudo/release_2015_01_20
Browse files Browse the repository at this point in the history
Release 2015 01 20
  • Loading branch information
gberaudo committed Jan 20, 2015
2 parents d3d4a20 + d2edb84 commit 00e18eb
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
16 changes: 12 additions & 4 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
# Changelog

## v1.1.0
## v1.1 - 2015-01-20

### Breaking changes
* Breaking changes
* The `olFeatureId` has been removed from the picked Cesium counterpart.
Use directly `olFeature` as illustrated in the synthetic vector examples.
* The `olcs.OLCesium` constructor signature has changed. Use
`new olcs.OLCesium({map: map, target: target});` instead of `new olcs.OLCesium(map, target);`
* Custom synchronizer function may be passed to the OLCesium constructor
* Core functions for implementing custom 2D-3D transitions à la Google Map
* Store the `ol.Feature` in the Cesium counterpart instead of an id.
Use `primitive.olFeature` to read it after picking. See the synthetic vector examples.
* Allow 3D warmup while displaying the 2D map

* The `olcs.OLCesium` constructor signature has changed. Use
`new olcs.OLCesium({map: map, target: target});` instead of `new olcs.OLCesium(map, target);`
## v1.0.0 - 2014-11-17
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ dist/ol3cesium.js: build/ol3cesium.json $(SRC_JS_FILES) ol3/build/ol-externs.js
node build/build.js $< $@
$(SEDI) 's!$(shell pwd)/dist!source!g' dist/ol3cesium.js.map
$(SEDI) 's!$(shell pwd)!source!g' dist/ol3cesium.js.map
echo '//# sourceMappingURL=ol3cesium.js.map' >> dist/ol3cesium.js
-ln -s .. dist/source
# echo '//# sourceMappingURL=ol3cesium.js.map' >> dist/ol3cesium.js
# -ln -s .. dist/source

.PHONY: ol3/build/ol-externs.js
ol3/build/ol-externs.js:
Expand Down
2 changes: 1 addition & 1 deletion cesium
2 changes: 1 addition & 1 deletion ol3
Submodule ol3 updated from 13ce41 to 68438c

0 comments on commit 00e18eb

Please sign in to comment.