Adjust polygon position heights before removing duplicates if not perPositionHeight #6731
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@hpinkos, thanks for the pull request! Maintainers, we have a signed CLA from @hpinkos, so you can review this at any time.
I am a bot who helps you make Cesium awesome! Contributions to my configuration are welcome. 🌍 🌎 🌏 |
|
@likangning93 can you review. Please update CHANGES. |
likangning93
suggested changes
Jun 25, 2018
| @@ -217,6 +217,13 @@ define([ | |||
| var outerRing = outerNode.positions; | |||
| var holes = outerNode.holes; | |||
|
|
|||
| var i; | |||
| if (!perPositionHeight) { | |||
| for (i = 0; i < outerRing.length; i++) { | |||
There was a problem hiding this comment.
Should this get set on a temp var before the loop?
| var holePositions = arrayRemoveDuplicates(hole.positions, Cartesian3.equalsEpsilon, true); | ||
| var holePositions = hole.positions; | ||
| if (!perPositionHeight) { | ||
| for (j = 0; j < holePositions.length; ++j) { |
| while (queue.length !== 0) { | ||
| var outerNode = queue.dequeue(); | ||
| var outerRing = outerNode.positions; | ||
| if (!perPositionHeight) { | ||
| for (i = 0; i < outerRing.length; i++) { |
| if (hole.positions.length < 3) { | ||
| var holePositions = hole.positions; | ||
| if (!perPositionHeight) { | ||
| for (j = 0; j < holePositions.length; ++j) { |
| }; | ||
|
|
||
| var geometry = PolygonOutlineGeometry.createGeometry(new PolygonOutlineGeometry({ polygonHierarchy : hierarchy, perPositionHeight: true })); | ||
| expect(geometry).not.toBeUndefined(); |
Specs/Core/PolygonGeometrySpec.js
Outdated
| }; | ||
|
|
||
| var geometry = PolygonGeometry.createGeometry(new PolygonGeometry({ polygonHierarchy : hierarchy, perPositionHeight: true })); | ||
| expect(geometry).not.toBeUndefined(); |
|
Thanks @likangning93! Updated |
likangning93
approved these changes
Jun 25, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes crash reported in #4863 (comment)
If
perPositionHeight: false, the positions passed toPolygonGeometryare scaled to the ellipsoid surface then adjusted forheightandextrudedHeight. However, this needs to happen beforearrayRemoveDuplicatesfor the case where there are positions with the same lon/lat but different heights.