Skip to content

Fix typo in vertexPositions cartographicRadians processing #1662

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

Merged
merged 2 commits into from
Apr 29, 2014
Merged

Fix typo in vertexPositions cartographicRadians processing #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50ec164
Fix typo in vertexPositions cartographicRadians processing
mramato Apr 29, 2014
8264e1f
Fix typos
mramato Apr 29, 2014
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
2 changes: 1 addition & 1 deletion Source/DynamicScene/CzmlDataSource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ define(['../Core/Cartesian2',
for (i = 0, len = tmp.length; i < len; i += 3) {
scratchCartographic.longitude = tmp[i];
scratchCartographic.latitude = tmp[i + 1];
scratchCartographic.height = tmp[i] + 2;
scratchCartographic.height = tmp[i + 2];
values.push(Ellipsoid.WGS84.cartographicToCartesian(scratchCartographic));
}
vertexPositionsData.array = values;
Expand Down
48 changes: 33 additions & 15 deletions Specs/DynamicScene/CzmlDataSourceSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,32 +1162,50 @@ defineSuite([
expect(dynamicObject.orientation.getValue(Iso8601.MINIMUM_VALUE)).toEqual(new Quaternion(0.0, 0.0, 0.0, 1.0));
});

it('CZML VertexPositions works.', function() {
it('vertexPositions work with cartesians.', function() {
var expectedResult = [new Cartesian3(1.0, 2.0, 3.0), new Cartesian3(5.0, 6.0, 7.0)];

var packet = {
vertexPositions : {
cartesian : [1.0, 2.0, 3.0, 5.0, 6.0, 7.0]
cartesian : [expectedResult[0].x, expectedResult[0].y, expectedResult[0].z, expectedResult[1].x, expectedResult[1].y, expectedResult[1].z]
}
};

var dataSource = new CzmlDataSource();
dataSource.load(packet);
var dynamicObject = dataSource.dynamicObjects.getObjects()[0];
expect(dynamicObject.vertexPositions.getValue(Iso8601.MINIMUM_VALUE)).toEqual([new Cartesian3(1.0, 2.0, 3.0), new Cartesian3(5.0, 6.0, 7.0)]);
expect(dynamicObject.vertexPositions.getValue(Iso8601.MINIMUM_VALUE)).toEqual(expectedResult);
});

packet = {
vertexPositions : [{
interval : '2013-01-01T00:00:00Z/2013-01-01T01:00:00Z',
cartesian : [1.0, 2.0, 3.0]
}, {
interval : '2013-01-01T01:00:00Z/2013-01-01T02:00:00Z',
cartesian : [4.0, 5.0, 6.0]
}]
it('vertexPositions work with cartographicRadians.', function() {
var input = [new Cartographic(1.0, 2.0, 4.0), new Cartographic(5.0, 6.0, 7.0)];
var expectedResult = Ellipsoid.WGS84.cartographicArrayToCartesianArray(input);

var packet = {
vertexPositions : {
cartographicRadians : [input[0].longitude, input[0].latitude, input[0].height, input[1].longitude, input[1].latitude, input[1].height]
}
};
dataSource = new CzmlDataSource();

var dataSource = new CzmlDataSource();
dataSource.load(packet);
dynamicObject = dataSource.dynamicObjects.getObjects()[0];
expect(dynamicObject.vertexPositions.getValue(JulianDate.fromIso8601('2013-01-01T00:00:00Z'))).toEqual([new Cartesian3(1.0, 2.0, 3.0)]);
expect(dynamicObject.vertexPositions.getValue(JulianDate.fromIso8601('2013-01-01T01:00:00Z'))).toEqual([new Cartesian3(4.0, 5.0, 6.0)]);
var dynamicObject = dataSource.dynamicObjects.getObjects()[0];
expect(dynamicObject.vertexPositions.getValue(Iso8601.MINIMUM_VALUE)).toEqual(expectedResult);
});

it('vertexPositions work with cartographicDegrees.', function() {
var expectedResult = Ellipsoid.WGS84.cartographicArrayToCartesianArray([Cartographic.fromDegrees(1.0, 2.0, 3.0), Cartographic.fromDegrees(5.0, 6.0, 7.0)]);

var packet = {
vertexPositions : {
cartographicDegrees : [1.0, 2.0, 3.0, 5.0, 6.0, 7.0]
}
};

var dataSource = new CzmlDataSource();
dataSource.load(packet);
var dynamicObject = dataSource.dynamicObjects.getObjects()[0];
expect(dynamicObject.vertexPositions.getValue(Iso8601.MINIMUM_VALUE)).toEqual(expectedResult);
});

it('CZML ViewFrom works.', function() {
Expand Down