Resolve NumberType | NumberArrayType ambiguity with a new SizeType

openlayers · May 10, 2024 · 993af2e · 993af2e
1 parent d9cce8c
commit 993af2e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 17 deletions.
diff --git a/src/ol/expr/expression.js b/src/ol/expr/expression.js
@@ -134,6 +134,7 @@ export const NumberType = 1 << numTypes++;
 export const StringType = 1 << numTypes++;
 export const ColorType = 1 << numTypes++;
 export const NumberArrayType = 1 << numTypes++;
+export const SizeType = NumberType | NumberArrayType;
 export const AnyType = Math.pow(2, numTypes) - 1;
 
 const typeNames = {

diff --git a/src/ol/expr/gpu.js b/src/ol/expr/gpu.js
@@ -10,6 +10,7 @@ import {
   NumberArrayType,
   NumberType,
   Ops,
+  SizeType,
   StringType,
   computeGeometryType,
   isType,
@@ -19,6 +20,7 @@ import {
 } from './expression.js';
 import {Uniforms} from '../renderer/webgl/TileLayer.js';
 import {asArray} from '../color.js';
+import {toSize} from '../size.js';
 
 /**
  * @param {string} operator Operator
@@ -72,6 +74,16 @@ export function colorToGlsl(color) {
   ]);
 }
 
+/**
+ * Normalizes and converts a number or array toa `vec2` array compatible with GLSL.
+ * @param {number|import('../size.js').Size} size Size.
+ * @return {string} The color expressed in the `vec4(1.0, 1.0, 1.0, 1.0)` form.
+ */
+export function sizeToGlsl(size) {
+  const array = toSize(size);
+  return arrayToGlsl(array);
+}
+
 /** @type {Object<string, number>} */
 const stringToFloatMap = {};
 let stringToFloatCounter = 0;
@@ -485,6 +497,12 @@ function compile(expression, returnType, context) {
     return arrayToGlsl(/** @type {Array<number>} */ (expression.value));
   }
 
+  if ((expression.type & SizeType) > 0) {
+    return sizeToGlsl(
+      /** @type {number|import('../size.js').Size} */ (expression.value),
+    );
+  }
+
   throw new Error(
     `Unexpected expression ${expression.value} (expected type ${typeName(
       returnType,

diff --git a/src/ol/webgl/styleparser.js b/src/ol/webgl/styleparser.js
@@ -7,6 +7,7 @@ import {
   ColorType,
   NumberArrayType,
   NumberType,
+  SizeType,
   StringType,
   newParsingContext,
 } from '../expr/expression.js';
@@ -67,7 +68,7 @@ const UNPACK_COLOR_FN = `vec4 unpackColor(vec2 packedColor) {
  * @return {1|2|3|4} The amount of components for this value
  */
 function getGlslSizeFromType(type) {
-  if (type === ColorType) {
+  if (type === ColorType || type === SizeType) {
     return 2;
   }
   if (type === NumberArrayType) {
@@ -134,7 +135,7 @@ function parseCommonSymbolProperties(style, builder, vertContext, prefix) {
     const scale = expressionToGlsl(
       vertContext,
       style[`${prefix}scale`],
-      NumberType | NumberArrayType,
+      SizeType,
     );
     builder.setSymbolSizeExpression(
       `${builder.getSymbolSizeExpression()} * ${scale}`,
@@ -301,7 +302,7 @@ function parseCircleProperties(
     const scale = expressionToGlsl(
       fragContext,
       style['circle-scale'],
-      NumberType | NumberArrayType,
+      SizeType,
     );
     currentPoint = `coordsPx / ${scale}`;
   }
@@ -420,11 +421,7 @@ function parseShapeProperties(
   // SCALE
   let currentPoint = 'coordsPx';
   if ('shape-scale' in style) {
-    const scale = expressionToGlsl(
-      fragContext,
-      style['shape-scale'],
-      NumberType | NumberArrayType,
-    );
+    const scale = expressionToGlsl(fragContext, style['shape-scale'], SizeType);
     currentPoint = `coordsPx / ${scale}`;
   }
 
@@ -584,11 +581,7 @@ function parseIconProperties(
     );
     let scale = `1.0`;
     if (`icon-scale` in style) {
-      scale = expressionToGlsl(
-        vertContext,
-        style[`icon-scale`],
-        NumberType | NumberArrayType,
-      );
+      scale = expressionToGlsl(vertContext, style[`icon-scale`], SizeType);
     }
     let shiftPx;
     if (

diff --git a/test/browser/spec/ol/webgl/styleparser.test.js b/test/browser/spec/ol/webgl/styleparser.test.js
@@ -898,12 +898,12 @@ describe('ol.webgl.styleparser', () => {
           ],
           'circle-radius': 8,
           'circle-fill-color': ['get', 'color'],
-          'circle-scale': ['get', 'iconSize', 'number[]'],
+          'circle-scale': ['get', 'iconSize'],
         });
       });
       it('adds attributes to the shader builder', () => {
         expect(parseResult.builder.attributes_).to.eql([
-          'vec4 a_prop_iconSize',
+          'vec2 a_prop_iconSize',
           'float a_prop_lineType',
           'float a_prop_lineWidth',
           'vec2 a_prop_color',
@@ -915,7 +915,7 @@ describe('ol.webgl.styleparser', () => {
         expect(parseResult.builder.varyings_).to.eql([
           {
             name: 'v_prop_iconSize',
-            type: 'vec4',
+            type: 'vec2',
             expression: 'a_prop_iconSize',
           },
           {
@@ -943,7 +943,7 @@ describe('ol.webgl.styleparser', () => {
       });
       it('returns attributes with their callbacks in the result', () => {
         expect(parseResult.attributes).to.eql({
-          iconSize: {size: 4, callback: {}},
+          iconSize: {size: 2, callback: {}},
           color: {size: 2, callback: {}},
           lineType: {size: 1, callback: {}},
           lineWidth: {size: 1, callback: {}},