Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare v1.19 #379

Merged
merged 4 commits into from
Aug 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
sudo: false

language: node_js

node_js:
- "4"
- "6"

cache:
directories:
- node_modules
Expand All @@ -8,7 +15,6 @@ git:

before_install:
- git submodule update --init ol3
- npm install -g npm && npm install

script:
- NO_CESIUM=1 make dist
Expand Down
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

# v 1.19 - 2016-08-08

* Changes
* Require node 4 or 6.
* Port to Cesium 1.24.

# v 1.18 - 2016-07-18

* Changes
Expand Down
2 changes: 1 addition & 1 deletion cesium
6 changes: 3 additions & 3 deletions examples/rastersync.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ var layer0 = new ol.layer.Tile({
});
var layer1 = new ol.layer.Tile({
source: new ol.source.TileJSON({
url: 'http://tileserver.maptiler.com/grandcanyon.json',
url: 'https://tileserver.maptiler.com/grandcanyon.json',
crossOrigin: 'anonymous'
})
});

var tileJsonSource = new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/mapbox.world-borders-light.json',
url: 'https://api.tiles.mapbox.com/v3/mapbox.world-borders-light.json',
crossOrigin: 'anonymous'
});

Expand All @@ -32,7 +32,7 @@ var ol2d = new ol.Map({
var ol3d = new olcs.OLCesium({map: ol2d, target: 'map3d'});
var scene = ol3d.getCesiumScene();
var terrainProvider = new Cesium.CesiumTerrainProvider({
url : '//assets.agi.com/stk-terrain/world'
url : 'https://assets.agi.com/stk-terrain/world'
});
scene.terrainProvider = terrainProvider;

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"url": "https://github.com/openlayers/ol3-cesium/issues"
},
"dependencies": {
"async": "1.5.2",
"async": "2.0.1",
"htmlparser2": "3.9.1"
},
"devDependencies": {
"closure-util": "1.14.0",
"closure-util": "1.15.0",
"geojsonhint": "1.2.1",
"fs-extra": "0.30.0",
"jsdoc": "~3.4.0",
"eslint": "2.13.1",
"eslint": "3.2.2",
"eslint-config-openlayers": "5.0.0",
"nomnom": "1.8.1",
"temp": "0.8.3",
Expand Down