Website updates

Author: tschaub

dist/en/main/apidoc/module-ol_expr_expression.html

@@ -187,7 +187,7 @@ <h4 class="name">
 
         <div class="tag-source">
             <a href="https://github.com/openlayers/openlayers/blob/main/src/ol/expr/expression.js">expr/expression.js</a>,
-            <a href="https://github.com/openlayers/openlayers/blob/main/src/ol/expr/expression.js#L601">line 601</a>
+            <a href="https://github.com/openlayers/openlayers/blob/main/src/ol/expr/expression.js#L602">line 602</a>
         </div>
 
     </div>
@@ -449,7 +449,8 @@ <h4 class="name">
 <li><code>['all', value1, value2, ...]</code> returns <code>true</code> if all the inputs are <code>true</code>, <code>false</code> otherwise.</li>
 <li><code>['any', value1, value2, ...]</code> returns <code>true</code> if any of the inputs are <code>true</code>, <code>false</code> otherwise.</li>
 <li><code>['has', attributeName, keyOrArrayIndex, ...]</code> returns <code>true</code> if feature properties include the (nested) key <code>attributeName</code>,
-<code>false</code> otherwise.</li>
+<code>false</code> otherwise.
+Note that for WebGL layers, the hardcoded value <code>-9999999</code> is used to distinguish when a property is not defined.</li>
 <li><code>['between', value1, value2, value3]</code> returns <code>true</code> if <code>value1</code> is contained between <code>value2</code> and <code>value3</code>
 (inclusively), or <code>false</code> otherwise.</li>
 <li><code>['in', needle, haystack]</code> returns <code>true</code> if <code>needle</code> is found in <code>haystack</code>, and
@@ -584,7 +585,7 @@ <h4 class="name">
 
         <div class="tag-source">
             <a href="https://github.com/openlayers/openlayers/blob/main/src/ol/expr/expression.js">expr/expression.js</a>,
-            <a href="https://github.com/openlayers/openlayers/blob/main/src/ol/expr/expression.js#L428">line 428</a>
+            <a href="https://github.com/openlayers/openlayers/blob/main/src/ol/expr/expression.js#L429">line 429</a>
         </div>
 
     </div>

dist/en/main/examples/common.js

@@ -182,6 +182,7 @@ declare namespace ol {
             export { _ol_expr_gpu$FEATURE_ID_PROPERTY_NAME as FEATURE_ID_PROPERTY_NAME };
             export { _ol_expr_gpu$GEOMETRY_TYPE_PROPERTY_NAME as GEOMETRY_TYPE_PROPERTY_NAME };
             export { _ol_expr_gpu$PALETTE_TEXTURE_ARRAY as PALETTE_TEXTURE_ARRAY };
+            export { _ol_expr_gpu$UNDEFINED_PROP_VALUE as UNDEFINED_PROP_VALUE };
             export { _ol_expr_gpu$arrayToGlsl as arrayToGlsl };
             export { _ol_expr_gpu$buildExpression as buildExpression };
             export { _ol_expr_gpu$colorToGlsl as colorToGlsl };
@@ -1179,6 +1180,7 @@ import { typeName as _ol_expr_expression$typeName } from '../../ol/expr/expressi
 import { FEATURE_ID_PROPERTY_NAME as _ol_expr_gpu$FEATURE_ID_PROPERTY_NAME } from '../../ol/expr/gpu.js';
 import { GEOMETRY_TYPE_PROPERTY_NAME as _ol_expr_gpu$GEOMETRY_TYPE_PROPERTY_NAME } from '../../ol/expr/gpu.js';
 import { PALETTE_TEXTURE_ARRAY as _ol_expr_gpu$PALETTE_TEXTURE_ARRAY } from '../../ol/expr/gpu.js';
+import { UNDEFINED_PROP_VALUE as _ol_expr_gpu$UNDEFINED_PROP_VALUE } from '../../ol/expr/gpu.js';
 import { arrayToGlsl as _ol_expr_gpu$arrayToGlsl } from '../../ol/expr/gpu.js';
 import { buildExpression as _ol_expr_gpu$buildExpression } from '../../ol/expr/gpu.js';
 import { colorToGlsl as _ol_expr_gpu$colorToGlsl } from '../../ol/expr/gpu.js';

dist/en/main/examples/common.js.map

@@ -203,6 +203,7 @@ export type ArgValidator = (arg0: Array<EncodedExpression>, arg1: number, arg2:
  *   * `['any', value1, value2, ...]` returns `true` if any of the inputs are `true`, `false` otherwise.
  *   * `['has', attributeName, keyOrArrayIndex, ...]` returns `true` if feature properties include the (nested) key `attributeName`,
  *     `false` otherwise.
+ *     Note that for WebGL layers, the hardcoded value `-9999999` is used to distinguish when a property is not defined.
  *   * `['between', value1, value2, value3]` returns `true` if `value1` is contained between `value2` and `value3`
  *     (inclusively), or `false` otherwise.
  *   * `['in', needle, haystack]` returns `true` if `needle` is found in `haystack`, and

dist/en/main/ol/dist/ol.d.ts

@@ -96,6 +96,7 @@ import {toSize} from '../size.js';
  *   * `['any', value1, value2, ...]` returns `true` if any of the inputs are `true`, `false` otherwise.
  *   * `['has', attributeName, keyOrArrayIndex, ...]` returns `true` if feature properties include the (nested) key `attributeName`,
  *     `false` otherwise.
+ *     Note that for WebGL layers, the hardcoded value `-9999999` is used to distinguish when a property is not defined.
  *   * `['between', value1, value2, value3]` returns `true` if `value1` is contained between `value2` and `value3`
  *     (inclusively), or `false` otherwise.
  *   * `['in', needle, haystack]` returns `true` if `needle` is found in `haystack`, and

dist/en/main/ol/dist/ol.d.ts.map

@@ -97,6 +97,10 @@ export function buildExpression(encoded: import("./expression.js").EncodedExpres
 export const PALETTE_TEXTURE_ARRAY: "u_paletteTextures";
 export const FEATURE_ID_PROPERTY_NAME: "featureId";
 export const GEOMETRY_TYPE_PROPERTY_NAME: "geometryType";
+/**
+ * The value `-9999999` will be used to indicate that a property on a feature is not defined, similar to a "no data" value.
+ */
+export const UNDEFINED_PROP_VALUE: -9999999;
 export type ParsingContext = import("./expression.js").ParsingContext;
 export type Expression = import("./expression.js").Expression;
 export type LiteralExpression = import("./expression.js").LiteralExpression;

dist/en/main/ol/dist/ol.js.map

@@ -166,6 +166,11 @@ export const PALETTE_TEXTURE_ARRAY = 'u_paletteTextures';
 export const FEATURE_ID_PROPERTY_NAME = 'featureId';
 export const GEOMETRY_TYPE_PROPERTY_NAME = 'geometryType';
 
+/**
+ * The value `-9999999` will be used to indicate that a property on a feature is not defined, similar to a "no data" value.
+ */
+export const UNDEFINED_PROP_VALUE = -9999999;
+
 /**
  * @typedef {string} CompiledExpression
  */
@@ -244,6 +249,18 @@ const compilers = {
     }
     return uniformNameForVariable(varName);
   },
+  [Ops.Has]: (context, expression) => {
+    const firstArg = /** @type {LiteralExpression} */ (expression.args[0]);
+    const propName = /** @type {string} */ (firstArg.value);
+    const isExisting = propName in context.properties;
+    if (!isExisting) {
+      context.properties[propName] = {
+        name: propName,
+        type: expression.type,
+      };
+    }
+    return `(a_prop_${propName} != ${numberToGlsl(UNDEFINED_PROP_VALUE)})`;
+  },
   [Ops.Resolution]: () => 'u_resolution',
   [Ops.Zoom]: () => 'u_zoom',
   [Ops.Time]: () => 'u_time',

dist/en/main/ol/expr/expression.d.ts.map

@@ -1,6 +1,7 @@
 /**
  * @module ol/render/webgl/renderinstructions
  */
+import {UNDEFINED_PROP_VALUE} from '../../expr/gpu.js';
 import {transform2D} from '../../geom/flat/transform.js';
 import {apply as applyTransform} from '../../transform.js';
 
@@ -21,7 +22,16 @@ function pushCustomAttributesInRenderInstructions(
   for (const key in customAttributes) {
     const attr = customAttributes[key];
     const value = attr.callback.call(batchEntry, batchEntry.feature);
-    renderInstructions[currentIndex + shift++] = value?.[0] ?? value;
+    let first = value?.[0] ?? value;
+    if (first === UNDEFINED_PROP_VALUE) {
+      console.warn('The "has" operator might return false positives.'); // eslint-disable-line no-console
+    }
+    if (first === undefined) {
+      first = UNDEFINED_PROP_VALUE;
+    } else if (first === null) {
+      first = 0;
+    }
+    renderInstructions[currentIndex + shift++] = first;
     if (!attr.size || attr.size === 1) {
       continue;
     }