Replace source ready flag with loading/ready/error enum

This commit is contained in:
Tom Payne
2013-09-24 15:22:23 +02:00
parent da84dd9253
commit 167b309242
12 changed files with 114 additions and 78 deletions
+6 -5
View File
@@ -54,7 +54,7 @@ describe('ol.layer.Layer', function() {
opacity: 1,
saturation: 1,
visible: true,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: Infinity,
minResolution: 0
});
@@ -96,7 +96,7 @@ describe('ol.layer.Layer', function() {
opacity: 0.5,
saturation: 5,
visible: false,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: 500,
minResolution: 0.25
});
@@ -138,7 +138,7 @@ describe('ol.layer.Layer', function() {
opacity: 0.3,
saturation: 0.3,
visible: false,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: 500,
minResolution: 0.25
});
@@ -158,7 +158,7 @@ describe('ol.layer.Layer', function() {
opacity: 0,
saturation: 0,
visible: false,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: Infinity,
minResolution: 0
});
@@ -176,7 +176,7 @@ describe('ol.layer.Layer', function() {
opacity: 1,
saturation: 42,
visible: true,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: Infinity,
minResolution: 0
});
@@ -359,3 +359,4 @@ goog.require('goog.dispose');
goog.require('ol.layer.Layer');
goog.require('ol.proj');
goog.require('ol.source.Source');
goog.require('ol.source.State');
+7 -6
View File
@@ -50,7 +50,7 @@ describe('ol.layer.Group', function() {
opacity: 1,
saturation: 1,
visible: true,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: Infinity,
minResolution: 0
});
@@ -98,7 +98,7 @@ describe('ol.layer.Group', function() {
opacity: 0.5,
saturation: 5,
visible: false,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: 500,
minResolution: 0.25
});
@@ -140,7 +140,7 @@ describe('ol.layer.Group', function() {
opacity: 0.3,
saturation: 0.3,
visible: false,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: 500,
minResolution: 0.25
});
@@ -160,7 +160,7 @@ describe('ol.layer.Group', function() {
opacity: 0,
saturation: 0,
visible: false,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: Infinity,
minResolution: 0
});
@@ -178,7 +178,7 @@ describe('ol.layer.Group', function() {
opacity: 1,
saturation: 42,
visible: true,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: Infinity,
minResolution: 0
});
@@ -297,7 +297,7 @@ describe('ol.layer.Group', function() {
opacity: 0.25,
saturation: 25,
visible: false,
ready: true,
sourceState: ol.source.State.READY,
maxResolution: 150,
minResolution: 0.25
});
@@ -316,4 +316,5 @@ goog.require('goog.dispose');
goog.require('ol.layer.Layer');
goog.require('ol.layer.Group');
goog.require('ol.source.Source');
goog.require('ol.source.State');
goog.require('ol.Collection');