Merge pull request #132 from DavidLevinsky/master

Fixed geodata processing bug
melowntech · Jan 14, 2019 · b32d21a · b32d21a
2 parents 2d43629 + 4917da5
commit b32d21a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vts-browser-js",
-  "version": "2.17.3",
+  "version": "2.17.4",
   "description": "JavaScript WebGL 3D maps rendering engine",
   "main": "src/browser/index.js",
   "scripts": {

diff --git a/src/core/core.js b/src/core/core.js
@@ -33,6 +33,7 @@ var Core = function(element, config, coreInterface) {
         mapMaxHiresLodLevels : 2,
         mapDownloadThreads : 20,
         mapMaxProcessingTime : 1000*20,
+        mapMaxGeodataProcessingTime : 10,
         mapMobileMode : false,
         mapMobileModeAutodect : true,
         mapMobileDetailDegradation : 1,
@@ -542,7 +543,7 @@ string getCoreVersion()
 */
 
 function getCoreVersion(full) {
-    return (full ? 'Core: ' : '') + '2.17.3';
+    return (full ? 'Core: ' : '') + '2.17.4';
 }
 
 

diff --git a/src/core/map/geodata-processor/worker-message.js b/src/core/map/geodata-processor/worker-message.js
@@ -148,6 +148,7 @@ function optimizeGroupMessages() {
 
                     if (message2.signature == signature) {
                         message2.reduced = true;
+                        globals.messagePackSize -= message2.job.byteLength;
                         count++;
 
                         //get message2 vertices length
@@ -226,8 +227,12 @@ function optimizeGroupMessages() {
     var buffer = new Uint8Array(globals.messagePackSize), index = 0;
 
     for (var i = 0, li = globals.messageBufferIndex; i < li; i++) {
-        buffer.set(new Uint8Array(globals.messageBuffer[i].job), index);
-        index += globals.messageBuffer[i].job.byteLength;
+        var message = globals.messageBuffer[i];
+
+        if (!message.reduced) {
+            buffer.set(new Uint8Array(message.job), index);
+            index += globals.messageBuffer[i].job.byteLength;
+        }
     }
 
     //console.log('send:' + buffer.length);

diff --git a/src/core/map/geodata-view.js b/src/core/map/geodata-view.js
@@ -78,6 +78,7 @@ MapGeodataView.prototype.killGeodataView = function(killedByCache) {
 MapGeodataView.prototype.processPackedCommands = function(buffer, index) {
 
     var maxIndex = buffer.byteLength;
+    var maxTime = this.map.config.mapMaxGeodataProcessingTime;
     var t = performance.now(), length, str, data;
     var view = new DataView(buffer.buffer);
 
@@ -118,7 +119,7 @@ MapGeodataView.prototype.processPackedCommands = function(buffer, index) {
                 break;
         }
 
-        if ((performance.now() - t) > 10) {
+        if ((performance.now() - t) > maxTime) {
             return index;
         }
 

diff --git a/src/core/map/map.js b/src/core/map/map.js
@@ -781,6 +781,7 @@ Map.prototype.setConfigParam = function(key, value) {
     case 'mapTexelSizeFit':               this.config.mapTexelSizeFit = utils.validateNumber(value, 0.0001, Number.MAXINTEGER, 1.1); break;
     case 'mapDownloadThreads':            this.config.mapDownloadThreads = utils.validateNumber(value, 1, Number.MAXINTEGER, 6); break;
     case 'mapMaxProcessingTime':          this.config.mapMaxProcessingTime = utils.validateNumber(value, 1, Number.MAXINTEGER, 1000/20); break;
+    case 'mapMaxGeodataProcessingTime':   this.config.mapMaxGeodataProcessingTime = utils.validateNumber(value, 1, Number.MAXINTEGER, 10); break;
     case 'mapMobileMode':                 this.config.mapMobileMode = utils.validateBool(value, false); this.setupMobileMode(); break;
     case 'mapMobileModeAutodect':         this.config.mapMobileModeAutodect = utils.validateBool(value, false); break;
     case 'mapMobileDetailDegradation':    this.config.mapMobileDetailDegradation = utils.validateNumber(value, 1, Number.MAXINTEGER, 2); break;
@@ -853,6 +854,7 @@ Map.prototype.getConfigParam = function(key) {
     case 'mapTexelSizeFit':               return this.config.mapTexelSizeFit;
     case 'mapDownloadThreads':            return this.config.mapDownloadThreads;
     case 'mapMaxProcessingTime':          return this.config.mapMaxProcessingTime;
+    case 'mapMaxGeodataProcessingTime':   return this.config.mapMaxGeodataProcessingTime;
     case 'mapMobileMode':                 return this.config.mapMobileMode;
     case 'mapMobileModeAutodect':         return this.config.mapMobileModeAutodect;
     case 'mapMobileDetailDegradation':    return this.config.mapMobileDetailDegradation;