maplibre-gl 2.0.5 → 2.1.3
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 +1574 -1022
- package/dist/maplibre-gl.js +3 -3
- package/dist/maplibre-gl.js.map +1 -1
- package/package.json +94 -131
- package/src/css/maplibre-gl.css +49 -49
- 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 +56 -56
- 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 +47 -47
- 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_debug.ts +1 -1
- 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 +34 -33
- package/src/render/image_manager.ts +4 -4
- package/src/render/painter.ts +16 -14
- package/src/render/program/background_program.ts +29 -29
- package/src/render/program/circle_program.ts +11 -11
- 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 +41 -41
- package/src/render/program/pattern.ts +28 -28
- package/src/render/program/raster_program.ts +21 -21
- package/src/render/program/symbol_program.ts +97 -97
- 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_source.test.ts +2 -1
- package/src/source/geojson_source.ts +1 -1
- 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 +4 -3
- package/src/source/raster_dem_tile_source.ts +1 -1
- package/src/source/raster_tile_source.test.ts +4 -3
- package/src/source/raster_tile_source.ts +1 -1
- package/src/source/rtl_text_plugin.ts +10 -10
- package/src/source/source.ts +29 -29
- package/src/source/source_cache.test.ts +33 -1
- 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 +10 -13
- package/src/source/tile_id.ts +2 -2
- package/src/source/vector_tile_source.test.ts +17 -5
- package/src/source/vector_tile_source.ts +4 -5
- 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 +5 -4
- package/src/style/pauseable_placement.ts +1 -1
- package/src/style/properties.ts +70 -70
- package/src/style/query_utils.ts +7 -7
- package/src/style/style.test.ts +26 -15
- package/src/style/style.ts +30 -30
- 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 +19 -19
- package/src/style/style_layer/fill_extrusion_style_layer.ts +11 -11
- 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 +26 -7
- package/src/style/style_layer/{symbol_style_layer_properties.ts → symbol_style_layer_properties.g.ts} +6 -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/CHANGELOG.md +6 -0
- 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/package.json +1 -1
- package/src/style-spec/reference/v8.json +68 -2
- package/src/style-spec/style-spec.ts +44 -44
- package/src/style-spec/types.ts +2 -0
- 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 +43 -43
- package/src/symbol/cross_tile_symbol_index.ts +17 -17
- package/src/symbol/get_anchors.ts +16 -16
- package/src/symbol/grid_index.test.ts +42 -19
- package/src/symbol/grid_index.ts +69 -40
- package/src/symbol/placement.ts +124 -95
- 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 +49 -2
- 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 +87 -14
- package/src/ui/map.ts +136 -106
- 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
package/src/css/maplibre-gl.css
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
.maplibregl-map,
|
|
2
2
|
.mapboxgl-map {
|
|
3
|
-
font: 12px/20px
|
|
3
|
+
font: 12px/20px "Helvetica Neue", Arial, Helvetica, sans-serif;
|
|
4
4
|
overflow: hidden;
|
|
5
5
|
position: relative;
|
|
6
|
-
-webkit-tap-highlight-color:
|
|
6
|
+
-webkit-tap-highlight-color: rgb(0 0 0 / 0%);
|
|
7
7
|
}
|
|
8
8
|
|
|
9
9
|
.maplibregl-canvas,
|
|
@@ -117,9 +117,9 @@
|
|
|
117
117
|
|
|
118
118
|
.maplibregl-ctrl-group:not(:empty),
|
|
119
119
|
.mapboxgl-ctrl-group:not(:empty) {
|
|
120
|
-
-moz-box-shadow: 0 0 2px
|
|
121
|
-
-webkit-box-shadow: 0 0 2px
|
|
122
|
-
box-shadow: 0 0 0 2px
|
|
120
|
+
-moz-box-shadow: 0 0 2px rgb(0 0 0 / 10%);
|
|
121
|
+
-webkit-box-shadow: 0 0 2px rgb(0 0 0 / 10%);
|
|
122
|
+
box-shadow: 0 0 0 2px rgb(0 0 0 / 10%);
|
|
123
123
|
}
|
|
124
124
|
|
|
125
125
|
@media (-ms-high-contrast: active) {
|
|
@@ -179,7 +179,7 @@
|
|
|
179
179
|
.maplibregl-ctrl-group button:focus,
|
|
180
180
|
.mapboxgl-ctrl-attrib-button:focus,
|
|
181
181
|
.mapboxgl-ctrl-group button:focus {
|
|
182
|
-
box-shadow: 0 0 2px 2px
|
|
182
|
+
box-shadow: 0 0 2px 2px rgb(0 150 255 / 100%);
|
|
183
183
|
}
|
|
184
184
|
|
|
185
185
|
.maplibregl-ctrl button:disabled,
|
|
@@ -194,12 +194,12 @@
|
|
|
194
194
|
|
|
195
195
|
.maplibregl-ctrl button:not(:disabled):hover,
|
|
196
196
|
.mapboxgl-ctrl button:not(:disabled):hover {
|
|
197
|
-
background-color:
|
|
197
|
+
background-color: rgb(0 0 0 / 5%);
|
|
198
198
|
}
|
|
199
199
|
|
|
200
200
|
.maplibregl-ctrl-group button:focus:focus-visible,
|
|
201
201
|
.mapboxgl-ctrl-group button:focus:focus-visible {
|
|
202
|
-
box-shadow: 0 0 2px 2px
|
|
202
|
+
box-shadow: 0 0 2px 2px rgb(0 150 255 / 100%);
|
|
203
203
|
}
|
|
204
204
|
|
|
205
205
|
.maplibregl-ctrl-group button:focus:not(:focus-visible),
|
|
@@ -224,81 +224,81 @@
|
|
|
224
224
|
|
|
225
225
|
.maplibregl-ctrl button.maplibregl-ctrl-zoom-out .maplibregl-ctrl-icon,
|
|
226
226
|
.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-out .mapboxgl-ctrl-icon {
|
|
227
|
-
background-image: svg-load(
|
|
227
|
+
background-image: svg-load("svg/maplibregl-ctrl-zoom-out.svg", fill: #333);
|
|
228
228
|
}
|
|
229
229
|
|
|
230
230
|
.maplibregl-ctrl button.maplibregl-ctrl-zoom-in .maplibregl-ctrl-icon,
|
|
231
231
|
.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-in .mapboxgl-ctrl-icon {
|
|
232
|
-
background-image: svg-load(
|
|
232
|
+
background-image: svg-load("svg/maplibregl-ctrl-zoom-in.svg", fill: #333);
|
|
233
233
|
}
|
|
234
234
|
|
|
235
235
|
@media (-ms-high-contrast: active) {
|
|
236
236
|
.maplibregl-ctrl button.maplibregl-ctrl-zoom-out .maplibregl-ctrl-icon,
|
|
237
237
|
.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-out .mapboxgl-ctrl-icon {
|
|
238
|
-
background-image: svg-load(
|
|
238
|
+
background-image: svg-load("svg/maplibregl-ctrl-zoom-out.svg", fill: #fff);
|
|
239
239
|
}
|
|
240
240
|
|
|
241
241
|
.maplibregl-ctrl button.maplibregl-ctrl-zoom-in .maplibregl-ctrl-icon,
|
|
242
242
|
.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-in .mapboxgl-ctrl-icon {
|
|
243
|
-
background-image: svg-load(
|
|
243
|
+
background-image: svg-load("svg/maplibregl-ctrl-zoom-in.svg", fill: #fff);
|
|
244
244
|
}
|
|
245
245
|
}
|
|
246
246
|
|
|
247
247
|
@media (-ms-high-contrast: black-on-white) {
|
|
248
248
|
.maplibregl-ctrl button.maplibregl-ctrl-zoom-out .maplibregl-ctrl-icon,
|
|
249
249
|
.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-out .mapboxgl-ctrl-icon {
|
|
250
|
-
background-image: svg-load(
|
|
250
|
+
background-image: svg-load("svg/maplibregl-ctrl-zoom-out.svg", fill: #000);
|
|
251
251
|
}
|
|
252
252
|
|
|
253
253
|
.maplibregl-ctrl button.maplibregl-ctrl-zoom-in .maplibregl-ctrl-icon,
|
|
254
254
|
.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-in .mapboxgl-ctrl-icon {
|
|
255
|
-
background-image: svg-load(
|
|
255
|
+
background-image: svg-load("svg/maplibregl-ctrl-zoom-in.svg", fill: #000);
|
|
256
256
|
}
|
|
257
257
|
}
|
|
258
258
|
|
|
259
259
|
.maplibregl-ctrl button.maplibregl-ctrl-fullscreen .maplibregl-ctrl-icon,
|
|
260
260
|
.mapboxgl-ctrl button.mapboxgl-ctrl-fullscreen .mapboxgl-ctrl-icon {
|
|
261
|
-
background-image: svg-load(
|
|
261
|
+
background-image: svg-load("svg/maplibregl-ctrl-fullscreen.svg", fill: #333);
|
|
262
262
|
}
|
|
263
263
|
|
|
264
264
|
.maplibregl-ctrl button.maplibregl-ctrl-shrink .maplibregl-ctrl-icon,
|
|
265
265
|
.mapboxgl-ctrl button.mapboxgl-ctrl-shrink .mapboxgl-ctrl-icon {
|
|
266
|
-
background-image: svg-load(
|
|
266
|
+
background-image: svg-load("svg/maplibregl-ctrl-shrink.svg");
|
|
267
267
|
}
|
|
268
268
|
|
|
269
269
|
@media (-ms-high-contrast: active) {
|
|
270
270
|
.maplibregl-ctrl button.maplibregl-ctrl-fullscreen .maplibregl-ctrl-icon,
|
|
271
271
|
.mapboxgl-ctrl button.mapboxgl-ctrl-fullscreen .mapboxgl-ctrl-icon {
|
|
272
|
-
background-image: svg-load(
|
|
272
|
+
background-image: svg-load("svg/maplibregl-ctrl-fullscreen.svg", fill: #fff);
|
|
273
273
|
}
|
|
274
274
|
|
|
275
275
|
.maplibregl-ctrl button.maplibregl-ctrl-shrink .maplibregl-ctrl-icon,
|
|
276
276
|
.mapboxgl-ctrl button.mapboxgl-ctrl-shrink .mapboxgl-ctrl-icon {
|
|
277
|
-
background-image: svg-load(
|
|
277
|
+
background-image: svg-load("svg/maplibregl-ctrl-shrink.svg", fill: #fff);
|
|
278
278
|
}
|
|
279
279
|
}
|
|
280
280
|
|
|
281
281
|
@media (-ms-high-contrast: black-on-white) {
|
|
282
282
|
.maplibregl-ctrl button.maplibregl-ctrl-fullscreen .maplibregl-ctrl-icon,
|
|
283
283
|
.mapboxgl-ctrl button.mapboxgl-ctrl-fullscreen .mapboxgl-ctrl-icon {
|
|
284
|
-
background-image: svg-load(
|
|
284
|
+
background-image: svg-load("svg/maplibregl-ctrl-fullscreen.svg", fill: #000);
|
|
285
285
|
}
|
|
286
286
|
|
|
287
287
|
.maplibregl-ctrl button.maplibregl-ctrl-shrink .maplibregl-ctrl-icon,
|
|
288
288
|
.mapboxgl-ctrl button.mapboxgl-ctrl-shrink .mapboxgl-ctrl-icon {
|
|
289
|
-
background-image: svg-load(
|
|
289
|
+
background-image: svg-load("svg/maplibregl-ctrl-shrink.svg", fill: #000);
|
|
290
290
|
}
|
|
291
291
|
}
|
|
292
292
|
|
|
293
293
|
.maplibregl-ctrl button.maplibregl-ctrl-compass .maplibregl-ctrl-icon,
|
|
294
294
|
.mapboxgl-ctrl button.mapboxgl-ctrl-compass .mapboxgl-ctrl-icon {
|
|
295
|
-
background-image: svg-load(
|
|
295
|
+
background-image: svg-load("svg/maplibregl-ctrl-compass.svg", fill: #333);
|
|
296
296
|
}
|
|
297
297
|
|
|
298
298
|
@media (-ms-high-contrast: active) {
|
|
299
299
|
.maplibregl-ctrl button.maplibregl-ctrl-compass .maplibregl-ctrl-icon,
|
|
300
300
|
.mapboxgl-ctrl button.mapboxgl-ctrl-compass .mapboxgl-ctrl-icon {
|
|
301
|
-
@svg-load ctrl-compass-white url(svg/maplibregl-ctrl-compass.svg) {
|
|
301
|
+
@svg-load ctrl-compass-white url("svg/maplibregl-ctrl-compass.svg") {
|
|
302
302
|
fill: #fff;
|
|
303
303
|
#south { fill: #999; }
|
|
304
304
|
}
|
|
@@ -310,57 +310,57 @@
|
|
|
310
310
|
@media (-ms-high-contrast: black-on-white) {
|
|
311
311
|
.maplibregl-ctrl button.maplibregl-ctrl-compass .maplibregl-ctrl-icon,
|
|
312
312
|
.mapboxgl-ctrl button.mapboxgl-ctrl-compass .mapboxgl-ctrl-icon {
|
|
313
|
-
background-image: svg-load(
|
|
313
|
+
background-image: svg-load("svg/maplibregl-ctrl-compass.svg", fill: #000);
|
|
314
314
|
}
|
|
315
315
|
}
|
|
316
316
|
|
|
317
|
-
@svg-load ctrl-geolocate url(svg/maplibregl-ctrl-geolocate.svg) {
|
|
317
|
+
@svg-load ctrl-geolocate url("svg/maplibregl-ctrl-geolocate.svg") {
|
|
318
318
|
fill: #333;
|
|
319
319
|
#stroke { display: none; }
|
|
320
320
|
}
|
|
321
321
|
|
|
322
|
-
@svg-load ctrl-geolocate-white url(svg/maplibregl-ctrl-geolocate.svg) {
|
|
322
|
+
@svg-load ctrl-geolocate-white url("svg/maplibregl-ctrl-geolocate.svg") {
|
|
323
323
|
fill: #fff;
|
|
324
324
|
#stroke { display: none; }
|
|
325
325
|
}
|
|
326
326
|
|
|
327
|
-
@svg-load ctrl-geolocate-black url(svg/maplibregl-ctrl-geolocate.svg) {
|
|
327
|
+
@svg-load ctrl-geolocate-black url("svg/maplibregl-ctrl-geolocate.svg") {
|
|
328
328
|
fill: #000;
|
|
329
329
|
#stroke { display: none; }
|
|
330
330
|
}
|
|
331
331
|
|
|
332
|
-
@svg-load ctrl-geolocate-disabled url(svg/maplibregl-ctrl-geolocate.svg) {
|
|
332
|
+
@svg-load ctrl-geolocate-disabled url("svg/maplibregl-ctrl-geolocate.svg") {
|
|
333
333
|
fill: #aaa;
|
|
334
334
|
#stroke { fill: #f00; }
|
|
335
335
|
}
|
|
336
336
|
|
|
337
|
-
@svg-load ctrl-geolocate-disabled-white url(svg/maplibregl-ctrl-geolocate.svg) {
|
|
337
|
+
@svg-load ctrl-geolocate-disabled-white url("svg/maplibregl-ctrl-geolocate.svg") {
|
|
338
338
|
fill: #999;
|
|
339
339
|
#stroke { fill: #f00; }
|
|
340
340
|
}
|
|
341
341
|
|
|
342
|
-
@svg-load ctrl-geolocate-disabled-black url(svg/maplibregl-ctrl-geolocate.svg) {
|
|
342
|
+
@svg-load ctrl-geolocate-disabled-black url("svg/maplibregl-ctrl-geolocate.svg") {
|
|
343
343
|
fill: #666;
|
|
344
344
|
#stroke { fill: #f00; }
|
|
345
345
|
}
|
|
346
346
|
|
|
347
|
-
@svg-load ctrl-geolocate-active url(svg/maplibregl-ctrl-geolocate.svg) {
|
|
347
|
+
@svg-load ctrl-geolocate-active url("svg/maplibregl-ctrl-geolocate.svg") {
|
|
348
348
|
fill: #33b5e5;
|
|
349
349
|
#stroke { display: none; }
|
|
350
350
|
}
|
|
351
351
|
|
|
352
|
-
@svg-load ctrl-geolocate-active-error url(svg/maplibregl-ctrl-geolocate.svg) {
|
|
352
|
+
@svg-load ctrl-geolocate-active-error url("svg/maplibregl-ctrl-geolocate.svg") {
|
|
353
353
|
fill: #e58978;
|
|
354
354
|
#stroke { display: none; }
|
|
355
355
|
}
|
|
356
356
|
|
|
357
|
-
@svg-load ctrl-geolocate-background url(svg/maplibregl-ctrl-geolocate.svg) {
|
|
357
|
+
@svg-load ctrl-geolocate-background url("svg/maplibregl-ctrl-geolocate.svg") {
|
|
358
358
|
fill: #33b5e5;
|
|
359
359
|
#stroke { display: none; }
|
|
360
360
|
#dot { display: none; }
|
|
361
361
|
}
|
|
362
362
|
|
|
363
|
-
@svg-load ctrl-geolocate-background-error url(svg/maplibregl-ctrl-geolocate.svg) {
|
|
363
|
+
@svg-load ctrl-geolocate-background-error url("svg/maplibregl-ctrl-geolocate.svg") {
|
|
364
364
|
fill: #e54e33;
|
|
365
365
|
#stroke { display: none; }
|
|
366
366
|
#dot { display: none; }
|
|
@@ -483,7 +483,7 @@ a.mapboxgl-ctrl-logo {
|
|
|
483
483
|
background-repeat: no-repeat;
|
|
484
484
|
cursor: pointer;
|
|
485
485
|
overflow: hidden;
|
|
486
|
-
background-image: svg-load(
|
|
486
|
+
background-image: svg-load("svg/maplibregl-ctrl-logo.svg");
|
|
487
487
|
}
|
|
488
488
|
|
|
489
489
|
a.maplibregl-ctrl-logo.maplibregl-compact,
|
|
@@ -494,7 +494,7 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
494
494
|
@media (-ms-high-contrast: active) {
|
|
495
495
|
a.maplibregl-ctrl-logo,
|
|
496
496
|
a.mapboxgl-ctrl-logo {
|
|
497
|
-
@svg-load ctrl-logo-white url(svg/maplibregl-ctrl-logo.svg) {
|
|
497
|
+
@svg-load ctrl-logo-white url("svg/maplibregl-ctrl-logo.svg") {
|
|
498
498
|
#outline { opacity: 1; }
|
|
499
499
|
#fill { opacity: 1; }
|
|
500
500
|
}
|
|
@@ -507,7 +507,7 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
507
507
|
@media (-ms-high-contrast: black-on-white) {
|
|
508
508
|
a.maplibregl-ctrl-logo,
|
|
509
509
|
a.mapboxgl-ctrl-logo {
|
|
510
|
-
@svg-load ctrl-logo-black url(svg/maplibregl-ctrl-logo.svg) {
|
|
510
|
+
@svg-load ctrl-logo-black url("svg/maplibregl-ctrl-logo.svg") {
|
|
511
511
|
#outline { opacity: 1; fill: #fff; stroke: #fff; }
|
|
512
512
|
#fill { opacity: 1; fill: #000; }
|
|
513
513
|
}
|
|
@@ -519,7 +519,7 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
519
519
|
.maplibregl-ctrl.maplibregl-ctrl-attrib,
|
|
520
520
|
.mapboxgl-ctrl.mapboxgl-ctrl-attrib {
|
|
521
521
|
padding: 0 5px;
|
|
522
|
-
background-color:
|
|
522
|
+
background-color: rgb(255 255 255 / 50%);
|
|
523
523
|
margin: 0;
|
|
524
524
|
}
|
|
525
525
|
|
|
@@ -558,8 +558,8 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
558
558
|
display: none;
|
|
559
559
|
cursor: pointer;
|
|
560
560
|
position: absolute;
|
|
561
|
-
background-image: svg-load(
|
|
562
|
-
background-color:
|
|
561
|
+
background-image: svg-load("svg/maplibregl-ctrl-attrib.svg");
|
|
562
|
+
background-color: rgb(255 255 255 / 50%);
|
|
563
563
|
width: 24px;
|
|
564
564
|
height: 24px;
|
|
565
565
|
box-sizing: border-box;
|
|
@@ -586,7 +586,7 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
586
586
|
|
|
587
587
|
.maplibregl-ctrl-attrib.maplibregl-compact-show .maplibregl-ctrl-attrib-button,
|
|
588
588
|
.mapboxgl-ctrl-attrib.mapboxgl-compact-show .mapboxgl-ctrl-attrib-button {
|
|
589
|
-
background-color:
|
|
589
|
+
background-color: rgb(0 0 0 / 5%);
|
|
590
590
|
}
|
|
591
591
|
|
|
592
592
|
.maplibregl-ctrl-bottom-right > .maplibregl-ctrl-attrib.maplibregl-compact::after,
|
|
@@ -617,20 +617,20 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
617
617
|
@media screen and (-ms-high-contrast: active) {
|
|
618
618
|
.maplibregl-ctrl-attrib.maplibregl-compact::after,
|
|
619
619
|
.mapboxgl-ctrl-attrib.mapboxgl-compact::after {
|
|
620
|
-
background-image: svg-load(
|
|
620
|
+
background-image: svg-load("svg/maplibregl-ctrl-attrib.svg", fill=#fff);
|
|
621
621
|
}
|
|
622
622
|
}
|
|
623
623
|
|
|
624
624
|
@media screen and (-ms-high-contrast: black-on-white) {
|
|
625
625
|
.maplibregl-ctrl-attrib.maplibregl-compact::after,
|
|
626
626
|
.mapboxgl-ctrl-attrib.mapboxgl-compact::after {
|
|
627
|
-
background-image: svg-load(
|
|
627
|
+
background-image: svg-load("svg/maplibregl-ctrl-attrib.svg");
|
|
628
628
|
}
|
|
629
629
|
}
|
|
630
630
|
|
|
631
631
|
.maplibregl-ctrl-attrib a,
|
|
632
632
|
.mapboxgl-ctrl-attrib a {
|
|
633
|
-
color:
|
|
633
|
+
color: rgb(0 0 0 / 75%);
|
|
634
634
|
text-decoration: none;
|
|
635
635
|
}
|
|
636
636
|
|
|
@@ -647,7 +647,7 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
647
647
|
|
|
648
648
|
.maplibregl-ctrl-scale,
|
|
649
649
|
.mapboxgl-ctrl-scale {
|
|
650
|
-
background-color:
|
|
650
|
+
background-color: rgb(255 255 255 / 75%);
|
|
651
651
|
font-size: 10px;
|
|
652
652
|
border-width: medium 2px 2px;
|
|
653
653
|
border-style: none solid solid;
|
|
@@ -789,7 +789,7 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
789
789
|
|
|
790
790
|
.maplibregl-popup-close-button:hover,
|
|
791
791
|
.mapboxgl-popup-close-button:hover {
|
|
792
|
-
background-color:
|
|
792
|
+
background-color: rgb(0 0 0 / 5%);
|
|
793
793
|
}
|
|
794
794
|
|
|
795
795
|
.maplibregl-popup-content,
|
|
@@ -797,7 +797,7 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
797
797
|
position: relative;
|
|
798
798
|
background: #fff;
|
|
799
799
|
border-radius: 3px;
|
|
800
|
-
box-shadow: 0 1px 2px
|
|
800
|
+
box-shadow: 0 1px 2px rgb(0 0 0 / 10%);
|
|
801
801
|
padding: 15px 10px;
|
|
802
802
|
pointer-events: auto;
|
|
803
803
|
}
|
|
@@ -862,7 +862,7 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
862
862
|
.maplibregl-user-location-dot::before,
|
|
863
863
|
.mapboxgl-user-location-dot::before {
|
|
864
864
|
background-color: #1da1f2;
|
|
865
|
-
content:
|
|
865
|
+
content: "";
|
|
866
866
|
width: 15px;
|
|
867
867
|
height: 15px;
|
|
868
868
|
border-radius: 50%;
|
|
@@ -877,14 +877,14 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
|
|
|
877
877
|
.mapboxgl-user-location-dot::after {
|
|
878
878
|
border-radius: 50%;
|
|
879
879
|
border: 2px solid #fff;
|
|
880
|
-
content:
|
|
880
|
+
content: "";
|
|
881
881
|
height: 19px;
|
|
882
882
|
left: -2px;
|
|
883
883
|
position: absolute;
|
|
884
884
|
top: -2px;
|
|
885
885
|
width: 19px;
|
|
886
886
|
box-sizing: border-box;
|
|
887
|
-
box-shadow: 0 0 3px
|
|
887
|
+
box-shadow: 0 0 3px rgb(0 0 0 / 35%);
|
|
888
888
|
}
|
|
889
889
|
|
|
890
890
|
@-webkit-keyframes maplibregl-user-location-dot-pulse {
|
|
File without changes
|
|
@@ -13,7 +13,7 @@ import ZoomHistory from '../../style/zoom_history';
|
|
|
13
13
|
import {BucketFeature, BucketParameters} from '../bucket';
|
|
14
14
|
|
|
15
15
|
// Load a fill feature from fixture tile.
|
|
16
|
-
const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/
|
|
16
|
+
const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/unit/assets/mbsv5-6-18-23.vector.pbf'))));
|
|
17
17
|
const feature = vt.layers.water.feature(0);
|
|
18
18
|
|
|
19
19
|
function createPolygon(numPoints) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {FillLayoutArray} from '../array_types';
|
|
1
|
+
import {FillLayoutArray} from '../array_types.g';
|
|
2
2
|
|
|
3
3
|
import {members as layoutAttributes} from './fill_attributes';
|
|
4
4
|
import SegmentVector from '../segment';
|
|
@@ -126,14 +126,14 @@ class FillBucket implements Bucket {
|
|
|
126
126
|
}
|
|
127
127
|
|
|
128
128
|
update(states: FeatureStates, vtLayer: VectorTileLayer, imagePositions: {
|
|
129
|
-
|
|
129
|
+
[_: string]: ImagePosition;
|
|
130
130
|
}) {
|
|
131
131
|
if (!this.stateDependentLayers.length) return;
|
|
132
132
|
this.programConfigurations.updatePaintArrays(states, vtLayer, this.stateDependentLayers, imagePositions);
|
|
133
133
|
}
|
|
134
134
|
|
|
135
135
|
addFeatures(options: PopulateParameters, canonical: CanonicalTileID, imagePositions: {
|
|
136
|
-
|
|
136
|
+
[_: string]: ImagePosition;
|
|
137
137
|
}) {
|
|
138
138
|
for (const feature of this.patternFeatures) {
|
|
139
139
|
this.addFeature(feature, feature.geometry, feature.index, canonical, imagePositions);
|
|
@@ -168,7 +168,7 @@ class FillBucket implements Bucket {
|
|
|
168
168
|
}
|
|
169
169
|
|
|
170
170
|
addFeature(feature: BucketFeature, geometry: Array<Array<Point>>, index: number, canonical: CanonicalTileID, imagePositions: {
|
|
171
|
-
|
|
171
|
+
[_: string]: ImagePosition;
|
|
172
172
|
}) {
|
|
173
173
|
for (const polygon of classifyRings(geometry, EARCUT_MAX_RINGS)) {
|
|
174
174
|
let numVertices = 0;
|
|
@@ -11,7 +11,7 @@ import EvaluationParameters from '../../style/evaluation_parameters';
|
|
|
11
11
|
import {BucketFeature, BucketParameters} from '../bucket';
|
|
12
12
|
|
|
13
13
|
// Load a line feature from fixture tile.
|
|
14
|
-
const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/
|
|
14
|
+
const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/unit/assets/mbsv5-6-18-23.vector.pbf'))));
|
|
15
15
|
const feature = vt.layers.road.feature(0);
|
|
16
16
|
|
|
17
17
|
function createLine(numPoints) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {LineLayoutArray, LineExtLayoutArray} from '../array_types';
|
|
1
|
+
import {LineLayoutArray, LineExtLayoutArray} from '../array_types.g';
|
|
2
2
|
|
|
3
3
|
import {members as layoutAttributes} from './line_attributes';
|
|
4
4
|
import {members as layoutAttributesExt} from './line_attributes_ext';
|
|
@@ -71,14 +71,14 @@ const LINE_DISTANCE_SCALE = 1 / 2;
|
|
|
71
71
|
const MAX_LINE_DISTANCE = Math.pow(2, LINE_DISTANCE_BUFFER_BITS - 1) / LINE_DISTANCE_SCALE;
|
|
72
72
|
|
|
73
73
|
type LineClips = {
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
start: number;
|
|
75
|
+
end: number;
|
|
76
76
|
};
|
|
77
77
|
|
|
78
78
|
type GradientTexture = {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
79
|
+
texture?: Texture;
|
|
80
|
+
gradient?: RGBAImage;
|
|
81
|
+
version?: number;
|
|
82
82
|
};
|
|
83
83
|
|
|
84
84
|
/**
|
|
@@ -3,7 +3,7 @@ import path from 'path';
|
|
|
3
3
|
import Protobuf from 'pbf';
|
|
4
4
|
import {VectorTile} from '@mapbox/vector-tile';
|
|
5
5
|
import SymbolBucket from './symbol_bucket';
|
|
6
|
-
import {CollisionBoxArray} from '../../data/array_types';
|
|
6
|
+
import {CollisionBoxArray} from '../../data/array_types.g';
|
|
7
7
|
import {performSymbolLayout} from '../../symbol/symbol_layout';
|
|
8
8
|
import {Placement} from '../../symbol/placement';
|
|
9
9
|
import Transform from '../../geo/transform';
|
|
@@ -11,16 +11,16 @@ import {OverscaledTileID} from '../../source/tile_id';
|
|
|
11
11
|
import Tile from '../../source/tile';
|
|
12
12
|
import CrossTileSymbolIndex from '../../symbol/cross_tile_symbol_index';
|
|
13
13
|
import FeatureIndex from '../../data/feature_index';
|
|
14
|
-
import {createSymbolBucket, createSymbolIconBucket} from '../../../test/
|
|
14
|
+
import {createSymbolBucket, createSymbolIconBucket} from '../../../test/unit/lib/create_symbol_layer';
|
|
15
15
|
import {RGBAImage} from '../../util/image';
|
|
16
16
|
import {ImagePosition} from '../../render/image_atlas';
|
|
17
17
|
import {IndexedFeature, PopulateParameters} from '../bucket';
|
|
18
18
|
import {StyleImage} from '../../style/style_image';
|
|
19
|
-
import glyphs from '../../../test/
|
|
19
|
+
import glyphs from '../../../test/unit/assets/fontstack-glyphs.json';
|
|
20
20
|
import {StyleGlyph} from '../../style/style_glyph';
|
|
21
21
|
|
|
22
22
|
// Load a point feature from fixture tile.
|
|
23
|
-
const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/
|
|
23
|
+
const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/unit/assets/mbsv5-6-18-23.vector.pbf'))));
|
|
24
24
|
const feature = vt.layers.place_label.feature(10);
|
|
25
25
|
|
|
26
26
|
/*eslint new-cap: 0*/
|
|
@@ -139,12 +139,12 @@ describe('SymbolBucket', () => {
|
|
|
139
139
|
const options = {iconDependencies: {}, glyphDependencies: {}} as PopulateParameters;
|
|
140
140
|
|
|
141
141
|
bucket.populate(
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
142
|
+
[
|
|
143
|
+
createIndexedFeature(0, 0, 'a'),
|
|
144
|
+
createIndexedFeature(1, 1, 'b'),
|
|
145
|
+
createIndexedFeature(2, 2, 'a')
|
|
146
|
+
] as any as IndexedFeature[],
|
|
147
|
+
options, undefined
|
|
148
148
|
);
|
|
149
149
|
|
|
150
150
|
const icons = options.iconDependencies as any;
|
|
@@ -179,12 +179,12 @@ describe('SymbolBucket', () => {
|
|
|
179
179
|
const options = {iconDependencies: {}, glyphDependencies: {}} as PopulateParameters;
|
|
180
180
|
|
|
181
181
|
bucket.populate(
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
182
|
+
[
|
|
183
|
+
createIndexedFeature(0, 0, 'a'),
|
|
184
|
+
createIndexedFeature(1, 1, 'b'),
|
|
185
|
+
createIndexedFeature(2, 2, 'a')
|
|
186
|
+
] as any as IndexedFeature[],
|
|
187
|
+
options, undefined
|
|
188
188
|
);
|
|
189
189
|
|
|
190
190
|
const icons = options.iconDependencies as any;
|