@mapwhit/tilerenderer 0.50.0 → 0.51.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/min/package.json +1 -1
- package/build/min/src/shaders/.dir +0 -0
- package/build/min/src/shaders/{_prelude.fragment.glsl.txt → _prelude.fragment.glsl.js} +2 -1
- package/build/min/src/shaders/{_prelude.vertex.glsl.txt → _prelude.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/background.fragment.glsl.js +5 -0
- package/build/min/src/shaders/background.vertex.glsl.js +1 -0
- package/build/min/src/shaders/background_pattern.fragment.glsl.js +5 -0
- package/build/min/src/shaders/background_pattern.vertex.glsl.js +1 -0
- package/build/min/src/shaders/{circle.fragment.glsl.txt → circle.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{circle.vertex.glsl.txt → circle.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/clipping_mask.fragment.glsl.js +1 -0
- package/build/min/src/shaders/clipping_mask.vertex.glsl.js +1 -0
- package/build/min/src/shaders/collision_box.fragment.glsl.js +1 -0
- package/build/min/src/shaders/collision_box.vertex.glsl.js +1 -0
- package/build/min/src/shaders/collision_circle.fragment.glsl.js +1 -0
- package/build/min/src/shaders/collision_circle.vertex.glsl.js +1 -0
- package/build/min/src/shaders/debug.fragment.glsl.js +1 -0
- package/build/min/src/shaders/debug.vertex.glsl.js +1 -0
- package/build/min/src/shaders/{fill.fragment.glsl.txt → fill.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{fill.vertex.glsl.txt → fill.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/fill_extrusion.fragment.glsl.js +5 -0
- package/build/min/src/shaders/{fill_extrusion.vertex.glsl.txt → fill_extrusion.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/{fill_extrusion_pattern.fragment.glsl.txt → fill_extrusion_pattern.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{fill_extrusion_pattern.vertex.glsl.txt → fill_extrusion_pattern.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/{fill_outline.fragment.glsl.txt → fill_outline.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{fill_outline.vertex.glsl.txt → fill_outline.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/{fill_outline_pattern.fragment.glsl.txt → fill_outline_pattern.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{fill_outline_pattern.vertex.glsl.txt → fill_outline_pattern.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/{fill_pattern.fragment.glsl.txt → fill_pattern.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{fill_pattern.vertex.glsl.txt → fill_pattern.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/{heatmap.fragment.glsl.txt → heatmap.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{heatmap.vertex.glsl.txt → heatmap.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/heatmap_texture.fragment.glsl.js +5 -0
- package/build/min/src/shaders/heatmap_texture.vertex.glsl.js +1 -0
- package/build/min/src/shaders/{hillshade.fragment.glsl.txt → hillshade.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/hillshade.vertex.glsl.js +1 -0
- package/build/min/src/shaders/{hillshade_prepare.fragment.glsl.txt → hillshade_prepare.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/hillshade_prepare.vertex.glsl.js +1 -0
- package/build/min/src/shaders/{line.fragment.glsl.txt → line.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{line.vertex.glsl.txt → line.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/{line_gradient.fragment.glsl.txt → line_gradient.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{line_gradient.vertex.glsl.txt → line_gradient.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/{line_pattern.fragment.glsl.txt → line_pattern.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{line_pattern.vertex.glsl.txt → line_pattern.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/{line_sdf.fragment.glsl.txt → line_sdf.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{line_sdf.vertex.glsl.txt → line_sdf.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/raster.fragment.glsl.js +5 -0
- package/build/min/src/shaders/raster.vertex.glsl.js +1 -0
- package/build/min/src/shaders/{symbol_icon.fragment.glsl.txt → symbol_icon.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{symbol_icon.vertex.glsl.txt → symbol_icon.vertex.glsl.js} +2 -2
- package/build/min/src/shaders/{symbol_sdf.fragment.glsl.txt → symbol_sdf.fragment.glsl.js} +2 -2
- package/build/min/src/shaders/{symbol_sdf.vertex.glsl.txt → symbol_sdf.vertex.glsl.js} +2 -2
- package/package.json +14 -10
- package/src/data/array_types.js +1 -1
- package/src/data/bucket/fill_bucket.js +1 -1
- package/src/data/bucket/fill_extrusion_bucket.js +2 -2
- package/src/data/bucket/line_bucket.js +1 -1
- package/src/data/bucket/symbol_bucket.js +3 -3
- package/src/data/feature_index.js +1 -1
- package/src/data/program_configuration.js +1 -1
- package/src/geo/transform.js +1 -1
- package/src/gl/color_mode.js +1 -1
- package/src/gl/value.js +1 -1
- package/src/index.js +2 -2
- package/src/render/draw_debug.js +1 -1
- package/src/render/draw_fill.js +1 -1
- package/src/render/draw_heatmap.js +1 -1
- package/src/render/glyph_manager.js +6 -130
- package/src/render/painter.js +1 -1
- package/src/render/uniform_binding.js +1 -1
- package/src/shaders/index.js +50 -50
- package/src/source/geojson_source.js +1 -1
- package/src/source/geojson_worker_source.js +4 -4
- package/src/source/geojson_wrapper.js +35 -27
- package/src/source/image_source.js +2 -2
- package/src/source/raster_tile_source.js +1 -1
- package/src/source/resources/glyphs.js +73 -0
- package/src/source/resources/images.js +68 -0
- package/src/source/resources/index.js +22 -0
- package/src/source/rtl_text_plugin.js +1 -1
- package/src/source/source_cache.js +2 -2
- package/src/source/tile.js +1 -1
- package/src/source/vector_tile_source.js +1 -1
- package/src/source/vector_tile_worker_source.js +5 -5
- package/src/source/worker.js +6 -5
- package/src/source/worker_tile.js +4 -4
- package/src/style/light.js +1 -1
- package/src/style/properties.js +1 -2
- package/src/style/query_utils.js +1 -1
- package/src/style/style.js +4 -4
- package/src/style/style_layer/circle_style_layer.js +1 -1
- package/src/style/style_layer/fill_extrusion_style_layer.js +1 -1
- package/src/style/style_layer/line_style_layer.js +1 -1
- package/src/style/style_layer/symbol_style_layer.js +1 -1
- package/src/style/style_layer.js +2 -2
- package/src/style-spec/feature_filter/index.js +43 -34
- package/src/style-spec/group_by_layout.js +10 -32
- package/src/symbol/anchor.js +1 -1
- package/src/symbol/clip_line.js +1 -1
- package/src/symbol/collision_feature.js +1 -1
- package/src/symbol/collision_index.js +1 -1
- package/src/symbol/mergelines.js +0 -2
- package/src/symbol/projection.js +1 -1
- package/src/symbol/quads.js +1 -1
- package/src/symbol/symbol_layout.js +0 -1
- package/src/symbol/symbol_size.js +1 -1
- package/src/symbol/transform_text.js +0 -1
- package/src/ui/camera.js +2 -2
- package/src/ui/map.js +11 -41
- package/src/util/browser.js +3 -18
- package/src/util/classify_rings.js +1 -1
- package/src/util/config.js +1 -1
- package/src/util/dom.js +0 -88
- package/src/util/find_pole_of_inaccessibility.js +3 -3
- package/src/util/intersection_tests.js +1 -1
- package/src/util/web_worker_transfer.js +4 -4
- package/src/worker.js +4 -0
- package/build/min/src/shaders/background.fragment.glsl.txt +0 -5
- package/build/min/src/shaders/background.vertex.glsl.txt +0 -1
- package/build/min/src/shaders/background_pattern.fragment.glsl.txt +0 -5
- package/build/min/src/shaders/background_pattern.vertex.glsl.txt +0 -1
- package/build/min/src/shaders/clipping_mask.fragment.glsl.txt +0 -1
- package/build/min/src/shaders/clipping_mask.vertex.glsl.txt +0 -1
- package/build/min/src/shaders/collision_box.fragment.glsl.txt +0 -1
- package/build/min/src/shaders/collision_box.vertex.glsl.txt +0 -1
- package/build/min/src/shaders/collision_circle.fragment.glsl.txt +0 -1
- package/build/min/src/shaders/collision_circle.vertex.glsl.txt +0 -1
- package/build/min/src/shaders/debug.fragment.glsl.txt +0 -1
- package/build/min/src/shaders/debug.vertex.glsl.txt +0 -1
- package/build/min/src/shaders/fill_extrusion.fragment.glsl.txt +0 -5
- package/build/min/src/shaders/heatmap_texture.fragment.glsl.txt +0 -5
- package/build/min/src/shaders/heatmap_texture.vertex.glsl.txt +0 -1
- package/build/min/src/shaders/hillshade.vertex.glsl.txt +0 -1
- package/build/min/src/shaders/hillshade_prepare.vertex.glsl.txt +0 -1
- package/build/min/src/shaders/raster.fragment.glsl.txt +0 -5
- package/build/min/src/shaders/raster.vertex.glsl.txt +0 -1
- package/src/style/load_glyph_range.js +0 -17
- package/src/style-spec/expression/compound_expression.js +0 -132
- package/src/style-spec/expression/definitions/assertion.js +0 -116
- package/src/style-spec/expression/definitions/at.js +0 -57
- package/src/style-spec/expression/definitions/case.js +0 -73
- package/src/style-spec/expression/definitions/coalesce.js +0 -66
- package/src/style-spec/expression/definitions/coercion.js +0 -120
- package/src/style-spec/expression/definitions/collator.js +0 -80
- package/src/style-spec/expression/definitions/comparison.js +0 -193
- package/src/style-spec/expression/definitions/format.js +0 -97
- package/src/style-spec/expression/definitions/index.js +0 -339
- package/src/style-spec/expression/definitions/interpolate.js +0 -245
- package/src/style-spec/expression/definitions/length.js +0 -54
- package/src/style-spec/expression/definitions/let.js +0 -60
- package/src/style-spec/expression/definitions/literal.js +0 -69
- package/src/style-spec/expression/definitions/match.js +0 -142
- package/src/style-spec/expression/definitions/step.js +0 -116
- package/src/style-spec/expression/definitions/var.js +0 -38
- package/src/style-spec/expression/evaluation_context.js +0 -38
- package/src/style-spec/expression/index.js +0 -330
- package/src/style-spec/expression/is_constant.js +0 -63
- package/src/style-spec/expression/parsing_context.js +0 -221
- package/src/style-spec/expression/parsing_error.js +0 -9
- package/src/style-spec/expression/runtime_error.js +0 -12
- package/src/style-spec/expression/scope.js +0 -34
- package/src/style-spec/expression/stops.js +0 -37
- package/src/style-spec/expression/types/collator.js +0 -24
- package/src/style-spec/expression/types/formatted.js +0 -39
- package/src/style-spec/expression/types.js +0 -88
- package/src/style-spec/expression/values.js +0 -149
- package/src/style-spec/function/convert.js +0 -240
- package/src/style-spec/function/index.js +0 -303
- package/src/style-spec/util/color.js +0 -73
- package/src/style-spec/util/color_spaces.js +0 -128
- package/src/style-spec/util/get_type.js +0 -18
- package/src/style-spec/util/interpolate.js +0 -21
- package/src/style-spec/util/properties.js +0 -17
- package/src/style-spec/util/result.js +0 -19
- package/src/ui/anchor.js +0 -24
- package/src/ui/bind_handlers.js +0 -199
- package/src/ui/events.js +0 -210
- package/src/ui/handler/box_zoom.js +0 -151
- package/src/ui/handler/dblclick_zoom.js +0 -91
- package/src/ui/handler/drag_pan.js +0 -285
- package/src/ui/handler/drag_rotate.js +0 -290
- package/src/ui/handler/frame.js +0 -28
- package/src/ui/handler/inertia.js +0 -45
- package/src/ui/handler/keyboard.js +0 -148
- package/src/ui/handler/scroll_zoom.js +0 -284
- package/src/ui/handler/touch_zoom_rotate.js +0 -263
- package/src/util/evented.js +0 -182
|
@@ -1,330 +0,0 @@
|
|
|
1
|
-
const assert = require('assert');
|
|
2
|
-
|
|
3
|
-
const ParsingError = require('./parsing_error');
|
|
4
|
-
const ParsingContext = require('./parsing_context');
|
|
5
|
-
const EvaluationContext = require('./evaluation_context');
|
|
6
|
-
const CompoundExpression = require('./compound_expression');
|
|
7
|
-
const Step = require('./definitions/step');
|
|
8
|
-
const Interpolate = require('./definitions/interpolate');
|
|
9
|
-
const Coalesce = require('./definitions/coalesce');
|
|
10
|
-
const Let = require('./definitions/let');
|
|
11
|
-
const definitions = require('./definitions');
|
|
12
|
-
const isConstant = require('./is_constant');
|
|
13
|
-
const RuntimeError = require('./runtime_error');
|
|
14
|
-
const { success, error } = require('../util/result');
|
|
15
|
-
const { supportsPropertyExpression, supportsZoomExpression, supportsInterpolation } = require('../util/properties');
|
|
16
|
-
|
|
17
|
-
class StyleExpression {
|
|
18
|
-
constructor(expression, propertySpec) {
|
|
19
|
-
this.expression = expression;
|
|
20
|
-
this._warningHistory = {};
|
|
21
|
-
this._evaluator = new EvaluationContext();
|
|
22
|
-
this._defaultValue = getDefaultValue(propertySpec);
|
|
23
|
-
this._enumValues = propertySpec.type === 'enum' ? propertySpec.values : null;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
evaluateWithoutErrorHandling(globals, feature, featureState) {
|
|
27
|
-
this._evaluator.globals = globals;
|
|
28
|
-
this._evaluator.feature = feature;
|
|
29
|
-
this._evaluator.featureState = featureState;
|
|
30
|
-
|
|
31
|
-
return this.expression.evaluate(this._evaluator);
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
evaluate(globals, feature, featureState) {
|
|
35
|
-
this._evaluator.globals = globals;
|
|
36
|
-
this._evaluator.feature = feature || null;
|
|
37
|
-
this._evaluator.featureState = featureState || null;
|
|
38
|
-
|
|
39
|
-
try {
|
|
40
|
-
const val = this.expression.evaluate(this._evaluator);
|
|
41
|
-
if (val === null || val === undefined) {
|
|
42
|
-
return this._defaultValue;
|
|
43
|
-
}
|
|
44
|
-
if (this._enumValues && !this._enumValues.includes(val)) {
|
|
45
|
-
throw new RuntimeError(
|
|
46
|
-
`Expected value to be one of ${this._enumValues
|
|
47
|
-
.map(v => JSON.stringify(v))
|
|
48
|
-
.join(', ')}, but found ${JSON.stringify(val)} instead.`
|
|
49
|
-
);
|
|
50
|
-
}
|
|
51
|
-
return val;
|
|
52
|
-
} catch (e) {
|
|
53
|
-
if (!this._warningHistory[e.message]) {
|
|
54
|
-
this._warningHistory[e.message] = true;
|
|
55
|
-
if (typeof console !== 'undefined') {
|
|
56
|
-
console.warn(e.message);
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
return this._defaultValue;
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
function isExpression(expression) {
|
|
65
|
-
return (
|
|
66
|
-
Array.isArray(expression) &&
|
|
67
|
-
expression.length > 0 &&
|
|
68
|
-
typeof expression[0] === 'string' &&
|
|
69
|
-
expression[0] in definitions
|
|
70
|
-
);
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
/**
|
|
74
|
-
* Parse and typecheck the given style spec JSON expression. If
|
|
75
|
-
* options.defaultValue is provided, then the resulting StyleExpression's
|
|
76
|
-
* `evaluate()` method will handle errors by logging a warning (once per
|
|
77
|
-
* message) and returning the default value. Otherwise, it will throw
|
|
78
|
-
* evaluation errors.
|
|
79
|
-
*
|
|
80
|
-
* @private
|
|
81
|
-
*/
|
|
82
|
-
function createExpression(expression, propertySpec) {
|
|
83
|
-
const parser = new ParsingContext(definitions, [], getExpectedType(propertySpec));
|
|
84
|
-
|
|
85
|
-
// For string-valued properties, coerce to string at the top level rather than asserting.
|
|
86
|
-
const parsed = parser.parse(
|
|
87
|
-
expression,
|
|
88
|
-
undefined,
|
|
89
|
-
undefined,
|
|
90
|
-
undefined,
|
|
91
|
-
propertySpec.type === 'string' ? { typeAnnotation: 'coerce' } : undefined
|
|
92
|
-
);
|
|
93
|
-
|
|
94
|
-
if (!parsed) {
|
|
95
|
-
assert(parser.errors.length > 0);
|
|
96
|
-
return error(parser.errors);
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
return success(new StyleExpression(parsed, propertySpec));
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
class ZoomConstantExpression {
|
|
103
|
-
constructor(kind, expression) {
|
|
104
|
-
this.kind = kind;
|
|
105
|
-
this._styleExpression = expression;
|
|
106
|
-
this.isStateDependent = kind !== 'constant' && !isConstant.isStateConstant(expression.expression);
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
evaluateWithoutErrorHandling(globals, feature, featureState) {
|
|
110
|
-
return this._styleExpression.evaluateWithoutErrorHandling(globals, feature, featureState);
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
evaluate(globals, feature, featureState) {
|
|
114
|
-
return this._styleExpression.evaluate(globals, feature, featureState);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
class ZoomDependentExpression {
|
|
119
|
-
constructor(kind, expression, zoomCurve) {
|
|
120
|
-
this.kind = kind;
|
|
121
|
-
this.zoomStops = zoomCurve.labels;
|
|
122
|
-
this._styleExpression = expression;
|
|
123
|
-
this.isStateDependent = kind !== 'camera' && !isConstant.isStateConstant(expression.expression);
|
|
124
|
-
if (zoomCurve instanceof Interpolate) {
|
|
125
|
-
this._interpolationType = zoomCurve.interpolation;
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
evaluateWithoutErrorHandling(globals, feature, featureState) {
|
|
130
|
-
return this._styleExpression.evaluateWithoutErrorHandling(globals, feature, featureState);
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
evaluate(globals, feature, featureState) {
|
|
134
|
-
return this._styleExpression.evaluate(globals, feature, featureState);
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
interpolationFactor(input, lower, upper) {
|
|
138
|
-
if (this._interpolationType) {
|
|
139
|
-
return Interpolate.interpolationFactor(this._interpolationType, input, lower, upper);
|
|
140
|
-
}
|
|
141
|
-
return 0;
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
function createPropertyExpression(expression, propertySpec) {
|
|
146
|
-
expression = createExpression(expression, propertySpec);
|
|
147
|
-
if (expression.result === 'error') {
|
|
148
|
-
return expression;
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
const parsed = expression.value.expression;
|
|
152
|
-
|
|
153
|
-
const isFeatureConstant = isConstant.isFeatureConstant(parsed);
|
|
154
|
-
if (!isFeatureConstant && !supportsPropertyExpression(propertySpec)) {
|
|
155
|
-
return error([new ParsingError('', 'data expressions not supported')]);
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
const isZoomConstant = isConstant.isGlobalPropertyConstant(parsed, ['zoom']);
|
|
159
|
-
if (!isZoomConstant && !supportsZoomExpression(propertySpec)) {
|
|
160
|
-
return error([new ParsingError('', 'zoom expressions not supported')]);
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
const zoomCurve = findZoomCurve(parsed);
|
|
164
|
-
if (!zoomCurve && !isZoomConstant) {
|
|
165
|
-
return error([
|
|
166
|
-
new ParsingError(
|
|
167
|
-
'',
|
|
168
|
-
'"zoom" expression may only be used as input to a top-level "step" or "interpolate" expression.'
|
|
169
|
-
)
|
|
170
|
-
]);
|
|
171
|
-
}
|
|
172
|
-
if (zoomCurve instanceof ParsingError) {
|
|
173
|
-
return error([zoomCurve]);
|
|
174
|
-
}
|
|
175
|
-
if (zoomCurve instanceof Interpolate && !supportsInterpolation(propertySpec)) {
|
|
176
|
-
return error([new ParsingError('', '"interpolate" expressions cannot be used with this property')]);
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
if (!zoomCurve) {
|
|
180
|
-
return success(
|
|
181
|
-
isFeatureConstant
|
|
182
|
-
? new ZoomConstantExpression('constant', expression.value)
|
|
183
|
-
: new ZoomConstantExpression('source', expression.value)
|
|
184
|
-
);
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
return success(
|
|
188
|
-
isFeatureConstant
|
|
189
|
-
? new ZoomDependentExpression('camera', expression.value, zoomCurve)
|
|
190
|
-
: new ZoomDependentExpression('composite', expression.value, zoomCurve)
|
|
191
|
-
);
|
|
192
|
-
}
|
|
193
|
-
|
|
194
|
-
const { isFunction, createFunction } = require('../function');
|
|
195
|
-
const { Color } = require('./values');
|
|
196
|
-
|
|
197
|
-
// serialization wrapper for old-style stop functions normalized to the
|
|
198
|
-
// expression interface
|
|
199
|
-
class StylePropertyFunction {
|
|
200
|
-
constructor(parameters, specification) {
|
|
201
|
-
this._parameters = parameters;
|
|
202
|
-
this._specification = specification;
|
|
203
|
-
Object.assign(this, createFunction(this._parameters, this._specification));
|
|
204
|
-
}
|
|
205
|
-
|
|
206
|
-
static deserialize(serialized) {
|
|
207
|
-
return new StylePropertyFunction(serialized._parameters, serialized._specification);
|
|
208
|
-
}
|
|
209
|
-
|
|
210
|
-
static serialize(input) {
|
|
211
|
-
return {
|
|
212
|
-
_parameters: input._parameters,
|
|
213
|
-
_specification: input._specification
|
|
214
|
-
};
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
function normalizePropertyExpression(value, specification) {
|
|
219
|
-
if (isFunction(value)) {
|
|
220
|
-
return new StylePropertyFunction(value, specification);
|
|
221
|
-
}
|
|
222
|
-
if (isExpression(value)) {
|
|
223
|
-
const expression = createPropertyExpression(value, specification);
|
|
224
|
-
if (expression.result === 'error') {
|
|
225
|
-
// this should have been caught in validation
|
|
226
|
-
throw new Error(expression.value.map(err => `${err.key}: ${err.message}`).join(', '));
|
|
227
|
-
}
|
|
228
|
-
return expression.value;
|
|
229
|
-
}
|
|
230
|
-
let constant = value;
|
|
231
|
-
if (typeof value === 'string' && specification.type === 'color') {
|
|
232
|
-
constant = Color.parse(value);
|
|
233
|
-
}
|
|
234
|
-
return {
|
|
235
|
-
kind: 'constant',
|
|
236
|
-
evaluate: () => constant
|
|
237
|
-
};
|
|
238
|
-
}
|
|
239
|
-
|
|
240
|
-
// Zoom-dependent expressions may only use ["zoom"] as the input to a top-level "step" or "interpolate"
|
|
241
|
-
// expression (collectively referred to as a "curve"). The curve may be wrapped in one or more "let" or
|
|
242
|
-
// "coalesce" expressions.
|
|
243
|
-
function findZoomCurve(expression) {
|
|
244
|
-
let result = null;
|
|
245
|
-
if (expression instanceof Let) {
|
|
246
|
-
result = findZoomCurve(expression.result);
|
|
247
|
-
} else if (expression instanceof Coalesce) {
|
|
248
|
-
for (const arg of expression.args) {
|
|
249
|
-
result = findZoomCurve(arg);
|
|
250
|
-
if (result) {
|
|
251
|
-
break;
|
|
252
|
-
}
|
|
253
|
-
}
|
|
254
|
-
} else if (
|
|
255
|
-
(expression instanceof Step || expression instanceof Interpolate) &&
|
|
256
|
-
expression.input instanceof CompoundExpression &&
|
|
257
|
-
expression.input.name === 'zoom'
|
|
258
|
-
) {
|
|
259
|
-
result = expression;
|
|
260
|
-
}
|
|
261
|
-
|
|
262
|
-
if (result instanceof ParsingError) {
|
|
263
|
-
return result;
|
|
264
|
-
}
|
|
265
|
-
|
|
266
|
-
expression.eachChild(child => {
|
|
267
|
-
const childResult = findZoomCurve(child);
|
|
268
|
-
if (childResult instanceof ParsingError) {
|
|
269
|
-
result = childResult;
|
|
270
|
-
} else if (!result && childResult) {
|
|
271
|
-
result = new ParsingError(
|
|
272
|
-
'',
|
|
273
|
-
'"zoom" expression may only be used as input to a top-level "step" or "interpolate" expression.'
|
|
274
|
-
);
|
|
275
|
-
} else if (result && childResult && result !== childResult) {
|
|
276
|
-
result = new ParsingError(
|
|
277
|
-
'',
|
|
278
|
-
'Only one zoom-based "step" or "interpolate" subexpression may be used in an expression.'
|
|
279
|
-
);
|
|
280
|
-
}
|
|
281
|
-
});
|
|
282
|
-
|
|
283
|
-
return result;
|
|
284
|
-
}
|
|
285
|
-
|
|
286
|
-
const { ColorType, StringType, NumberType, BooleanType, ValueType, FormattedType, array } = require('./types');
|
|
287
|
-
|
|
288
|
-
function getExpectedType(spec) {
|
|
289
|
-
const types = {
|
|
290
|
-
color: ColorType,
|
|
291
|
-
string: StringType,
|
|
292
|
-
number: NumberType,
|
|
293
|
-
enum: StringType,
|
|
294
|
-
boolean: BooleanType,
|
|
295
|
-
formatted: FormattedType
|
|
296
|
-
};
|
|
297
|
-
|
|
298
|
-
if (spec.type === 'array') {
|
|
299
|
-
return array(types[spec.value] || ValueType, spec.length);
|
|
300
|
-
}
|
|
301
|
-
|
|
302
|
-
return types[spec.type];
|
|
303
|
-
}
|
|
304
|
-
|
|
305
|
-
function getDefaultValue(spec) {
|
|
306
|
-
if (spec.type === 'color' && isFunction(spec.default)) {
|
|
307
|
-
// Special case for heatmap-color: it uses the 'default:' to define a
|
|
308
|
-
// default color ramp, but createExpression expects a simple value to fall
|
|
309
|
-
// back to in case of runtime errors
|
|
310
|
-
return new Color(0, 0, 0, 0);
|
|
311
|
-
}
|
|
312
|
-
if (spec.type === 'color') {
|
|
313
|
-
return Color.parse(spec.default) || null;
|
|
314
|
-
}
|
|
315
|
-
if (spec.default === undefined) {
|
|
316
|
-
return null;
|
|
317
|
-
}
|
|
318
|
-
return spec.default;
|
|
319
|
-
}
|
|
320
|
-
|
|
321
|
-
module.exports = {
|
|
322
|
-
StyleExpression,
|
|
323
|
-
isExpression,
|
|
324
|
-
createExpression,
|
|
325
|
-
ZoomConstantExpression,
|
|
326
|
-
ZoomDependentExpression,
|
|
327
|
-
createPropertyExpression,
|
|
328
|
-
StylePropertyFunction,
|
|
329
|
-
normalizePropertyExpression
|
|
330
|
-
};
|
|
@@ -1,63 +0,0 @@
|
|
|
1
|
-
const CompoundExpression = require('./compound_expression');
|
|
2
|
-
|
|
3
|
-
function isFeatureConstant(e) {
|
|
4
|
-
if (e instanceof CompoundExpression) {
|
|
5
|
-
if (e.name === 'get' && e.args.length === 1) {
|
|
6
|
-
return false;
|
|
7
|
-
}
|
|
8
|
-
if (e.name === 'feature-state') {
|
|
9
|
-
return false;
|
|
10
|
-
}
|
|
11
|
-
if (e.name === 'has' && e.args.length === 1) {
|
|
12
|
-
return false;
|
|
13
|
-
}
|
|
14
|
-
if (e.name === 'properties' || e.name === 'geometry-type' || e.name === 'id') {
|
|
15
|
-
return false;
|
|
16
|
-
}
|
|
17
|
-
if (/^filter-/.test(e.name)) {
|
|
18
|
-
return false;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
let result = true;
|
|
23
|
-
e.eachChild(arg => {
|
|
24
|
-
if (result && !isFeatureConstant(arg)) {
|
|
25
|
-
result = false;
|
|
26
|
-
}
|
|
27
|
-
});
|
|
28
|
-
return result;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
function isStateConstant(e) {
|
|
32
|
-
if (e instanceof CompoundExpression) {
|
|
33
|
-
if (e.name === 'feature-state') {
|
|
34
|
-
return false;
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
let result = true;
|
|
38
|
-
e.eachChild(arg => {
|
|
39
|
-
if (result && !isStateConstant(arg)) {
|
|
40
|
-
result = false;
|
|
41
|
-
}
|
|
42
|
-
});
|
|
43
|
-
return result;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
function isGlobalPropertyConstant(e, properties) {
|
|
47
|
-
if (e instanceof CompoundExpression && properties.indexOf(e.name) >= 0) {
|
|
48
|
-
return false;
|
|
49
|
-
}
|
|
50
|
-
let result = true;
|
|
51
|
-
e.eachChild(arg => {
|
|
52
|
-
if (result && !isGlobalPropertyConstant(arg, properties)) {
|
|
53
|
-
result = false;
|
|
54
|
-
}
|
|
55
|
-
});
|
|
56
|
-
return result;
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
module.exports = {
|
|
60
|
-
isFeatureConstant,
|
|
61
|
-
isGlobalPropertyConstant,
|
|
62
|
-
isStateConstant
|
|
63
|
-
};
|
|
@@ -1,221 +0,0 @@
|
|
|
1
|
-
const assert = require('assert');
|
|
2
|
-
const Scope = require('./scope');
|
|
3
|
-
|
|
4
|
-
const { checkSubtype } = require('./types');
|
|
5
|
-
const ParsingError = require('./parsing_error');
|
|
6
|
-
const Literal = require('./definitions/literal');
|
|
7
|
-
const Assertion = require('./definitions/assertion');
|
|
8
|
-
const Coercion = require('./definitions/coercion');
|
|
9
|
-
const EvaluationContext = require('./evaluation_context');
|
|
10
|
-
const { CollatorExpression } = require('./definitions/collator');
|
|
11
|
-
const { isGlobalPropertyConstant, isFeatureConstant } = require('./is_constant');
|
|
12
|
-
const Var = require('./definitions/var');
|
|
13
|
-
|
|
14
|
-
/**
|
|
15
|
-
* State associated parsing at a given point in an expression tree.
|
|
16
|
-
* @private
|
|
17
|
-
*/
|
|
18
|
-
class ParsingContext {
|
|
19
|
-
// The expected type of this expression. Provided only to allow Expression
|
|
20
|
-
// implementations to infer argument types: Expression#parse() need not
|
|
21
|
-
// check that the output type of the parsed expression matches
|
|
22
|
-
// `expectedType`.
|
|
23
|
-
|
|
24
|
-
constructor(registry, path = [], expectedType, scope = new Scope(), errors = []) {
|
|
25
|
-
this.registry = registry;
|
|
26
|
-
this.path = path;
|
|
27
|
-
this.key = path.map(part => `[${part}]`).join('');
|
|
28
|
-
this.scope = scope;
|
|
29
|
-
this.errors = errors;
|
|
30
|
-
this.expectedType = expectedType;
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
/**
|
|
34
|
-
* @param expr the JSON expression to parse
|
|
35
|
-
* @param index the optional argument index if this expression is an argument of a parent expression that's being parsed
|
|
36
|
-
* @param options
|
|
37
|
-
* @param options.omitTypeAnnotations set true to omit inferred type annotations. Caller beware: with this option set, the parsed expression's type will NOT satisfy `expectedType` if it would normally be wrapped in an inferred annotation.
|
|
38
|
-
* @private
|
|
39
|
-
*/
|
|
40
|
-
parse(expr, index, expectedType, bindings, options = {}) {
|
|
41
|
-
if (index) {
|
|
42
|
-
return this.concat(index, expectedType, bindings)._parse(expr, options);
|
|
43
|
-
}
|
|
44
|
-
return this._parse(expr, options);
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
_parse(expr, options) {
|
|
48
|
-
if (expr === null || typeof expr === 'string' || typeof expr === 'boolean' || typeof expr === 'number') {
|
|
49
|
-
expr = ['literal', expr];
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
function annotate(parsed, type, typeAnnotation) {
|
|
53
|
-
if (typeAnnotation === 'assert') {
|
|
54
|
-
return new Assertion(type, [parsed]);
|
|
55
|
-
}
|
|
56
|
-
if (typeAnnotation === 'coerce') {
|
|
57
|
-
return new Coercion(type, [parsed]);
|
|
58
|
-
}
|
|
59
|
-
return parsed;
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
if (Array.isArray(expr)) {
|
|
63
|
-
if (expr.length === 0) {
|
|
64
|
-
return this.error(
|
|
65
|
-
`Expected an array with at least one element. If you wanted a literal array, use ["literal", []].`
|
|
66
|
-
);
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
const op = expr[0];
|
|
70
|
-
if (typeof op !== 'string') {
|
|
71
|
-
this.error(
|
|
72
|
-
`Expression name must be a string, but found ${typeof op} instead. If you wanted a literal array, use ["literal", [...]].`,
|
|
73
|
-
0
|
|
74
|
-
);
|
|
75
|
-
return null;
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
const Expr = this.registry[op];
|
|
79
|
-
if (Expr) {
|
|
80
|
-
let parsed = Expr.parse(expr, this);
|
|
81
|
-
if (!parsed) return null;
|
|
82
|
-
|
|
83
|
-
if (this.expectedType) {
|
|
84
|
-
const expected = this.expectedType;
|
|
85
|
-
const actual = parsed.type;
|
|
86
|
-
|
|
87
|
-
// When we expect a number, string, boolean, or array but have a value, wrap it in an assertion.
|
|
88
|
-
// When we expect a color or formatted string, but have a string or value, wrap it in a coercion.
|
|
89
|
-
// Otherwise, we do static type-checking.
|
|
90
|
-
//
|
|
91
|
-
// These behaviors are overridable for:
|
|
92
|
-
// * The "coalesce" operator, which needs to omit type annotations.
|
|
93
|
-
// * String-valued properties (e.g. `text-field`), where coercion is more convenient than assertion.
|
|
94
|
-
//
|
|
95
|
-
if (
|
|
96
|
-
(expected.kind === 'string' ||
|
|
97
|
-
expected.kind === 'number' ||
|
|
98
|
-
expected.kind === 'boolean' ||
|
|
99
|
-
expected.kind === 'object' ||
|
|
100
|
-
expected.kind === 'array') &&
|
|
101
|
-
actual.kind === 'value'
|
|
102
|
-
) {
|
|
103
|
-
parsed = annotate(parsed, expected, options.typeAnnotation || 'assert');
|
|
104
|
-
} else if (
|
|
105
|
-
(expected.kind === 'color' || expected.kind === 'formatted') &&
|
|
106
|
-
(actual.kind === 'value' || actual.kind === 'string')
|
|
107
|
-
) {
|
|
108
|
-
parsed = annotate(parsed, expected, options.typeAnnotation || 'coerce');
|
|
109
|
-
} else if (this.checkSubtype(expected, actual)) {
|
|
110
|
-
return null;
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
// If an expression's arguments are all literals, we can evaluate
|
|
115
|
-
// it immediately and replace it with a literal value in the
|
|
116
|
-
// parsed/compiled result.
|
|
117
|
-
if (!(parsed instanceof Literal) && isConstant(parsed)) {
|
|
118
|
-
const ec = new EvaluationContext();
|
|
119
|
-
try {
|
|
120
|
-
parsed = new Literal(parsed.type, parsed.evaluate(ec));
|
|
121
|
-
} catch (e) {
|
|
122
|
-
this.error(e.message);
|
|
123
|
-
return null;
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
return parsed;
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
return this.error(`Unknown expression "${op}". If you wanted a literal array, use ["literal", [...]].`, 0);
|
|
131
|
-
}
|
|
132
|
-
if (typeof expr === 'undefined') {
|
|
133
|
-
return this.error(`'undefined' value invalid. Use null instead.`);
|
|
134
|
-
}
|
|
135
|
-
if (typeof expr === 'object') {
|
|
136
|
-
return this.error(`Bare objects invalid. Use ["literal", {...}] instead.`);
|
|
137
|
-
}
|
|
138
|
-
return this.error(`Expected an array, but found ${typeof expr} instead.`);
|
|
139
|
-
}
|
|
140
|
-
|
|
141
|
-
/**
|
|
142
|
-
* Returns a copy of this context suitable for parsing the subexpression at
|
|
143
|
-
* index `index`, optionally appending to 'let' binding map.
|
|
144
|
-
*
|
|
145
|
-
* Note that `errors` property, intended for collecting errors while
|
|
146
|
-
* parsing, is copied by reference rather than cloned.
|
|
147
|
-
* @private
|
|
148
|
-
*/
|
|
149
|
-
concat(index, expectedType, bindings) {
|
|
150
|
-
const path = typeof index === 'number' ? this.path.concat(index) : this.path;
|
|
151
|
-
const scope = bindings ? this.scope.concat(bindings) : this.scope;
|
|
152
|
-
return new ParsingContext(this.registry, path, expectedType || null, scope, this.errors);
|
|
153
|
-
}
|
|
154
|
-
|
|
155
|
-
/**
|
|
156
|
-
* Push a parsing (or type checking) error into the `this.errors`
|
|
157
|
-
* @param error The message
|
|
158
|
-
* @param keys Optionally specify the source of the error at a child
|
|
159
|
-
* of the current expression at `this.key`.
|
|
160
|
-
* @private
|
|
161
|
-
*/
|
|
162
|
-
error(error, ...keys) {
|
|
163
|
-
const key = `${this.key}${keys.map(k => `[${k}]`).join('')}`;
|
|
164
|
-
this.errors.push(new ParsingError(key, error));
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
-
/**
|
|
168
|
-
* Returns null if `t` is a subtype of `expected`; otherwise returns an
|
|
169
|
-
* error message and also pushes it to `this.errors`.
|
|
170
|
-
*/
|
|
171
|
-
checkSubtype(expected, t) {
|
|
172
|
-
const error = checkSubtype(expected, t);
|
|
173
|
-
if (error) this.error(error);
|
|
174
|
-
return error;
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
|
-
|
|
178
|
-
module.exports = ParsingContext;
|
|
179
|
-
|
|
180
|
-
function isConstant(expression) {
|
|
181
|
-
const CompoundExpression = require('./compound_expression');
|
|
182
|
-
|
|
183
|
-
if (expression instanceof Var) {
|
|
184
|
-
return isConstant(expression.boundExpression);
|
|
185
|
-
}
|
|
186
|
-
if (expression instanceof CompoundExpression && expression.name === 'error') {
|
|
187
|
-
return false;
|
|
188
|
-
}
|
|
189
|
-
if (expression instanceof CollatorExpression) {
|
|
190
|
-
// Although the results of a Collator expression with fixed arguments
|
|
191
|
-
// generally shouldn't change between executions, we can't serialize them
|
|
192
|
-
// as constant expressions because results change based on environment.
|
|
193
|
-
return false;
|
|
194
|
-
}
|
|
195
|
-
|
|
196
|
-
const isTypeAnnotation = expression instanceof Coercion || expression instanceof Assertion;
|
|
197
|
-
|
|
198
|
-
let childrenConstant = true;
|
|
199
|
-
expression.eachChild(child => {
|
|
200
|
-
// We can _almost_ assume that if `expressions` children are constant,
|
|
201
|
-
// they would already have been evaluated to Literal values when they
|
|
202
|
-
// were parsed. Type annotations are the exception, because they might
|
|
203
|
-
// have been inferred and added after a child was parsed.
|
|
204
|
-
|
|
205
|
-
// So we recurse into isConstant() for the children of type annotations,
|
|
206
|
-
// but otherwise simply check whether they are Literals.
|
|
207
|
-
if (isTypeAnnotation) {
|
|
208
|
-
childrenConstant = childrenConstant && isConstant(child);
|
|
209
|
-
} else {
|
|
210
|
-
childrenConstant = childrenConstant && child instanceof Literal;
|
|
211
|
-
}
|
|
212
|
-
});
|
|
213
|
-
if (!childrenConstant) {
|
|
214
|
-
return false;
|
|
215
|
-
}
|
|
216
|
-
|
|
217
|
-
return (
|
|
218
|
-
isFeatureConstant(expression) &&
|
|
219
|
-
isGlobalPropertyConstant(expression, ['zoom', 'heatmap-density', 'line-progress', 'is-supported-script'])
|
|
220
|
-
);
|
|
221
|
-
}
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Tracks `let` bindings during expression parsing.
|
|
3
|
-
* @private
|
|
4
|
-
*/
|
|
5
|
-
class Scope {
|
|
6
|
-
constructor(parent, bindings = []) {
|
|
7
|
-
this.parent = parent;
|
|
8
|
-
this.bindings = {};
|
|
9
|
-
for (const [name, expression] of bindings) {
|
|
10
|
-
this.bindings[name] = expression;
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
concat(bindings) {
|
|
15
|
-
return new Scope(this, bindings);
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
get(name) {
|
|
19
|
-
if (this.bindings[name]) {
|
|
20
|
-
return this.bindings[name];
|
|
21
|
-
}
|
|
22
|
-
if (this.parent) {
|
|
23
|
-
return this.parent.get(name);
|
|
24
|
-
}
|
|
25
|
-
throw new Error(`${name} not found in scope.`);
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
has(name) {
|
|
29
|
-
if (this.bindings[name]) return true;
|
|
30
|
-
return this.parent ? this.parent.has(name) : false;
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
module.exports = Scope;
|