From 6dcc54bfb89f39a8c8b9576eb3a943db60121a5e Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Tue, 17 Mar 2020 17:55:54 +0100
Subject: [PATCH] 'action' instead of 'type' as message identifier

---
 examples/mvtlayer.worker.js        |  8 ++--
 examples/offscreen-canvas-tiles.js | 65 ++++++++++++++++--------------
 src/ol/render/canvas.js            |  6 +--
 3 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/examples/mvtlayer.worker.js b/examples/mvtlayer.worker.js
index 7dc263cf23..16a555e052 100644
--- a/examples/mvtlayer.worker.js
+++ b/examples/mvtlayer.worker.js
@@ -44,7 +44,7 @@ const layer = new VectorTileLayer({
 });
 const renderer = layer.getRenderer();
 const tileQueue = new TileQueue(getTilePriority, function() {
-  worker.postMessage({type: 'request-render'});
+  worker.postMessage({action: 'request-render'});
 });
 const maxTotalLoading = 8;
 const maxNewLoads = 2;
@@ -64,12 +64,12 @@ renderer.useContainer = function(target, transform, opacity) {
 let rendering = false;
 
 worker.addEventListener('message', function(event) {
-  if (event.data.type !== 'render') {
+  if (event.data.action !== 'render') {
     return;
   }
   if (rendering) {
     // drop this frame
-    worker.postMessage({type: 'request-render'});
+    worker.postMessage({action: 'request-render'});
     return;
   }
   frameState = event.data.frameState;
@@ -85,7 +85,7 @@ worker.addEventListener('message', function(event) {
     }
     const imageData = canvas.transferToImageBitmap();
     worker.postMessage({
-      type: 'rendered',
+      action: 'rendered',
       imageData: imageData,
       transform: rendererTransform,
       opacity: rendererOpacity,
diff --git a/examples/offscreen-canvas-tiles.js b/examples/offscreen-canvas-tiles.js
index 13899f2949..60ee70480c 100644
--- a/examples/offscreen-canvas-tiles.js
+++ b/examples/offscreen-canvas-tiles.js
@@ -11,14 +11,14 @@ const mvtLayerWorker = new Worker();
 
 const loadingImages = {};
 mvtLayerWorker.addEventListener('message', event => {
-  if (event.data.type === 'getFontParameters') {
+  if (event.data.action === 'getFontParameters') {
     getFontParameters(event.data.font, font => {
       mvtLayerWorker.postMessage({
-        type: 'getFontParameters',
+        action: 'getFontParameters',
         font: font
       });
     });
-  } else if (event.data.type === 'loadImage') {
+  } else if (event.data.action === 'loadImage') {
     if (!(event.data.src in loadingImages)) {
       const image = new Image();
       image.crossOrigin = 'anonymous';
@@ -26,7 +26,7 @@ mvtLayerWorker.addEventListener('message', event => {
         createImageBitmap(image, 0, 0, image.width, image.height).then(imageBitmap => {
           delete loadingImages[event.data.iconName];
           mvtLayerWorker.postMessage({
-            type: 'imageLoaded',
+            action: 'imageLoaded',
             image: imageBitmap,
             iconName: event.data.iconName
           }, [imageBitmap]);
@@ -77,34 +77,37 @@ function updateContainerTransform() {
 
 }
 
+function render(id, frameState) {
+  if (!container) {
+    container = document.createElement('div');
+    container.style.position = 'absolute';
+    container.style.width = '100%';
+    container.style.height = '100%';
+    transformContainer = document.createElement('div');
+    transformContainer.style.position = 'absolute';
+    transformContainer.style.width = '100%';
+    transformContainer.style.height = '100%';
+    container.appendChild(transformContainer);
+    canvas = document.createElement('canvas');
+    canvas.style.position = 'absolute';
+    canvas.style.left = '0';
+    canvas.style.transformOrigin = 'top left';
+    transformContainer.appendChild(canvas);
+  }
+  mainThreadFrameState = frameState;
+  updateContainerTransform();
+  mvtLayerWorker.postMessage({
+    action: 'render',
+    id: id,
+    frameState: JSON.parse(JSON.stringify(frameState, getCircularReplacer()))
+  });
+  return container;
+}
+
 const map = new Map({
   layers: [
     new Layer({
-      render: function(frameState) {
-        if (!container) {
-          container = document.createElement('div');
-          container.style.position = 'absolute';
-          container.style.width = '100%';
-          container.style.height = '100%';
-          transformContainer = document.createElement('div');
-          transformContainer.style.position = 'absolute';
-          transformContainer.style.width = '100%';
-          transformContainer.style.height = '100%';
-          container.appendChild(transformContainer);
-          canvas = document.createElement('canvas');
-          canvas.style.position = 'absolute';
-          canvas.style.left = '0';
-          canvas.style.transformOrigin = 'top left';
-          transformContainer.appendChild(canvas);
-        }
-        mainThreadFrameState = frameState;
-        updateContainerTransform();
-        mvtLayerWorker.postMessage({
-          type: 'render',
-          frameState: JSON.parse(JSON.stringify(frameState, getCircularReplacer()))
-        });
-        return container;
-      }
+      render: render.bind(undefined, 'mapbox')
     })
   ],
   target: 'map',
@@ -114,9 +117,9 @@ const map = new Map({
   })
 });
 mvtLayerWorker.addEventListener('message', function(message) {
-  if (message.data.type === 'request-render') {
+  if (message.data.action === 'request-render') {
     map.render();
-  } else if (canvas && message.data.type === 'rendered') {
+  } else if (canvas && message.data.action === 'rendered') {
     transformContainer.style.transform = '';
     const imageData = message.data.imageData;
     canvas.width = imageData.width;
diff --git a/src/ol/render/canvas.js b/src/ol/render/canvas.js
index 1a5293bd2e..002ec4efd0 100644
--- a/src/ol/render/canvas.js
+++ b/src/ol/render/canvas.js
@@ -289,15 +289,15 @@ export const registerFont = (function() {
   return function(fontSpec) {
     if (WINDOW) {
       getFontParameters(fontSpec, fontCallback);
-    } else {
+    } else if (self.postMessage) {
       /** @type {any} */
       const worker = self;
       worker.postMessage({
-        type: 'getFontParameters',
+        action: 'getFontParameters',
         font: fontSpec
       });
       worker.addEventListener('message', function handler(event) {
-        if (event.data.type === 'getFontParameters') {
+        if (event.data.action === 'getFontParameters') {
           worker.removeEventListener('message', handler);
           const font = event.data.font;
           fontCallback(font);