Skip to content

Tile creation and update #71

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

Closed
Jeremy-Gaillard wants to merge 19 commits into from
Closed

Tile creation and update #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5b4ebdb
reworked tile creation
Apr 8, 2016
f1f5cfa
rework update mechanisms
Apr 8, 2016
f0ce495
Fixed update mechanism
Apr 12, 2016
5aa9b2d
Changed command request interface
Apr 12, 2016
e54422b
cleanup and NodeProcess tweaking
Apr 12, 2016
70aa415
merge with master
Apr 12, 2016
5e09813
Merge master into branch
Apr 13, 2016
0ed9df1
removed unnecessary attributes
Apr 13, 2016
4673313
restored command cancellation & clean pass
Apr 14, 2016
a7425e3
merge and clean
Apr 14, 2016
1d1f522
Added callback after command execution. Fixed TileProvider not return…
Apr 15, 2016
8067be3
Fixed command callback
Apr 18, 2016
ce3de76
Fixed clean
Apr 18, 2016
0c8ef8e
Restored WMTS imagery provider. Warning: disabled texture upscaling
Apr 18, 2016
2db5d52
Moved pending command tracking to interface commander. Reworked getSt…
Apr 18, 2016
336572c
removed unnecessary lines from ApiGlobe
Apr 18, 2016
4114263
texture upscaling WIP
May 20, 2016
7d7d907
restored old loading pattern and texture downscaling
May 23, 2016
f202514
removed unused attribute
May 26, 2016
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 src/Core/Commander/Command.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ define('Core/Commander/Command', [], function() {
this.inParallel = null;
this.inBuffers = null;
this.outBuffers = null;
this.paramsFunction = {};
this.parameters = {};
this.processFunction = null;
this.async = null;
this.force = null;
Expand Down
24 changes: 20 additions & 4 deletions src/Core/Commander/InterfaceCommander.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ define('Core/Commander/InterfaceCommander', ['Core/Commander/ManagerCommands', '

this.managerCommands = ManagerCommands();
this.type = type;
this.pendingRequests = {};

}

Expand All @@ -24,13 +25,28 @@ define('Core/Commander/InterfaceCommander', ['Core/Commander/ManagerCommands', '
this._builderCommand();
};

InterfaceCommander.prototype.request = function(parameters, requester) {
InterfaceCommander.prototype.request = function(type, requester, layer, parameters) {

if(type === undefined) return;

var key = requester.id + "." + type;
if(this.pendingRequests[key] !== undefined) return;

var command = new Command();
command.type = this.type;
command.type = type;
command.requester = requester;
command.paramsFunction = parameters;
command.layer = parameters.layer;
command.parameters = parameters;
command.layer = layer;

var that = this;
command.callback = function() {
if(parameters.callback) {
parameters.callback();
}
that.pendingRequests[key] = undefined;
};

this.pendingRequests[key] = command;

//command.priority = parent.sse === undefined ? 1 : Math.floor(parent.visible ? parent.sse * 10000 : 1.0) * (parent.visible ? Math.abs(19 - parent.level) : Math.abs(parent.level) ) *10000;

Expand Down
2 changes: 0 additions & 2 deletions src/Core/Commander/Interfaces/ApiInterface/ApiGlobe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ define('Core/Commander/Interfaces/ApiInterface/ApiGlobe', [
var providerWMTS = manager.getProvider(map.tiles).providerWMTS;

providerWMTS.addLayer(layer);
manager.addLayer(map.colorTerrain,providerWMTS);
map.colorTerrain.services.push(layer.id);

};
Expand All @@ -77,7 +76,6 @@ define('Core/Commander/Interfaces/ApiInterface/ApiGlobe', [
var providerWMTS = manager.getProvider(map.tiles).providerWMTS;

providerWMTS.addLayer(layer);
manager.addLayer(map.elevationTerrain,providerWMTS);
map.elevationTerrain.services.push(layer.id);

};
Expand Down
35 changes: 17 additions & 18 deletions src/Core/Commander/ManagerCommands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,11 @@ define('Core/Commander/ManagerCommands', [

while (this.queueAsync.length > 0 && arrayTasks.length < nT) {
var command = this.deQueue();
if(command)
arrayTasks.push(this.providerMap[command.layer.id].executeCommand(command));
if(command) {
var task = this.providerMap[command.layer.id].executeCommand(command);
task = task.then(command.callback);
arrayTasks.push(task);
Copy link
Contributor

@vmora vmora May 4, 2016

Choose a reason for hiding this comment

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

one liner ?

arrayTasks.push(this.providerMap[command.layer.id].executeCommand(command).then(command.callback));

}
}

return arrayTasks;
Expand All @@ -122,22 +125,18 @@ define('Core/Commander/ManagerCommands', [
ManagerCommands.prototype.deQueue = function() {

while (this.queueAsync.length > 0) {
var com = this.queueAsync.peek();
var parent = com.requester;

if (parent.visible === false && parent.level >= 2) {

while (parent.children.length > 0) {
var child = parent.children[0];
child.dispose();
parent.remove(child);
}
parent.wait = false;
parent.false = false;
this.queueAsync.dequeue();
} else
return this.queueAsync.dequeue();

var com = this.queueAsync.dequeue();
var node = com.requester;

if(!node || node.disposed) {
return;
} else if(node.parent.visible === false) {
node.parent.disposeChildren();
com.callback();
return;
} else {
return com;
}
}

return undefined;
Expand Down
1 change: 1 addition & 0 deletions src/Core/Commander/Providers/IoDriver_Image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ define('Core/Commander/Providers/IoDriver_Image', ['Core/Commander/Providers/IoD
{

var image = new Image();
resolve.image = image; // avoid image deletion by garbage collector

image.addEventListener('load', function(/*event*/) {

Expand Down
1 change: 1 addition & 0 deletions src/Core/Commander/Providers/IoDriver_XBIL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ define('Core/Commander/Providers/IoDriver_XBIL', ['Core/Commander/Providers/IoDr
//return new Promise(function(resolve/*, reject*/)
{
var xhr = new XMLHttpRequest();
resolve.xhr = xhr; // avoid deletion by garbage collector


//The responseType property cannot be set when the XMLHttpRequest is not async, that is, synchronous.
Expand Down
106 changes: 65 additions & 41 deletions src/Core/Commander/Providers/TileProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ define('Core/Commander/Providers/TileProvider', [
'when',
'Core/Geographic/Projection',
'Core/Commander/Providers/WMTS_Provider',
'Core/Commander/Providers/WMS_Provider',
'Core/Commander/Providers/KML_Provider',
'Globe/TileGeometry',
'Core/Geographic/CoordWMTS',
Expand All @@ -31,6 +32,7 @@ define('Core/Commander/Providers/TileProvider', [
when,
Projection,
WMTS_Provider,
WMS_Provider,
KML_Provider,
TileGeometry,
CoordWMTS,
Expand Down Expand Up @@ -105,59 +107,81 @@ define('Core/Commander/Providers/TileProvider', [

TileProvider.prototype.executeCommand = function(command) {

var bbox = command.paramsFunction.bbox;
var tile = command.requester;
var parent = tile.parent;
var service;
if(command.type === "geometry") {
var bbox = tile.bbox;

// TODO not generic
var tileCoord = this.projection.WGS84toWMTS(bbox);
var parent = command.requester;
// TODO not generic
var tileCoord = this.projection.WGS84toWMTS(bbox);

// build tile
var geometry = undefined; //getGeometry(bbox,tileCoord);
// build tile
var geometry; // = getGeometry(bbox,tileCoord);

var params = {bbox:bbox,zoom:tileCoord.zoom,segment:16,center:null,projected:null}
var params = {bbox:bbox,zoom:tileCoord.zoom,segment:16,center:null,projected:null};

var tile = new command.type(params,this.builder);

tile.tileCoord = tileCoord;
tile.material.setUuid(this.nNode++);
tile.link = parent.link;
tile.geometricError = Math.pow(2, (18 - tileCoord.zoom));
tile.setGeometry(new TileGeometry(params, this.builder)); //TODO: use cache?
// set material too ?

if (geometry) {
tile.rotation.set(0, (tileCoord.col % 2) * (Math.PI * 2.0 / Math.pow(2, tileCoord.zoom + 1)), 0);
}

parent.worldToLocal(params.center);

tile.position.copy(params.center);
tile.setVisibility(false);

parent.add(tile);
tile.updateMatrix();
tile.updateMatrixWorld();

// PROBLEM is not generic : elevationTerrain ,colorTerrain
var elevationlayerId = command.paramsFunction.layer.parent.elevationTerrain.services[tileCoord.zoom > 11 ? 1 : 0];
var colorlayerId = command.paramsFunction.layer.parent.colorTerrain.services[0];
tile.tileCoord = tileCoord;
tile.material.setUuid(this.nNode++);
tile.link = parent.link;
tile.geometricError = Math.pow(2, (18 - tileCoord.zoom));

if(tileCoord.zoom > 3 )
tileCoord = undefined;
if (geometry) {
tile.rotation.set(0, (tileCoord.col % 2) * (Math.PI * 2.0 / Math.pow(2, tileCoord.zoom + 1)), 0);
}

tile.texturesNeeded =+ 1;
parent.worldToLocal(params.center);

return when.all([
tile.position.copy(params.center);
tile.setVisibility(false);

this.providerElevationTexture.getElevationTexture(tileCoord,elevationlayerId).then(function(terrain){

this.setTextureElevation(terrain);}.bind(tile)),

this.providerColorTexture.getColorTextures(tile,colorlayerId).then(function(colorTextures){

this.setTexturesLayer(colorTextures,1);}.bind(tile))

//,this.getKML(tile)
tile.updateMatrix();
tile.updateMatrixWorld();

var elevationlayerId = tile.tileCoord.zoom > 11 ? 'IGN_MNT_HIGHRES' : 'IGN_MNT';
return when.all([
this.providerElevationTexture.getElevationTexture(tileCoord, elevationlayerId).then(function(terrain) {
if(this.disposed) return;
this.setTextureElevation(terrain);
}.bind(tile)),
this.providerColorTexture.getColorTextures(tile,"IGNPO").then(function(colorTextures) {
if(this.disposed) return;
this.setTexturesLayer(colorTextures,1);
}.bind(tile))
]);
} else if(command.type === "elevation") {
// TODO: remove hard-written values
parent = tile.level === tile.levelElevation ? tile : tile.getParentLevel(tile.levelElevation);


if(parent.downScaledLayer(0)) {
service = tile.tileCoord.zoom > 11 ? 'IGN_MNT_HIGHRES' : 'IGN_MNT';

return this.providerElevationTexture.getElevationTexture(parent.tileCoord,service).then(function(terrain) {
if(this.disposed) return;
this.setTextureElevation(terrain);
}.bind(parent)).then(function() {
if(this.disposed) return;
if(this.downScaledLayer(0))
this.setTextureElevation(-2);
}.bind(tile));
}
else {
tile.setTextureElevation(-2);
}
return when();

} else if(command.type === "imagery") {
service = "IGNPO";
return this.providerColorTexture.getColorTextures(command.requester,service).then(function(result) {
if(this.disposed) return;
this.setTexturesLayer(result,1);
}.bind(command.requester));
}
};

return TileProvider;
Expand Down
6 changes: 5 additions & 1 deletion src/Core/Commander/Providers/WMS_Provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ define('Core/Commander/Providers/WMS_Provider', [

this.baseUrl = options.url || "";
this.layer = options.layer || "";
this.style = options.style || "";
this.format = defaultValue(options.format, "image/jpeg");
this.srs = options.srs || "";
this.width = defaultValue(options.width, 256);
Expand All @@ -63,7 +64,8 @@ define('Core/Commander/Providers/WMS_Provider', [
"&SERVICE=WMS&VERSION=1.1.1" + "&REQUEST=GetMap&BBOX=" +
bbox.minCarto.longitude + "," + bbox.minCarto.latitude + "," +
bbox.maxCarto.longitude + "," + bbox.maxCarto.latitude +
"&WIDTH=" + this.width + "&HEIGHT=" + this.height + "&SRS=" + this.srs;
"&WIDTH=" + this.width + "&HEIGHT=" + this.height + "&SRS=" + this.srs +
"&STYLES=";
return url;
};

Expand Down Expand Up @@ -121,6 +123,8 @@ define('Core/Commander/Providers/WMS_Provider', [
result.texture.magFilter = THREE.LinearFilter;
result.texture.minFilter = THREE.LinearFilter;
result.texture.anisotropy = 16;
result.texture.needsUpdate = true;
result.texture.url = url;

this.cache.addRessource(url, result.texture);
return result.texture;
Expand Down
9 changes: 4 additions & 5 deletions src/Core/Commander/Providers/WMTS_Provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,10 @@ define('Core/Commander/Providers/WMTS_Provider', [
result.texture.minFilter = THREE.LinearFilter;
result.texture.anisotropy = 16;
result.texture.url = url;
result.texture['level'] = coWMTS.zoom;
result.texture.level = coWMTS.zoom;
var box = this.projection.WMTStoWGS84(coWMTS);
result.texture.coord = coWMTS;
result.texture.box = new THREE.Box2(new THREE.Vector2(box[0], box[2]), new THREE.Vector2(box[1], box[3]));

this.cache.addRessource(url, result.texture);
}
Expand Down Expand Up @@ -321,10 +324,6 @@ define('Core/Commander/Providers/WMTS_Provider', [

var colorTexturesNeeded = box[1].row + 1 - box[0].row;

if(lookAtAncestor)
tile.texturesNeeded += colorTexturesNeeded;
else
tile.material.nbTextures -= colorTexturesNeeded;

for (var row = box[0].row; row < box[1].row + 1; row++) {

Expand Down
16 changes: 16 additions & 0 deletions src/Core/Geographic/Projection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,22 @@ define('Core/Geographic/Projection', ['Core/Geographic/CoordWMTS', 'Core/Math/Ma
return new CoordWMTS(zoom, row, col);
};

// TODO : only works for one WMTS tile scheme
Projection.prototype.WMTStoWGS84 = function(coord) {

var x1, x2, y1, y2;

var p = MathExt.PI / Math.pow(2, coord.zoom);
x1 = p * coord.col;
x2 = x1 + p;
y1 = p * coord.row - MathExt.PI_OV_TWO;
y2 = y1 + p;
y1 = - y1;
y2 = - y2;

return [x1, x2, y2, y1];
};

Projection.prototype.UnitaryToLongitudeWGS84 = function(u,projection,bbox)
{
projection.longitude = bbox.minCarto.longitude + u * bbox.dimension.x;
Expand Down
Loading