MINOR: Removes default font catalog option (#2015)

* MINOR: Removes default font catalog option Signed-off-by: Frauke Fritz <[email protected]> * MINOR: Makes default style handling in TextStylesCache independent of DEFAULT_FONT_CATALOG Signed-off-by: Frauke Fritz <[email protected]>
heremaps · Dec 16, 2020 · d7754a8 · d7754a8
1 parent 9c589d4
commit d7754a8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 21 deletions.
diff --git a/@here/harp-mapview/lib/text/TextElementsRenderer.ts b/@here/harp-mapview/lib/text/TextElementsRenderer.ts
@@ -530,7 +530,7 @@ export class TextElementsRenderer {
         // TODO: this is an intermeditate solution, in the end this
         // should not create a new cache, but update the former one
         this.m_textStyleCache = new TextStyleCache(textStyles, defaultTextStyle);
-        this.m_textStyleCache.initializeDefaultTextElementStyle(DEFAULT_FONT_CATALOG_NAME);
+        this.m_textStyleCache.initializeDefaultTextElementStyle();
         await this.waitLoaded();
         this.m_textStyleCache.initializeTextElementStyles(this.m_textCanvases);
     }

diff --git a/@here/harp-mapview/lib/text/TextElementsRendererOptions.ts b/@here/harp-mapview/lib/text/TextElementsRendererOptions.ts
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const DEFAULT_FONT_CATALOG = "./resources/fonts/Default_FontCatalog.json";
-
 /**
  * Default number of labels/POIs rendered in the scene
  */
@@ -47,7 +45,7 @@ const MAX_GLYPH_COUNT = 32768;
 
 export interface TextElementsRendererOptions {
     /**
-     * The path to the font catalog file. Default is [[DEFAULT_FONT_CATALOG]].
+     * The path to the font catalog file.
      */
     fontCatalog?: string;
     /**
@@ -138,10 +136,6 @@ export interface TextElementsRendererOptions {
  * @param options - The options to be initialized.
  */
 export function initializeDefaultOptions(options: TextElementsRendererOptions) {
-    if (options.fontCatalog === undefined) {
-        options.fontCatalog = DEFAULT_FONT_CATALOG;
-    }
-
     if (options.minNumGlyphs === undefined) {
         options.minNumGlyphs = MIN_GLYPH_COUNT;
     }

diff --git a/@here/harp-mapview/lib/text/TextStyleCache.ts b/@here/harp-mapview/lib/text/TextStyleCache.ts
@@ -89,11 +89,12 @@ export class TextStyleCache {
         private readonly m_defaultTextStyleDefinition?: TextStyleDefinition
     ) {}
 
-    initializeDefaultTextElementStyle(defaultFontCatalogName: string) {
+    initializeDefaultTextElementStyle() {
         if (this.m_textStyleDefinitions === undefined) {
             this.m_textStyleDefinitions = [];
         }
         const styles = this.m_textStyleDefinitions;
+        this.m_defaultStyle.fontCatalog = undefined;
 
         const themedDefaultStyle = styles.find(style => style.name === DEFAULT_STYLE_NAME);
         if (themedDefaultStyle !== undefined) {
@@ -109,7 +110,6 @@ export class TextStyleCache {
         } else if (styles.length > 0) {
             this.m_defaultStyle = this.createTextElementStyle(styles[0], DEFAULT_STYLE_NAME);
         }
-        this.m_defaultStyle.fontCatalog = defaultFontCatalogName;
         this.m_defaultStyle.textCanvas = undefined;
     }
 
@@ -362,28 +362,39 @@ export class TextStyleCache {
                 return;
             }
         }
+        // specified canvas not found
         if (style.textCanvas === undefined) {
-            if (style.fontCatalog !== undefined) {
+            if (
+                style.fontCatalog !== undefined &&
+                style.fontCatalog !== DEFAULT_FONT_CATALOG_NAME
+            ) {
                 logger.warn(
                     `FontCatalog '${style.fontCatalog}' set in TextStyle
                      '${style.name}' not found`
                 );
             }
-            const defaultCanvas = textCanvases.get(DEFAULT_FONT_CATALOG_NAME);
-            if (defaultCanvas) {
-                style.textCanvas = defaultCanvas;
-                logger.info(`using default fontCatalog(${style.textCanvas?.fontCatalog.name}).`);
-            } else if (textCanvases.size > 0) {
+
+            // find another canvas to use then
+            let alternativeTextCanvas = textCanvases.get(DEFAULT_FONT_CATALOG_NAME);
+            if (!alternativeTextCanvas && textCanvases.size > 0) {
                 for (const [, canvas] of textCanvases) {
                     if (canvas) {
-                        style.textCanvas = canvas;
-                        logger.info(
-                            `using default fontCatalog(${style.textCanvas?.fontCatalog.name}).`
-                        );
+                        alternativeTextCanvas = canvas;
                         break;
                     }
                 }
             }
+
+            // if an alternative canvas is found, use it
+            if (alternativeTextCanvas) {
+                style.textCanvas = alternativeTextCanvas;
+                if (style.fontCatalog !== undefined) {
+                    logger.info(
+                        `fontCatalog: '${style.fontCatalog}' not found,
+                      using default fontCatalog(${style.textCanvas?.name}).`
+                    );
+                }
+            }
         }
     }
 

diff --git a/@here/harp-mapview/test/TextElementsRendererTestFixture.ts b/@here/harp-mapview/test/TextElementsRendererTestFixture.ts
@@ -149,7 +149,8 @@ export class TestFixture {
         });
         this.m_options = {
             labelDistanceScaleMin: 1,
-            labelDistanceScaleMax: 1
+            labelDistanceScaleMax: 1,
+            fontCatalog: "./resources/fonts/Default_FontCatalog.json"
         };
         this.m_fontCatalog = stubFontCatalog(this.sandbox);
         this.m_textCanvasStub = stubTextCanvas(