ol 10.5.1-dev.1747647746066 → 10.5.1-dev.1747831869658

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.5.1-dev.1747647746066",
+  "version": "10.5.1-dev.1747831869658",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/render/canvas.d.ts

@@ -188,7 +188,7 @@ export const checkedFonts: BaseObject;
 export const textHeights: {
     [x: string]: number;
 };
-export function registerFont(fontSpec: any): void;
+export function registerFont(fontSpec: any): Promise<void>;
 export function measureTextHeight(fontSpec: any): number;
 export type BuilderType = "Circle" | "Image" | "LineString" | "Polygon" | "Text" | "Default";
 export type FillState = {

package/render/canvas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["canvas.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["canvas.js"],"names":[],"mappings":"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"}

package/render/canvas.js

@@ -2,7 +2,7 @@
  * @module ol/render/canvas
  */
 import BaseObject from '../Object.js';
-import {getFontParameters} from '../css.js';
+import {fontWeights, getFontParameters} from '../css.js';
 import {createCanvasContext2D} from '../dom.js';
 import {WORKER_OFFSCREEN_CANVAS} from '../has.js';
 import {clear} from '../obj.js';
@@ -178,98 +178,123 @@ let measureFont;
  */
 export const textHeights = {};
 
+const genericFontFamilies = new Set([
+  'serif',
+  'sans-serif',
+  'monospace',
+  'cursive',
+  'fantasy',
+  'system-ui',
+  'ui-serif',
+  'ui-sans-serif',
+  'ui-monospace',
+  'ui-rounded',
+  'emoji',
+  'math',
+  'fangsong',
+]);
+
+/**
+ * @param {string} style Css font-style
+ * @param {string} weight Css font-weight
+ * @param {string} family Css font-family
+ * @return {string} Font key.
+ */
+function getFontKey(style, weight, family) {
+  return `${style} ${weight} 16px "${family}"`;
+}
+
 /**
  * Clears the label cache when a font becomes available.
  * @param {string} fontSpec CSS font spec.
  */
 export const registerFont = (function () {
   const retries = 100;
-  const size = '32px ';
-  const referenceFonts = ['monospace', 'serif'];
-  const len = referenceFonts.length;
-  const text = 'wmytzilWMYTZIL@#/&?$%10\uF013';
-  let interval, referenceWidth;
+  let timeout, fontFaceSet;
 
   /**
-   * @param {string} fontStyle Css font-style
-   * @param {string} fontWeight Css font-weight
-   * @param {*} fontFamily Css font-family
-   * @return {boolean} Font with style and weight is available
+   * @param {string} fontSpec Css font spec
+   * @return {Promise<boolean>} Font with style and weight is available
    */
-  function isAvailable(fontStyle, fontWeight, fontFamily) {
-    let available = true;
-    for (let i = 0; i < len; ++i) {
-      const referenceFont = referenceFonts[i];
-      referenceWidth = measureTextWidth(
-        fontStyle + ' ' + fontWeight + ' ' + size + referenceFont,
-        text,
-      );
-      if (fontFamily != referenceFont) {
-        const width = measureTextWidth(
-          fontStyle +
-            ' ' +
-            fontWeight +
-            ' ' +
-            size +
-            fontFamily +
-            ',' +
-            referenceFont,
-          text,
-        );
-        // If width and referenceWidth are the same, then the fallback was used
-        // instead of the font we wanted, so the font is not available.
-        available = available && width != referenceWidth;
-      }
+  async function isAvailable(fontSpec) {
+    await fontFaceSet.ready;
+    const fontFaces = await fontFaceSet.load(fontSpec);
+    if (fontFaces.length === 0) {
+      return false;
     }
-    if (available) {
-      return true;
-    }
-    return false;
+    const font = getFontParameters(fontSpec);
+    const checkFamily = font.families[0].toLowerCase();
+    const checkWeight = font.weight;
+    return fontFaces.some(
+      /**
+       * @param {import('../css.js').FontParameters} f Font.
+       * @return {boolean} Font matches.
+       */
+      (f) => {
+        const family = f.family.replace(/^['"]|['"]$/g, '').toLowerCase();
+        const weight = fontWeights[f.weight] || f.weight;
+        return (
+          family === checkFamily &&
+          f.style === font.style &&
+          weight == checkWeight
+        );
+      },
+    );
   }
 
-  function check() {
+  async function check() {
+    await fontFaceSet.ready;
     let done = true;
-    const fonts = checkedFonts.getKeys();
-    for (let i = 0, ii = fonts.length; i < ii; ++i) {
+    const checkedFontsProperties = checkedFonts.getProperties();
+    const fonts = Object.keys(checkedFontsProperties).filter(
+      (key) => checkedFontsProperties[key] < retries,
+    );
+    for (let i = fonts.length - 1; i >= 0; --i) {
       const font = fonts[i];
-      if (checkedFonts.get(font) < retries) {
-        const [style, weight, family] = font.split('\n');
-        if (isAvailable(style, weight, family)) {
+      let currentRetries = checkedFontsProperties[font];
+      if (currentRetries < retries) {
+        if (await isAvailable(font)) {
           clear(textHeights);
-          // Make sure that loaded fonts are picked up by Safari
-          measureContext = null;
-          measureFont = undefined;
           checkedFonts.set(font, retries);
         } else {
-          checkedFonts.set(font, checkedFonts.get(font) + 1, true);
-          done = false;
+          currentRetries += 10;
+          checkedFonts.set(font, currentRetries, true);
+          if (currentRetries < retries) {
+            done = false;
+          }
         }
       }
     }
-    if (done) {
-      clearInterval(interval);
-      interval = undefined;
+    timeout = undefined;
+    if (!done) {
+      timeout = setTimeout(check, 100);
     }
   }
 
-  return function (fontSpec) {
+  return async function (fontSpec) {
+    if (!fontFaceSet) {
+      fontFaceSet = WORKER_OFFSCREEN_CANVAS ? self.fonts : document.fonts;
+    }
     const font = getFontParameters(fontSpec);
     if (!font) {
       return;
     }
     const families = font.families;
-    for (let i = 0, ii = families.length; i < ii; ++i) {
-      const family = families[i];
-      const key = font.style + '\n' + font.weight + '\n' + family;
-      if (checkedFonts.get(key) === undefined) {
-        checkedFonts.set(key, retries, true);
-        if (!isAvailable(font.style, font.weight, family)) {
-          checkedFonts.set(key, 0, true);
-          if (interval === undefined) {
-            interval = setInterval(check, 32);
-          }
-        }
+    let needCheck = false;
+    for (const family of families) {
+      if (genericFontFamilies.has(family)) {
+        continue;
       }
+      const key = getFontKey(font.style, font.weight, family);
+      if (checkedFonts.get(key) !== undefined) {
+        continue;
+      }
+      checkedFonts.set(key, 0, true);
+      needCheck = true;
+    }
+    if (needCheck) {
+      clearTimeout(timeout);
+      timeout = setTimeout(check, 100);
     }
   };
 })();

package/util.js

@@ -33,4 +33,4 @@ export function getUid(obj) {
  * OpenLayers version.
  * @type {string}
  */
-export const VERSION = '10.5.1-dev.1747647746066';
+export const VERSION = '10.5.1-dev.1747831869658';