Merge pull request #96 from DavidLevinsky/master

Support for new fonts
melowntech · Mar 15, 2018 · fa3c626 · fa3c626
2 parents 3bba9bb + e18ba58
commit fa3c626
Show file tree

Hide file tree

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

diff --git a/src/browser/autopilot/autopilot.js b/src/browser/autopilot/autopilot.js
@@ -170,14 +170,24 @@ Autopilot.prototype.tick = function() {
 
 
 Autopilot.prototype.generateTrajectory = function(p1, p2, options) {
-    if(!this.map) return;
-    return this.map.generateTrajectory(p1, p2, options);
+    var map = this.browser.core.map;
+    if (!map) {
+        return;
+    }
+
+    options = options || {};
+    return map.generateTrajectory(p1, p2, options);
 };
 
 
 Autopilot.prototype.generatePIHTrajectory = function(position, azimuth, distance, options) {
-    if(!this.map) return;
-    return this.map.generatePIHTrajectory(position, azimuth, distance, options);
+    var map = this.browser.core.map;
+    if (!map) {
+        return;
+    }
+
+    options = options || {};
+    return map.generatePIHTrajectory(position, azimuth, distance, options);
 };
 
 

diff --git a/src/core/core.js b/src/core/core.js
@@ -63,6 +63,8 @@ var Core = function(element, config, coreInterface) {
         mapRefreshCycles : 3,
         mapDegradeHorizon : false,
         mapDegradeHorizonParams : [1, 1500, 97500, 3500], //[1, 3000, 15000, 7000],
+        mapDefaultFont : '//cdn.melown.com/libs/vtsjs/fonts/noto-basic/1.0.0/noto.fnt',
+        //mapDefaultFont : '../fonts/basic.fnt',
         mapFog : true,
         rendererAntialiasing : true,
         rendererAllowScreenshots : false,
@@ -479,7 +481,7 @@ string getCoreVersion()
 */
 
 function getCoreVersion(full) {
-    return (full ? 'Core: ' : '') + '2.13.6';
+    return (full ? 'Core: ' : '') + '2.14.4';
 }
 
 

diff --git a/src/core/map/geodata-processor/processor.js b/src/core/map/geodata-processor/processor.js
@@ -103,11 +103,11 @@ MapGeodataProcessor.prototype.setStylesheet = function(stylesheet, fontsOnly) {
         return;
     }
 
-    this.setFont('#system', this.renderer.font);
+    //this.setFont('#default', this.renderer.font);
     this.sendCommand('setStylesheet', { 'data' : stylesheet.data, 'geocent' : (!this.map.getNavigationSrs().isProjected()) } );
 
     var fonts = stylesheet.fonts;
-    var fontMap = { '#system' : '#system' };
+    var fontMap = {}; //'#default' : '#default' };
 
     for (var key in fonts) {
         var fontUrl = fonts[key];
@@ -125,8 +125,7 @@ MapGeodataProcessor.prototype.setStylesheet = function(stylesheet, fontsOnly) {
 MapGeodataProcessor.prototype.setFont = function(url, font) {
     if (!this.fonts[url]) {
         this.fonts[url] = font;
-        this.sendCommand('setFont', {'url' : url, 'chars' : font.chars, 'space' : font.space, 'cly' : font.cly, 
-                                     'size' : font.size, 'version':font.version});
+        this.sendCommand('setFont', {'url' : url, 'data': font.data}, [font.data]);
     }
 };