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.

Sign up for GitHub

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

Fix broken handling of sampled Rectangles in CZML. #4033

Merged
merged 1 commit into from
Jun 20, 2016
Merged

Fix broken handling of sampled Rectangles in CZML. #4033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 26 additions & 11 deletions Source/DataSources/CzmlDataSource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ define([
return undefined;
}

if (rgba.length === Color.length) {
var length = rgba.length;
if (length === Color.packedLength) {
return [Color.byteToFloat(rgba[0]), Color.byteToFloat(rgba[1]), Color.byteToFloat(rgba[2]), Color.byteToFloat(rgba[3])];
}

var len = rgba.length;
rgbaf = new Array(len);
for (var i = 0; i < len; i += 5) {
rgbaf = new Array(length);
for (var i = 0; i < length; i += 5) {
rgbaf[i] = rgba[i];
rgbaf[i + 1] = Color.byteToFloat(rgba[i + 1]);
rgbaf[i + 2] = Color.byteToFloat(rgba[i + 2]);
Expand All @@ -211,15 +211,30 @@ define([
}

function unwrapRectangleInterval(czmlInterval) {
var wsen = czmlInterval.wsen;
if (defined(wsen)) {
return wsen;
}

var wsenDegrees = czmlInterval.wsenDegrees;
if (defined(wsenDegrees)) {
var length = wsenDegrees.length;
for (var i = 0; i < length; i++) {
wsenDegrees[i] = CesiumMath.toRadians(wsenDegrees[i]);
}
return wsenDegrees;
if (!defined(wsenDegrees)) {
return undefined;
}

var length = wsenDegrees.length;
if (length === Rectangle.packedLength) {
return [CesiumMath.toRadians(wsenDegrees[0]), CesiumMath.toRadians(wsenDegrees[1]), CesiumMath.toRadians(wsenDegrees[2]), CesiumMath.toRadians(wsenDegrees[3])];
}

wsen = new Array(length);
for (var i = 0; i < length; i += 5) {
wsen[i] = wsenDegrees[i];
wsen[i + 1] = CesiumMath.toRadians(wsenDegrees[i + 1]);
wsen[i + 2] = CesiumMath.toRadians(wsenDegrees[i + 2]);
wsen[i + 3] = CesiumMath.toRadians(wsenDegrees[i + 3]);
wsen[i + 4] = CesiumMath.toRadians(wsenDegrees[i + 4]);
}
return czmlInterval.wsen;
return wsen;
}

function unwrapCartesianInterval(czmlInterval) {
Expand Down
91 changes: 87 additions & 4 deletions Specs/DataSources/CzmlDataSourceSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ defineSuite([
'Core/Iso8601',
'Core/JulianDate',
'Core/loadJson',
'Core/Math',
'Core/NearFarScalar',
'Core/Quaternion',
'Core/Rectangle',
Expand Down Expand Up @@ -47,6 +48,7 @@ defineSuite([
Iso8601,
JulianDate,
loadJson,
CesiumMath,
NearFarScalar,
Quaternion,
Rectangle,
Expand Down Expand Up @@ -555,7 +557,8 @@ defineSuite([
billboard : {
pixelOffset : {
epoch : JulianDate.toIso8601(epoch),
cartesian2 : [0, 1, 2, 1, 3, 4]
cartesian2 : [0.0, 1.0, 2.0,
1.0, 3.0, 4.0]
}
}
};
Expand All @@ -566,9 +569,11 @@ defineSuite([

expect(entity.billboard).toBeDefined();
var date1 = epoch;
var date2 = JulianDate.addSeconds(epoch, 1.0, new JulianDate());
var date2 = JulianDate.addSeconds(epoch, 0.5, new JulianDate());
var date3 = JulianDate.addSeconds(epoch, 1.0, new JulianDate());
expect(entity.billboard.pixelOffset.getValue(date1)).toEqual(new Cartesian2(1.0, 2.0));
expect(entity.billboard.pixelOffset.getValue(date2)).toEqual(new Cartesian2(3.0, 4.0));
expect(entity.billboard.pixelOffset.getValue(date2)).toEqual(new Cartesian2(2.0, 3.0));
expect(entity.billboard.pixelOffset.getValue(date3)).toEqual(new Cartesian2(3.0, 4.0));
});

it('can handle interval billboard scaleByDistance.', function() {
Expand Down Expand Up @@ -621,6 +626,32 @@ defineSuite([
expect(entity.billboard.scaleByDistance.getValue(date3)).toEqual(new NearFarScalar(2.0, 3.0, 20000.0, 4.0));
});

it('can handle sampled billboard color rgba.', function() {
var epoch = JulianDate.now();

var billboardPacket = {
billboard : {
color : {
epoch : JulianDate.toIso8601(epoch),
rgba : [0, 200, 202, 204, 206,
2, 0, 0, 0, 0]
}
}
};

var dataSource = new CzmlDataSource();
dataSource.load(makePacket(billboardPacket));
var entity = dataSource.entities.values[0];

expect(entity.billboard).toBeDefined();
var date1 = epoch;
var date2 = JulianDate.addSeconds(epoch, 1.0, new JulianDate());
var date3 = JulianDate.addSeconds(epoch, 2.0, new JulianDate());
expect(entity.billboard.color.getValue(date1)).toEqual(Color.fromBytes(200, 202, 204, 206));
expect(entity.billboard.color.getValue(date2)).toEqual(Color.fromBytes(100, 101, 102, 103));
expect(entity.billboard.color.getValue(date3)).toEqual(Color.fromBytes(0, 0, 0, 0));
});

it('CZML adds clock data.', function() {
var clockPacket = {
id : 'document',
Expand Down Expand Up @@ -2006,7 +2037,7 @@ defineSuite([
expect(entity.rectangle.outlineWidth.getValue(Iso8601.MINIMUM_VALUE)).toEqual(6);
});

it('CZML adds data for rectangle in degrees.', function() {
it('can handle constant rectangle coordinates in degrees.', function() {
var rectanglePacket = {
rectangle : {
coordinates : {
Expand All @@ -2021,6 +2052,58 @@ defineSuite([
expect(entity.rectangle.coordinates.getValue(Iso8601.MINIMUM_VALUE)).toEqual(Rectangle.fromDegrees(0, 1, 2, 3));
});

it('can handle sampled rectangle coordinates.', function() {
var epoch = JulianDate.now();

var rectanglePacket = {
rectangle : {
coordinates : {
epoch : JulianDate.toIso8601(epoch),
wsen : [0.0, 1.0, 2.0, 3.0, 4.0,
1.0, 3.0, 4.0, 5.0, 6.0]
}
}
};

var dataSource = new CzmlDataSource();
dataSource.load(makePacket(rectanglePacket));
var entity = dataSource.entities.values[0];

expect(entity.rectangle).toBeDefined();
var date1 = epoch;
var date2 = JulianDate.addSeconds(epoch, 0.5, new JulianDate());
var date3 = JulianDate.addSeconds(epoch, 1.0, new JulianDate());
expect(entity.rectangle.coordinates.getValue(date1)).toEqual(new Rectangle(1.0, 2.0, 3.0, 4.0));
expect(entity.rectangle.coordinates.getValue(date2)).toEqual(new Rectangle(2.0, 3.0, 4.0, 5.0));
expect(entity.rectangle.coordinates.getValue(date3)).toEqual(new Rectangle(3.0, 4.0, 5.0, 6.0));
});

it('can handle sampled rectangle coordinates in degrees.', function() {
var epoch = JulianDate.now();

var rectanglePacket = {
rectangle : {
coordinates : {
epoch : JulianDate.toIso8601(epoch),
wsenDegrees : [0.0, 1.0, 2.0, 3.0, 4.0,
1.0, 3.0, 4.0, 5.0, 6.0]
}
}
};

var dataSource = new CzmlDataSource();
dataSource.load(makePacket(rectanglePacket));
var entity = dataSource.entities.values[0];

expect(entity.rectangle).toBeDefined();
var date1 = epoch;
var date2 = JulianDate.addSeconds(epoch, 0.5, new JulianDate());
var date3 = JulianDate.addSeconds(epoch, 1.0, new JulianDate());
expect(entity.rectangle.coordinates.getValue(date1)).toEqual(Rectangle.fromDegrees(1.0, 2.0, 3.0, 4.0));
expect(entity.rectangle.coordinates.getValue(date2)).toEqualEpsilon(Rectangle.fromDegrees(2.0, 3.0, 4.0, 5.0), CesiumMath.EPSILON15);
expect(entity.rectangle.coordinates.getValue(date3)).toEqual(Rectangle.fromDegrees(3.0, 4.0, 5.0, 6.0));
});

it('CZML adds data for wall.', function() {
var wallPacket = {
wall : {
Expand Down