@mapwhit/tilerenderer 0.52.1 → 1.1.0

package/src/style/properties.js

@@ -1,10 +1,8 @@
-const assert = require('assert');
-
-const { clone } = require('../util/object');
-const { easeCubicInOut } = require('../util/util');
-const { interpolate, normalizePropertyExpression } = require('@mapwhit/style-expressions');
-const { register } = require('../util/transfer_registry');
-const EvaluationParameters = require('./evaluation_parameters');
+import { interpolate, normalizePropertyExpression } from '@mapwhit/style-expressions';
+import assert from 'assert';
+import { clone } from '../util/object.js';
+import { easeCubicInOut } from '../util/util.js';
+import EvaluationParameters from './evaluation_parameters.js';
 
 /**
  * Implements a number of classes that define state and behavior for paint and layout properties, most
@@ -61,7 +59,7 @@ const EvaluationParameters = require('./evaluation_parameters');
  *
  *  @private
  */
-class PropertyValue {
+export class PropertyValue {
   constructor(property, value) {
     this.property = property;
     this.value = value;
@@ -98,7 +96,7 @@ class PropertyValue {
  *
  * @private
  */
-class TransitionablePropertyValue {
+export class TransitionablePropertyValue {
   constructor(property) {
     this.property = property;
     this.value = new PropertyValue(property, undefined);
@@ -133,7 +131,7 @@ class TransitionablePropertyValue {
  *
  * @private
  */
-class Transitionable {
+export class Transitionable {
   constructor(properties) {
     this._properties = properties;
     this._values = Object.create(properties.defaultTransitionablePropertyValues);
@@ -210,7 +208,7 @@ class Transitionable {
  *
  * @private
  */
-class TransitioningPropertyValue {
+export class TransitioningPropertyValue {
   constructor(property, value, prior, transition, now) {
     this.property = property;
     this.value = value;
@@ -265,7 +263,7 @@ class TransitioningPropertyValue {
  *
  * @private
  */
-class Transitioning {
+export class Transitioning {
   constructor(properties) {
     this._properties = properties;
     this._values = Object.create(properties.defaultTransitioningPropertyValues);
@@ -309,7 +307,7 @@ class Transitioning {
  *
  * @private
  */
-class Layout {
+export class Layout {
   constructor(properties) {
     this._properties = properties;
     this._values = Object.create(properties.defaultPropertyValues);
@@ -375,7 +373,7 @@ class Layout {
  *
  * @private
  */
-class PossiblyEvaluatedPropertyValue {
+export class PossiblyEvaluatedPropertyValue {
   constructor(property, value, parameters) {
     this.property = property;
     this.value = value;
@@ -403,15 +401,8 @@ class PossiblyEvaluatedPropertyValue {
  * an object type with the same keys, and values of type `R`.
  *
  * For properties that don't allow data-driven values, `R` is a scalar type such as `number`, `string`, or `Color`.
- * For data-driven properties, it is `PossiblyEvaluatedPropertyValue`. Critically, the type definitions are set up
- * in a way that allows flow to know which of these two cases applies for any given property name, and if you attempt
- * to use a `PossiblyEvaluatedPropertyValue` as if it was a scalar, or vice versa, you will get a type error. (However,
- * there's at least one case in which flow fails to produce a type error that you should be aware of: in a context such
- * as `layer.paint.get('foo-opacity') === 0`, if `foo-opacity` is data-driven, than the left-hand side is of type
- * `PossiblyEvaluatedPropertyValue<number>`, but flow will not complain about comparing this to a number using `===`.
- * See https://github.com/facebook/flow/issues/2359.)
- *
- * There's also a third, special case possiblity for `R`: for cross-faded properties, it's `?CrossFaded<T>`.
+ * For data-driven properties, it is `PossiblyEvaluatedPropertyValue`.
+ * For cross-faded properties, it's `?CrossFaded<T>`.
  *
  * @private
  */
@@ -421,7 +412,7 @@ class PossiblyEvaluatedPropertyValue {
  * given layer type.
  * @private
  */
-class PossiblyEvaluated {
+export class PossiblyEvaluated {
   constructor(properties) {
     this._properties = properties;
     this._values = Object.create(properties.defaultPossiblyEvaluatedValues);
@@ -439,7 +430,7 @@ class PossiblyEvaluated {
  *
  * @private
  */
-class DataConstantProperty {
+export class DataConstantProperty {
   constructor(specification) {
     this.specification = specification;
     this.specification['property-type'] ??= 'data-constant';
@@ -466,7 +457,7 @@ class DataConstantProperty {
  *
  * @private
  */
-class DataDrivenProperty {
+export class DataDrivenProperty {
   constructor(specification) {
     this.specification = specification;
     this.specification['property-type'] ??= 'data-driven';
@@ -526,7 +517,7 @@ class DataDrivenProperty {
  * @private
  */
 
-class CrossFadedDataDrivenProperty extends DataDrivenProperty {
+export class CrossFadedDataDrivenProperty extends DataDrivenProperty {
   constructor(specification) {
     specification['property-type'] ??= 'cross-faded-data-driven';
     super(specification);
@@ -586,7 +577,7 @@ class CrossFadedDataDrivenProperty extends DataDrivenProperty {
  *
  * @private
  */
-class CrossFadedProperty {
+export class CrossFadedProperty {
   constructor(specification) {
     this.specification = specification;
     this.specification['property-type'] ??= 'cross-faded';
@@ -627,7 +618,7 @@ class CrossFadedProperty {
  * @private
  */
 
-class ColorRampProperty {
+export class ColorRampProperty {
   constructor(specification) {
     this.specification = specification;
     this.specification['property-type'] ??= 'color-ramp';
@@ -653,7 +644,7 @@ class ColorRampProperty {
  *
  * @private
  */
-class Properties {
+export class Properties {
   constructor(properties) {
     this.properties = properties;
     this.defaultPropertyValues = {};
@@ -671,24 +662,3 @@ class Properties {
     }
   }
 }
-
-register('DataDrivenProperty', DataDrivenProperty);
-register('DataConstantProperty', DataConstantProperty);
-register('CrossFadedDataDrivenProperty', CrossFadedDataDrivenProperty);
-register('CrossFadedProperty', CrossFadedProperty);
-register('ColorRampProperty', ColorRampProperty);
-
-module.exports = {
-  PropertyValue,
-  Transitionable,
-  Transitioning,
-  Layout,
-  PossiblyEvaluatedPropertyValue,
-  PossiblyEvaluated,
-  DataConstantProperty,
-  DataDrivenProperty,
-  CrossFadedDataDrivenProperty,
-  CrossFadedProperty,
-  ColorRampProperty,
-  Properties
-};

package/src/style/query_utils.js

@@ -1,13 +1,7 @@
-const { default: Point } = require('@mapbox/point-geometry');
+import Point from '@mapbox/point-geometry';
 
-module.exports = {
-  getMaximumPaintValue,
-  translateDistance,
-  translate
-};
-
-function getMaximumPaintValue(property, layer, bucket) {
-  const value = layer.paint.get(property).value;
+export function getMaximumPaintValue(property, layer, bucket) {
+  const value = layer._paint.get(property).value;
   if (value.kind === 'constant') {
     return value.value;
   }
@@ -15,16 +9,16 @@ function getMaximumPaintValue(property, layer, bucket) {
   return binders[property].maxValue;
 }
 
-function translateDistance(translate) {
+export function translateDistance(translate) {
   return Math.sqrt(translate[0] * translate[0] + translate[1] * translate[1]);
 }
 
-function translate(queryGeometry, translate, translateAnchor, bearing, pixelsToTileUnits) {
+export function translate(queryGeometry, translate, translateAnchor, bearing, pixelsToTileUnits) {
   if (!translate[0] && !translate[1]) {
     return queryGeometry;
   }
 
-  const pt = Point.convert(translate);
+  const pt = Point.convert(translate)._mult(pixelsToTileUnits);
 
   if (translateAnchor === 'viewport') {
     pt._rotate(-bearing);
@@ -33,7 +27,7 @@ function translate(queryGeometry, translate, translateAnchor, bearing, pixelsToT
   const translated = [];
   for (let i = 0; i < queryGeometry.length; i++) {
     const point = queryGeometry[i];
-    translated.push(point.sub(pt._mult(pixelsToTileUnits)));
+    translated.push(point.sub(pt));
   }
   return translated;
 }