maplibre-gl 2.1.0 → 2.1.4
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/{banner.js → banner.ts} +1 -1
- package/build/generate-query-test-fixtures.ts +123 -0
- package/build/generate-shaders.ts +35 -0
- package/build/generate-struct-arrays.ts +7 -7
- package/build/generate-style-code.ts +8 -8
- package/build/generate-style-spec.ts +5 -4
- package/build/generate-typings.ts +16 -0
- package/build/readme.md +8 -18
- package/build/release-notes.js +9 -13
- package/build/{rollup_plugin_minify_style_spec.js → rollup_plugin_minify_style_spec.ts} +4 -3
- package/build/{rollup_plugins.js → rollup_plugins.ts} +12 -26
- package/dist/maplibre-gl-dev.js +54885 -0
- package/dist/maplibre-gl.css +1 -1
- package/dist/maplibre-gl.d.ts +1537 -1011
- package/dist/maplibre-gl.js +3 -3
- package/dist/maplibre-gl.js.map +1 -1
- package/package.json +83 -107
- package/postinstall.js +5 -0
- package/src/css/maplibre-gl.css +28 -28
- package/src/data/{array_types.ts → array_types.g.ts} +0 -0
- package/src/data/bucket/circle_bucket.ts +1 -1
- package/src/data/bucket/fill_bucket.test.ts +1 -1
- package/src/data/bucket/fill_bucket.ts +4 -4
- package/src/data/bucket/fill_extrusion_bucket.ts +1 -1
- package/src/data/bucket/line_bucket.test.ts +1 -1
- package/src/data/bucket/line_bucket.ts +6 -6
- package/src/data/bucket/symbol_bucket.test.ts +16 -16
- package/src/data/bucket/symbol_bucket.ts +53 -53
- package/src/data/bucket.ts +43 -43
- package/src/data/dem_data.ts +12 -12
- package/src/data/evaluation_feature.ts +10 -10
- package/src/data/feature_index.ts +37 -37
- package/src/data/feature_position_map.ts +5 -5
- package/src/data/index_array_type.ts +1 -1
- package/src/data/load_geometry.test.ts +1 -1
- package/src/data/program_configuration.ts +46 -46
- package/src/data/segment.ts +14 -14
- package/src/geo/edge_insets.ts +2 -2
- package/src/geo/lng_lat.ts +4 -4
- package/src/geo/lng_lat_bounds.ts +35 -35
- package/src/geo/mercator_coordinate.ts +5 -5
- package/src/geo/transform.test.ts +1 -1
- package/src/geo/transform.ts +14 -14
- package/src/gl/context.ts +3 -3
- package/src/gl/types.ts +19 -19
- package/src/gl/value.ts +6 -6
- package/src/gl/vertex_buffer.test.ts +1 -1
- package/src/index.ts +24 -9
- package/src/render/draw_circle.ts +8 -8
- package/src/render/draw_collision_debug.ts +5 -5
- package/src/render/draw_line.ts +4 -4
- package/src/render/draw_symbol.ts +21 -21
- package/src/render/glyph_atlas.ts +12 -12
- package/src/render/glyph_manager.test.ts +10 -21
- package/src/render/glyph_manager.ts +33 -32
- package/src/render/image_manager.ts +4 -4
- package/src/render/painter.ts +11 -11
- package/src/render/program/background_program.ts +29 -29
- package/src/render/program/circle_program.ts +10 -10
- package/src/render/program/clipping_mask_program.ts +1 -1
- package/src/render/program/collision_program.ts +9 -9
- package/src/render/program/debug_program.ts +4 -4
- package/src/render/program/fill_extrusion_program.ts +31 -31
- package/src/render/program/fill_program.ts +29 -29
- package/src/render/program/heatmap_program.ts +12 -12
- package/src/render/program/hillshade_program.ts +12 -12
- package/src/render/program/line_program.ts +38 -38
- package/src/render/program/pattern.ts +28 -28
- package/src/render/program/raster_program.ts +21 -21
- package/src/render/program/symbol_program.ts +96 -96
- package/src/render/program.ts +25 -25
- package/src/render/texture.ts +9 -9
- package/src/render/uniform_binding.ts +1 -1
- package/src/render/vertex_array_object.ts +13 -13
- package/src/shaders/_prelude.fragment.glsl.g.ts +2 -0
- package/src/shaders/_prelude.vertex.glsl.g.ts +2 -0
- package/src/shaders/background.fragment.glsl.g.ts +2 -0
- package/src/shaders/background.vertex.glsl.g.ts +2 -0
- package/src/shaders/background_pattern.fragment.glsl.g.ts +2 -0
- package/src/shaders/background_pattern.vertex.glsl.g.ts +2 -0
- package/src/shaders/circle.fragment.glsl.g.ts +2 -0
- package/src/shaders/circle.vertex.glsl.g.ts +2 -0
- package/src/shaders/clipping_mask.fragment.glsl.g.ts +2 -0
- package/src/shaders/clipping_mask.vertex.glsl.g.ts +2 -0
- package/src/shaders/collision_box.fragment.glsl.g.ts +2 -0
- package/src/shaders/collision_box.vertex.glsl.g.ts +2 -0
- package/src/shaders/collision_circle.fragment.glsl.g.ts +2 -0
- package/src/shaders/collision_circle.vertex.glsl.g.ts +2 -0
- package/src/shaders/debug.fragment.glsl.g.ts +2 -0
- package/src/shaders/debug.vertex.glsl.g.ts +2 -0
- package/src/shaders/fill.fragment.glsl.g.ts +2 -0
- package/src/shaders/fill.vertex.glsl.g.ts +2 -0
- package/src/shaders/fill_extrusion.fragment.glsl.g.ts +2 -0
- package/src/shaders/fill_extrusion.vertex.glsl.g.ts +2 -0
- package/src/shaders/fill_extrusion_pattern.fragment.glsl.g.ts +2 -0
- package/src/shaders/fill_extrusion_pattern.vertex.glsl.g.ts +2 -0
- package/src/shaders/fill_outline.fragment.glsl.g.ts +2 -0
- package/src/shaders/fill_outline.vertex.glsl.g.ts +2 -0
- package/src/shaders/fill_outline_pattern.fragment.glsl.g.ts +2 -0
- package/src/shaders/fill_outline_pattern.vertex.glsl.g.ts +2 -0
- package/src/shaders/fill_pattern.fragment.glsl.g.ts +2 -0
- package/src/shaders/fill_pattern.vertex.glsl.g.ts +2 -0
- package/src/shaders/heatmap.fragment.glsl.g.ts +2 -0
- package/src/shaders/heatmap.vertex.glsl.g.ts +2 -0
- package/src/shaders/heatmap_texture.fragment.glsl.g.ts +2 -0
- package/src/shaders/heatmap_texture.vertex.glsl.g.ts +2 -0
- package/src/shaders/hillshade.fragment.glsl.g.ts +2 -0
- package/src/shaders/hillshade.vertex.glsl.g.ts +2 -0
- package/src/shaders/hillshade_prepare.fragment.glsl.g.ts +2 -0
- package/src/shaders/hillshade_prepare.vertex.glsl.g.ts +2 -0
- package/src/shaders/line.fragment.glsl.g.ts +2 -0
- package/src/shaders/line.vertex.glsl.g.ts +2 -0
- package/src/shaders/line_gradient.fragment.glsl.g.ts +2 -0
- package/src/shaders/line_gradient.vertex.glsl.g.ts +2 -0
- package/src/shaders/line_pattern.fragment.glsl.g.ts +2 -0
- package/src/shaders/line_pattern.vertex.glsl.g.ts +2 -0
- package/src/shaders/line_sdf.fragment.glsl.g.ts +2 -0
- package/src/shaders/line_sdf.vertex.glsl.g.ts +2 -0
- package/src/shaders/raster.fragment.glsl.g.ts +2 -0
- package/src/shaders/raster.vertex.glsl.g.ts +2 -0
- package/src/shaders/shaders.ts +52 -55
- package/src/shaders/symbol_icon.fragment.glsl.g.ts +2 -0
- package/src/shaders/symbol_icon.vertex.glsl.g.ts +2 -0
- package/src/shaders/symbol_sdf.fragment.glsl.g.ts +2 -0
- package/src/shaders/symbol_sdf.vertex.glsl.g.ts +2 -0
- package/src/shaders/symbol_text_and_icon.fragment.glsl.g.ts +2 -0
- package/src/shaders/symbol_text_and_icon.vertex.glsl.g.ts +2 -0
- package/src/source/canvas_source.test.ts +11 -12
- package/src/source/canvas_source.ts +4 -4
- package/src/source/geojson_worker_source.ts +23 -23
- package/src/source/geojson_wrapper.ts +8 -8
- package/src/source/image_source.test.ts +2 -2
- package/src/source/image_source.ts +6 -6
- package/src/source/pixels_to_tile_units.ts +6 -6
- package/src/source/query_features.ts +20 -20
- package/src/source/raster_dem_tile_source.test.ts +2 -2
- package/src/source/raster_tile_source.test.ts +2 -2
- package/src/source/rtl_text_plugin.ts +10 -10
- package/src/source/source.ts +29 -29
- package/src/source/source_cache.test.ts +32 -0
- package/src/source/source_cache.ts +7 -5
- package/src/source/source_state.ts +1 -1
- package/src/source/tile.test.ts +3 -3
- package/src/source/tile.ts +15 -15
- package/src/source/tile_cache.test.ts +6 -4
- package/src/source/tile_cache.ts +6 -6
- package/src/source/tile_id.test.ts +0 -1
- package/src/source/vector_tile_source.test.ts +16 -5
- package/src/source/vector_tile_source.ts +2 -3
- package/src/source/vector_tile_worker_source.test.ts +4 -4
- package/src/source/vector_tile_worker_source.ts +5 -5
- package/src/source/worker.test.ts +1 -1
- package/src/source/worker.ts +22 -22
- package/src/source/worker_source.ts +56 -56
- package/src/source/worker_tile.ts +4 -4
- package/src/style/evaluation_parameters.ts +3 -3
- package/src/style/format_section_override.test.ts +1 -1
- package/src/style/light.ts +10 -10
- package/src/style/load_glyph_range.test.ts +3 -5
- package/src/style/load_glyph_range.ts +6 -6
- package/src/style/load_sprite.ts +4 -4
- package/src/style/pauseable_placement.ts +1 -1
- package/src/style/properties.ts +69 -69
- package/src/style/query_utils.ts +7 -7
- package/src/style/style.test.ts +22 -15
- package/src/style/style.ts +29 -29
- package/src/style/style_glyph.ts +8 -8
- package/src/style/style_image.ts +58 -58
- package/src/style/style_layer/background_style_layer.ts +2 -2
- package/src/style/style_layer/{background_style_layer_properties.ts → background_style_layer_properties.g.ts} +0 -0
- package/src/style/style_layer/circle_style_layer.ts +10 -10
- package/src/style/style_layer/{circle_style_layer_properties.ts → circle_style_layer_properties.g.ts} +0 -0
- package/src/style/style_layer/custom_style_layer.ts +17 -17
- package/src/style/style_layer/fill_extrusion_style_layer.ts +10 -10
- package/src/style/style_layer/{fill_extrusion_style_layer_properties.ts → fill_extrusion_style_layer_properties.g.ts} +0 -0
- package/src/style/style_layer/fill_style_layer.ts +9 -9
- package/src/style/style_layer/{fill_style_layer_properties.ts → fill_style_layer_properties.g.ts} +0 -0
- package/src/style/style_layer/heatmap_style_layer.ts +2 -2
- package/src/style/style_layer/{heatmap_style_layer_properties.ts → heatmap_style_layer_properties.g.ts} +0 -0
- package/src/style/style_layer/hillshade_style_layer.ts +2 -2
- package/src/style/style_layer/{hillshade_style_layer_properties.ts → hillshade_style_layer_properties.g.ts} +0 -0
- package/src/style/style_layer/line_style_layer.ts +9 -9
- package/src/style/style_layer/{line_style_layer_properties.ts → line_style_layer_properties.g.ts} +0 -0
- package/src/style/style_layer/raster_style_layer.ts +2 -2
- package/src/style/style_layer/{raster_style_layer_properties.ts → raster_style_layer_properties.g.ts} +0 -0
- package/src/style/style_layer/symbol_style_layer.ts +7 -7
- package/src/style/style_layer/{symbol_style_layer_properties.ts → symbol_style_layer_properties.g.ts} +0 -0
- package/src/style/style_layer.ts +10 -10
- package/src/style/style_layer_index.ts +3 -3
- package/src/style/validate_style.ts +15 -15
- package/src/style-spec/error/validation_error.ts +1 -1
- package/src/style-spec/expression/compound_expression.ts +3 -3
- package/src/style-spec/expression/definitions/format.ts +11 -11
- package/src/style-spec/expression/definitions/interpolate.ts +5 -5
- package/src/style-spec/expression/definitions/match.ts +2 -2
- package/src/style-spec/expression/definitions/number_format.ts +11 -11
- package/src/style-spec/expression/expression.ts +8 -8
- package/src/style-spec/expression/index.ts +97 -97
- package/src/style-spec/expression/parsing_context.ts +11 -11
- package/src/style-spec/expression/types/collator.ts +9 -9
- package/src/style-spec/expression/types/resolved_image.ts +2 -2
- package/src/style-spec/expression/types.ts +14 -14
- package/src/style-spec/expression/values.ts +1 -1
- package/src/style-spec/feature_filter/index.ts +66 -66
- package/src/style-spec/function/convert.ts +3 -3
- package/src/style-spec/style-spec.ts +44 -44
- package/src/style-spec/util/color_spaces.ts +8 -8
- package/src/style-spec/util/result.ts +4 -4
- package/src/style-spec/validate/validate_filter.ts +58 -58
- package/src/style-spec/validate/validate_source.ts +63 -63
- package/src/style-spec/visit.ts +11 -11
- package/src/symbol/collision_feature.test.ts +1 -1
- package/src/symbol/collision_feature.ts +10 -10
- package/src/symbol/collision_index.ts +26 -26
- package/src/symbol/cross_tile_symbol_index.ts +17 -17
- package/src/symbol/get_anchors.ts +16 -16
- package/src/symbol/grid_index.ts +7 -7
- package/src/symbol/placement.ts +72 -72
- package/src/symbol/projection.ts +30 -30
- package/src/symbol/quads.ts +30 -30
- package/src/symbol/shaping.ts +160 -160
- package/src/symbol/symbol_layout.ts +119 -119
- package/src/symbol/symbol_size.ts +29 -29
- package/src/symbol/symbol_style_layer.test.ts +1 -1
- package/src/types/cancelable.ts +1 -1
- package/src/types/tilejson.ts +13 -13
- package/src/ui/anchor.ts +1 -1
- package/src/ui/camera.test.ts +9 -9
- package/src/ui/camera.ts +18 -18
- package/src/ui/control/attribution_control.test.ts +51 -16
- package/src/ui/control/attribution_control.ts +35 -16
- package/src/ui/control/control.ts +40 -40
- package/src/ui/control/fullscreen_control.ts +1 -1
- package/src/ui/control/geolocate_control.test.ts +1 -1
- package/src/ui/control/geolocate_control.ts +102 -102
- package/src/ui/control/logo_control.test.ts +5 -4
- package/src/ui/control/navigation_control.ts +3 -3
- package/src/ui/control/scale_control.test.ts +2 -2
- package/src/ui/control/scale_control.ts +5 -5
- package/src/ui/events.ts +289 -200
- package/src/ui/handler/box_zoom.test.ts +1 -1
- package/src/ui/handler/box_zoom.ts +1 -1
- package/src/ui/handler/dblclick_zoom.test.ts +1 -1
- package/src/ui/handler/drag_pan.test.ts +1 -1
- package/src/ui/handler/drag_rotate.test.ts +1 -1
- package/src/ui/handler/keyboard.test.ts +1 -1
- package/src/ui/handler/keyboard.ts +51 -51
- package/src/ui/handler/map_event.test.ts +1 -1
- package/src/ui/handler/map_event.ts +1 -1
- package/src/ui/handler/mouse.ts +1 -1
- package/src/ui/handler/mouse_rotate.test.ts +1 -1
- package/src/ui/handler/scroll_zoom.test.ts +3 -2
- package/src/ui/handler/scroll_zoom.ts +9 -9
- package/src/ui/handler/shim/drag_pan.ts +4 -4
- package/src/ui/handler/shim/drag_rotate.ts +1 -1
- package/src/ui/handler/shim/touch_zoom_rotate.ts +1 -1
- package/src/ui/handler/tap_recognizer.ts +4 -4
- package/src/ui/handler/touch_pan.ts +2 -2
- package/src/ui/handler/touch_zoom_rotate.test.ts +1 -1
- package/src/ui/handler/touch_zoom_rotate.ts +1 -1
- package/src/ui/handler_inertia.ts +6 -6
- package/src/ui/handler_manager.ts +44 -44
- package/src/ui/map/isMoving.test.ts +1 -1
- package/src/ui/map/isRotating.test.ts +1 -1
- package/src/ui/map/isZooming.test.ts +1 -1
- package/src/ui/map.test.ts +26 -14
- package/src/ui/map.ts +107 -102
- package/src/ui/map_events.test.ts +1 -1
- package/src/ui/marker.test.ts +12 -12
- package/src/ui/marker.ts +37 -37
- package/src/ui/popup.test.ts +7 -7
- package/src/ui/popup.ts +9 -9
- package/src/util/actor.test.ts +41 -10
- package/src/util/actor.ts +8 -8
- package/src/util/ajax.test.ts +29 -21
- package/src/util/ajax.ts +51 -30
- package/src/util/browser.ts +1 -1
- package/src/util/classify_rings.test.ts +1 -1
- package/src/util/color_ramp.ts +5 -5
- package/src/util/config.ts +2 -2
- package/src/util/dispatcher.ts +1 -1
- package/src/util/dom.ts +2 -2
- package/src/util/evented.ts +1 -1
- package/src/util/find_pole_of_inaccessibility.ts +3 -3
- package/src/util/image.ts +5 -5
- package/src/util/performance.ts +7 -7
- package/src/util/request_manager.ts +4 -4
- package/src/util/resolve_tokens.ts +4 -4
- package/src/util/struct_array.test.ts +1 -1
- package/src/util/struct_array.ts +15 -15
- package/src/util/task_queue.ts +3 -3
- package/src/util/tile_request_cache.ts +3 -3
- package/src/util/transferable_grid_index.ts +4 -4
- package/src/util/util.ts +8 -8
- package/src/util/web_worker.ts +4 -68
- package/src/util/web_worker_transfer.test.ts +3 -0
- package/src/util/web_worker_transfer.ts +21 -17
- package/src/util/worker_pool.ts +1 -1
- package/build/.eslintrc +0 -21
- package/build/glsl_to_js.js +0 -12
- package/build/post-ts-build.js +0 -43
- package/build/release-notes.md.ejs +0 -8
- package/build/test/build-tape.js +0 -17
- package/build/web_worker_replacement.js +0 -5
- package/dist/package.json +0 -1
- package/src/style-spec/validate_spec.test.ts +0 -29
- package/src/symbol/shaping.test.ts +0 -392
- package/src/types/glsl.d.ts +0 -4
|
File without changes
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import StyleLayer from '../style_layer';
|
|
2
2
|
|
|
3
|
-
import properties, {HillshadePaintPropsPossiblyEvaluated} from './hillshade_style_layer_properties';
|
|
3
|
+
import properties, {HillshadePaintPropsPossiblyEvaluated} from './hillshade_style_layer_properties.g';
|
|
4
4
|
import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
|
|
5
5
|
|
|
6
|
-
import type {HillshadePaintProps} from './hillshade_style_layer_properties';
|
|
6
|
+
import type {HillshadePaintProps} from './hillshade_style_layer_properties.g';
|
|
7
7
|
import type {LayerSpecification} from '../../style-spec/types';
|
|
8
8
|
|
|
9
9
|
class HillshadeStyleLayer extends StyleLayer {
|
|
File without changes
|
|
@@ -4,7 +4,7 @@ import StyleLayer from '../style_layer';
|
|
|
4
4
|
import LineBucket from '../../data/bucket/line_bucket';
|
|
5
5
|
import {polygonIntersectsBufferedMultiLine} from '../../util/intersection_tests';
|
|
6
6
|
import {getMaximumPaintValue, translateDistance, translate} from '../query_utils';
|
|
7
|
-
import properties, {LineLayoutPropsPossiblyEvaluated, LinePaintPropsPossiblyEvaluated} from './line_style_layer_properties';
|
|
7
|
+
import properties, {LineLayoutPropsPossiblyEvaluated, LinePaintPropsPossiblyEvaluated} from './line_style_layer_properties.g';
|
|
8
8
|
import {extend} from '../../util/util';
|
|
9
9
|
import EvaluationParameters from '../evaluation_parameters';
|
|
10
10
|
import {Transitionable, Transitioning, Layout, PossiblyEvaluated, DataDrivenProperty} from '../properties';
|
|
@@ -12,7 +12,7 @@ import {Transitionable, Transitioning, Layout, PossiblyEvaluated, DataDrivenProp
|
|
|
12
12
|
import Step from '../../style-spec/expression/definitions/step';
|
|
13
13
|
import type {FeatureState, ZoomConstantExpression} from '../../style-spec/expression';
|
|
14
14
|
import type {Bucket, BucketParameters} from '../../data/bucket';
|
|
15
|
-
import type {LineLayoutProps, LinePaintProps} from './line_style_layer_properties';
|
|
15
|
+
import type {LineLayoutProps, LinePaintProps} from './line_style_layer_properties.g';
|
|
16
16
|
import type Transform from '../../geo/transform';
|
|
17
17
|
import type {LayerSpecification} from '../../style-spec/types';
|
|
18
18
|
import type {VectorTileFeature} from '@mapbox/vector-tile';
|
|
@@ -88,13 +88,13 @@ class LineStyleLayer extends StyleLayer {
|
|
|
88
88
|
}
|
|
89
89
|
|
|
90
90
|
queryIntersectsFeature(
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
91
|
+
queryGeometry: Array<Point>,
|
|
92
|
+
feature: VectorTileFeature,
|
|
93
|
+
featureState: FeatureState,
|
|
94
|
+
geometry: Array<Array<Point>>,
|
|
95
|
+
zoom: number,
|
|
96
|
+
transform: Transform,
|
|
97
|
+
pixelsToTileUnits: number
|
|
98
98
|
): boolean {
|
|
99
99
|
const translatedPolygon = translate(queryGeometry,
|
|
100
100
|
this.paint.get('line-translate'),
|
package/src/style/style_layer/{line_style_layer_properties.ts → line_style_layer_properties.g.ts}
RENAMED
|
File without changes
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import StyleLayer from '../style_layer';
|
|
2
2
|
|
|
3
|
-
import properties, {RasterPaintPropsPossiblyEvaluated} from './raster_style_layer_properties';
|
|
3
|
+
import properties, {RasterPaintPropsPossiblyEvaluated} from './raster_style_layer_properties.g';
|
|
4
4
|
import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
|
|
5
5
|
|
|
6
|
-
import type {RasterPaintProps} from './raster_style_layer_properties';
|
|
6
|
+
import type {RasterPaintProps} from './raster_style_layer_properties.g';
|
|
7
7
|
import type {LayerSpecification} from '../../style-spec/types';
|
|
8
8
|
|
|
9
9
|
class RasterStyleLayer extends StyleLayer {
|
|
File without changes
|
|
@@ -3,7 +3,7 @@ import StyleLayer from '../style_layer';
|
|
|
3
3
|
import assert from 'assert';
|
|
4
4
|
import SymbolBucket from '../../data/bucket/symbol_bucket';
|
|
5
5
|
import resolveTokens from '../../util/resolve_tokens';
|
|
6
|
-
import properties, {SymbolLayoutPropsPossiblyEvaluated, SymbolPaintPropsPossiblyEvaluated} from './symbol_style_layer_properties';
|
|
6
|
+
import properties, {SymbolLayoutPropsPossiblyEvaluated, SymbolPaintPropsPossiblyEvaluated} from './symbol_style_layer_properties.g';
|
|
7
7
|
|
|
8
8
|
import {
|
|
9
9
|
Transitionable,
|
|
@@ -22,7 +22,7 @@ import {
|
|
|
22
22
|
} from '../../style-spec/expression';
|
|
23
23
|
|
|
24
24
|
import type {BucketParameters} from '../../data/bucket';
|
|
25
|
-
import type {SymbolLayoutProps, SymbolPaintProps} from './symbol_style_layer_properties';
|
|
25
|
+
import type {SymbolLayoutProps, SymbolPaintProps} from './symbol_style_layer_properties.g';
|
|
26
26
|
import type EvaluationParameters from '../evaluation_parameters';
|
|
27
27
|
import type {LayerSpecification} from '../../style-spec/types';
|
|
28
28
|
import type {Feature, SourceExpression, CompositeExpression} from '../../style-spec/expression';
|
|
@@ -127,13 +127,13 @@ class SymbolStyleLayer extends StyleLayer {
|
|
|
127
127
|
expression = (new ZoomConstantExpression('source', styleExpression) as SourceExpression);
|
|
128
128
|
} else {
|
|
129
129
|
expression = (new ZoomDependentExpression('composite',
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
130
|
+
styleExpression,
|
|
131
|
+
overriden.value.zoomStops,
|
|
132
|
+
(overriden.value as any)._interpolationType) as CompositeExpression);
|
|
133
133
|
}
|
|
134
134
|
this.paint._values[overridable] = new PossiblyEvaluatedPropertyValue(overriden.property,
|
|
135
|
-
|
|
136
|
-
|
|
135
|
+
expression,
|
|
136
|
+
overriden.parameters);
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
139
|
|
|
File without changes
|
package/src/style/style_layer.ts
CHANGED
|
@@ -58,19 +58,19 @@ abstract class StyleLayer extends Evented {
|
|
|
58
58
|
|
|
59
59
|
queryRadius?(bucket: Bucket): number;
|
|
60
60
|
queryIntersectsFeature?(
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
61
|
+
queryGeometry: Array<Point>,
|
|
62
|
+
feature: VectorTileFeature,
|
|
63
|
+
featureState: FeatureState,
|
|
64
|
+
geometry: Array<Array<Point>>,
|
|
65
|
+
zoom: number,
|
|
66
|
+
transform: Transform,
|
|
67
|
+
pixelsToTileUnits: number,
|
|
68
|
+
pixelPosMatrix: mat4
|
|
69
69
|
): boolean | number;
|
|
70
70
|
|
|
71
71
|
constructor(layer: LayerSpecification | CustomLayerInterface, properties: Readonly<{
|
|
72
|
-
|
|
73
|
-
|
|
72
|
+
layout?: Properties<any>;
|
|
73
|
+
paint?: Properties<any>;
|
|
74
74
|
}>) {
|
|
75
75
|
super();
|
|
76
76
|
|
|
@@ -12,9 +12,9 @@ export type Family<Layer extends TypedStyleLayer> = Array<Layer>;
|
|
|
12
12
|
|
|
13
13
|
class StyleLayerIndex {
|
|
14
14
|
familiesBySource: {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
[source: string]: {
|
|
16
|
+
[sourceLayer: string]: Array<Family<any>>;
|
|
17
|
+
};
|
|
18
18
|
};
|
|
19
19
|
keyCache: {[source: string]: string};
|
|
20
20
|
|
|
@@ -4,21 +4,21 @@ import {ErrorEvent} from '../util/evented';
|
|
|
4
4
|
import type {Evented} from '../util/evented';
|
|
5
5
|
|
|
6
6
|
type ValidationError = {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
message: string;
|
|
8
|
+
line: number;
|
|
9
|
+
identifier?: string;
|
|
10
10
|
};
|
|
11
11
|
|
|
12
12
|
export type Validator = (a: any) => ReadonlyArray<ValidationError>;
|
|
13
13
|
|
|
14
14
|
type ValidateStyle = {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
15
|
+
source: Validator;
|
|
16
|
+
layer: Validator;
|
|
17
|
+
light: Validator;
|
|
18
|
+
filter: Validator;
|
|
19
|
+
paintProperty: Validator;
|
|
20
|
+
layoutProperty: Validator;
|
|
21
|
+
(b: any, a?: any | null): ReadonlyArray<ValidationError>;
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
export const validateStyle = (validateStyleMin as ValidateStyle);
|
|
@@ -30,11 +30,11 @@ export const validatePaintProperty = validateStyle.paintProperty;
|
|
|
30
30
|
export const validateLayoutProperty = validateStyle.layoutProperty;
|
|
31
31
|
|
|
32
32
|
export function emitValidationErrors(
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
33
|
+
emitter: Evented,
|
|
34
|
+
errors?: ReadonlyArray<{
|
|
35
|
+
message: string;
|
|
36
|
+
identifier?: string;
|
|
37
|
+
}> | null
|
|
38
38
|
): boolean {
|
|
39
39
|
let hasErrors = false;
|
|
40
40
|
if (errors && errors.length) {
|
|
@@ -6,7 +6,7 @@ export default class ValidationError {
|
|
|
6
6
|
line: number;
|
|
7
7
|
|
|
8
8
|
constructor(key: string, value: {
|
|
9
|
-
|
|
9
|
+
__line__: number;
|
|
10
10
|
}, message: string, identifier?: string | null) {
|
|
11
11
|
this.message = (key ? `${key}: ` : '') + message;
|
|
12
12
|
if (identifier) this.identifier = identifier;
|
|
@@ -9,14 +9,14 @@ import type {Type} from './types';
|
|
|
9
9
|
import type {Value} from './values';
|
|
10
10
|
|
|
11
11
|
export type Varargs = {
|
|
12
|
-
|
|
12
|
+
type: Type;
|
|
13
13
|
};
|
|
14
14
|
type Signature = Array<Type> | Varargs;
|
|
15
15
|
type Evaluate = (b: EvaluationContext, a: Array<Expression>) => Value;
|
|
16
16
|
|
|
17
17
|
type Definition = [Type, Signature, Evaluate] | {
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
type: Type;
|
|
19
|
+
overloads: Array<[Signature, Evaluate]>;
|
|
20
20
|
};
|
|
21
21
|
|
|
22
22
|
class CompoundExpression implements Expression {
|
|
@@ -16,12 +16,12 @@ import type ParsingContext from '../parsing_context';
|
|
|
16
16
|
import type {Type} from '../types';
|
|
17
17
|
|
|
18
18
|
type FormattedSectionExpression = {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
19
|
+
// Content of a section may be Image expression or other
|
|
20
|
+
// type of expression that is coercable to 'string'.
|
|
21
|
+
content: Expression;
|
|
22
|
+
scale: Expression | null;
|
|
23
|
+
font: Expression | null;
|
|
24
|
+
textColor: Expression | null;
|
|
25
25
|
};
|
|
26
26
|
|
|
27
27
|
export default class FormatExpression implements Expression {
|
|
@@ -97,11 +97,11 @@ export default class FormatExpression implements Expression {
|
|
|
97
97
|
}
|
|
98
98
|
|
|
99
99
|
return new FormattedSection(
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
100
|
+
toString(evaluatedContent),
|
|
101
|
+
null,
|
|
102
|
+
section.scale ? section.scale.evaluate(ctx) : null,
|
|
103
|
+
section.font ? section.font.evaluate(ctx).join(',') : null,
|
|
104
|
+
section.textColor ? section.textColor.evaluate(ctx) : null
|
|
105
105
|
);
|
|
106
106
|
};
|
|
107
107
|
|
|
@@ -12,13 +12,13 @@ import type EvaluationContext from '../evaluation_context';
|
|
|
12
12
|
import type {Type} from '../types';
|
|
13
13
|
|
|
14
14
|
export type InterpolationType = {
|
|
15
|
-
|
|
15
|
+
name: 'linear';
|
|
16
16
|
} | {
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
name: 'exponential';
|
|
18
|
+
base: number;
|
|
19
19
|
} | {
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
name: 'cubic-bezier';
|
|
21
|
+
controlPoints: [number, number, number, number];
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
class Interpolate implements Expression {
|
|
@@ -11,7 +11,7 @@ import type EvaluationContext from '../evaluation_context';
|
|
|
11
11
|
|
|
12
12
|
// Map input label values to output expression index
|
|
13
13
|
type Cases = {
|
|
14
|
-
|
|
14
|
+
[k in number | string]: number;
|
|
15
15
|
};
|
|
16
16
|
|
|
17
17
|
class Match implements Expression {
|
|
@@ -128,7 +128,7 @@ class Match implements Expression {
|
|
|
128
128
|
// serializations of the form [case1, case2, ...] -> matchExpression
|
|
129
129
|
const groupedByOutput: Array<[number, Array<number | string>]> = [];
|
|
130
130
|
const outputLookup: {
|
|
131
|
-
|
|
131
|
+
[index: number]: number;
|
|
132
132
|
} = {}; // lookup index into groupedByOutput for a given output expression
|
|
133
133
|
for (const label of sortedLabels) {
|
|
134
134
|
const outputIndex = outputLookup[this.cases[label]];
|
|
@@ -6,9 +6,9 @@ import type ParsingContext from '../parsing_context';
|
|
|
6
6
|
import type {Type} from '../types';
|
|
7
7
|
|
|
8
8
|
declare let Intl: {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
NumberFormat: {
|
|
10
|
+
new (...args: any): Intl$NumberFormat;
|
|
11
|
+
};
|
|
12
12
|
};
|
|
13
13
|
|
|
14
14
|
declare class Intl$NumberFormat {
|
|
@@ -18,10 +18,10 @@ declare class Intl$NumberFormat {
|
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
type NumberFormatOptions = {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
style?: 'decimal' | 'currency' | 'percent';
|
|
22
|
+
currency?: null | string;
|
|
23
|
+
minimumFractionDigits?: null | string;
|
|
24
|
+
maximumFractionDigits?: null | string;
|
|
25
25
|
};
|
|
26
26
|
|
|
27
27
|
export default class NumberFormat implements Expression {
|
|
@@ -33,10 +33,10 @@ export default class NumberFormat implements Expression {
|
|
|
33
33
|
maxFractionDigits: Expression | null; // Default 3
|
|
34
34
|
|
|
35
35
|
constructor(number: Expression,
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
locale: Expression | null,
|
|
37
|
+
currency: Expression | null,
|
|
38
|
+
minFractionDigits: Expression | null,
|
|
39
|
+
maxFractionDigits: Expression | null) {
|
|
40
40
|
this.type = StringType;
|
|
41
41
|
this.number = number;
|
|
42
42
|
this.locale = locale;
|
|
@@ -5,21 +5,21 @@ import type EvaluationContext from './evaluation_context';
|
|
|
5
5
|
type SerializedExpression = Array<unknown> | string | number | boolean | null;
|
|
6
6
|
|
|
7
7
|
export interface Expression {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
readonly type: Type;
|
|
9
|
+
evaluate(ctx: EvaluationContext): any;
|
|
10
|
+
eachChild(fn: (a: Expression) => void): void;
|
|
11
|
+
/**
|
|
12
12
|
* Statically analyze the expression, attempting to enumerate possible outputs. Returns
|
|
13
13
|
* false if the complete set of outputs is statically undecidable, otherwise true.
|
|
14
14
|
*/
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
outputDefined(): boolean;
|
|
16
|
+
serialize(): SerializedExpression;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
export type ExpressionParser = (args: ReadonlyArray<unknown>, context: ParsingContext) => Expression;
|
|
20
20
|
export type ExpressionRegistration = {
|
|
21
|
-
|
|
21
|
+
new (...args: any): Expression;
|
|
22
22
|
} & {
|
|
23
|
-
|
|
23
|
+
readonly parse: ExpressionParser;
|
|
24
24
|
};
|
|
25
25
|
export type ExpressionRegistry = {[_: string]: ExpressionRegistration};
|