Merge branch 'hotfix/rasters3'

tnrastertile.js

@@ -31,6 +31,7 @@ module.exports = {
         var rasterRender = {
             renderers: [],
             awsS3Client: [],
+            loadVectorTileError:[],
             vtconfig: vtconfig
         };
         const createPool = function(ratio, min, max, isEng, workerIndex) {
@@ -58,6 +59,7 @@ module.exports = {
                                 requestdata: requestdata,
                                 callback: function(error, data){
                                     var response = {};
+                                    rasterRender.loadVectorTileError[workerIndex] = (data.length == 0);
                                     response.data = zlib.unzipSync(data);
                                     callback(null,  response);
                                 }
@@ -148,6 +150,7 @@ module.exports = {
                                                         secretAccessKey: awsConfig.awsSecretAccessKey,
                                                         region: awsConfig.awsRegion
                                                     });
+                rasterRender.loadVectorTileError[workerIndex] = false;
                                                     //"rtiles-mmg-2017-{name}-{lng}-{scale}"
             };
             return new advancedPool.Pool({
@@ -185,7 +188,10 @@ module.exports = {
         };
         const sendResponseToClient = function(awsClient, channel, msg, buffer, awsParams, rabbitmqBucketName){
             if(awsParams){
+                //console.log('save on s3');
                 saveTileOnS3(awsClient, awsParams, buffer, rabbitmqBucketName)
+            }else{
+                //console.log('not save on s3');
             }
             channel.sendToQueue(msg.properties.replyTo,
                                 buffer,
@@ -278,7 +284,8 @@ module.exports = {
                                         });
                                         image.png({adaptiveFiltering: false});
                                         image.toBuffer(function(err, buffer, info) {
-                                            return sendResponseToClient(awsClient, mqdata.channel, mqdata.msg, buffer, awsParams, rabbitmqBucketName);
+                                            var isError = rasterRender.loadVectorTileError[index];
+                                            return sendResponseToClient(awsClient, mqdata.channel, mqdata.msg, buffer, isError?null:awsParams, rabbitmqBucketName);
                                         });
                                     });
                                 });