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

Proj4JS and Custom Projections in Columbus View #6986

Merged
merged 17 commits into from
Nov 1, 2018
Merged

Proj4JS and Custom Projections in Columbus View #6986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
358308b
preliminary support for Proj4JS and Custom Projections in Columbus View
likangning93 Aug 31, 2018
805d181
base64 encode URI in Custom Projection Sandcastle
likangning93 Aug 31, 2018
66c0646
add support for heights in custom projections
likangning93 Sep 4, 2018
0d2d47a
PR comments
likangning93 Sep 10, 2018
56dd456
require custom project and unproject to use Cesium types
likangning93 Sep 12, 2018
377cb18
replace eval in CustomProjection with loadjsonp and importScripts
likangning93 Sep 13, 2018
bf1f530
decouple proj4js
likangning93 Sep 18, 2018
092c411
re-add proj4
likangning93 Oct 11, 2018
f0c8305
fix middle-click rotation and 2D infinite scroll in non-rectangular p…
likangning93 Oct 12, 2018
741773b
merge master into additionalProjections
likangning93 Oct 12, 2018
52a3c4f
add limiter rectangle in Proj4Projection as well to avoid infinite pr…
likangning93 Oct 12, 2018
ada6205
avoid cutoff for ground primitives with materials in alternate projec…
likangning93 Oct 16, 2018
01c3ac1
for non-normal-cylindrical projections, default to rotatable 2D map a…
likangning93 Oct 18, 2018
7505a9e
merge in master
likangning93 Oct 18, 2018
52cdb96
update Rectangle projection extent approximation
likangning93 Oct 25, 2018
cc4690e
merge master into additionalProjections
likangning93 Oct 29, 2018
8a69d0a
maintain camera up axis when zooming in polar projections in 2D
likangning93 Oct 31, 2018
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
13 changes: 13 additions & 0 deletions Apps/SampleData/sampleProjection.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
function createProjectionFunctions(callback) {
function project(cartographic, result) {
result.x = cartographic.longitude * 6378137.0;
result.y = cartographic.latitude * 2.0 * 6378137.0;
result.z = cartographic.height + Math.abs(cartographic.longitude * cartographic.longitude * 1000000.0);
}
function unproject(cartesian, result) {
result.longitude = cartesian.x / 6378137.0;
result.latitude = cartesian.y / (2.0 * 6378137.0);
result.height = cartesian.z - Math.abs(result.longitude * result.longitude * 1000000.0);
}
callback(project, unproject);
}
101 changes: 101 additions & 0 deletions Apps/Sandcastle/gallery/Custom Projection.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="description" content="Demonstration of Custom projections.">
<meta name="cesium-sandcastle-labels" content="Showcases">
<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
<script type="text/javascript">
if(typeof require === "function") {
require.config({
baseUrl : '../../../Source',
waitSeconds : 120
});
}
</script>
</head>
<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
<style>
@import url(../templates/bucket.css);
</style>
<div id="cesiumContainer" class="fullSize"></div>
<div id="loadingOverlay"><h1>Loading...</h1></div>
<div id="toolbar"></div>
<script id="cesium_sandcastle_script">
function startup(Cesium) {
'use strict';
//Sandcastle_Begin

var projectionText =
'function createProjectionFunctions(callback) {\n' +
' function project(cartographic, result) {\n' +
' result.x = cartographic.longitude * 6378137.0;\n' +
' result.y = cartographic.latitude * 2.0 * 6378137.0;\n' +
' result.z = cartographic.height + Math.abs(cartographic.longitude * cartographic.longitude * 1000000.0);\n' +
' }\n' +
' function unproject(cartesian, result) {\n' +
' result.longitude = cartesian.x / 6378137.0;\n' +
' result.latitude = cartesian.y / (2.0 * 6378137.0);\n' +
' result.height = cartesian.z - Math.abs(result.longitude * result.longitude * 1000000.0);\n' +
' }\n' +
' callback(project, unproject);\n' +
' }\n';
var projectionTextUrl = 'data:text/plain;base64,' + window.btoa(projectionText);

if (Cesium.FeatureDetection.isInternetExplorer()) {
projectionTextUrl = '../../SampleData/SampleProjection.txt';
}

var customProjection = new Cesium.CustomProjection(projectionTextUrl, 'sample projection');
customProjection.readyPromise
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this logic should be inside scene. Have the scene wait for the projection to be ready before it starts to render. This would also work when using proj4js and have Proj4Projection load the module.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there are several project calls before the first Scene update, including but maybe not limited to:

  • Camera constructor
  • ScreenSpaceCameraController constructor
  • scene morph from setting sceneMode when initializating the viewer

I'm not sure if all of that can be modified, or if there's anything else users would like to do that would break if the projection isn't ready.

.then(function(projection) {

var viewer = new Cesium.Viewer('cesiumContainer', {
sceneMode : Cesium.SceneMode.COLUMBUS_VIEW,
mapProjection : projection
});

var pointEntities = [];
function addPoint(longitude, latitude) {
pointEntities.push(viewer.entities.add({
position : Cesium.Cartesian3.fromDegrees(longitude, latitude),
point : {
pixelSize : 5,
color : Cesium.Color.PURPLE,
disableDepthTestDistance : Number.POSITIVE_INFINITY
},
id : 'longitude: ' + longitude + ' latitude: ' + latitude
}));
}

for (var longitude = -175; longitude < 180; longitude += 10) {
for (var latitude = -85; latitude < 90; latitude += 10) {
addPoint(longitude, latitude);
}
}

Sandcastle.addToolbarButton('Show/Hide Points', function() {
for (var i = 0; i < pointEntities.length; i++) {
pointEntities[i].show = !pointEntities[i].show;
}
});

}).otherwise(function(e) {
console.log(e);
});

//Sandcastle_End
Sandcastle.finishedLoading();
}
if (typeof Cesium !== "undefined") {
startup(Cesium);
} else if (typeof require === "function") {
require(["Cesium"], startup);
}
</script>
</body>
</html>
Binary file added Apps/Sandcastle/gallery/Custom Projection.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 72 additions & 0 deletions Apps/Sandcastle/gallery/Proj4Js Projection.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="description" content="Demonstration of Proj4JS projections.">
<meta name="cesium-sandcastle-labels" content="Showcases">
<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
<script type="text/javascript">
if(typeof require === "function") {
require.config({
baseUrl : '../../../Source',
waitSeconds : 120
});
}
</script>
</head>
<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
<style>
@import url(../templates/bucket.css);
</style>
<div id="cesiumContainer" class="fullSize"></div>
<div id="loadingOverlay"><h1>Loading...</h1></div>
<div id="toolbar"></div>
<script id="cesium_sandcastle_script">
function startup(Cesium) {
'use strict';
//Sandcastle_Begin
var viewer = new Cesium.Viewer('cesiumContainer', {
sceneMode : Cesium.SceneMode.COLUMBUS_VIEW,
mapProjection : new Cesium.Proj4Projection('+proj=moll +lon_0=0 +x_0=0 +y_0=0 +a=6371000 +b=6371000 +units=m +no_defs')
});

var pointEntities = [];
function addPoint(longitude, latitude) {
pointEntities.push(viewer.entities.add({
position : Cesium.Cartesian3.fromDegrees(longitude, latitude),
point : {
pixelSize : 5,
color : Cesium.Color.PURPLE,
disableDepthTestDistance : Number.POSITIVE_INFINITY
},
id : 'longitude: ' + longitude + ' latitude: ' + latitude
}));
}

for (var longitude = -175; longitude < 180; longitude += 10) {
for (var latitude = -85; latitude < 90; latitude += 10) {
addPoint(longitude, latitude);
}
}

Sandcastle.addToolbarButton('Show/Hide Points', function() {
for (var i = 0; i < pointEntities.length; i++) {
pointEntities[i].show = !pointEntities[i].show;
}
});

//Sandcastle_End
Sandcastle.finishedLoading();
}
if (typeof Cesium !== "undefined") {
startup(Cesium);
} else if (typeof require === "function") {
require(["Cesium"], startup);
}
</script>
</body>
</html>
Binary file added Apps/Sandcastle/gallery/Proj4Js Projection.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,37 @@ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
THIS SOFTWARE.

### proj4js

> Authors:
> - Mike Adair madairATdmsolutions.ca
> - Richard Greenwood richATgreenwoodmap.com
> - Didier Richard didier.richardATign.fr
> - Stephen Irons stephen.ironsATclear.net.nz
> - Olivier Terral oterralATgmail.com
> - Calvin Metcalf cmetcalfATappgeo.com
> Copyright (c) 2014, Mike Adair, Richard Greenwood, Didier Richard, Stephen Irons, Olivier Terral and Calvin Metcalf
> Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:

> The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

>
_THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE._

### crunch

https://github.com/BinomialLLC/crunch
Expand Down
76 changes: 61 additions & 15 deletions Source/Core/BoundingSphere.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ define([
'./Cartesian3',
'./Cartographic',
'./Check',
'./CustomProjection',
'./defaultValue',
'./defined',
'./Ellipsoid',
Expand All @@ -11,11 +12,13 @@ define([
'./Math',
'./Matrix3',
'./Matrix4',
'./Proj4Projection',
'./Rectangle'
], function(
Cartesian3,
Cartographic,
Check,
CustomProjection,
defaultValue,
defined,
Ellipsoid,
Expand All @@ -25,6 +28,7 @@ define([
CesiumMath,
Matrix3,
Matrix4,
Proj4Projection,
Rectangle) {
'use strict';

Expand Down Expand Up @@ -235,6 +239,19 @@ define([
return BoundingSphere.fromRectangleWithHeights2D(rectangle, projection, 0.0, 0.0, result);
};

var projectedPointsScratch = [
new Cartesian3(), new Cartesian3(),
new Cartesian3(), new Cartesian3(),
new Cartesian3(), new Cartesian3(),
new Cartesian3(), new Cartesian3(),
new Cartesian3(), new Cartesian3(),
new Cartesian3(), new Cartesian3(),
new Cartesian3(), new Cartesian3(),
new Cartesian3(), new Cartesian3()
];
var sampleScratch = new Cartographic();
var cornerScratch = new Cartographic();

/**
* Computes a bounding sphere from a rectangle projected in 2D. The bounding sphere accounts for the
* object's minimum and maximum heights over the rectangle.
Expand All @@ -259,24 +276,53 @@ define([

projection = defaultValue(projection, defaultProjection);

Rectangle.southwest(rectangle, fromRectangle2DSouthwest);
fromRectangle2DSouthwest.height = minimumHeight;
Rectangle.northeast(rectangle, fromRectangle2DNortheast);
fromRectangle2DNortheast.height = maximumHeight;
if (projection.isNormalCylindrical) {
Rectangle.southwest(rectangle, fromRectangle2DSouthwest);
fromRectangle2DSouthwest.height = minimumHeight;
Rectangle.northeast(rectangle, fromRectangle2DNortheast);
fromRectangle2DNortheast.height = maximumHeight;

var lowerLeft = projection.project(fromRectangle2DSouthwest, fromRectangle2DLowerLeft);
var upperRight = projection.project(fromRectangle2DNortheast, fromRectangle2DUpperRight);
var lowerLeft = projection.project(fromRectangle2DSouthwest, fromRectangle2DLowerLeft);
var upperRight = projection.project(fromRectangle2DNortheast, fromRectangle2DUpperRight);

var width = upperRight.x - lowerLeft.x;
var height = upperRight.y - lowerLeft.y;
var elevation = upperRight.z - lowerLeft.z;
var width = upperRight.x - lowerLeft.x;
var height = upperRight.y - lowerLeft.y;
var elevation = upperRight.z - lowerLeft.z;

result.radius = Math.sqrt(width * width + height * height + elevation * elevation) * 0.5;
var center = result.center;
center.x = lowerLeft.x + width * 0.5;
center.y = lowerLeft.y + height * 0.5;
center.z = lowerLeft.z + elevation * 0.5;
return result;
result.radius = Math.sqrt(width * width + height * height + elevation * elevation) * 0.5;
var center = result.center;
center.x = lowerLeft.x + width * 0.5;
center.y = lowerLeft.y + height * 0.5;
center.z = lowerLeft.z + elevation * 0.5;
return result;
}

var southwest = Rectangle.southwest(rectangle, cornerScratch);
var halfWidth = rectangle.width * 0.5;
var halfHeight = rectangle.height * 0.5;
var sample = sampleScratch;
var index = 0;

// Project 18 points, one for each corner, the edge centers, and minimum/maximum height
for (var x = 0; x < 3; x++) {
for (var y = 0; y < 3; y++) {
if (x === 1 && y === 1) {
continue;
}
sample.longitude = southwest.longitude + x * halfWidth;
sample.latitude = southwest.latitude + y * halfHeight;
sample.height = minimumHeight;

projection.project(sample, projectedPointsScratch[index]);

sample.height = maximumHeight;
projection.project(sample, projectedPointsScratch[index + 8]);

index++;
}
}

return BoundingSphere.fromPoints(projectedPointsScratch, result);
};

var fromRectangle3DScratch = [];
Expand Down
Loading