diff --git a/CHANGES.md b/CHANGES.md index 6894fb829..9984aa0e9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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);` \ No newline at end of file +## v1.0.0 - 2014-11-17 diff --git a/Makefile b/Makefile index 5c494638b..1feea8da6 100644 --- a/Makefile +++ b/Makefile @@ -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: diff --git a/cesium b/cesium index 9382cd391..1f7cf7be6 160000 --- a/cesium +++ b/cesium @@ -1 +1 @@ -Subproject commit 9382cd391d78b4460be93d61850626815b730079 +Subproject commit 1f7cf7be6f8c31245525adc3dfd12a743fec9ffd diff --git a/ol3 b/ol3 index 13ce41a1d..68438c7c1 160000 --- a/ol3 +++ b/ol3 @@ -1 +1 @@ -Subproject commit 13ce41a1d52f2e845b6559513f501f38c89809f6 +Subproject commit 68438c7c106e193f6535509a12c6223811e36401