From b9e10b939c6a3fe5d7ecac209f751b4871970ede Mon Sep 17 00:00:00 2001 From: Lucas Wojciechowski Date: Mon, 6 Feb 2017 16:06:24 -0800 Subject: [PATCH] Tidy up & clarify directory structure (#4215) * Merge LICENSE files * Rename "interfaces" to "flow-interfaces" * Rename "js" to "src" * Move "shaders" to "src/shaders" * Rename "test/js" to "test/unit" * Rename "ci" to "ci-scripts" * Move "global_worker_pool" to "src/util" * Merge "src/lib/debugtext.js" into "src/render/draw_debug.js" * Rename "src/mapbox-gl.js" to "src/index.js" --- .flowconfig | 4 +- LICENSE | 47 ------------ LICENSE.txt | 32 ++++++++ bench/benchmarks.js | 2 +- bench/benchmarks/buffer.js | 16 ++-- bench/benchmarks/fps.js | 2 +- bench/benchmarks/frame_duration.js | 2 +- bench/benchmarks/geojson_setdata_large.js | 4 +- bench/benchmarks/geojson_setdata_small.js | 2 +- bench/benchmarks/map_load.js | 2 +- bench/benchmarks/query_box.js | 2 +- bench/benchmarks/query_point.js | 2 +- bench/benchmarks/style_load.js | 8 +- bench/lib/coordinates.js | 2 +- bench/lib/create_map.js | 4 +- bench/unit/bench_transform.js | 4 +- bench/unit/feature_filter/bench.js | 2 +- bench/unit/feature_filter/big.js | 2 +- bench/unit/function/profile.js | 2 +- {ci => ci-scripts}/dependencies.sh | 0 {ci => ci-scripts}/deploy.sh | 0 {ci => ci-scripts}/test.sh | 0 circle.yml | 6 +- docs/_layouts/default.html | 2 +- docs/_layouts/pages.html | 2 +- docs/_theme/index.hbs | 2 +- docs/assets/prettify.js | 2 +- docs/js/site.js | 2 +- docs/roadmap/index.html | 2 +- docs/style-spec/_generate/generate.js | 2 +- .../mapbox-gl-js-test.js | 0 .../point-geometry.js | 0 {interfaces => flow-interfaces}/unitbezier.js | 0 js/render/draw_debug.js | 57 -------------- js/render/shaders.js | 76 ------------------- package.json | 18 ++--- {js => src}/data/array_group.js | 0 {js => src}/data/bucket.js | 0 {js => src}/data/bucket/circle_bucket.js | 0 {js => src}/data/bucket/fill_bucket.js | 0 .../data/bucket/fill_extrusion_bucket.js | 0 {js => src}/data/bucket/line_bucket.js | 0 {js => src}/data/bucket/symbol_bucket.js | 0 {js => src}/data/buffer.js | 0 {js => src}/data/buffer_group.js | 0 {js => src}/data/element_array_type.js | 0 {js => src}/data/extent.js | 0 {js => src}/data/feature_index.js | 0 {js => src}/data/load_geometry.js | 0 {js => src}/data/pos_array.js | 0 {js => src}/data/program_configuration.js | 0 {js => src}/data/raster_bounds_array.js | 0 {js => src}/data/vertex_array_type.js | 0 {js => src}/geo/coordinate.js | 0 {js => src}/geo/lng_lat.js | 0 {js => src}/geo/lng_lat_bounds.js | 0 {js => src}/geo/transform.js | 0 js/mapbox-gl.js => src/index.js | 0 {js => src}/render/draw_background.js | 0 {js => src}/render/draw_circle.js | 0 {js => src}/render/draw_collision_debug.js | 0 .../debugtext.js => src/render/draw_debug.js | 57 +++++++++++++- {js => src}/render/draw_fill.js | 0 {js => src}/render/draw_fill_extrusion.js | 0 {js => src}/render/draw_line.js | 0 {js => src}/render/draw_raster.js | 0 {js => src}/render/draw_symbol.js | 0 {js => src}/render/frame_history.js | 0 {js => src}/render/line_atlas.js | 0 {js => src}/render/painter.js | 0 {js => src}/render/pattern.js | 0 src/render/shaders.js | 76 +++++++++++++++++++ {js => src}/render/vertex_array_object.js | 0 {shaders => src/shaders}/README.md | 0 .../shaders}/_prelude.fragment.glsl | 0 {shaders => src/shaders}/_prelude.vertex.glsl | 0 {shaders => src/shaders}/circle.fragment.glsl | 0 {shaders => src/shaders}/circle.vertex.glsl | 0 .../shaders}/collision_box.fragment.glsl | 0 .../shaders}/collision_box.vertex.glsl | 0 {shaders => src/shaders}/debug.fragment.glsl | 0 {shaders => src/shaders}/debug.vertex.glsl | 0 .../shaders}/extrusion_texture.fragment.glsl | 0 .../shaders}/extrusion_texture.vertex.glsl | 0 {shaders => src/shaders}/fill.fragment.glsl | 0 {shaders => src/shaders}/fill.vertex.glsl | 0 .../shaders}/fill_extrusion.fragment.glsl | 0 .../shaders}/fill_extrusion.vertex.glsl | 0 .../fill_extrusion_pattern.fragment.glsl | 0 .../fill_extrusion_pattern.vertex.glsl | 0 .../shaders}/fill_outline.fragment.glsl | 0 .../shaders}/fill_outline.vertex.glsl | 0 .../fill_outline_pattern.fragment.glsl | 0 .../shaders}/fill_outline_pattern.vertex.glsl | 0 .../shaders}/fill_pattern.fragment.glsl | 0 .../shaders}/fill_pattern.vertex.glsl | 0 {shaders => src/shaders}/line.fragment.glsl | 0 {shaders => src/shaders}/line.vertex.glsl | 0 .../shaders}/line_pattern.fragment.glsl | 0 .../shaders}/line_pattern.vertex.glsl | 0 .../shaders}/line_sdf.fragment.glsl | 0 {shaders => src/shaders}/line_sdf.vertex.glsl | 0 {shaders => src/shaders}/raster.fragment.glsl | 0 {shaders => src/shaders}/raster.vertex.glsl | 0 .../shaders}/symbol_icon.fragment.glsl | 0 .../shaders}/symbol_icon.vertex.glsl | 0 .../shaders}/symbol_sdf.fragment.glsl | 0 .../shaders}/symbol_sdf.vertex.glsl | 0 {js => src}/source/canvas_source.js | 0 {js => src}/source/geojson_source.js | 0 {js => src}/source/geojson_worker_source.js | 0 {js => src}/source/geojson_wrapper.js | 0 {js => src}/source/image_source.js | 0 {js => src}/source/load_tilejson.js | 0 {js => src}/source/pixels_to_tile_units.js | 0 {js => src}/source/query_features.js | 0 {js => src}/source/raster_tile_source.js | 0 {js => src}/source/rtl_text_plugin.js | 0 {js => src}/source/source.js | 0 {js => src}/source/source_cache.js | 0 {js => src}/source/tile.js | 0 {js => src}/source/tile_coord.js | 0 {js => src}/source/vector_tile_source.js | 0 .../source/vector_tile_worker_source.js | 0 {js => src}/source/video_source.js | 0 {js => src}/source/worker.js | 0 {js => src}/source/worker_tile.js | 0 {js => src}/style-spec/CHANGELOG.md | 0 {js => src}/style-spec/README.md | 0 {js => src}/style-spec/bin/gl-style-composite | 0 {js => src}/style-spec/bin/gl-style-format | 0 {js => src}/style-spec/bin/gl-style-migrate | 0 {js => src}/style-spec/bin/gl-style-validate | 0 {js => src}/style-spec/composite.js | 0 {js => src}/style-spec/declass.js | 0 {js => src}/style-spec/deref.js | 0 {js => src}/style-spec/diff.js | 0 {js => src}/style-spec/error/parsing_error.js | 0 .../style-spec/error/validation_error.js | 0 .../style-spec/feature_filter/README.md | 0 .../style-spec/feature_filter/index.js | 0 {js => src}/style-spec/format.js | 0 .../style-spec/function/color_spaces.js | 0 {js => src}/style-spec/function/index.js | 0 {js => src}/style-spec/group_by_layout.js | 0 {js => src}/style-spec/index.js | 0 {js => src}/style-spec/migrate.js | 0 {js => src}/style-spec/migrate/v7.js | 2 +- {js => src}/style-spec/migrate/v8.js | 0 {js => src}/style-spec/migrate/v9.js | 0 .../style-spec/minifyify_style_spec.js | 0 {js => src}/style-spec/package.json | 0 {js => src}/style-spec/reference/latest.js | 0 {js => src}/style-spec/reference/v6.json | 0 {js => src}/style-spec/reference/v7.json | 0 {js => src}/style-spec/reference/v8.json | 0 {js => src}/style-spec/util/extend.js | 0 {js => src}/style-spec/util/get_type.js | 0 {js => src}/style-spec/util/parse_color.js | 0 {js => src}/style-spec/util/ref_properties.js | 0 .../style-spec/util/unbundle_jsonlint.js | 0 {js => src}/style-spec/validate/latest.js | 0 {js => src}/style-spec/validate/validate.js | 0 .../style-spec/validate/validate_array.js | 0 .../style-spec/validate/validate_boolean.js | 0 .../style-spec/validate/validate_color.js | 0 .../style-spec/validate/validate_constants.js | 0 .../style-spec/validate/validate_enum.js | 0 .../style-spec/validate/validate_filter.js | 0 .../style-spec/validate/validate_function.js | 0 .../validate/validate_glyphs_url.js | 0 .../style-spec/validate/validate_layer.js | 0 .../validate/validate_layout_property.js | 0 .../style-spec/validate/validate_light.js | 0 .../style-spec/validate/validate_number.js | 0 .../style-spec/validate/validate_object.js | 0 .../validate/validate_paint_property.js | 0 .../style-spec/validate/validate_property.js | 0 .../style-spec/validate/validate_source.js | 0 .../style-spec/validate/validate_string.js | 0 {js => src}/style-spec/validate_style.js | 0 {js => src}/style-spec/validate_style.min.js | 0 {js => src}/style-spec/yarn.lock | 0 {js => src}/style/animation_loop.js | 0 {js => src}/style/image_sprite.js | 0 {js => src}/style/light.js | 0 {js => src}/style/style.js | 2 +- {js => src}/style/style_declaration.js | 0 {js => src}/style/style_layer.js | 0 .../style/style_layer/circle_style_layer.js | 0 .../style_layer/fill_extrusion_style_layer.js | 0 .../style/style_layer/fill_style_layer.js | 0 .../style/style_layer/line_style_layer.js | 0 .../style/style_layer/symbol_style_layer.js | 0 {js => src}/style/style_layer_index.js | 0 {js => src}/style/style_transition.js | 0 {js => src}/style/validate_style.js | 0 {js => src}/symbol/anchor.js | 0 {js => src}/symbol/check_max_angle.js | 0 {js => src}/symbol/clip_line.js | 0 {js => src}/symbol/collision_box.js | 0 {js => src}/symbol/collision_feature.js | 0 {js => src}/symbol/collision_tile.js | 0 {js => src}/symbol/get_anchors.js | 0 {js => src}/symbol/glyph_atlas.js | 0 {js => src}/symbol/glyph_source.js | 0 {js => src}/symbol/mergelines.js | 0 {js => src}/symbol/quads.js | 0 {js => src}/symbol/resolve_text.js | 0 {js => src}/symbol/shaping.js | 0 {js => src}/symbol/sprite_atlas.js | 0 {js => src}/symbol/symbol_instances.js | 0 {js => src}/symbol/symbol_quads.js | 0 {js => src}/ui/bind_handlers.js | 0 {js => src}/ui/camera.js | 0 {js => src}/ui/control/attribution_control.js | 0 {js => src}/ui/control/geolocate_control.js | 0 {js => src}/ui/control/logo_control.js | 0 {js => src}/ui/control/navigation_control.js | 0 {js => src}/ui/control/scale_control.js | 0 {js => src}/ui/handler/box_zoom.js | 0 {js => src}/ui/handler/dblclick_zoom.js | 0 {js => src}/ui/handler/drag_pan.js | 0 {js => src}/ui/handler/drag_rotate.js | 0 {js => src}/ui/handler/keyboard.js | 0 {js => src}/ui/handler/scroll_zoom.js | 0 {js => src}/ui/handler/touch_zoom_rotate.js | 0 {js => src}/ui/hash.js | 0 {js => src}/ui/map.js | 0 {js => src}/ui/marker.js | 0 {js => src}/ui/popup.js | 0 {js => src}/util/actor.js | 0 {js => src}/util/ajax.js | 0 {js => src}/util/browser.js | 0 {js => src}/util/browser/web_worker.js | 0 {js => src}/util/browser/window.js | 0 {js => src}/util/classify_rings.js | 0 {js => src}/util/config.js | 0 {js => src}/util/dictionary_coder.js | 0 {js => src}/util/dispatcher.js | 0 {js => src}/util/dom.js | 0 {js => src}/util/evented.js | 0 .../util/find_pole_of_inaccessibility.js | 0 {js => src/util}/global_worker_pool.js | 2 +- {js => src}/util/glyphs.js | 0 {js => src}/util/interpolate.js | 0 {js => src}/util/intersection_tests.js | 0 {js => src}/util/is_char_in_unicode_block.js | 0 {js => src}/util/lru_cache.js | 0 {js => src}/util/mapbox.js | 0 {js => src}/util/script_detection.js | 0 {js => src}/util/struct_array.js | 0 {js => src}/util/token.js | 0 {js => src}/util/util.js | 0 {js => src}/util/vectortile_to_geojson.js | 0 {js => src}/util/verticalize_punctuation.js | 0 {js => src}/util/web_worker.js | 0 {js => src}/util/window.js | 0 {js => src}/util/worker_pool.js | 2 +- test/build/min.test.js | 2 +- test/suite_implementation.js | 10 +-- test/{js => unit}/data/bucket.test.js | 14 ++-- test/{js => unit}/data/buffer.test.js | 4 +- test/{js => unit}/data/fill_bucket.test.js | 6 +- test/{js => unit}/data/line_bucket.test.js | 6 +- test/{js => unit}/data/load_geometry.test.js | 2 +- test/{js => unit}/data/symbol_bucket.test.js | 18 ++--- test/{js => unit}/geo/coordinate.test.js | 2 +- test/{js => unit}/geo/lng_lat.test.js | 2 +- test/{js => unit}/geo/lng_lat_bounds.test.js | 4 +- test/{js => unit}/geo/transform.test.js | 6 +- test/{js => unit}/mapbox-gl.js | 2 +- .../{js => unit}/source/canvas_source.test.js | 10 +-- .../source/geojson_source.test.js | 10 +-- .../source/geojson_worker_source.test.js | 4 +- .../source/geojson_wrapper.test.js | 2 +- .../source/query_features.test.js | 4 +- test/{js => unit}/source/source_cache.test.js | 20 ++--- test/{js => unit}/source/tile.test.js | 18 ++--- test/{js => unit}/source/tile_coord.test.js | 2 +- .../source/vector_tile_source.test.js | 8 +- .../source/vector_tile_worker_source.test.js | 4 +- test/{js => unit}/source/worker.test.js | 4 +- test/{js => unit}/source/worker_tile.test.js | 10 +-- .../{js => unit}/style-spec/composite.test.js | 2 +- test/{js => unit}/style-spec/declass.test.js | 2 +- test/{js => unit}/style-spec/deref.test.js | 2 +- test/{js => unit}/style-spec/diff.test.js | 2 +- .../style-spec/feature_filter.test.js | 2 +- .../style-spec/fixture/bad-color.input.json | 0 .../style-spec/fixture/bad-color.output.json | 0 .../fixture/constants-v7.input.json | 0 .../fixture/constants-v7.output.json | 0 .../fixture/constants-v8.input.json | 0 .../fixture/constants-v8.output.json | 0 .../style-spec/fixture/extrakeys.input.json | 0 .../style-spec/fixture/extrakeys.output.json | 0 .../style-spec/fixture/filters.input.json | 0 .../style-spec/fixture/filters.output.json | 0 .../style-spec/fixture/functions.input.json | 0 .../style-spec/fixture/functions.output.json | 0 .../style-spec/fixture/invalidjson.input.json | 0 .../fixture/invalidjson.output.json | 0 .../style-spec/fixture/layers.input.json | 0 .../style-spec/fixture/layers.output.json | 0 .../fixture/light-arbitrary.input.json | 0 .../fixture/light-arbitrary.output.json | 0 .../style-spec/fixture/light.input.json | 0 .../style-spec/fixture/light.output.json | 0 .../fixture/malformed-glyphs-type.input.json | 0 .../fixture/malformed-glyphs-type.output.json | 0 .../fixture/malformed-glyphs.input.json | 0 .../fixture/malformed-glyphs.output.json | 0 .../fixture/map-properties.input.json | 0 .../fixture/map-properties.output.json | 0 .../style-spec/fixture/metadata.input.json | 0 .../style-spec/fixture/metadata.output.json | 0 .../fixture/missing-glyphs.input.json | 0 .../fixture/missing-glyphs.output.json | 0 .../fixture/missing-sprite.input.json | 0 .../fixture/missing-sprite.output.json | 0 .../style-spec/fixture/no-sources.input.json | 0 .../style-spec/fixture/no-sources.output.json | 0 .../style-spec/fixture/pitch.input.json | 0 .../style-spec/fixture/pitch.output.json | 0 .../style-spec/fixture/properties.input.json | 0 .../style-spec/fixture/properties.output.json | 0 .../style-spec/fixture/required.input.json | 0 .../style-spec/fixture/required.output.json | 0 .../fixture/root-properties.input.json | 0 .../fixture/root-properties.output.json | 0 .../style-spec/fixture/sources.input.json | 0 .../style-spec/fixture/sources.output.json | 0 .../style-spec/fixture/text-font.input.json | 0 .../style-spec/fixture/text-font.output.json | 0 .../fixture/unknown-keys-nested.input.json | 0 .../fixture/unknown-keys-nested.output.json | 0 .../style-spec/fixture/v6.input.json | 0 .../style-spec/fixture/v6.output.json | 0 .../fixture/v7-migrate/style-basic.input.json | 0 .../v7-migrate/style-basic.output.json | 0 test/{js => unit}/style-spec/format.test.js | 2 +- test/{js => unit}/style-spec/function.test.js | 2 +- .../style-spec/group_by_layout.test.js | 2 +- test/{js => unit}/style-spec/migrate.test.js | 8 +- test/{js => unit}/style-spec/migrate/v7.js | 2 +- test/{js => unit}/style-spec/migrate/v8.js | 2 +- test/{js => unit}/style-spec/migrate/v9.js | 2 +- test/{js => unit}/style-spec/parse_color.js | 2 +- test/{js => unit}/style-spec/spec.test.js | 2 +- test/{js => unit}/style-spec/validate.test.js | 4 +- .../{js => unit}/style/animation_loop.test.js | 2 +- test/{js => unit}/style/light.test.js | 4 +- test/{js => unit}/style/style.test.js | 18 ++--- .../style/style_declaration.test.js | 2 +- test/{js => unit}/style/style_layer.test.js | 6 +- .../style/style_layer_index.test.js | 4 +- .../style/style_transition.test.js | 4 +- test/{js => unit}/symbol/anchor.test.js | 2 +- .../symbol/check_max_angle.test.js | 4 +- test/{js => unit}/symbol/collision_feature.js | 6 +- test/{js => unit}/symbol/get_anchors.test.js | 2 +- test/{js => unit}/symbol/mergelines.test.js | 2 +- test/{js => unit}/symbol/quads.test.js | 4 +- test/{js => unit}/symbol/resolve_text.test.js | 4 +- test/{js => unit}/symbol/shaping.test.js | 2 +- test/{js => unit}/ui/camera.test.js | 4 +- .../ui/control/attribution.test.js | 6 +- test/{js => unit}/ui/control/logo.test.js | 6 +- test/{js => unit}/ui/hash.test.js | 6 +- test/{js => unit}/ui/map.test.js | 8 +- test/{js => unit}/ui/marker.test.js | 8 +- test/{js => unit}/ui/popup.test.js | 8 +- test/{js => unit}/util/actor.test.js | 6 +- test/{js => unit}/util/ajax.test.js | 4 +- test/{js => unit}/util/browser.test.js | 2 +- test/{js => unit}/util/classify_rings.test.js | 2 +- test/{js => unit}/util/dispatcher.test.js | 16 ++-- test/{js => unit}/util/evented.test.js | 2 +- .../util/find_pole_of_inaccessibility.test.js | 2 +- test/{js => unit}/util/interpolate.test.js | 2 +- test/{js => unit}/util/lru_cache.test.js | 2 +- test/{js => unit}/util/mapbox.test.js | 8 +- test/{js => unit}/util/struct_array.test.js | 2 +- test/{js => unit}/util/token.test.js | 2 +- test/{js => unit}/util/util.test.js | 4 +- test/{js => unit}/util/worker_pool.test.js | 8 +- 387 files changed, 411 insertions(+), 428 deletions(-) delete mode 100644 LICENSE rename {ci => ci-scripts}/dependencies.sh (100%) rename {ci => ci-scripts}/deploy.sh (100%) rename {ci => ci-scripts}/test.sh (100%) rename {interfaces => flow-interfaces}/mapbox-gl-js-test.js (100%) rename {interfaces => flow-interfaces}/point-geometry.js (100%) rename {interfaces => flow-interfaces}/unitbezier.js (100%) delete mode 100644 js/render/draw_debug.js delete mode 100644 js/render/shaders.js rename {js => src}/data/array_group.js (100%) rename {js => src}/data/bucket.js (100%) rename {js => src}/data/bucket/circle_bucket.js (100%) rename {js => src}/data/bucket/fill_bucket.js (100%) rename {js => src}/data/bucket/fill_extrusion_bucket.js (100%) rename {js => src}/data/bucket/line_bucket.js (100%) rename {js => src}/data/bucket/symbol_bucket.js (100%) rename {js => src}/data/buffer.js (100%) rename {js => src}/data/buffer_group.js (100%) rename {js => src}/data/element_array_type.js (100%) rename {js => src}/data/extent.js (100%) rename {js => src}/data/feature_index.js (100%) rename {js => src}/data/load_geometry.js (100%) rename {js => src}/data/pos_array.js (100%) rename {js => src}/data/program_configuration.js (100%) rename {js => src}/data/raster_bounds_array.js (100%) rename {js => src}/data/vertex_array_type.js (100%) rename {js => src}/geo/coordinate.js (100%) rename {js => src}/geo/lng_lat.js (100%) rename {js => src}/geo/lng_lat_bounds.js (100%) rename {js => src}/geo/transform.js (100%) rename js/mapbox-gl.js => src/index.js (100%) rename {js => src}/render/draw_background.js (100%) rename {js => src}/render/draw_circle.js (100%) rename {js => src}/render/draw_collision_debug.js (100%) rename js/lib/debugtext.js => src/render/draw_debug.js (82%) rename {js => src}/render/draw_fill.js (100%) rename {js => src}/render/draw_fill_extrusion.js (100%) rename {js => src}/render/draw_line.js (100%) rename {js => src}/render/draw_raster.js (100%) rename {js => src}/render/draw_symbol.js (100%) rename {js => src}/render/frame_history.js (100%) rename {js => src}/render/line_atlas.js (100%) rename {js => src}/render/painter.js (100%) rename {js => src}/render/pattern.js (100%) create mode 100644 src/render/shaders.js rename {js => src}/render/vertex_array_object.js (100%) rename {shaders => src/shaders}/README.md (100%) rename {shaders => src/shaders}/_prelude.fragment.glsl (100%) rename {shaders => src/shaders}/_prelude.vertex.glsl (100%) rename {shaders => src/shaders}/circle.fragment.glsl (100%) rename {shaders => src/shaders}/circle.vertex.glsl (100%) rename {shaders => src/shaders}/collision_box.fragment.glsl (100%) rename {shaders => src/shaders}/collision_box.vertex.glsl (100%) rename {shaders => src/shaders}/debug.fragment.glsl (100%) rename {shaders => src/shaders}/debug.vertex.glsl (100%) rename {shaders => src/shaders}/extrusion_texture.fragment.glsl (100%) rename {shaders => src/shaders}/extrusion_texture.vertex.glsl (100%) rename {shaders => src/shaders}/fill.fragment.glsl (100%) rename {shaders => src/shaders}/fill.vertex.glsl (100%) rename {shaders => src/shaders}/fill_extrusion.fragment.glsl (100%) rename {shaders => src/shaders}/fill_extrusion.vertex.glsl (100%) rename {shaders => src/shaders}/fill_extrusion_pattern.fragment.glsl (100%) rename {shaders => src/shaders}/fill_extrusion_pattern.vertex.glsl (100%) rename {shaders => src/shaders}/fill_outline.fragment.glsl (100%) rename {shaders => src/shaders}/fill_outline.vertex.glsl (100%) rename {shaders => src/shaders}/fill_outline_pattern.fragment.glsl (100%) rename {shaders => src/shaders}/fill_outline_pattern.vertex.glsl (100%) rename {shaders => src/shaders}/fill_pattern.fragment.glsl (100%) rename {shaders => src/shaders}/fill_pattern.vertex.glsl (100%) rename {shaders => src/shaders}/line.fragment.glsl (100%) rename {shaders => src/shaders}/line.vertex.glsl (100%) rename {shaders => src/shaders}/line_pattern.fragment.glsl (100%) rename {shaders => src/shaders}/line_pattern.vertex.glsl (100%) rename {shaders => src/shaders}/line_sdf.fragment.glsl (100%) rename {shaders => src/shaders}/line_sdf.vertex.glsl (100%) rename {shaders => src/shaders}/raster.fragment.glsl (100%) rename {shaders => src/shaders}/raster.vertex.glsl (100%) rename {shaders => src/shaders}/symbol_icon.fragment.glsl (100%) rename {shaders => src/shaders}/symbol_icon.vertex.glsl (100%) rename {shaders => src/shaders}/symbol_sdf.fragment.glsl (100%) rename {shaders => src/shaders}/symbol_sdf.vertex.glsl (100%) rename {js => src}/source/canvas_source.js (100%) rename {js => src}/source/geojson_source.js (100%) rename {js => src}/source/geojson_worker_source.js (100%) rename {js => src}/source/geojson_wrapper.js (100%) rename {js => src}/source/image_source.js (100%) rename {js => src}/source/load_tilejson.js (100%) rename {js => src}/source/pixels_to_tile_units.js (100%) rename {js => src}/source/query_features.js (100%) rename {js => src}/source/raster_tile_source.js (100%) rename {js => src}/source/rtl_text_plugin.js (100%) rename {js => src}/source/source.js (100%) rename {js => src}/source/source_cache.js (100%) rename {js => src}/source/tile.js (100%) rename {js => src}/source/tile_coord.js (100%) rename {js => src}/source/vector_tile_source.js (100%) rename {js => src}/source/vector_tile_worker_source.js (100%) rename {js => src}/source/video_source.js (100%) rename {js => src}/source/worker.js (100%) rename {js => src}/source/worker_tile.js (100%) rename {js => src}/style-spec/CHANGELOG.md (100%) rename {js => src}/style-spec/README.md (100%) rename {js => src}/style-spec/bin/gl-style-composite (100%) rename {js => src}/style-spec/bin/gl-style-format (100%) rename {js => src}/style-spec/bin/gl-style-migrate (100%) rename {js => src}/style-spec/bin/gl-style-validate (100%) rename {js => src}/style-spec/composite.js (100%) rename {js => src}/style-spec/declass.js (100%) rename {js => src}/style-spec/deref.js (100%) rename {js => src}/style-spec/diff.js (100%) rename {js => src}/style-spec/error/parsing_error.js (100%) rename {js => src}/style-spec/error/validation_error.js (100%) rename {js => src}/style-spec/feature_filter/README.md (100%) rename {js => src}/style-spec/feature_filter/index.js (100%) rename {js => src}/style-spec/format.js (100%) rename {js => src}/style-spec/function/color_spaces.js (100%) rename {js => src}/style-spec/function/index.js (100%) rename {js => src}/style-spec/group_by_layout.js (100%) rename {js => src}/style-spec/index.js (100%) rename {js => src}/style-spec/migrate.js (100%) rename {js => src}/style-spec/migrate/v7.js (99%) rename {js => src}/style-spec/migrate/v8.js (100%) rename {js => src}/style-spec/migrate/v9.js (100%) rename {js => src}/style-spec/minifyify_style_spec.js (100%) rename {js => src}/style-spec/package.json (100%) rename {js => src}/style-spec/reference/latest.js (100%) rename {js => src}/style-spec/reference/v6.json (100%) rename {js => src}/style-spec/reference/v7.json (100%) rename {js => src}/style-spec/reference/v8.json (100%) rename {js => src}/style-spec/util/extend.js (100%) rename {js => src}/style-spec/util/get_type.js (100%) rename {js => src}/style-spec/util/parse_color.js (100%) rename {js => src}/style-spec/util/ref_properties.js (100%) rename {js => src}/style-spec/util/unbundle_jsonlint.js (100%) rename {js => src}/style-spec/validate/latest.js (100%) rename {js => src}/style-spec/validate/validate.js (100%) rename {js => src}/style-spec/validate/validate_array.js (100%) rename {js => src}/style-spec/validate/validate_boolean.js (100%) rename {js => src}/style-spec/validate/validate_color.js (100%) rename {js => src}/style-spec/validate/validate_constants.js (100%) rename {js => src}/style-spec/validate/validate_enum.js (100%) rename {js => src}/style-spec/validate/validate_filter.js (100%) rename {js => src}/style-spec/validate/validate_function.js (100%) rename {js => src}/style-spec/validate/validate_glyphs_url.js (100%) rename {js => src}/style-spec/validate/validate_layer.js (100%) rename {js => src}/style-spec/validate/validate_layout_property.js (100%) rename {js => src}/style-spec/validate/validate_light.js (100%) rename {js => src}/style-spec/validate/validate_number.js (100%) rename {js => src}/style-spec/validate/validate_object.js (100%) rename {js => src}/style-spec/validate/validate_paint_property.js (100%) rename {js => src}/style-spec/validate/validate_property.js (100%) rename {js => src}/style-spec/validate/validate_source.js (100%) rename {js => src}/style-spec/validate/validate_string.js (100%) rename {js => src}/style-spec/validate_style.js (100%) rename {js => src}/style-spec/validate_style.min.js (100%) rename {js => src}/style-spec/yarn.lock (100%) rename {js => src}/style/animation_loop.js (100%) rename {js => src}/style/image_sprite.js (100%) rename {js => src}/style/light.js (100%) rename {js => src}/style/style.js (99%) rename {js => src}/style/style_declaration.js (100%) rename {js => src}/style/style_layer.js (100%) rename {js => src}/style/style_layer/circle_style_layer.js (100%) rename {js => src}/style/style_layer/fill_extrusion_style_layer.js (100%) rename {js => src}/style/style_layer/fill_style_layer.js (100%) rename {js => src}/style/style_layer/line_style_layer.js (100%) rename {js => src}/style/style_layer/symbol_style_layer.js (100%) rename {js => src}/style/style_layer_index.js (100%) rename {js => src}/style/style_transition.js (100%) rename {js => src}/style/validate_style.js (100%) rename {js => src}/symbol/anchor.js (100%) rename {js => src}/symbol/check_max_angle.js (100%) rename {js => src}/symbol/clip_line.js (100%) rename {js => src}/symbol/collision_box.js (100%) rename {js => src}/symbol/collision_feature.js (100%) rename {js => src}/symbol/collision_tile.js (100%) rename {js => src}/symbol/get_anchors.js (100%) rename {js => src}/symbol/glyph_atlas.js (100%) rename {js => src}/symbol/glyph_source.js (100%) rename {js => src}/symbol/mergelines.js (100%) rename {js => src}/symbol/quads.js (100%) rename {js => src}/symbol/resolve_text.js (100%) rename {js => src}/symbol/shaping.js (100%) rename {js => src}/symbol/sprite_atlas.js (100%) rename {js => src}/symbol/symbol_instances.js (100%) rename {js => src}/symbol/symbol_quads.js (100%) rename {js => src}/ui/bind_handlers.js (100%) rename {js => src}/ui/camera.js (100%) rename {js => src}/ui/control/attribution_control.js (100%) rename {js => src}/ui/control/geolocate_control.js (100%) rename {js => src}/ui/control/logo_control.js (100%) rename {js => src}/ui/control/navigation_control.js (100%) rename {js => src}/ui/control/scale_control.js (100%) rename {js => src}/ui/handler/box_zoom.js (100%) rename {js => src}/ui/handler/dblclick_zoom.js (100%) rename {js => src}/ui/handler/drag_pan.js (100%) rename {js => src}/ui/handler/drag_rotate.js (100%) rename {js => src}/ui/handler/keyboard.js (100%) rename {js => src}/ui/handler/scroll_zoom.js (100%) rename {js => src}/ui/handler/touch_zoom_rotate.js (100%) rename {js => src}/ui/hash.js (100%) rename {js => src}/ui/map.js (100%) rename {js => src}/ui/marker.js (100%) rename {js => src}/ui/popup.js (100%) rename {js => src}/util/actor.js (100%) rename {js => src}/util/ajax.js (100%) rename {js => src}/util/browser.js (100%) rename {js => src}/util/browser/web_worker.js (100%) rename {js => src}/util/browser/window.js (100%) rename {js => src}/util/classify_rings.js (100%) rename {js => src}/util/config.js (100%) rename {js => src}/util/dictionary_coder.js (100%) rename {js => src}/util/dispatcher.js (100%) rename {js => src}/util/dom.js (100%) rename {js => src}/util/evented.js (100%) rename {js => src}/util/find_pole_of_inaccessibility.js (100%) rename {js => src/util}/global_worker_pool.js (86%) rename {js => src}/util/glyphs.js (100%) rename {js => src}/util/interpolate.js (100%) rename {js => src}/util/intersection_tests.js (100%) rename {js => src}/util/is_char_in_unicode_block.js (100%) rename {js => src}/util/lru_cache.js (100%) rename {js => src}/util/mapbox.js (100%) rename {js => src}/util/script_detection.js (100%) rename {js => src}/util/struct_array.js (100%) rename {js => src}/util/token.js (100%) rename {js => src}/util/util.js (100%) rename {js => src}/util/vectortile_to_geojson.js (100%) rename {js => src}/util/verticalize_punctuation.js (100%) rename {js => src}/util/web_worker.js (100%) rename {js => src}/util/window.js (100%) rename {js => src}/util/worker_pool.js (93%) rename test/{js => unit}/data/bucket.test.js (92%) rename test/{js => unit}/data/buffer.test.js (90%) rename test/{js => unit}/data/fill_bucket.test.js (94%) rename test/{js => unit}/data/line_bucket.test.js (93%) rename test/{js => unit}/data/load_geometry.test.js (94%) rename test/{js => unit}/data/symbol_bucket.test.js (83%) rename test/{js => unit}/geo/coordinate.test.js (95%) rename test/{js => unit}/geo/lng_lat.test.js (97%) rename test/{js => unit}/geo/lng_lat_bounds.test.js (97%) rename test/{js => unit}/geo/transform.test.js (97%) rename test/{js => unit}/mapbox-gl.js (86%) rename test/{js => unit}/source/canvas_source.test.js (89%) rename test/{js => unit}/source/geojson_source.test.js (95%) rename test/{js => unit}/source/geojson_worker_source.test.js (89%) rename test/{js => unit}/source/geojson_wrapper.test.js (93%) rename test/{js => unit}/source/query_features.test.js (86%) rename test/{js => unit}/source/source_cache.test.js (97%) rename test/{js => unit}/source/tile.test.js (91%) rename test/{js => unit}/source/tile_coord.test.js (99%) rename test/{js => unit}/source/vector_tile_source.test.js (95%) rename test/{js => unit}/source/vector_tile_worker_source.test.js (93%) rename test/{js => unit}/source/worker.test.js (94%) rename test/{js => unit}/source/worker_tile.test.js (87%) rename test/{js => unit}/style-spec/composite.test.js (95%) rename test/{js => unit}/style-spec/declass.test.js (98%) rename test/{js => unit}/style-spec/deref.test.js (94%) rename test/{js => unit}/style-spec/diff.test.js (99%) rename test/{js => unit}/style-spec/feature_filter.test.js (99%) rename test/{js => unit}/style-spec/fixture/bad-color.input.json (100%) rename test/{js => unit}/style-spec/fixture/bad-color.output.json (100%) rename test/{js => unit}/style-spec/fixture/constants-v7.input.json (100%) rename test/{js => unit}/style-spec/fixture/constants-v7.output.json (100%) rename test/{js => unit}/style-spec/fixture/constants-v8.input.json (100%) rename test/{js => unit}/style-spec/fixture/constants-v8.output.json (100%) rename test/{js => unit}/style-spec/fixture/extrakeys.input.json (100%) rename test/{js => unit}/style-spec/fixture/extrakeys.output.json (100%) rename test/{js => unit}/style-spec/fixture/filters.input.json (100%) rename test/{js => unit}/style-spec/fixture/filters.output.json (100%) rename test/{js => unit}/style-spec/fixture/functions.input.json (100%) rename test/{js => unit}/style-spec/fixture/functions.output.json (100%) rename test/{js => unit}/style-spec/fixture/invalidjson.input.json (100%) rename test/{js => unit}/style-spec/fixture/invalidjson.output.json (100%) rename test/{js => unit}/style-spec/fixture/layers.input.json (100%) rename test/{js => unit}/style-spec/fixture/layers.output.json (100%) rename test/{js => unit}/style-spec/fixture/light-arbitrary.input.json (100%) rename test/{js => unit}/style-spec/fixture/light-arbitrary.output.json (100%) rename test/{js => unit}/style-spec/fixture/light.input.json (100%) rename test/{js => unit}/style-spec/fixture/light.output.json (100%) rename test/{js => unit}/style-spec/fixture/malformed-glyphs-type.input.json (100%) rename test/{js => unit}/style-spec/fixture/malformed-glyphs-type.output.json (100%) rename test/{js => unit}/style-spec/fixture/malformed-glyphs.input.json (100%) rename test/{js => unit}/style-spec/fixture/malformed-glyphs.output.json (100%) rename test/{js => unit}/style-spec/fixture/map-properties.input.json (100%) rename test/{js => unit}/style-spec/fixture/map-properties.output.json (100%) rename test/{js => unit}/style-spec/fixture/metadata.input.json (100%) rename test/{js => unit}/style-spec/fixture/metadata.output.json (100%) rename test/{js => unit}/style-spec/fixture/missing-glyphs.input.json (100%) rename test/{js => unit}/style-spec/fixture/missing-glyphs.output.json (100%) rename test/{js => unit}/style-spec/fixture/missing-sprite.input.json (100%) rename test/{js => unit}/style-spec/fixture/missing-sprite.output.json (100%) rename test/{js => unit}/style-spec/fixture/no-sources.input.json (100%) rename test/{js => unit}/style-spec/fixture/no-sources.output.json (100%) rename test/{js => unit}/style-spec/fixture/pitch.input.json (100%) rename test/{js => unit}/style-spec/fixture/pitch.output.json (100%) rename test/{js => unit}/style-spec/fixture/properties.input.json (100%) rename test/{js => unit}/style-spec/fixture/properties.output.json (100%) rename test/{js => unit}/style-spec/fixture/required.input.json (100%) rename test/{js => unit}/style-spec/fixture/required.output.json (100%) rename test/{js => unit}/style-spec/fixture/root-properties.input.json (100%) rename test/{js => unit}/style-spec/fixture/root-properties.output.json (100%) rename test/{js => unit}/style-spec/fixture/sources.input.json (100%) rename test/{js => unit}/style-spec/fixture/sources.output.json (100%) rename test/{js => unit}/style-spec/fixture/text-font.input.json (100%) rename test/{js => unit}/style-spec/fixture/text-font.output.json (100%) rename test/{js => unit}/style-spec/fixture/unknown-keys-nested.input.json (100%) rename test/{js => unit}/style-spec/fixture/unknown-keys-nested.output.json (100%) rename test/{js => unit}/style-spec/fixture/v6.input.json (100%) rename test/{js => unit}/style-spec/fixture/v6.output.json (100%) rename test/{js => unit}/style-spec/fixture/v7-migrate/style-basic.input.json (100%) rename test/{js => unit}/style-spec/fixture/v7-migrate/style-basic.output.json (100%) rename test/{js => unit}/style-spec/format.test.js (92%) rename test/{js => unit}/style-spec/function.test.js (99%) rename test/{js => unit}/style-spec/group_by_layout.test.js (95%) rename test/{js => unit}/style-spec/migrate.test.js (79%) rename test/{js => unit}/style-spec/migrate/v7.js (83%) rename test/{js => unit}/style-spec/migrate/v8.js (99%) rename test/{js => unit}/style-spec/migrate/v9.js (96%) rename test/{js => unit}/style-spec/parse_color.js (83%) rename test/{js => unit}/style-spec/spec.test.js (99%) rename test/{js => unit}/style-spec/validate.test.js (91%) rename test/{js => unit}/style/animation_loop.test.js (88%) rename test/{js => unit}/style/light.test.js (96%) rename test/{js => unit}/style/style.test.js (98%) rename test/{js => unit}/style/style_declaration.test.js (97%) rename test/{js => unit}/style/style_layer.test.js (99%) rename test/{js => unit}/style/style_layer_index.test.js (96%) rename test/{js => unit}/style/style_transition.test.js (88%) rename test/{js => unit}/symbol/anchor.test.js (91%) rename test/{js => unit}/symbol/check_max_angle.test.js (94%) rename test/{js => unit}/symbol/collision_feature.js (95%) rename test/{js => unit}/symbol/get_anchors.test.js (98%) rename test/{js => unit}/symbol/mergelines.test.js (94%) rename test/{js => unit}/symbol/quads.test.js (98%) rename test/{js => unit}/symbol/resolve_text.test.js (94%) rename test/{js => unit}/symbol/shaping.test.js (98%) rename test/{js => unit}/ui/camera.test.js (99%) rename test/{js => unit}/ui/control/attribution.test.js (95%) rename test/{js => unit}/ui/control/logo.test.js (91%) rename test/{js => unit}/ui/hash.test.js (94%) rename test/{js => unit}/ui/map.test.js (99%) rename test/{js => unit}/ui/marker.test.js (92%) rename test/{js => unit}/ui/popup.test.js (98%) rename test/{js => unit}/util/actor.test.js (91%) rename test/{js => unit}/util/ajax.test.js (88%) rename test/{js => unit}/util/browser.test.js (94%) rename test/{js => unit}/util/classify_rings.test.js (98%) rename test/{js => unit}/util/dispatcher.test.js (75%) rename test/{js => unit}/util/evented.test.js (98%) rename test/{js => unit}/util/find_pole_of_inaccessibility.test.js (87%) rename test/{js => unit}/util/interpolate.test.js (89%) rename test/{js => unit}/util/lru_cache.test.js (97%) rename test/{js => unit}/util/mapbox.test.js (98%) rename test/{js => unit}/util/struct_array.test.js (96%) rename test/{js => unit}/util/token.test.js (93%) rename test/{js => unit}/util/util.test.js (98%) rename test/{js => unit}/util/worker_pool.test.js (84%) diff --git a/.flowconfig b/.flowconfig index ef69dbbc7da..4a9d4aac7f3 100644 --- a/.flowconfig +++ b/.flowconfig @@ -3,13 +3,13 @@ .*/node_modules/jsonlint/.* .*/node_modules/jsonlint-lines-primitives/.* .*/node_modules/unflowify/.* -.*/test/js/style-spec/fixture/invalidjson.input.json +.*/test/unit/style-spec/fixture/invalidjson.input.json [include] [libs] -./interfaces/ +./flow-interfaces/ [options] diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 7118f4cb28e..00000000000 --- a/LICENSE +++ /dev/null @@ -1,47 +0,0 @@ -ISC License - -Copyright (c) 2016, Mapbox - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - --------------------------------------------------------------------------------- - -Contains a portion of d3-color https://github.com/d3/d3-color - -Copyright 2010-2016 Mike Bostock -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* Neither the name of the author nor the names of contributors may be used to - endorse or promote products derived from this software without specific prior - written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE.txt b/LICENSE.txt index 3562d403ad4..993b8e1db36 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -79,3 +79,35 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-------------------------------------------------------------------------------- + +Contains a portion of d3-color https://github.com/d3/d3-color + +Copyright 2010-2016 Mike Bostock +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the author nor the names of contributors may be used to + endorse or promote products derived from this software without specific prior + written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/bench/benchmarks.js b/bench/benchmarks.js index 8686fce2ec3..78babd3570b 100644 --- a/bench/benchmarks.js +++ b/bench/benchmarks.js @@ -20,4 +20,4 @@ registerBenchmark('geojson-setdata-large', require('./benchmarks/geojson_setdata // Ensure the global worker pool is never drained. Browsers have resource limits // on the max number of workers that can be created per page. -require('../js/global_worker_pool')().acquire(-1); +require('../src/util/global_worker_pool')().acquire(-1); diff --git a/bench/benchmarks/buffer.js b/bench/benchmarks/buffer.js index bd262335f4d..5e2097a5b0b 100644 --- a/bench/benchmarks/buffer.js +++ b/bench/benchmarks/buffer.js @@ -4,17 +4,17 @@ const VT = require('vector-tile'); const Protobuf = require('pbf'); const assert = require('assert'); -const WorkerTile = require('../../js/source/worker_tile'); -const ajax = require('../../js/util/ajax'); -const Style = require('../../js/style/style'); -const StyleLayerIndex = require('../../js/style/style_layer_index'); -const util = require('../../js/util/util'); -const Evented = require('../../js/util/evented'); -const config = require('../../js/util/config'); +const WorkerTile = require('../../src/source/worker_tile'); +const ajax = require('../../src/util/ajax'); +const Style = require('../../src/style/style'); +const StyleLayerIndex = require('../../src/style/style_layer_index'); +const util = require('../../src/util/util'); +const Evented = require('../../src/util/evented'); +const config = require('../../src/util/config'); const coordinates = require('../lib/coordinates'); const formatNumber = require('../lib/format_number'); const accessToken = require('../lib/access_token'); -const deref = require('../../js/style-spec/deref'); +const deref = require('../../src/style-spec/deref'); const SAMPLE_COUNT = 10; diff --git a/bench/benchmarks/fps.js b/bench/benchmarks/fps.js index 8a939f9ef02..08f16755f03 100644 --- a/bench/benchmarks/fps.js +++ b/bench/benchmarks/fps.js @@ -1,6 +1,6 @@ 'use strict'; -const Evented = require('../../js/util/evented'); +const Evented = require('../../src/util/evented'); const formatNumber = require('../lib/format_number'); const measureFramerate = require('../lib/measure_framerate'); const createMap = require('../lib/create_map'); diff --git a/bench/benchmarks/frame_duration.js b/bench/benchmarks/frame_duration.js index 0129c553cb4..e16a4bfa40b 100644 --- a/bench/benchmarks/frame_duration.js +++ b/bench/benchmarks/frame_duration.js @@ -1,6 +1,6 @@ 'use strict'; -const Evented = require('../../js/util/evented'); +const Evented = require('../../src/util/evented'); const formatNumber = require('../lib/format_number'); const createMap = require('../lib/create_map'); diff --git a/bench/benchmarks/geojson_setdata_large.js b/bench/benchmarks/geojson_setdata_large.js index 8aca78573b7..364dfe2c170 100644 --- a/bench/benchmarks/geojson_setdata_large.js +++ b/bench/benchmarks/geojson_setdata_large.js @@ -1,11 +1,11 @@ 'use strict'; -const Evented = require('../../js/util/evented'); +const Evented = require('../../src/util/evented'); const formatNumber = require('../lib/format_number'); const setDataPerf = require('../lib/set_data_perf'); const setupGeoJSONMap = require('../lib/setup_geojson_map'); const createMap = require('../lib/create_map'); -const ajax = require('../../js/util/ajax'); +const ajax = require('../../src/util/ajax'); module.exports = function() { const evented = new Evented(); diff --git a/bench/benchmarks/geojson_setdata_small.js b/bench/benchmarks/geojson_setdata_small.js index d490c77c4ed..1e65065b584 100644 --- a/bench/benchmarks/geojson_setdata_small.js +++ b/bench/benchmarks/geojson_setdata_small.js @@ -1,6 +1,6 @@ 'use strict'; -const Evented = require('../../js/util/evented'); +const Evented = require('../../src/util/evented'); const formatNumber = require('../lib/format_number'); const setDataPerf = require('../lib/set_data_perf'); const setupGeoJSONMap = require('../lib/setup_geojson_map'); diff --git a/bench/benchmarks/map_load.js b/bench/benchmarks/map_load.js index f754ad6fa51..82870cdf01e 100644 --- a/bench/benchmarks/map_load.js +++ b/bench/benchmarks/map_load.js @@ -1,6 +1,6 @@ 'use strict'; -const Evented = require('../../js/util/evented'); +const Evented = require('../../src/util/evented'); const formatNumber = require('../lib/format_number'); const createMap = require('../lib/create_map'); diff --git a/bench/benchmarks/query_box.js b/bench/benchmarks/query_box.js index a3a42a82cf2..83f651d901e 100644 --- a/bench/benchmarks/query_box.js +++ b/bench/benchmarks/query_box.js @@ -1,6 +1,6 @@ 'use strict'; -const Evented = require('../../js/util/evented'); +const Evented = require('../../src/util/evented'); const createMap = require('../lib/create_map'); const width = 1024; diff --git a/bench/benchmarks/query_point.js b/bench/benchmarks/query_point.js index d2c74bb3146..e2284889357 100644 --- a/bench/benchmarks/query_point.js +++ b/bench/benchmarks/query_point.js @@ -1,6 +1,6 @@ 'use strict'; -const Evented = require('../../js/util/evented'); +const Evented = require('../../src/util/evented'); const createMap = require('../lib/create_map'); const width = 1024; diff --git a/bench/benchmarks/style_load.js b/bench/benchmarks/style_load.js index 9326fe1c331..b026fa95c23 100644 --- a/bench/benchmarks/style_load.js +++ b/bench/benchmarks/style_load.js @@ -1,9 +1,9 @@ 'use strict'; -const Evented = require('../../js/util/evented'); -const ajax = require('../../js/util/ajax'); -const config = require('../../js/util/config'); -const Style = require('../../js/style/style'); +const Evented = require('../../src/util/evented'); +const ajax = require('../../src/util/ajax'); +const config = require('../../src/util/config'); +const Style = require('../../src/style/style'); const formatNumber = require('../lib/format_number'); const accessToken = require('../lib/access_token'); diff --git a/bench/lib/coordinates.js b/bench/lib/coordinates.js index ca3bd129674..5312e928b8a 100644 --- a/bench/lib/coordinates.js +++ b/bench/lib/coordinates.js @@ -3,7 +3,7 @@ // This file contains the set of coordinates of tiles used in a "flyTo" from // the Mapbox SF office to the Mapbox DC office. -const Coordinate = require('../../js/geo/coordinate'); +const Coordinate = require('../../src/geo/coordinate'); module.exports = [ new Coordinate(5242, 12665, 15), diff --git a/bench/lib/create_map.js b/bench/lib/create_map.js index b4970386c66..3c0a600f60d 100644 --- a/bench/lib/create_map.js +++ b/bench/lib/create_map.js @@ -1,7 +1,7 @@ 'use strict'; -const util = require('../../js/util/util'); -const mapboxgl = require('../../js/mapbox-gl'); +const util = require('../../src/util/util'); +const mapboxgl = require('../../src'); module.exports = function createMap(options) { options = util.extend({width: 512, height: 512}, options); diff --git a/bench/unit/bench_transform.js b/bench/unit/bench_transform.js index d40921f1d59..994e4e66a17 100644 --- a/bench/unit/bench_transform.js +++ b/bench/unit/bench_transform.js @@ -3,8 +3,8 @@ const Benchmark = require('benchmark'); const suite = new Benchmark.Suite(); -const Transform = require('../../js/geo/transform'); -const LngLat = require('../../js/geo/lng_lat.js'); +const Transform = require('../../src/geo/transform'); +const LngLat = require('../../src/geo/lng_lat.js'); const Point = require('point-geometry'); const t = new Transform(); diff --git a/bench/unit/feature_filter/bench.js b/bench/unit/feature_filter/bench.js index 479d9dac1cb..f7ceba1b1d5 100644 --- a/bench/unit/feature_filter/bench.js +++ b/bench/unit/feature_filter/bench.js @@ -3,7 +3,7 @@ const VectorTile = require('vector-tile').VectorTile; const Pbf = require('pbf'); const fs = require('fs'); -const createFilter = require('../../../js/style-spec').featureFilter; +const createFilter = require('../../../src/style-spec').featureFilter; const filters = require('./filters.json'); const path = require('path'); diff --git a/bench/unit/feature_filter/big.js b/bench/unit/feature_filter/big.js index 429267e2c89..9cb097c0a0f 100644 --- a/bench/unit/feature_filter/big.js +++ b/bench/unit/feature_filter/big.js @@ -1,6 +1,6 @@ 'use strict'; -const filter = require('../../../js/style-spec').featureFilter; +const filter = require('../../../src/style-spec').featureFilter; const N = 64000; diff --git a/bench/unit/function/profile.js b/bench/unit/function/profile.js index eed20030f25..8f8a1dc2825 100644 --- a/bench/unit/function/profile.js +++ b/bench/unit/function/profile.js @@ -1,6 +1,6 @@ 'use strict'; -const createFunction = require('../../../js/style-spec').function.interpolated; +const createFunction = require('../../../src/style-spec').function.interpolated; function buildExponentialFunction(stopsCount) { // Build an exponential function with a long list of stops diff --git a/ci/dependencies.sh b/ci-scripts/dependencies.sh similarity index 100% rename from ci/dependencies.sh rename to ci-scripts/dependencies.sh diff --git a/ci/deploy.sh b/ci-scripts/deploy.sh similarity index 100% rename from ci/deploy.sh rename to ci-scripts/deploy.sh diff --git a/ci/test.sh b/ci-scripts/test.sh similarity index 100% rename from ci/test.sh rename to ci-scripts/test.sh diff --git a/circle.yml b/circle.yml index d75ca3d5ce9..f3d9599c551 100644 --- a/circle.yml +++ b/circle.yml @@ -11,15 +11,15 @@ dependencies: - './nvm' - '~/.yarn' override: - - ./ci/dependencies.sh + - ./ci-scripts/dependencies.sh test: override: - - ./ci/test.sh + - ./ci-scripts/test.sh deployment: release: tag: /v[0-9]+\.[0-9]+\.[0-9]+(\-dev)?/ commands: - - ./ci/deploy.sh + - ./ci-scripts/deploy.sh general: artifacts: - "node_modules/mapbox-gl-test-suite/render-tests/index.html" diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 4d6a8660713..34b17b6ccf9 100755 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -143,7 +143,7 @@ {% endunless %} - + + diff --git a/docs/_theme/index.hbs b/docs/_theme/index.hbs index c9a923fdef0..3c54ffdd9ef 100644 --- a/docs/_theme/index.hbs +++ b/docs/_theme/index.hbs @@ -198,6 +198,6 @@ var map = new mapboxgl.Map({ - + diff --git a/docs/assets/prettify.js b/docs/assets/prettify.js index 037c26da4aa..63fa7c80590 100644 --- a/docs/assets/prettify.js +++ b/docs/assets/prettify.js @@ -185,7 +185,7 @@ window['PR_SHOULD_USE_CONTINUATION'] = true; /** * A set of tokens that can precede a regular expression literal in * javascript - * http://web.archive.org/web/20070717142515/http://www.mozilla.org/js/language/js20/rationale/syntax.html + * http://web.archive.org/web/20070717142515/http://www.mozilla.org/src/language/js20/rationale/syntax.html * has the full list, but I've removed ones that might be problematic when * seen in languages that don't support regular expression literals. * diff --git a/docs/js/site.js b/docs/js/site.js index 94961f769bc..1d640da5d83 100644 --- a/docs/js/site.js +++ b/docs/js/site.js @@ -1,6 +1,6 @@ function load() { ZeroClipboard.config({ - swfPath: window.location.origin + '/mapbox-gl-js/js/ZeroClipboard.swf', + swfPath: window.location.origin + '/mapbox-gl-js/src/ZeroClipboard.swf', forceHandCursor: true }); diff --git a/docs/roadmap/index.html b/docs/roadmap/index.html index 7029a6eb030..8ab8be7a27f 100644 --- a/docs/roadmap/index.html +++ b/docs/roadmap/index.html @@ -62,4 +62,4 @@

{{r.term}}

- + diff --git a/docs/style-spec/_generate/generate.js b/docs/style-spec/_generate/generate.js index 2ad0df73bd8..e76b572755e 100755 --- a/docs/style-spec/_generate/generate.js +++ b/docs/style-spec/_generate/generate.js @@ -4,7 +4,7 @@ var fs = require('fs'); var path = require('path'); -var ref = require('../../../js/style-spec/reference/latest'); +var ref = require('../../../src/style-spec/reference/latest'); var _ = require('lodash'); var remark = require('remark'); var html = require('remark-html'); diff --git a/interfaces/mapbox-gl-js-test.js b/flow-interfaces/mapbox-gl-js-test.js similarity index 100% rename from interfaces/mapbox-gl-js-test.js rename to flow-interfaces/mapbox-gl-js-test.js diff --git a/interfaces/point-geometry.js b/flow-interfaces/point-geometry.js similarity index 100% rename from interfaces/point-geometry.js rename to flow-interfaces/point-geometry.js diff --git a/interfaces/unitbezier.js b/flow-interfaces/unitbezier.js similarity index 100% rename from interfaces/unitbezier.js rename to flow-interfaces/unitbezier.js diff --git a/js/render/draw_debug.js b/js/render/draw_debug.js deleted file mode 100644 index 3dfed40d1e0..00000000000 --- a/js/render/draw_debug.js +++ /dev/null @@ -1,57 +0,0 @@ -'use strict'; - -const textVertices = require('../lib/debugtext'); -const browser = require('../util/browser'); -const mat4 = require('@mapbox/gl-matrix').mat4; -const EXTENT = require('../data/extent'); -const Buffer = require('../data/buffer'); -const VertexArrayObject = require('./vertex_array_object'); -const PosArray = require('../data/pos_array'); - -module.exports = drawDebug; - -function drawDebug(painter, sourceCache, coords) { - for (let i = 0; i < coords.length; i++) { - drawDebugTile(painter, sourceCache, coords[i]); - } -} - -function drawDebugTile(painter, sourceCache, coord) { - const gl = painter.gl; - - gl.disable(gl.STENCIL_TEST); - painter.lineWidth(1 * browser.devicePixelRatio); - - const posMatrix = coord.posMatrix; - const program = painter.useProgram('debug'); - - gl.uniformMatrix4fv(program.u_matrix, false, posMatrix); - gl.uniform4f(program.u_color, 1, 0, 0, 1); - painter.debugVAO.bind(gl, program, painter.debugBuffer); - gl.drawArrays(gl.LINE_STRIP, 0, painter.debugBuffer.length); - - const vertices = textVertices(coord.toString(), 50, 200, 5); - const debugTextArray = new PosArray(); - for (let v = 0; v < vertices.length; v += 2) { - debugTextArray.emplaceBack(vertices[v], vertices[v + 1]); - } - const debugTextBuffer = Buffer.fromStructArray(debugTextArray, Buffer.BufferType.VERTEX); - const debugTextVAO = new VertexArrayObject(); - debugTextVAO.bind(gl, program, debugTextBuffer); - gl.uniform4f(program.u_color, 1, 1, 1, 1); - - // Draw the halo with multiple 1px lines instead of one wider line because - // the gl spec doesn't guarantee support for lines with width > 1. - const tileSize = sourceCache.getTile(coord).tileSize; - const onePixel = EXTENT / (Math.pow(2, painter.transform.zoom - coord.z) * tileSize); - const translations = [[-1, -1], [-1, 1], [1, -1], [1, 1]]; - for (let i = 0; i < translations.length; i++) { - const translation = translations[i]; - gl.uniformMatrix4fv(program.u_matrix, false, mat4.translate([], posMatrix, [onePixel * translation[0], onePixel * translation[1], 0])); - gl.drawArrays(gl.LINES, 0, debugTextBuffer.length); - } - - gl.uniform4f(program.u_color, 0, 0, 0, 1); - gl.uniformMatrix4fv(program.u_matrix, false, posMatrix); - gl.drawArrays(gl.LINES, 0, debugTextBuffer.length); -} diff --git a/js/render/shaders.js b/js/render/shaders.js deleted file mode 100644 index c4299c30673..00000000000 --- a/js/render/shaders.js +++ /dev/null @@ -1,76 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); - -// readFileSync calls must be written out long-form for brfs. -module.exports = { - prelude: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/_prelude.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/_prelude.vertex.glsl'), 'utf8') - }, - circle: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/circle.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/circle.vertex.glsl'), 'utf8') - }, - collisionBox: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/collision_box.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/collision_box.vertex.glsl'), 'utf8') - }, - debug: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/debug.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/debug.vertex.glsl'), 'utf8') - }, - fill: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill.vertex.glsl'), 'utf8') - }, - fillOutline: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill_outline.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill_outline.vertex.glsl'), 'utf8') - }, - fillOutlinePattern: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill_outline_pattern.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill_outline_pattern.vertex.glsl'), 'utf8') - }, - fillPattern: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill_pattern.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill_pattern.vertex.glsl'), 'utf8') - }, - fillExtrusion: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill_extrusion.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill_extrusion.vertex.glsl'), 'utf8') - }, - fillExtrusionPattern: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill_extrusion_pattern.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/fill_extrusion_pattern.vertex.glsl'), 'utf8') - }, - extrusionTexture: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/extrusion_texture.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/extrusion_texture.vertex.glsl'), 'utf8') - }, - line: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/line.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/line.vertex.glsl'), 'utf8') - }, - linePattern: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/line_pattern.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/line_pattern.vertex.glsl'), 'utf8') - }, - lineSDF: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/line_sdf.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/line_sdf.vertex.glsl'), 'utf8') - }, - raster: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/raster.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/raster.vertex.glsl'), 'utf8') - }, - symbolIcon: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/symbol_icon.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/symbol_icon.vertex.glsl'), 'utf8') - }, - symbolSDF: { - fragmentSource: fs.readFileSync(path.join(__dirname, '../../shaders/symbol_sdf.fragment.glsl'), 'utf8'), - vertexSource: fs.readFileSync(path.join(__dirname, '../../shaders/symbol_sdf.vertex.glsl'), 'utf8') - } -}; diff --git a/package.json b/package.json index fa3a2f29fa2..1edae10f35e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "mapbox-gl", "description": "A WebGL interactive maps library", "version": "0.32.1", - "main": "js/mapbox-gl.js", + "main": "src/index.js", "license": "BSD-3-Clause", "repository": { "type": "git", @@ -89,17 +89,17 @@ "package-json-versionify", "unassertify", "brfs", - "./js/style-spec/minifyify_style_spec" + "./src/style-spec/minifyify_style_spec" ] }, "browser": { - "./js/util/window.js": "./js/util/browser/window.js", - "./js/util/web_worker.js": "./js/util/browser/web_worker.js" + "./src/util/window.js": "./src/util/browser/window.js", + "./src/util/web_worker.js": "./src/util/browser/web_worker.js" }, "scripts": { - "build-dev": "browserify js/mapbox-gl.js --debug --ignore-transform unassertify --standalone mapboxgl > dist/mapbox-gl-dev.js && tap --no-coverage test/build/dev.test.js", - "watch-dev": "watchify js/mapbox-gl.js --debug --ignore-transform unassertify --standalone mapboxgl --outfile dist/mapbox-gl-dev.js --verbose", - "build-min": "browserify js/mapbox-gl.js --debug --plugin [minifyify --map mapbox-gl.js.map --output dist/mapbox-gl.js.map] --standalone mapboxgl > dist/mapbox-gl.js && tap --no-coverage test/build/min.test.js", + "build-dev": "browserify src/index.js --debug --ignore-transform unassertify --standalone mapboxgl > dist/mapbox-gl-dev.js && tap --no-coverage test/build/dev.test.js", + "watch-dev": "watchify src/index.js --debug --ignore-transform unassertify --standalone mapboxgl --outfile dist/mapbox-gl-dev.js --verbose", + "build-min": "browserify src/index.js --debug --plugin [minifyify --map mapbox-gl.js.map --output dist/mapbox-gl.js.map] --standalone mapboxgl > dist/mapbox-gl.js && tap --no-coverage test/build/min.test.js", "build-token": "browserify debug/access_token.js --debug --transform envify > debug/access_token_generated.js", "build-benchmarks": "BENCHMARK_VERSION=\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\" browserify bench/benchmarks.js --plugin [minifyify --no-map] --transform envify --outfile bench/benchmarks_generated.js --verbose", "watch-benchmarks": "BENCHMARK_VERSION=\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\" watchify bench/benchmarks.js --plugin [minifyify --no-map] --transform envify --outfile bench/benchmarks_generated.js --verbose", @@ -119,12 +119,12 @@ "test-plugin": "tap test/plugins/", "test-suite": "run-s test-render test-query", "test-suite-clean": "find test/integration/*-tests -mindepth 2 -type d -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r", - "test-unit": "tap --reporter dot --no-coverage test/js", + "test-unit": "tap --reporter dot --no-coverage test/unit", "test-render": "node test/render.test.js", "test-query": "node test/query.test.js", "test-flow": "flow .", "test-cov": "nyc --require=flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-render test-query", "prepublish": "in-publish && run-s build-dev build-min || not-in-publish", - "postinstall": "cd js/style-spec && yarn || npm install" + "postinstall": "cd src/style-spec && yarn || npm install" } } diff --git a/js/data/array_group.js b/src/data/array_group.js similarity index 100% rename from js/data/array_group.js rename to src/data/array_group.js diff --git a/js/data/bucket.js b/src/data/bucket.js similarity index 100% rename from js/data/bucket.js rename to src/data/bucket.js diff --git a/js/data/bucket/circle_bucket.js b/src/data/bucket/circle_bucket.js similarity index 100% rename from js/data/bucket/circle_bucket.js rename to src/data/bucket/circle_bucket.js diff --git a/js/data/bucket/fill_bucket.js b/src/data/bucket/fill_bucket.js similarity index 100% rename from js/data/bucket/fill_bucket.js rename to src/data/bucket/fill_bucket.js diff --git a/js/data/bucket/fill_extrusion_bucket.js b/src/data/bucket/fill_extrusion_bucket.js similarity index 100% rename from js/data/bucket/fill_extrusion_bucket.js rename to src/data/bucket/fill_extrusion_bucket.js diff --git a/js/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js similarity index 100% rename from js/data/bucket/line_bucket.js rename to src/data/bucket/line_bucket.js diff --git a/js/data/bucket/symbol_bucket.js b/src/data/bucket/symbol_bucket.js similarity index 100% rename from js/data/bucket/symbol_bucket.js rename to src/data/bucket/symbol_bucket.js diff --git a/js/data/buffer.js b/src/data/buffer.js similarity index 100% rename from js/data/buffer.js rename to src/data/buffer.js diff --git a/js/data/buffer_group.js b/src/data/buffer_group.js similarity index 100% rename from js/data/buffer_group.js rename to src/data/buffer_group.js diff --git a/js/data/element_array_type.js b/src/data/element_array_type.js similarity index 100% rename from js/data/element_array_type.js rename to src/data/element_array_type.js diff --git a/js/data/extent.js b/src/data/extent.js similarity index 100% rename from js/data/extent.js rename to src/data/extent.js diff --git a/js/data/feature_index.js b/src/data/feature_index.js similarity index 100% rename from js/data/feature_index.js rename to src/data/feature_index.js diff --git a/js/data/load_geometry.js b/src/data/load_geometry.js similarity index 100% rename from js/data/load_geometry.js rename to src/data/load_geometry.js diff --git a/js/data/pos_array.js b/src/data/pos_array.js similarity index 100% rename from js/data/pos_array.js rename to src/data/pos_array.js diff --git a/js/data/program_configuration.js b/src/data/program_configuration.js similarity index 100% rename from js/data/program_configuration.js rename to src/data/program_configuration.js diff --git a/js/data/raster_bounds_array.js b/src/data/raster_bounds_array.js similarity index 100% rename from js/data/raster_bounds_array.js rename to src/data/raster_bounds_array.js diff --git a/js/data/vertex_array_type.js b/src/data/vertex_array_type.js similarity index 100% rename from js/data/vertex_array_type.js rename to src/data/vertex_array_type.js diff --git a/js/geo/coordinate.js b/src/geo/coordinate.js similarity index 100% rename from js/geo/coordinate.js rename to src/geo/coordinate.js diff --git a/js/geo/lng_lat.js b/src/geo/lng_lat.js similarity index 100% rename from js/geo/lng_lat.js rename to src/geo/lng_lat.js diff --git a/js/geo/lng_lat_bounds.js b/src/geo/lng_lat_bounds.js similarity index 100% rename from js/geo/lng_lat_bounds.js rename to src/geo/lng_lat_bounds.js diff --git a/js/geo/transform.js b/src/geo/transform.js similarity index 100% rename from js/geo/transform.js rename to src/geo/transform.js diff --git a/js/mapbox-gl.js b/src/index.js similarity index 100% rename from js/mapbox-gl.js rename to src/index.js diff --git a/js/render/draw_background.js b/src/render/draw_background.js similarity index 100% rename from js/render/draw_background.js rename to src/render/draw_background.js diff --git a/js/render/draw_circle.js b/src/render/draw_circle.js similarity index 100% rename from js/render/draw_circle.js rename to src/render/draw_circle.js diff --git a/js/render/draw_collision_debug.js b/src/render/draw_collision_debug.js similarity index 100% rename from js/render/draw_collision_debug.js rename to src/render/draw_collision_debug.js diff --git a/js/lib/debugtext.js b/src/render/draw_debug.js similarity index 82% rename from js/lib/debugtext.js rename to src/render/draw_debug.js index b7f388efca3..d46737d4cc6 100644 --- a/js/lib/debugtext.js +++ b/src/render/draw_debug.js @@ -1,5 +1,60 @@ 'use strict'; +const browser = require('../util/browser'); +const mat4 = require('@mapbox/gl-matrix').mat4; +const EXTENT = require('../data/extent'); +const Buffer = require('../data/buffer'); +const VertexArrayObject = require('./vertex_array_object'); +const PosArray = require('../data/pos_array'); + +module.exports = drawDebug; + +function drawDebug(painter, sourceCache, coords) { + for (let i = 0; i < coords.length; i++) { + drawDebugTile(painter, sourceCache, coords[i]); + } +} + +function drawDebugTile(painter, sourceCache, coord) { + const gl = painter.gl; + + gl.disable(gl.STENCIL_TEST); + painter.lineWidth(1 * browser.devicePixelRatio); + + const posMatrix = coord.posMatrix; + const program = painter.useProgram('debug'); + + gl.uniformMatrix4fv(program.u_matrix, false, posMatrix); + gl.uniform4f(program.u_color, 1, 0, 0, 1); + painter.debugVAO.bind(gl, program, painter.debugBuffer); + gl.drawArrays(gl.LINE_STRIP, 0, painter.debugBuffer.length); + + const vertices = createTextVerticies(coord.toString(), 50, 200, 5); + const debugTextArray = new PosArray(); + for (let v = 0; v < vertices.length; v += 2) { + debugTextArray.emplaceBack(vertices[v], vertices[v + 1]); + } + const debugTextBuffer = Buffer.fromStructArray(debugTextArray, Buffer.BufferType.VERTEX); + const debugTextVAO = new VertexArrayObject(); + debugTextVAO.bind(gl, program, debugTextBuffer); + gl.uniform4f(program.u_color, 1, 1, 1, 1); + + // Draw the halo with multiple 1px lines instead of one wider line because + // the gl spec doesn't guarantee support for lines with width > 1. + const tileSize = sourceCache.getTile(coord).tileSize; + const onePixel = EXTENT / (Math.pow(2, painter.transform.zoom - coord.z) * tileSize); + const translations = [[-1, -1], [-1, 1], [1, -1], [1, 1]]; + for (let i = 0; i < translations.length; i++) { + const translation = translations[i]; + gl.uniformMatrix4fv(program.u_matrix, false, mat4.translate([], posMatrix, [onePixel * translation[0], onePixel * translation[1], 0])); + gl.drawArrays(gl.LINES, 0, debugTextBuffer.length); + } + + gl.uniform4f(program.u_color, 0, 0, 0, 1); + gl.uniformMatrix4fv(program.u_matrix, false, posMatrix); + gl.drawArrays(gl.LINES, 0, debugTextBuffer.length); +} + // Font data From Hershey Simplex Font // http://paulbourke.net/dataformats/hershey/ const simplexFont = { @@ -100,7 +155,7 @@ const simplexFont = { "~": [24, [3, 6, 3, 8, 4, 11, 6, 12, 8, 12, 10, 11, 14, 8, 16, 7, 18, 7, 20, 8, 21, 10, -1, -1, 3, 8, 4, 10, 6, 11, 8, 11, 10, 10, 14, 7, 16, 6, 18, 6, 20, 7, 21, 10, 21, 12]] }; -module.exports = function textVertices(text, left, baseline, scale) { +function createTextVerticies(text, left, baseline, scale) { scale = scale || 1; const strokes = []; diff --git a/js/render/draw_fill.js b/src/render/draw_fill.js similarity index 100% rename from js/render/draw_fill.js rename to src/render/draw_fill.js diff --git a/js/render/draw_fill_extrusion.js b/src/render/draw_fill_extrusion.js similarity index 100% rename from js/render/draw_fill_extrusion.js rename to src/render/draw_fill_extrusion.js diff --git a/js/render/draw_line.js b/src/render/draw_line.js similarity index 100% rename from js/render/draw_line.js rename to src/render/draw_line.js diff --git a/js/render/draw_raster.js b/src/render/draw_raster.js similarity index 100% rename from js/render/draw_raster.js rename to src/render/draw_raster.js diff --git a/js/render/draw_symbol.js b/src/render/draw_symbol.js similarity index 100% rename from js/render/draw_symbol.js rename to src/render/draw_symbol.js diff --git a/js/render/frame_history.js b/src/render/frame_history.js similarity index 100% rename from js/render/frame_history.js rename to src/render/frame_history.js diff --git a/js/render/line_atlas.js b/src/render/line_atlas.js similarity index 100% rename from js/render/line_atlas.js rename to src/render/line_atlas.js diff --git a/js/render/painter.js b/src/render/painter.js similarity index 100% rename from js/render/painter.js rename to src/render/painter.js diff --git a/js/render/pattern.js b/src/render/pattern.js similarity index 100% rename from js/render/pattern.js rename to src/render/pattern.js diff --git a/src/render/shaders.js b/src/render/shaders.js new file mode 100644 index 00000000000..b4305c853b6 --- /dev/null +++ b/src/render/shaders.js @@ -0,0 +1,76 @@ +'use strict'; + +const fs = require('fs'); +const path = require('path'); + +// readFileSync calls must be written out long-form for brfs. +module.exports = { + prelude: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/_prelude.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/_prelude.vertex.glsl'), 'utf8') + }, + circle: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/circle.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/circle.vertex.glsl'), 'utf8') + }, + collisionBox: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/collision_box.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/collision_box.vertex.glsl'), 'utf8') + }, + debug: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/debug.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/debug.vertex.glsl'), 'utf8') + }, + fill: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill.vertex.glsl'), 'utf8') + }, + fillOutline: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_outline.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_outline.vertex.glsl'), 'utf8') + }, + fillOutlinePattern: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_outline_pattern.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_outline_pattern.vertex.glsl'), 'utf8') + }, + fillPattern: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_pattern.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_pattern.vertex.glsl'), 'utf8') + }, + fillExtrusion: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_extrusion.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_extrusion.vertex.glsl'), 'utf8') + }, + fillExtrusionPattern: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_extrusion_pattern.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_extrusion_pattern.vertex.glsl'), 'utf8') + }, + extrusionTexture: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/extrusion_texture.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/extrusion_texture.vertex.glsl'), 'utf8') + }, + line: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/line.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/line.vertex.glsl'), 'utf8') + }, + linePattern: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/line_pattern.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/line_pattern.vertex.glsl'), 'utf8') + }, + lineSDF: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/line_sdf.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/line_sdf.vertex.glsl'), 'utf8') + }, + raster: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/raster.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/raster.vertex.glsl'), 'utf8') + }, + symbolIcon: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/symbol_icon.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/symbol_icon.vertex.glsl'), 'utf8') + }, + symbolSDF: { + fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/symbol_sdf.fragment.glsl'), 'utf8'), + vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/symbol_sdf.vertex.glsl'), 'utf8') + } +}; diff --git a/js/render/vertex_array_object.js b/src/render/vertex_array_object.js similarity index 100% rename from js/render/vertex_array_object.js rename to src/render/vertex_array_object.js diff --git a/shaders/README.md b/src/shaders/README.md similarity index 100% rename from shaders/README.md rename to src/shaders/README.md diff --git a/shaders/_prelude.fragment.glsl b/src/shaders/_prelude.fragment.glsl similarity index 100% rename from shaders/_prelude.fragment.glsl rename to src/shaders/_prelude.fragment.glsl diff --git a/shaders/_prelude.vertex.glsl b/src/shaders/_prelude.vertex.glsl similarity index 100% rename from shaders/_prelude.vertex.glsl rename to src/shaders/_prelude.vertex.glsl diff --git a/shaders/circle.fragment.glsl b/src/shaders/circle.fragment.glsl similarity index 100% rename from shaders/circle.fragment.glsl rename to src/shaders/circle.fragment.glsl diff --git a/shaders/circle.vertex.glsl b/src/shaders/circle.vertex.glsl similarity index 100% rename from shaders/circle.vertex.glsl rename to src/shaders/circle.vertex.glsl diff --git a/shaders/collision_box.fragment.glsl b/src/shaders/collision_box.fragment.glsl similarity index 100% rename from shaders/collision_box.fragment.glsl rename to src/shaders/collision_box.fragment.glsl diff --git a/shaders/collision_box.vertex.glsl b/src/shaders/collision_box.vertex.glsl similarity index 100% rename from shaders/collision_box.vertex.glsl rename to src/shaders/collision_box.vertex.glsl diff --git a/shaders/debug.fragment.glsl b/src/shaders/debug.fragment.glsl similarity index 100% rename from shaders/debug.fragment.glsl rename to src/shaders/debug.fragment.glsl diff --git a/shaders/debug.vertex.glsl b/src/shaders/debug.vertex.glsl similarity index 100% rename from shaders/debug.vertex.glsl rename to src/shaders/debug.vertex.glsl diff --git a/shaders/extrusion_texture.fragment.glsl b/src/shaders/extrusion_texture.fragment.glsl similarity index 100% rename from shaders/extrusion_texture.fragment.glsl rename to src/shaders/extrusion_texture.fragment.glsl diff --git a/shaders/extrusion_texture.vertex.glsl b/src/shaders/extrusion_texture.vertex.glsl similarity index 100% rename from shaders/extrusion_texture.vertex.glsl rename to src/shaders/extrusion_texture.vertex.glsl diff --git a/shaders/fill.fragment.glsl b/src/shaders/fill.fragment.glsl similarity index 100% rename from shaders/fill.fragment.glsl rename to src/shaders/fill.fragment.glsl diff --git a/shaders/fill.vertex.glsl b/src/shaders/fill.vertex.glsl similarity index 100% rename from shaders/fill.vertex.glsl rename to src/shaders/fill.vertex.glsl diff --git a/shaders/fill_extrusion.fragment.glsl b/src/shaders/fill_extrusion.fragment.glsl similarity index 100% rename from shaders/fill_extrusion.fragment.glsl rename to src/shaders/fill_extrusion.fragment.glsl diff --git a/shaders/fill_extrusion.vertex.glsl b/src/shaders/fill_extrusion.vertex.glsl similarity index 100% rename from shaders/fill_extrusion.vertex.glsl rename to src/shaders/fill_extrusion.vertex.glsl diff --git a/shaders/fill_extrusion_pattern.fragment.glsl b/src/shaders/fill_extrusion_pattern.fragment.glsl similarity index 100% rename from shaders/fill_extrusion_pattern.fragment.glsl rename to src/shaders/fill_extrusion_pattern.fragment.glsl diff --git a/shaders/fill_extrusion_pattern.vertex.glsl b/src/shaders/fill_extrusion_pattern.vertex.glsl similarity index 100% rename from shaders/fill_extrusion_pattern.vertex.glsl rename to src/shaders/fill_extrusion_pattern.vertex.glsl diff --git a/shaders/fill_outline.fragment.glsl b/src/shaders/fill_outline.fragment.glsl similarity index 100% rename from shaders/fill_outline.fragment.glsl rename to src/shaders/fill_outline.fragment.glsl diff --git a/shaders/fill_outline.vertex.glsl b/src/shaders/fill_outline.vertex.glsl similarity index 100% rename from shaders/fill_outline.vertex.glsl rename to src/shaders/fill_outline.vertex.glsl diff --git a/shaders/fill_outline_pattern.fragment.glsl b/src/shaders/fill_outline_pattern.fragment.glsl similarity index 100% rename from shaders/fill_outline_pattern.fragment.glsl rename to src/shaders/fill_outline_pattern.fragment.glsl diff --git a/shaders/fill_outline_pattern.vertex.glsl b/src/shaders/fill_outline_pattern.vertex.glsl similarity index 100% rename from shaders/fill_outline_pattern.vertex.glsl rename to src/shaders/fill_outline_pattern.vertex.glsl diff --git a/shaders/fill_pattern.fragment.glsl b/src/shaders/fill_pattern.fragment.glsl similarity index 100% rename from shaders/fill_pattern.fragment.glsl rename to src/shaders/fill_pattern.fragment.glsl diff --git a/shaders/fill_pattern.vertex.glsl b/src/shaders/fill_pattern.vertex.glsl similarity index 100% rename from shaders/fill_pattern.vertex.glsl rename to src/shaders/fill_pattern.vertex.glsl diff --git a/shaders/line.fragment.glsl b/src/shaders/line.fragment.glsl similarity index 100% rename from shaders/line.fragment.glsl rename to src/shaders/line.fragment.glsl diff --git a/shaders/line.vertex.glsl b/src/shaders/line.vertex.glsl similarity index 100% rename from shaders/line.vertex.glsl rename to src/shaders/line.vertex.glsl diff --git a/shaders/line_pattern.fragment.glsl b/src/shaders/line_pattern.fragment.glsl similarity index 100% rename from shaders/line_pattern.fragment.glsl rename to src/shaders/line_pattern.fragment.glsl diff --git a/shaders/line_pattern.vertex.glsl b/src/shaders/line_pattern.vertex.glsl similarity index 100% rename from shaders/line_pattern.vertex.glsl rename to src/shaders/line_pattern.vertex.glsl diff --git a/shaders/line_sdf.fragment.glsl b/src/shaders/line_sdf.fragment.glsl similarity index 100% rename from shaders/line_sdf.fragment.glsl rename to src/shaders/line_sdf.fragment.glsl diff --git a/shaders/line_sdf.vertex.glsl b/src/shaders/line_sdf.vertex.glsl similarity index 100% rename from shaders/line_sdf.vertex.glsl rename to src/shaders/line_sdf.vertex.glsl diff --git a/shaders/raster.fragment.glsl b/src/shaders/raster.fragment.glsl similarity index 100% rename from shaders/raster.fragment.glsl rename to src/shaders/raster.fragment.glsl diff --git a/shaders/raster.vertex.glsl b/src/shaders/raster.vertex.glsl similarity index 100% rename from shaders/raster.vertex.glsl rename to src/shaders/raster.vertex.glsl diff --git a/shaders/symbol_icon.fragment.glsl b/src/shaders/symbol_icon.fragment.glsl similarity index 100% rename from shaders/symbol_icon.fragment.glsl rename to src/shaders/symbol_icon.fragment.glsl diff --git a/shaders/symbol_icon.vertex.glsl b/src/shaders/symbol_icon.vertex.glsl similarity index 100% rename from shaders/symbol_icon.vertex.glsl rename to src/shaders/symbol_icon.vertex.glsl diff --git a/shaders/symbol_sdf.fragment.glsl b/src/shaders/symbol_sdf.fragment.glsl similarity index 100% rename from shaders/symbol_sdf.fragment.glsl rename to src/shaders/symbol_sdf.fragment.glsl diff --git a/shaders/symbol_sdf.vertex.glsl b/src/shaders/symbol_sdf.vertex.glsl similarity index 100% rename from shaders/symbol_sdf.vertex.glsl rename to src/shaders/symbol_sdf.vertex.glsl diff --git a/js/source/canvas_source.js b/src/source/canvas_source.js similarity index 100% rename from js/source/canvas_source.js rename to src/source/canvas_source.js diff --git a/js/source/geojson_source.js b/src/source/geojson_source.js similarity index 100% rename from js/source/geojson_source.js rename to src/source/geojson_source.js diff --git a/js/source/geojson_worker_source.js b/src/source/geojson_worker_source.js similarity index 100% rename from js/source/geojson_worker_source.js rename to src/source/geojson_worker_source.js diff --git a/js/source/geojson_wrapper.js b/src/source/geojson_wrapper.js similarity index 100% rename from js/source/geojson_wrapper.js rename to src/source/geojson_wrapper.js diff --git a/js/source/image_source.js b/src/source/image_source.js similarity index 100% rename from js/source/image_source.js rename to src/source/image_source.js diff --git a/js/source/load_tilejson.js b/src/source/load_tilejson.js similarity index 100% rename from js/source/load_tilejson.js rename to src/source/load_tilejson.js diff --git a/js/source/pixels_to_tile_units.js b/src/source/pixels_to_tile_units.js similarity index 100% rename from js/source/pixels_to_tile_units.js rename to src/source/pixels_to_tile_units.js diff --git a/js/source/query_features.js b/src/source/query_features.js similarity index 100% rename from js/source/query_features.js rename to src/source/query_features.js diff --git a/js/source/raster_tile_source.js b/src/source/raster_tile_source.js similarity index 100% rename from js/source/raster_tile_source.js rename to src/source/raster_tile_source.js diff --git a/js/source/rtl_text_plugin.js b/src/source/rtl_text_plugin.js similarity index 100% rename from js/source/rtl_text_plugin.js rename to src/source/rtl_text_plugin.js diff --git a/js/source/source.js b/src/source/source.js similarity index 100% rename from js/source/source.js rename to src/source/source.js diff --git a/js/source/source_cache.js b/src/source/source_cache.js similarity index 100% rename from js/source/source_cache.js rename to src/source/source_cache.js diff --git a/js/source/tile.js b/src/source/tile.js similarity index 100% rename from js/source/tile.js rename to src/source/tile.js diff --git a/js/source/tile_coord.js b/src/source/tile_coord.js similarity index 100% rename from js/source/tile_coord.js rename to src/source/tile_coord.js diff --git a/js/source/vector_tile_source.js b/src/source/vector_tile_source.js similarity index 100% rename from js/source/vector_tile_source.js rename to src/source/vector_tile_source.js diff --git a/js/source/vector_tile_worker_source.js b/src/source/vector_tile_worker_source.js similarity index 100% rename from js/source/vector_tile_worker_source.js rename to src/source/vector_tile_worker_source.js diff --git a/js/source/video_source.js b/src/source/video_source.js similarity index 100% rename from js/source/video_source.js rename to src/source/video_source.js diff --git a/js/source/worker.js b/src/source/worker.js similarity index 100% rename from js/source/worker.js rename to src/source/worker.js diff --git a/js/source/worker_tile.js b/src/source/worker_tile.js similarity index 100% rename from js/source/worker_tile.js rename to src/source/worker_tile.js diff --git a/js/style-spec/CHANGELOG.md b/src/style-spec/CHANGELOG.md similarity index 100% rename from js/style-spec/CHANGELOG.md rename to src/style-spec/CHANGELOG.md diff --git a/js/style-spec/README.md b/src/style-spec/README.md similarity index 100% rename from js/style-spec/README.md rename to src/style-spec/README.md diff --git a/js/style-spec/bin/gl-style-composite b/src/style-spec/bin/gl-style-composite similarity index 100% rename from js/style-spec/bin/gl-style-composite rename to src/style-spec/bin/gl-style-composite diff --git a/js/style-spec/bin/gl-style-format b/src/style-spec/bin/gl-style-format similarity index 100% rename from js/style-spec/bin/gl-style-format rename to src/style-spec/bin/gl-style-format diff --git a/js/style-spec/bin/gl-style-migrate b/src/style-spec/bin/gl-style-migrate similarity index 100% rename from js/style-spec/bin/gl-style-migrate rename to src/style-spec/bin/gl-style-migrate diff --git a/js/style-spec/bin/gl-style-validate b/src/style-spec/bin/gl-style-validate similarity index 100% rename from js/style-spec/bin/gl-style-validate rename to src/style-spec/bin/gl-style-validate diff --git a/js/style-spec/composite.js b/src/style-spec/composite.js similarity index 100% rename from js/style-spec/composite.js rename to src/style-spec/composite.js diff --git a/js/style-spec/declass.js b/src/style-spec/declass.js similarity index 100% rename from js/style-spec/declass.js rename to src/style-spec/declass.js diff --git a/js/style-spec/deref.js b/src/style-spec/deref.js similarity index 100% rename from js/style-spec/deref.js rename to src/style-spec/deref.js diff --git a/js/style-spec/diff.js b/src/style-spec/diff.js similarity index 100% rename from js/style-spec/diff.js rename to src/style-spec/diff.js diff --git a/js/style-spec/error/parsing_error.js b/src/style-spec/error/parsing_error.js similarity index 100% rename from js/style-spec/error/parsing_error.js rename to src/style-spec/error/parsing_error.js diff --git a/js/style-spec/error/validation_error.js b/src/style-spec/error/validation_error.js similarity index 100% rename from js/style-spec/error/validation_error.js rename to src/style-spec/error/validation_error.js diff --git a/js/style-spec/feature_filter/README.md b/src/style-spec/feature_filter/README.md similarity index 100% rename from js/style-spec/feature_filter/README.md rename to src/style-spec/feature_filter/README.md diff --git a/js/style-spec/feature_filter/index.js b/src/style-spec/feature_filter/index.js similarity index 100% rename from js/style-spec/feature_filter/index.js rename to src/style-spec/feature_filter/index.js diff --git a/js/style-spec/format.js b/src/style-spec/format.js similarity index 100% rename from js/style-spec/format.js rename to src/style-spec/format.js diff --git a/js/style-spec/function/color_spaces.js b/src/style-spec/function/color_spaces.js similarity index 100% rename from js/style-spec/function/color_spaces.js rename to src/style-spec/function/color_spaces.js diff --git a/js/style-spec/function/index.js b/src/style-spec/function/index.js similarity index 100% rename from js/style-spec/function/index.js rename to src/style-spec/function/index.js diff --git a/js/style-spec/group_by_layout.js b/src/style-spec/group_by_layout.js similarity index 100% rename from js/style-spec/group_by_layout.js rename to src/style-spec/group_by_layout.js diff --git a/js/style-spec/index.js b/src/style-spec/index.js similarity index 100% rename from js/style-spec/index.js rename to src/style-spec/index.js diff --git a/js/style-spec/migrate.js b/src/style-spec/migrate.js similarity index 100% rename from js/style-spec/migrate.js rename to src/style-spec/migrate.js diff --git a/js/style-spec/migrate/v7.js b/src/style-spec/migrate/v7.js similarity index 99% rename from js/style-spec/migrate/v7.js rename to src/style-spec/migrate/v7.js index b05512bf67d..29ba4fc2146 100644 --- a/js/style-spec/migrate/v7.js +++ b/src/style-spec/migrate/v7.js @@ -160,7 +160,7 @@ module.exports = function(style) { return style; }; -// from mapbox-gl-js/js/style/style_declaration.js +// from mapbox-gl-js/src/style/style_declaration.js function parseNumberArray(array) { const widths = array.map(parseNumber); diff --git a/js/style-spec/migrate/v8.js b/src/style-spec/migrate/v8.js similarity index 100% rename from js/style-spec/migrate/v8.js rename to src/style-spec/migrate/v8.js diff --git a/js/style-spec/migrate/v9.js b/src/style-spec/migrate/v9.js similarity index 100% rename from js/style-spec/migrate/v9.js rename to src/style-spec/migrate/v9.js diff --git a/js/style-spec/minifyify_style_spec.js b/src/style-spec/minifyify_style_spec.js similarity index 100% rename from js/style-spec/minifyify_style_spec.js rename to src/style-spec/minifyify_style_spec.js diff --git a/js/style-spec/package.json b/src/style-spec/package.json similarity index 100% rename from js/style-spec/package.json rename to src/style-spec/package.json diff --git a/js/style-spec/reference/latest.js b/src/style-spec/reference/latest.js similarity index 100% rename from js/style-spec/reference/latest.js rename to src/style-spec/reference/latest.js diff --git a/js/style-spec/reference/v6.json b/src/style-spec/reference/v6.json similarity index 100% rename from js/style-spec/reference/v6.json rename to src/style-spec/reference/v6.json diff --git a/js/style-spec/reference/v7.json b/src/style-spec/reference/v7.json similarity index 100% rename from js/style-spec/reference/v7.json rename to src/style-spec/reference/v7.json diff --git a/js/style-spec/reference/v8.json b/src/style-spec/reference/v8.json similarity index 100% rename from js/style-spec/reference/v8.json rename to src/style-spec/reference/v8.json diff --git a/js/style-spec/util/extend.js b/src/style-spec/util/extend.js similarity index 100% rename from js/style-spec/util/extend.js rename to src/style-spec/util/extend.js diff --git a/js/style-spec/util/get_type.js b/src/style-spec/util/get_type.js similarity index 100% rename from js/style-spec/util/get_type.js rename to src/style-spec/util/get_type.js diff --git a/js/style-spec/util/parse_color.js b/src/style-spec/util/parse_color.js similarity index 100% rename from js/style-spec/util/parse_color.js rename to src/style-spec/util/parse_color.js diff --git a/js/style-spec/util/ref_properties.js b/src/style-spec/util/ref_properties.js similarity index 100% rename from js/style-spec/util/ref_properties.js rename to src/style-spec/util/ref_properties.js diff --git a/js/style-spec/util/unbundle_jsonlint.js b/src/style-spec/util/unbundle_jsonlint.js similarity index 100% rename from js/style-spec/util/unbundle_jsonlint.js rename to src/style-spec/util/unbundle_jsonlint.js diff --git a/js/style-spec/validate/latest.js b/src/style-spec/validate/latest.js similarity index 100% rename from js/style-spec/validate/latest.js rename to src/style-spec/validate/latest.js diff --git a/js/style-spec/validate/validate.js b/src/style-spec/validate/validate.js similarity index 100% rename from js/style-spec/validate/validate.js rename to src/style-spec/validate/validate.js diff --git a/js/style-spec/validate/validate_array.js b/src/style-spec/validate/validate_array.js similarity index 100% rename from js/style-spec/validate/validate_array.js rename to src/style-spec/validate/validate_array.js diff --git a/js/style-spec/validate/validate_boolean.js b/src/style-spec/validate/validate_boolean.js similarity index 100% rename from js/style-spec/validate/validate_boolean.js rename to src/style-spec/validate/validate_boolean.js diff --git a/js/style-spec/validate/validate_color.js b/src/style-spec/validate/validate_color.js similarity index 100% rename from js/style-spec/validate/validate_color.js rename to src/style-spec/validate/validate_color.js diff --git a/js/style-spec/validate/validate_constants.js b/src/style-spec/validate/validate_constants.js similarity index 100% rename from js/style-spec/validate/validate_constants.js rename to src/style-spec/validate/validate_constants.js diff --git a/js/style-spec/validate/validate_enum.js b/src/style-spec/validate/validate_enum.js similarity index 100% rename from js/style-spec/validate/validate_enum.js rename to src/style-spec/validate/validate_enum.js diff --git a/js/style-spec/validate/validate_filter.js b/src/style-spec/validate/validate_filter.js similarity index 100% rename from js/style-spec/validate/validate_filter.js rename to src/style-spec/validate/validate_filter.js diff --git a/js/style-spec/validate/validate_function.js b/src/style-spec/validate/validate_function.js similarity index 100% rename from js/style-spec/validate/validate_function.js rename to src/style-spec/validate/validate_function.js diff --git a/js/style-spec/validate/validate_glyphs_url.js b/src/style-spec/validate/validate_glyphs_url.js similarity index 100% rename from js/style-spec/validate/validate_glyphs_url.js rename to src/style-spec/validate/validate_glyphs_url.js diff --git a/js/style-spec/validate/validate_layer.js b/src/style-spec/validate/validate_layer.js similarity index 100% rename from js/style-spec/validate/validate_layer.js rename to src/style-spec/validate/validate_layer.js diff --git a/js/style-spec/validate/validate_layout_property.js b/src/style-spec/validate/validate_layout_property.js similarity index 100% rename from js/style-spec/validate/validate_layout_property.js rename to src/style-spec/validate/validate_layout_property.js diff --git a/js/style-spec/validate/validate_light.js b/src/style-spec/validate/validate_light.js similarity index 100% rename from js/style-spec/validate/validate_light.js rename to src/style-spec/validate/validate_light.js diff --git a/js/style-spec/validate/validate_number.js b/src/style-spec/validate/validate_number.js similarity index 100% rename from js/style-spec/validate/validate_number.js rename to src/style-spec/validate/validate_number.js diff --git a/js/style-spec/validate/validate_object.js b/src/style-spec/validate/validate_object.js similarity index 100% rename from js/style-spec/validate/validate_object.js rename to src/style-spec/validate/validate_object.js diff --git a/js/style-spec/validate/validate_paint_property.js b/src/style-spec/validate/validate_paint_property.js similarity index 100% rename from js/style-spec/validate/validate_paint_property.js rename to src/style-spec/validate/validate_paint_property.js diff --git a/js/style-spec/validate/validate_property.js b/src/style-spec/validate/validate_property.js similarity index 100% rename from js/style-spec/validate/validate_property.js rename to src/style-spec/validate/validate_property.js diff --git a/js/style-spec/validate/validate_source.js b/src/style-spec/validate/validate_source.js similarity index 100% rename from js/style-spec/validate/validate_source.js rename to src/style-spec/validate/validate_source.js diff --git a/js/style-spec/validate/validate_string.js b/src/style-spec/validate/validate_string.js similarity index 100% rename from js/style-spec/validate/validate_string.js rename to src/style-spec/validate/validate_string.js diff --git a/js/style-spec/validate_style.js b/src/style-spec/validate_style.js similarity index 100% rename from js/style-spec/validate_style.js rename to src/style-spec/validate_style.js diff --git a/js/style-spec/validate_style.min.js b/src/style-spec/validate_style.min.js similarity index 100% rename from js/style-spec/validate_style.min.js rename to src/style-spec/validate_style.min.js diff --git a/js/style-spec/yarn.lock b/src/style-spec/yarn.lock similarity index 100% rename from js/style-spec/yarn.lock rename to src/style-spec/yarn.lock diff --git a/js/style/animation_loop.js b/src/style/animation_loop.js similarity index 100% rename from js/style/animation_loop.js rename to src/style/animation_loop.js diff --git a/js/style/image_sprite.js b/src/style/image_sprite.js similarity index 100% rename from js/style/image_sprite.js rename to src/style/image_sprite.js diff --git a/js/style/light.js b/src/style/light.js similarity index 100% rename from js/style/light.js rename to src/style/light.js diff --git a/js/style/style.js b/src/style/style.js similarity index 99% rename from js/style/style.js rename to src/style/style.js index 09965291705..79c6c97af92 100644 --- a/js/style/style.js +++ b/src/style/style.js @@ -20,7 +20,7 @@ const QueryFeatures = require('../source/query_features'); const SourceCache = require('../source/source_cache'); const styleSpec = require('../style-spec/reference/latest'); const MapboxGLFunction = require('../style-spec/function'); -const getWorkerPool = require('../global_worker_pool'); +const getWorkerPool = require('../util/global_worker_pool'); const deref = require('../style-spec/deref'); const diff = require('../style-spec/diff'); const rtlTextPlugin = require('../source/rtl_text_plugin'); diff --git a/js/style/style_declaration.js b/src/style/style_declaration.js similarity index 100% rename from js/style/style_declaration.js rename to src/style/style_declaration.js diff --git a/js/style/style_layer.js b/src/style/style_layer.js similarity index 100% rename from js/style/style_layer.js rename to src/style/style_layer.js diff --git a/js/style/style_layer/circle_style_layer.js b/src/style/style_layer/circle_style_layer.js similarity index 100% rename from js/style/style_layer/circle_style_layer.js rename to src/style/style_layer/circle_style_layer.js diff --git a/js/style/style_layer/fill_extrusion_style_layer.js b/src/style/style_layer/fill_extrusion_style_layer.js similarity index 100% rename from js/style/style_layer/fill_extrusion_style_layer.js rename to src/style/style_layer/fill_extrusion_style_layer.js diff --git a/js/style/style_layer/fill_style_layer.js b/src/style/style_layer/fill_style_layer.js similarity index 100% rename from js/style/style_layer/fill_style_layer.js rename to src/style/style_layer/fill_style_layer.js diff --git a/js/style/style_layer/line_style_layer.js b/src/style/style_layer/line_style_layer.js similarity index 100% rename from js/style/style_layer/line_style_layer.js rename to src/style/style_layer/line_style_layer.js diff --git a/js/style/style_layer/symbol_style_layer.js b/src/style/style_layer/symbol_style_layer.js similarity index 100% rename from js/style/style_layer/symbol_style_layer.js rename to src/style/style_layer/symbol_style_layer.js diff --git a/js/style/style_layer_index.js b/src/style/style_layer_index.js similarity index 100% rename from js/style/style_layer_index.js rename to src/style/style_layer_index.js diff --git a/js/style/style_transition.js b/src/style/style_transition.js similarity index 100% rename from js/style/style_transition.js rename to src/style/style_transition.js diff --git a/js/style/validate_style.js b/src/style/validate_style.js similarity index 100% rename from js/style/validate_style.js rename to src/style/validate_style.js diff --git a/js/symbol/anchor.js b/src/symbol/anchor.js similarity index 100% rename from js/symbol/anchor.js rename to src/symbol/anchor.js diff --git a/js/symbol/check_max_angle.js b/src/symbol/check_max_angle.js similarity index 100% rename from js/symbol/check_max_angle.js rename to src/symbol/check_max_angle.js diff --git a/js/symbol/clip_line.js b/src/symbol/clip_line.js similarity index 100% rename from js/symbol/clip_line.js rename to src/symbol/clip_line.js diff --git a/js/symbol/collision_box.js b/src/symbol/collision_box.js similarity index 100% rename from js/symbol/collision_box.js rename to src/symbol/collision_box.js diff --git a/js/symbol/collision_feature.js b/src/symbol/collision_feature.js similarity index 100% rename from js/symbol/collision_feature.js rename to src/symbol/collision_feature.js diff --git a/js/symbol/collision_tile.js b/src/symbol/collision_tile.js similarity index 100% rename from js/symbol/collision_tile.js rename to src/symbol/collision_tile.js diff --git a/js/symbol/get_anchors.js b/src/symbol/get_anchors.js similarity index 100% rename from js/symbol/get_anchors.js rename to src/symbol/get_anchors.js diff --git a/js/symbol/glyph_atlas.js b/src/symbol/glyph_atlas.js similarity index 100% rename from js/symbol/glyph_atlas.js rename to src/symbol/glyph_atlas.js diff --git a/js/symbol/glyph_source.js b/src/symbol/glyph_source.js similarity index 100% rename from js/symbol/glyph_source.js rename to src/symbol/glyph_source.js diff --git a/js/symbol/mergelines.js b/src/symbol/mergelines.js similarity index 100% rename from js/symbol/mergelines.js rename to src/symbol/mergelines.js diff --git a/js/symbol/quads.js b/src/symbol/quads.js similarity index 100% rename from js/symbol/quads.js rename to src/symbol/quads.js diff --git a/js/symbol/resolve_text.js b/src/symbol/resolve_text.js similarity index 100% rename from js/symbol/resolve_text.js rename to src/symbol/resolve_text.js diff --git a/js/symbol/shaping.js b/src/symbol/shaping.js similarity index 100% rename from js/symbol/shaping.js rename to src/symbol/shaping.js diff --git a/js/symbol/sprite_atlas.js b/src/symbol/sprite_atlas.js similarity index 100% rename from js/symbol/sprite_atlas.js rename to src/symbol/sprite_atlas.js diff --git a/js/symbol/symbol_instances.js b/src/symbol/symbol_instances.js similarity index 100% rename from js/symbol/symbol_instances.js rename to src/symbol/symbol_instances.js diff --git a/js/symbol/symbol_quads.js b/src/symbol/symbol_quads.js similarity index 100% rename from js/symbol/symbol_quads.js rename to src/symbol/symbol_quads.js diff --git a/js/ui/bind_handlers.js b/src/ui/bind_handlers.js similarity index 100% rename from js/ui/bind_handlers.js rename to src/ui/bind_handlers.js diff --git a/js/ui/camera.js b/src/ui/camera.js similarity index 100% rename from js/ui/camera.js rename to src/ui/camera.js diff --git a/js/ui/control/attribution_control.js b/src/ui/control/attribution_control.js similarity index 100% rename from js/ui/control/attribution_control.js rename to src/ui/control/attribution_control.js diff --git a/js/ui/control/geolocate_control.js b/src/ui/control/geolocate_control.js similarity index 100% rename from js/ui/control/geolocate_control.js rename to src/ui/control/geolocate_control.js diff --git a/js/ui/control/logo_control.js b/src/ui/control/logo_control.js similarity index 100% rename from js/ui/control/logo_control.js rename to src/ui/control/logo_control.js diff --git a/js/ui/control/navigation_control.js b/src/ui/control/navigation_control.js similarity index 100% rename from js/ui/control/navigation_control.js rename to src/ui/control/navigation_control.js diff --git a/js/ui/control/scale_control.js b/src/ui/control/scale_control.js similarity index 100% rename from js/ui/control/scale_control.js rename to src/ui/control/scale_control.js diff --git a/js/ui/handler/box_zoom.js b/src/ui/handler/box_zoom.js similarity index 100% rename from js/ui/handler/box_zoom.js rename to src/ui/handler/box_zoom.js diff --git a/js/ui/handler/dblclick_zoom.js b/src/ui/handler/dblclick_zoom.js similarity index 100% rename from js/ui/handler/dblclick_zoom.js rename to src/ui/handler/dblclick_zoom.js diff --git a/js/ui/handler/drag_pan.js b/src/ui/handler/drag_pan.js similarity index 100% rename from js/ui/handler/drag_pan.js rename to src/ui/handler/drag_pan.js diff --git a/js/ui/handler/drag_rotate.js b/src/ui/handler/drag_rotate.js similarity index 100% rename from js/ui/handler/drag_rotate.js rename to src/ui/handler/drag_rotate.js diff --git a/js/ui/handler/keyboard.js b/src/ui/handler/keyboard.js similarity index 100% rename from js/ui/handler/keyboard.js rename to src/ui/handler/keyboard.js diff --git a/js/ui/handler/scroll_zoom.js b/src/ui/handler/scroll_zoom.js similarity index 100% rename from js/ui/handler/scroll_zoom.js rename to src/ui/handler/scroll_zoom.js diff --git a/js/ui/handler/touch_zoom_rotate.js b/src/ui/handler/touch_zoom_rotate.js similarity index 100% rename from js/ui/handler/touch_zoom_rotate.js rename to src/ui/handler/touch_zoom_rotate.js diff --git a/js/ui/hash.js b/src/ui/hash.js similarity index 100% rename from js/ui/hash.js rename to src/ui/hash.js diff --git a/js/ui/map.js b/src/ui/map.js similarity index 100% rename from js/ui/map.js rename to src/ui/map.js diff --git a/js/ui/marker.js b/src/ui/marker.js similarity index 100% rename from js/ui/marker.js rename to src/ui/marker.js diff --git a/js/ui/popup.js b/src/ui/popup.js similarity index 100% rename from js/ui/popup.js rename to src/ui/popup.js diff --git a/js/util/actor.js b/src/util/actor.js similarity index 100% rename from js/util/actor.js rename to src/util/actor.js diff --git a/js/util/ajax.js b/src/util/ajax.js similarity index 100% rename from js/util/ajax.js rename to src/util/ajax.js diff --git a/js/util/browser.js b/src/util/browser.js similarity index 100% rename from js/util/browser.js rename to src/util/browser.js diff --git a/js/util/browser/web_worker.js b/src/util/browser/web_worker.js similarity index 100% rename from js/util/browser/web_worker.js rename to src/util/browser/web_worker.js diff --git a/js/util/browser/window.js b/src/util/browser/window.js similarity index 100% rename from js/util/browser/window.js rename to src/util/browser/window.js diff --git a/js/util/classify_rings.js b/src/util/classify_rings.js similarity index 100% rename from js/util/classify_rings.js rename to src/util/classify_rings.js diff --git a/js/util/config.js b/src/util/config.js similarity index 100% rename from js/util/config.js rename to src/util/config.js diff --git a/js/util/dictionary_coder.js b/src/util/dictionary_coder.js similarity index 100% rename from js/util/dictionary_coder.js rename to src/util/dictionary_coder.js diff --git a/js/util/dispatcher.js b/src/util/dispatcher.js similarity index 100% rename from js/util/dispatcher.js rename to src/util/dispatcher.js diff --git a/js/util/dom.js b/src/util/dom.js similarity index 100% rename from js/util/dom.js rename to src/util/dom.js diff --git a/js/util/evented.js b/src/util/evented.js similarity index 100% rename from js/util/evented.js rename to src/util/evented.js diff --git a/js/util/find_pole_of_inaccessibility.js b/src/util/find_pole_of_inaccessibility.js similarity index 100% rename from js/util/find_pole_of_inaccessibility.js rename to src/util/find_pole_of_inaccessibility.js diff --git a/js/global_worker_pool.js b/src/util/global_worker_pool.js similarity index 86% rename from js/global_worker_pool.js rename to src/util/global_worker_pool.js index 4449c1facbd..4ed453514ab 100644 --- a/js/global_worker_pool.js +++ b/src/util/global_worker_pool.js @@ -1,5 +1,5 @@ 'use strict'; -const WorkerPool = require('./util/worker_pool'); +const WorkerPool = require('./worker_pool'); let globalWorkerPool; diff --git a/js/util/glyphs.js b/src/util/glyphs.js similarity index 100% rename from js/util/glyphs.js rename to src/util/glyphs.js diff --git a/js/util/interpolate.js b/src/util/interpolate.js similarity index 100% rename from js/util/interpolate.js rename to src/util/interpolate.js diff --git a/js/util/intersection_tests.js b/src/util/intersection_tests.js similarity index 100% rename from js/util/intersection_tests.js rename to src/util/intersection_tests.js diff --git a/js/util/is_char_in_unicode_block.js b/src/util/is_char_in_unicode_block.js similarity index 100% rename from js/util/is_char_in_unicode_block.js rename to src/util/is_char_in_unicode_block.js diff --git a/js/util/lru_cache.js b/src/util/lru_cache.js similarity index 100% rename from js/util/lru_cache.js rename to src/util/lru_cache.js diff --git a/js/util/mapbox.js b/src/util/mapbox.js similarity index 100% rename from js/util/mapbox.js rename to src/util/mapbox.js diff --git a/js/util/script_detection.js b/src/util/script_detection.js similarity index 100% rename from js/util/script_detection.js rename to src/util/script_detection.js diff --git a/js/util/struct_array.js b/src/util/struct_array.js similarity index 100% rename from js/util/struct_array.js rename to src/util/struct_array.js diff --git a/js/util/token.js b/src/util/token.js similarity index 100% rename from js/util/token.js rename to src/util/token.js diff --git a/js/util/util.js b/src/util/util.js similarity index 100% rename from js/util/util.js rename to src/util/util.js diff --git a/js/util/vectortile_to_geojson.js b/src/util/vectortile_to_geojson.js similarity index 100% rename from js/util/vectortile_to_geojson.js rename to src/util/vectortile_to_geojson.js diff --git a/js/util/verticalize_punctuation.js b/src/util/verticalize_punctuation.js similarity index 100% rename from js/util/verticalize_punctuation.js rename to src/util/verticalize_punctuation.js diff --git a/js/util/web_worker.js b/src/util/web_worker.js similarity index 100% rename from js/util/web_worker.js rename to src/util/web_worker.js diff --git a/js/util/window.js b/src/util/window.js similarity index 100% rename from js/util/window.js rename to src/util/window.js diff --git a/js/util/worker_pool.js b/src/util/worker_pool.js similarity index 93% rename from js/util/worker_pool.js rename to src/util/worker_pool.js index ce08edaaa1c..484a65a5a7d 100644 --- a/js/util/worker_pool.js +++ b/src/util/worker_pool.js @@ -17,7 +17,7 @@ class WorkerPool { // Lazily look up the value of mapboxgl.workerCount. This allows // client code a chance to set it while circumventing cyclic // dependency problems - const workerCount = require('../mapbox-gl').workerCount; + const workerCount = require('../').workerCount; assert(typeof workerCount === 'number' && workerCount < Infinity); this.workers = []; diff --git a/test/build/min.test.js b/test/build/min.test.js index af2dea6e296..c8398ea04f0 100644 --- a/test/build/min.test.js +++ b/test/build/min.test.js @@ -3,7 +3,7 @@ const test = require('mapbox-gl-js-test').test; const fs = require('fs'); const pkg = require('../../package.json'); -const reference = require('../../js/style-spec/reference/latest'); +const reference = require('../../src/style-spec/reference/latest'); const minBundle = fs.readFileSync('dist/mapbox-gl.js', 'utf8'); diff --git a/test/suite_implementation.js b/test/suite_implementation.js index 4b9ef66037b..87c171f2de9 100644 --- a/test/suite_implementation.js +++ b/test/suite_implementation.js @@ -1,13 +1,13 @@ 'use strict'; -const ajax = require('../js/util/ajax'); +const ajax = require('../src/util/ajax'); const sinon = require('sinon'); const request = require('request'); const PNG = require('pngjs').PNG; -const Map = require('../js/ui/map'); -const window = require('../js/util/window'); -const browser = require('../js/util/browser'); -const rtlTextPlugin = require('../js/source/rtl_text_plugin'); +const Map = require('../src/ui/map'); +const window = require('../src/util/window'); +const browser = require('../src/util/browser'); +const rtlTextPlugin = require('../src/source/rtl_text_plugin'); const rtlText = require('@mapbox/mapbox-gl-rtl-text'); rtlTextPlugin['applyArabicShaping'] = rtlText.applyArabicShaping; diff --git a/test/js/data/bucket.test.js b/test/unit/data/bucket.test.js similarity index 92% rename from test/js/data/bucket.test.js rename to test/unit/data/bucket.test.js index c14e6306a51..e18971962dd 100644 --- a/test/js/data/bucket.test.js +++ b/test/unit/data/bucket.test.js @@ -1,13 +1,13 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Bucket = require('../../../js/data/bucket'); -const createVertexArrayType = require('../../../js/data/vertex_array_type'); -const createElementArrayType = require('../../../js/data/element_array_type'); -const FeatureIndex = require('../../../js/data/feature_index'); -const StyleLayer = require('../../../js/style/style_layer'); -const featureFilter = require('../../../js/style-spec/feature_filter'); -const TileCoord = require('../../../js/source/tile_coord'); +const Bucket = require('../../../src/data/bucket'); +const createVertexArrayType = require('../../../src/data/vertex_array_type'); +const createElementArrayType = require('../../../src/data/element_array_type'); +const FeatureIndex = require('../../../src/data/feature_index'); +const StyleLayer = require('../../../src/style/style_layer'); +const featureFilter = require('../../../src/style-spec/feature_filter'); +const TileCoord = require('../../../src/source/tile_coord'); test('Bucket', (t) => { function createFeature(x, y) { diff --git a/test/js/data/buffer.test.js b/test/unit/data/buffer.test.js similarity index 90% rename from test/js/data/buffer.test.js rename to test/unit/data/buffer.test.js index a02055bd91d..1b357c1bf8b 100644 --- a/test/js/data/buffer.test.js +++ b/test/unit/data/buffer.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Buffer = require('../../../js/data/buffer'); -const StructArrayType = require('../../../js/util/struct_array'); +const Buffer = require('../../../src/data/buffer'); +const StructArrayType = require('../../../src/util/struct_array'); test('Buffer', (t) => { diff --git a/test/js/data/fill_bucket.test.js b/test/unit/data/fill_bucket.test.js similarity index 94% rename from test/js/data/fill_bucket.test.js rename to test/unit/data/fill_bucket.test.js index d76c0bb7215..03628dafa82 100644 --- a/test/js/data/fill_bucket.test.js +++ b/test/unit/data/fill_bucket.test.js @@ -6,9 +6,9 @@ const path = require('path'); const Protobuf = require('pbf'); const VectorTile = require('vector-tile').VectorTile; const Point = require('point-geometry'); -const ArrayGroup = require('../../../js/data/array_group'); -const FillBucket = require('../../../js/data/bucket/fill_bucket'); -const StyleLayer = require('../../../js/style/style_layer'); +const ArrayGroup = require('../../../src/data/array_group'); +const FillBucket = require('../../../src/data/bucket/fill_bucket'); +const StyleLayer = require('../../../src/style/style_layer'); // Load a fill feature from fixture tile. const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))); diff --git a/test/js/data/line_bucket.test.js b/test/unit/data/line_bucket.test.js similarity index 93% rename from test/js/data/line_bucket.test.js rename to test/unit/data/line_bucket.test.js index ebfed167597..a6ea572d29b 100644 --- a/test/js/data/line_bucket.test.js +++ b/test/unit/data/line_bucket.test.js @@ -6,9 +6,9 @@ const path = require('path'); const Protobuf = require('pbf'); const VectorTile = require('vector-tile').VectorTile; const Point = require('point-geometry'); -const ArrayGroup = require('../../../js/data/array_group'); -const LineBucket = require('../../../js/data/bucket/line_bucket'); -const StyleLayer = require('../../../js/style/style_layer'); +const ArrayGroup = require('../../../src/data/array_group'); +const LineBucket = require('../../../src/data/bucket/line_bucket'); +const StyleLayer = require('../../../src/style/style_layer'); // Load a line feature from fixture tile. const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))); diff --git a/test/js/data/load_geometry.test.js b/test/unit/data/load_geometry.test.js similarity index 94% rename from test/js/data/load_geometry.test.js rename to test/unit/data/load_geometry.test.js index cf7b6f327be..93f93809a16 100644 --- a/test/js/data/load_geometry.test.js +++ b/test/unit/data/load_geometry.test.js @@ -5,7 +5,7 @@ const fs = require('fs'); const path = require('path'); const Protobuf = require('pbf'); const VectorTile = require('vector-tile').VectorTile; -const loadGeometry = require('../../../js/data/load_geometry.js'); +const loadGeometry = require('../../../src/data/load_geometry.js'); // Load a line feature from fixture tile. const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))); diff --git a/test/js/data/symbol_bucket.test.js b/test/unit/data/symbol_bucket.test.js similarity index 83% rename from test/js/data/symbol_bucket.test.js rename to test/unit/data/symbol_bucket.test.js index 9b149196949..72b1def1d48 100644 --- a/test/js/data/symbol_bucket.test.js +++ b/test/unit/data/symbol_bucket.test.js @@ -5,15 +5,15 @@ const fs = require('fs'); const path = require('path'); const Protobuf = require('pbf'); const VectorTile = require('vector-tile').VectorTile; -const SymbolBucket = require('../../../js/data/bucket/symbol_bucket'); -const Collision = require('../../../js/symbol/collision_tile'); -const CollisionBoxArray = require('../../../js/symbol/collision_box'); -const SymbolInstancesArray = require('../../../js/symbol/symbol_instances'); -const SymbolQuadsArray = require('../../../js/symbol/symbol_quads'); -const GlyphAtlas = require('../../../js/symbol/glyph_atlas'); -const StyleLayer = require('../../../js/style/style_layer'); -const util = require('../../../js/util/util'); -const featureFilter = require('../../../js/style-spec/feature_filter'); +const SymbolBucket = require('../../../src/data/bucket/symbol_bucket'); +const Collision = require('../../../src/symbol/collision_tile'); +const CollisionBoxArray = require('../../../src/symbol/collision_box'); +const SymbolInstancesArray = require('../../../src/symbol/symbol_instances'); +const SymbolQuadsArray = require('../../../src/symbol/symbol_quads'); +const GlyphAtlas = require('../../../src/symbol/glyph_atlas'); +const StyleLayer = require('../../../src/style/style_layer'); +const util = require('../../../src/util/util'); +const featureFilter = require('../../../src/style-spec/feature_filter'); // Load a point feature from fixture tile. const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))); diff --git a/test/js/geo/coordinate.test.js b/test/unit/geo/coordinate.test.js similarity index 95% rename from test/js/geo/coordinate.test.js rename to test/unit/geo/coordinate.test.js index 2a6f0abd627..cc3565b029e 100644 --- a/test/js/geo/coordinate.test.js +++ b/test/unit/geo/coordinate.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Coordinate = require('../../../js/geo/coordinate'); +const Coordinate = require('../../../src/geo/coordinate'); test('Coordinate', (t) => { t.test('#constructor', (t) => { diff --git a/test/js/geo/lng_lat.test.js b/test/unit/geo/lng_lat.test.js similarity index 97% rename from test/js/geo/lng_lat.test.js rename to test/unit/geo/lng_lat.test.js index 0f0e5ff09d5..8387f8e7113 100644 --- a/test/js/geo/lng_lat.test.js +++ b/test/unit/geo/lng_lat.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const LngLat = require('../../../js/geo/lng_lat'); +const LngLat = require('../../../src/geo/lng_lat'); test('LngLat', (t) => { t.test('#constructor', (t) => { diff --git a/test/js/geo/lng_lat_bounds.test.js b/test/unit/geo/lng_lat_bounds.test.js similarity index 97% rename from test/js/geo/lng_lat_bounds.test.js rename to test/unit/geo/lng_lat_bounds.test.js index 76bd843e3fd..337b3e8c792 100644 --- a/test/js/geo/lng_lat_bounds.test.js +++ b/test/unit/geo/lng_lat_bounds.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const LngLat = require('../../../js/geo/lng_lat'); -const LngLatBounds = require('../../../js/geo/lng_lat_bounds'); +const LngLat = require('../../../src/geo/lng_lat'); +const LngLatBounds = require('../../../src/geo/lng_lat_bounds'); test('LngLatBounds', (t) => { t.test('#constructor', (t) => { diff --git a/test/js/geo/transform.test.js b/test/unit/geo/transform.test.js similarity index 97% rename from test/js/geo/transform.test.js rename to test/unit/geo/transform.test.js index 7b1ae13acac..6770f86ff3d 100644 --- a/test/js/geo/transform.test.js +++ b/test/unit/geo/transform.test.js @@ -2,9 +2,9 @@ const test = require('mapbox-gl-js-test').test; const Point = require('point-geometry'); -const Transform = require('../../../js/geo/transform'); -const TileCoord = require('../../../js/source/tile_coord'); -const LngLat = require('../../../js/geo/lng_lat'); +const Transform = require('../../../src/geo/transform'); +const TileCoord = require('../../../src/source/tile_coord'); +const LngLat = require('../../../src/geo/lng_lat'); const fixed = require('mapbox-gl-js-test/fixed'); const fixedLngLat = fixed.LngLat; diff --git a/test/js/mapbox-gl.js b/test/unit/mapbox-gl.js similarity index 86% rename from test/js/mapbox-gl.js rename to test/unit/mapbox-gl.js index a83885f202f..d47e3b3728f 100644 --- a/test/js/mapbox-gl.js +++ b/test/unit/mapbox-gl.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const mapboxgl = require('../../js/mapbox-gl'); +const mapboxgl = require('../../src'); test('mapboxgl', (t) => { t.test('version', (t) => { diff --git a/test/js/source/canvas_source.test.js b/test/unit/source/canvas_source.test.js similarity index 89% rename from test/js/source/canvas_source.test.js rename to test/unit/source/canvas_source.test.js index d9b73b99991..71ee25a3a3c 100644 --- a/test/js/source/canvas_source.test.js +++ b/test/unit/source/canvas_source.test.js @@ -1,11 +1,11 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const CanvasSource = require('../../../js/source/canvas_source'); -const Transform = require('../../../js/geo/transform'); -const Evented = require('../../../js/util/evented'); -const util = require('../../../js/util/util'); -const window = require('../../../js/util/window'); +const CanvasSource = require('../../../src/source/canvas_source'); +const Transform = require('../../../src/geo/transform'); +const Evented = require('../../../src/util/evented'); +const util = require('../../../src/util/util'); +const window = require('../../../src/util/window'); function createSource(options) { window.useFakeHTMLCanvasGetContext(); diff --git a/test/js/source/geojson_source.test.js b/test/unit/source/geojson_source.test.js similarity index 95% rename from test/js/source/geojson_source.test.js rename to test/unit/source/geojson_source.test.js index 55b55c4b4f7..14fc5a19629 100644 --- a/test/js/source/geojson_source.test.js +++ b/test/unit/source/geojson_source.test.js @@ -1,11 +1,11 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Tile = require('../../../js/source/tile'); -const TileCoord = require('../../../js/source/tile_coord'); -const GeoJSONSource = require('../../../js/source/geojson_source'); -const Transform = require('../../../js/geo/transform'); -const LngLat = require('../../../js/geo/lng_lat'); +const Tile = require('../../../src/source/tile'); +const TileCoord = require('../../../src/source/tile_coord'); +const GeoJSONSource = require('../../../src/source/geojson_source'); +const Transform = require('../../../src/geo/transform'); +const LngLat = require('../../../src/geo/lng_lat'); const mockDispatcher = { send: function () {} diff --git a/test/js/source/geojson_worker_source.test.js b/test/unit/source/geojson_worker_source.test.js similarity index 89% rename from test/js/source/geojson_worker_source.test.js rename to test/unit/source/geojson_worker_source.test.js index 628a291cda7..7b9e17ef224 100644 --- a/test/js/source/geojson_worker_source.test.js +++ b/test/unit/source/geojson_worker_source.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const GeoJSONWorkerSource = require('../../../js/source/geojson_worker_source'); -const StyleLayerIndex = require('../../../js/style/style_layer_index'); +const GeoJSONWorkerSource = require('../../../src/source/geojson_worker_source'); +const StyleLayerIndex = require('../../../src/style/style_layer_index'); test('removeSource', (t) => { t.test('removes the source from _geoJSONIndexes', (t) => { diff --git a/test/js/source/geojson_wrapper.test.js b/test/unit/source/geojson_wrapper.test.js similarity index 93% rename from test/js/source/geojson_wrapper.test.js rename to test/unit/source/geojson_wrapper.test.js index 1cb964bb715..0b600585fb6 100644 --- a/test/js/source/geojson_wrapper.test.js +++ b/test/unit/source/geojson_wrapper.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Wrapper = require('../../../js/source/geojson_wrapper'); +const Wrapper = require('../../../src/source/geojson_wrapper'); test('geojsonwrapper', (t) => { diff --git a/test/js/source/query_features.test.js b/test/unit/source/query_features.test.js similarity index 86% rename from test/js/source/query_features.test.js rename to test/unit/source/query_features.test.js index 652abc75e12..4fe87e999f8 100644 --- a/test/js/source/query_features.test.js +++ b/test/unit/source/query_features.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const QueryFeatures = require('../../../js/source/query_features.js'); -const SourceCache = require('../../../js/source/source_cache.js'); +const QueryFeatures = require('../../../src/source/query_features.js'); +const SourceCache = require('../../../src/source/source_cache.js'); test('QueryFeatures#rendered', (t) => { t.test('returns empty object if source returns no tiles', (t) => { diff --git a/test/js/source/source_cache.test.js b/test/unit/source/source_cache.test.js similarity index 97% rename from test/js/source/source_cache.test.js rename to test/unit/source/source_cache.test.js index 170e0101996..f4a603904f4 100644 --- a/test/js/source/source_cache.test.js +++ b/test/unit/source/source_cache.test.js @@ -1,16 +1,16 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const SourceCache = require('../../../js/source/source_cache'); -const AnimationLoop = require('../../../js/style/animation_loop'); -const Source = require('../../../js/source/source'); -const Tile = require('../../../js/source/tile'); -const TileCoord = require('../../../js/source/tile_coord'); -const Transform = require('../../../js/geo/transform'); -const LngLat = require('../../../js/geo/lng_lat'); -const Coordinate = require('../../../js/geo/coordinate'); -const Evented = require('../../../js/util/evented'); -const util = require('../../../js/util/util'); +const SourceCache = require('../../../src/source/source_cache'); +const AnimationLoop = require('../../../src/style/animation_loop'); +const Source = require('../../../src/source/source'); +const Tile = require('../../../src/source/tile'); +const TileCoord = require('../../../src/source/tile_coord'); +const Transform = require('../../../src/geo/transform'); +const LngLat = require('../../../src/geo/lng_lat'); +const Coordinate = require('../../../src/geo/coordinate'); +const Evented = require('../../../src/util/evented'); +const util = require('../../../src/util/util'); // Add a mocked source type for use in these tests function MockSourceType(id, sourceOptions, _dispatcher, eventedParent) { diff --git a/test/js/source/tile.test.js b/test/unit/source/tile.test.js similarity index 91% rename from test/js/source/tile.test.js rename to test/unit/source/tile.test.js index f712cfa84e2..3ba57ec0f29 100644 --- a/test/js/source/tile.test.js +++ b/test/unit/source/tile.test.js @@ -1,18 +1,18 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Tile = require('../../../js/source/tile'); -const GeoJSONWrapper = require('../../../js/source/geojson_wrapper'); -const TileCoord = require('../../../js/source/tile_coord'); +const Tile = require('../../../src/source/tile'); +const GeoJSONWrapper = require('../../../src/source/geojson_wrapper'); +const TileCoord = require('../../../src/source/tile_coord'); const fs = require('fs'); const path = require('path'); const vtpbf = require('vt-pbf'); -const FeatureIndex = require('../../../js/data/feature_index'); -const CollisionTile = require('../../../js/symbol/collision_tile'); -const CollisionBoxArray = require('../../../js/symbol/collision_box'); -const SymbolInstancesArray = require('../../../js/symbol/symbol_instances'); -const SymbolQuadsArray = require('../../../js/symbol/symbol_quads'); -const util = require('../../../js/util/util'); +const FeatureIndex = require('../../../src/data/feature_index'); +const CollisionTile = require('../../../src/symbol/collision_tile'); +const CollisionBoxArray = require('../../../src/symbol/collision_box'); +const SymbolInstancesArray = require('../../../src/symbol/symbol_instances'); +const SymbolQuadsArray = require('../../../src/symbol/symbol_quads'); +const util = require('../../../src/util/util'); test('querySourceFeatures', (t) => { const features = [{ diff --git a/test/js/source/tile_coord.test.js b/test/unit/source/tile_coord.test.js similarity index 99% rename from test/js/source/tile_coord.test.js rename to test/unit/source/tile_coord.test.js index fb3cd261a60..da969b655eb 100644 --- a/test/js/source/tile_coord.test.js +++ b/test/unit/source/tile_coord.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const TileCoord = require('../../../js/source/tile_coord'); +const TileCoord = require('../../../src/source/tile_coord'); test('TileCoord', (t) => { t.test('#constructor', (t) => { diff --git a/test/js/source/vector_tile_source.test.js b/test/unit/source/vector_tile_source.test.js similarity index 95% rename from test/js/source/vector_tile_source.test.js rename to test/unit/source/vector_tile_source.test.js index 4dcced1880c..48f38a781df 100644 --- a/test/js/source/vector_tile_source.test.js +++ b/test/unit/source/vector_tile_source.test.js @@ -1,10 +1,10 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const VectorTileSource = require('../../../js/source/vector_tile_source'); -const TileCoord = require('../../../js/source/tile_coord'); -const window = require('../../../js/util/window'); -const Evented = require('../../../js/util/evented'); +const VectorTileSource = require('../../../src/source/vector_tile_source'); +const TileCoord = require('../../../src/source/tile_coord'); +const window = require('../../../src/util/window'); +const Evented = require('../../../src/util/evented'); function createSource(options) { const source = new VectorTileSource('id', options, { send: function() {} }, options.eventedParent); diff --git a/test/js/source/vector_tile_worker_source.test.js b/test/unit/source/vector_tile_worker_source.test.js similarity index 93% rename from test/js/source/vector_tile_worker_source.test.js rename to test/unit/source/vector_tile_worker_source.test.js index ab5cbb37e5a..954c681de48 100644 --- a/test/js/source/vector_tile_worker_source.test.js +++ b/test/unit/source/vector_tile_worker_source.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const VectorTileWorkerSource = require('../../../js/source/vector_tile_worker_source'); -const StyleLayerIndex = require('../../../js/style/style_layer_index'); +const VectorTileWorkerSource = require('../../../src/source/vector_tile_worker_source'); +const StyleLayerIndex = require('../../../src/style/style_layer_index'); test('abortTile', (t) => { t.test('aborts pending request', (t) => { diff --git a/test/js/source/worker.test.js b/test/unit/source/worker.test.js similarity index 94% rename from test/js/source/worker.test.js rename to test/unit/source/worker.test.js index 4591a39e180..e3ebc0015a9 100644 --- a/test/js/source/worker.test.js +++ b/test/unit/source/worker.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Worker = require('../../../js/source/worker'); -const window = require('../../../js/util/window'); +const Worker = require('../../../src/source/worker'); +const window = require('../../../src/util/window'); const _self = { addEventListener: function() {} diff --git a/test/js/source/worker_tile.test.js b/test/unit/source/worker_tile.test.js similarity index 87% rename from test/js/source/worker_tile.test.js rename to test/unit/source/worker_tile.test.js index 5949872f5e8..fb54cce121e 100644 --- a/test/js/source/worker_tile.test.js +++ b/test/unit/source/worker_tile.test.js @@ -1,11 +1,11 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const WorkerTile = require('../../../js/source/worker_tile'); -const Wrapper = require('../../../js/source/geojson_wrapper'); -const TileCoord = require('../../../js/source/tile_coord'); -const StyleLayerIndex = require('../../../js/style/style_layer_index'); -const util = require('../../../js/util/util'); +const WorkerTile = require('../../../src/source/worker_tile'); +const Wrapper = require('../../../src/source/geojson_wrapper'); +const TileCoord = require('../../../src/source/tile_coord'); +const StyleLayerIndex = require('../../../src/style/style_layer_index'); +const util = require('../../../src/util/util'); function createWorkerTile() { return new WorkerTile({ diff --git a/test/js/style-spec/composite.test.js b/test/unit/style-spec/composite.test.js similarity index 95% rename from test/js/style-spec/composite.test.js rename to test/unit/style-spec/composite.test.js index ea998936f31..ac6e7627445 100644 --- a/test/js/style-spec/composite.test.js +++ b/test/unit/style-spec/composite.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const composite = require('../../../js/style-spec/composite'); +const composite = require('../../../src/style-spec/composite'); test('composites Mapbox vector sources', (t) => { const result = composite({ diff --git a/test/js/style-spec/declass.test.js b/test/unit/style-spec/declass.test.js similarity index 98% rename from test/js/style-spec/declass.test.js rename to test/unit/style-spec/declass.test.js index ff942081d81..5f9b4a01765 100644 --- a/test/js/style-spec/declass.test.js +++ b/test/unit/style-spec/declass.test.js @@ -1,7 +1,7 @@ 'use strict'; const t = require('mapbox-gl-js-test').test; -const declass = require('../../../js/style-spec/declass'); +const declass = require('../../../src/style-spec/declass'); t('declass a style, one class', (t) => { const style = { diff --git a/test/js/style-spec/deref.test.js b/test/unit/style-spec/deref.test.js similarity index 94% rename from test/js/style-spec/deref.test.js rename to test/unit/style-spec/deref.test.js index ffb4db31b62..9e2e03083d6 100644 --- a/test/js/style-spec/deref.test.js +++ b/test/unit/style-spec/deref.test.js @@ -1,7 +1,7 @@ 'use strict'; const t = require('mapbox-gl-js-test').test, - deref = require('../../../js/style-spec/deref'); + deref = require('../../../src/style-spec/deref'); t('derefs a ref layer which follows its parent', (t) => { t.deepEqual(deref([ diff --git a/test/js/style-spec/diff.test.js b/test/unit/style-spec/diff.test.js similarity index 99% rename from test/js/style-spec/diff.test.js rename to test/unit/style-spec/diff.test.js index 983847818f6..99b1c8b5d00 100644 --- a/test/js/style-spec/diff.test.js +++ b/test/unit/style-spec/diff.test.js @@ -1,7 +1,7 @@ 'use strict'; const t = require('mapbox-gl-js-test').test, - diffStyles = require('../../../js/style-spec/diff'); + diffStyles = require('../../../src/style-spec/diff'); t('diff', (t) => { diff --git a/test/js/style-spec/feature_filter.test.js b/test/unit/style-spec/feature_filter.test.js similarity index 99% rename from test/js/style-spec/feature_filter.test.js rename to test/unit/style-spec/feature_filter.test.js index 86c3c11c690..3077bf90c8f 100644 --- a/test/js/style-spec/feature_filter.test.js +++ b/test/unit/style-spec/feature_filter.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const filter = require('../../../js/style-spec').featureFilter; +const filter = require('../../../src/style-spec').featureFilter; test('degenerate', (t) => { t.equal(filter()(), true); diff --git a/test/js/style-spec/fixture/bad-color.input.json b/test/unit/style-spec/fixture/bad-color.input.json similarity index 100% rename from test/js/style-spec/fixture/bad-color.input.json rename to test/unit/style-spec/fixture/bad-color.input.json diff --git a/test/js/style-spec/fixture/bad-color.output.json b/test/unit/style-spec/fixture/bad-color.output.json similarity index 100% rename from test/js/style-spec/fixture/bad-color.output.json rename to test/unit/style-spec/fixture/bad-color.output.json diff --git a/test/js/style-spec/fixture/constants-v7.input.json b/test/unit/style-spec/fixture/constants-v7.input.json similarity index 100% rename from test/js/style-spec/fixture/constants-v7.input.json rename to test/unit/style-spec/fixture/constants-v7.input.json diff --git a/test/js/style-spec/fixture/constants-v7.output.json b/test/unit/style-spec/fixture/constants-v7.output.json similarity index 100% rename from test/js/style-spec/fixture/constants-v7.output.json rename to test/unit/style-spec/fixture/constants-v7.output.json diff --git a/test/js/style-spec/fixture/constants-v8.input.json b/test/unit/style-spec/fixture/constants-v8.input.json similarity index 100% rename from test/js/style-spec/fixture/constants-v8.input.json rename to test/unit/style-spec/fixture/constants-v8.input.json diff --git a/test/js/style-spec/fixture/constants-v8.output.json b/test/unit/style-spec/fixture/constants-v8.output.json similarity index 100% rename from test/js/style-spec/fixture/constants-v8.output.json rename to test/unit/style-spec/fixture/constants-v8.output.json diff --git a/test/js/style-spec/fixture/extrakeys.input.json b/test/unit/style-spec/fixture/extrakeys.input.json similarity index 100% rename from test/js/style-spec/fixture/extrakeys.input.json rename to test/unit/style-spec/fixture/extrakeys.input.json diff --git a/test/js/style-spec/fixture/extrakeys.output.json b/test/unit/style-spec/fixture/extrakeys.output.json similarity index 100% rename from test/js/style-spec/fixture/extrakeys.output.json rename to test/unit/style-spec/fixture/extrakeys.output.json diff --git a/test/js/style-spec/fixture/filters.input.json b/test/unit/style-spec/fixture/filters.input.json similarity index 100% rename from test/js/style-spec/fixture/filters.input.json rename to test/unit/style-spec/fixture/filters.input.json diff --git a/test/js/style-spec/fixture/filters.output.json b/test/unit/style-spec/fixture/filters.output.json similarity index 100% rename from test/js/style-spec/fixture/filters.output.json rename to test/unit/style-spec/fixture/filters.output.json diff --git a/test/js/style-spec/fixture/functions.input.json b/test/unit/style-spec/fixture/functions.input.json similarity index 100% rename from test/js/style-spec/fixture/functions.input.json rename to test/unit/style-spec/fixture/functions.input.json diff --git a/test/js/style-spec/fixture/functions.output.json b/test/unit/style-spec/fixture/functions.output.json similarity index 100% rename from test/js/style-spec/fixture/functions.output.json rename to test/unit/style-spec/fixture/functions.output.json diff --git a/test/js/style-spec/fixture/invalidjson.input.json b/test/unit/style-spec/fixture/invalidjson.input.json similarity index 100% rename from test/js/style-spec/fixture/invalidjson.input.json rename to test/unit/style-spec/fixture/invalidjson.input.json diff --git a/test/js/style-spec/fixture/invalidjson.output.json b/test/unit/style-spec/fixture/invalidjson.output.json similarity index 100% rename from test/js/style-spec/fixture/invalidjson.output.json rename to test/unit/style-spec/fixture/invalidjson.output.json diff --git a/test/js/style-spec/fixture/layers.input.json b/test/unit/style-spec/fixture/layers.input.json similarity index 100% rename from test/js/style-spec/fixture/layers.input.json rename to test/unit/style-spec/fixture/layers.input.json diff --git a/test/js/style-spec/fixture/layers.output.json b/test/unit/style-spec/fixture/layers.output.json similarity index 100% rename from test/js/style-spec/fixture/layers.output.json rename to test/unit/style-spec/fixture/layers.output.json diff --git a/test/js/style-spec/fixture/light-arbitrary.input.json b/test/unit/style-spec/fixture/light-arbitrary.input.json similarity index 100% rename from test/js/style-spec/fixture/light-arbitrary.input.json rename to test/unit/style-spec/fixture/light-arbitrary.input.json diff --git a/test/js/style-spec/fixture/light-arbitrary.output.json b/test/unit/style-spec/fixture/light-arbitrary.output.json similarity index 100% rename from test/js/style-spec/fixture/light-arbitrary.output.json rename to test/unit/style-spec/fixture/light-arbitrary.output.json diff --git a/test/js/style-spec/fixture/light.input.json b/test/unit/style-spec/fixture/light.input.json similarity index 100% rename from test/js/style-spec/fixture/light.input.json rename to test/unit/style-spec/fixture/light.input.json diff --git a/test/js/style-spec/fixture/light.output.json b/test/unit/style-spec/fixture/light.output.json similarity index 100% rename from test/js/style-spec/fixture/light.output.json rename to test/unit/style-spec/fixture/light.output.json diff --git a/test/js/style-spec/fixture/malformed-glyphs-type.input.json b/test/unit/style-spec/fixture/malformed-glyphs-type.input.json similarity index 100% rename from test/js/style-spec/fixture/malformed-glyphs-type.input.json rename to test/unit/style-spec/fixture/malformed-glyphs-type.input.json diff --git a/test/js/style-spec/fixture/malformed-glyphs-type.output.json b/test/unit/style-spec/fixture/malformed-glyphs-type.output.json similarity index 100% rename from test/js/style-spec/fixture/malformed-glyphs-type.output.json rename to test/unit/style-spec/fixture/malformed-glyphs-type.output.json diff --git a/test/js/style-spec/fixture/malformed-glyphs.input.json b/test/unit/style-spec/fixture/malformed-glyphs.input.json similarity index 100% rename from test/js/style-spec/fixture/malformed-glyphs.input.json rename to test/unit/style-spec/fixture/malformed-glyphs.input.json diff --git a/test/js/style-spec/fixture/malformed-glyphs.output.json b/test/unit/style-spec/fixture/malformed-glyphs.output.json similarity index 100% rename from test/js/style-spec/fixture/malformed-glyphs.output.json rename to test/unit/style-spec/fixture/malformed-glyphs.output.json diff --git a/test/js/style-spec/fixture/map-properties.input.json b/test/unit/style-spec/fixture/map-properties.input.json similarity index 100% rename from test/js/style-spec/fixture/map-properties.input.json rename to test/unit/style-spec/fixture/map-properties.input.json diff --git a/test/js/style-spec/fixture/map-properties.output.json b/test/unit/style-spec/fixture/map-properties.output.json similarity index 100% rename from test/js/style-spec/fixture/map-properties.output.json rename to test/unit/style-spec/fixture/map-properties.output.json diff --git a/test/js/style-spec/fixture/metadata.input.json b/test/unit/style-spec/fixture/metadata.input.json similarity index 100% rename from test/js/style-spec/fixture/metadata.input.json rename to test/unit/style-spec/fixture/metadata.input.json diff --git a/test/js/style-spec/fixture/metadata.output.json b/test/unit/style-spec/fixture/metadata.output.json similarity index 100% rename from test/js/style-spec/fixture/metadata.output.json rename to test/unit/style-spec/fixture/metadata.output.json diff --git a/test/js/style-spec/fixture/missing-glyphs.input.json b/test/unit/style-spec/fixture/missing-glyphs.input.json similarity index 100% rename from test/js/style-spec/fixture/missing-glyphs.input.json rename to test/unit/style-spec/fixture/missing-glyphs.input.json diff --git a/test/js/style-spec/fixture/missing-glyphs.output.json b/test/unit/style-spec/fixture/missing-glyphs.output.json similarity index 100% rename from test/js/style-spec/fixture/missing-glyphs.output.json rename to test/unit/style-spec/fixture/missing-glyphs.output.json diff --git a/test/js/style-spec/fixture/missing-sprite.input.json b/test/unit/style-spec/fixture/missing-sprite.input.json similarity index 100% rename from test/js/style-spec/fixture/missing-sprite.input.json rename to test/unit/style-spec/fixture/missing-sprite.input.json diff --git a/test/js/style-spec/fixture/missing-sprite.output.json b/test/unit/style-spec/fixture/missing-sprite.output.json similarity index 100% rename from test/js/style-spec/fixture/missing-sprite.output.json rename to test/unit/style-spec/fixture/missing-sprite.output.json diff --git a/test/js/style-spec/fixture/no-sources.input.json b/test/unit/style-spec/fixture/no-sources.input.json similarity index 100% rename from test/js/style-spec/fixture/no-sources.input.json rename to test/unit/style-spec/fixture/no-sources.input.json diff --git a/test/js/style-spec/fixture/no-sources.output.json b/test/unit/style-spec/fixture/no-sources.output.json similarity index 100% rename from test/js/style-spec/fixture/no-sources.output.json rename to test/unit/style-spec/fixture/no-sources.output.json diff --git a/test/js/style-spec/fixture/pitch.input.json b/test/unit/style-spec/fixture/pitch.input.json similarity index 100% rename from test/js/style-spec/fixture/pitch.input.json rename to test/unit/style-spec/fixture/pitch.input.json diff --git a/test/js/style-spec/fixture/pitch.output.json b/test/unit/style-spec/fixture/pitch.output.json similarity index 100% rename from test/js/style-spec/fixture/pitch.output.json rename to test/unit/style-spec/fixture/pitch.output.json diff --git a/test/js/style-spec/fixture/properties.input.json b/test/unit/style-spec/fixture/properties.input.json similarity index 100% rename from test/js/style-spec/fixture/properties.input.json rename to test/unit/style-spec/fixture/properties.input.json diff --git a/test/js/style-spec/fixture/properties.output.json b/test/unit/style-spec/fixture/properties.output.json similarity index 100% rename from test/js/style-spec/fixture/properties.output.json rename to test/unit/style-spec/fixture/properties.output.json diff --git a/test/js/style-spec/fixture/required.input.json b/test/unit/style-spec/fixture/required.input.json similarity index 100% rename from test/js/style-spec/fixture/required.input.json rename to test/unit/style-spec/fixture/required.input.json diff --git a/test/js/style-spec/fixture/required.output.json b/test/unit/style-spec/fixture/required.output.json similarity index 100% rename from test/js/style-spec/fixture/required.output.json rename to test/unit/style-spec/fixture/required.output.json diff --git a/test/js/style-spec/fixture/root-properties.input.json b/test/unit/style-spec/fixture/root-properties.input.json similarity index 100% rename from test/js/style-spec/fixture/root-properties.input.json rename to test/unit/style-spec/fixture/root-properties.input.json diff --git a/test/js/style-spec/fixture/root-properties.output.json b/test/unit/style-spec/fixture/root-properties.output.json similarity index 100% rename from test/js/style-spec/fixture/root-properties.output.json rename to test/unit/style-spec/fixture/root-properties.output.json diff --git a/test/js/style-spec/fixture/sources.input.json b/test/unit/style-spec/fixture/sources.input.json similarity index 100% rename from test/js/style-spec/fixture/sources.input.json rename to test/unit/style-spec/fixture/sources.input.json diff --git a/test/js/style-spec/fixture/sources.output.json b/test/unit/style-spec/fixture/sources.output.json similarity index 100% rename from test/js/style-spec/fixture/sources.output.json rename to test/unit/style-spec/fixture/sources.output.json diff --git a/test/js/style-spec/fixture/text-font.input.json b/test/unit/style-spec/fixture/text-font.input.json similarity index 100% rename from test/js/style-spec/fixture/text-font.input.json rename to test/unit/style-spec/fixture/text-font.input.json diff --git a/test/js/style-spec/fixture/text-font.output.json b/test/unit/style-spec/fixture/text-font.output.json similarity index 100% rename from test/js/style-spec/fixture/text-font.output.json rename to test/unit/style-spec/fixture/text-font.output.json diff --git a/test/js/style-spec/fixture/unknown-keys-nested.input.json b/test/unit/style-spec/fixture/unknown-keys-nested.input.json similarity index 100% rename from test/js/style-spec/fixture/unknown-keys-nested.input.json rename to test/unit/style-spec/fixture/unknown-keys-nested.input.json diff --git a/test/js/style-spec/fixture/unknown-keys-nested.output.json b/test/unit/style-spec/fixture/unknown-keys-nested.output.json similarity index 100% rename from test/js/style-spec/fixture/unknown-keys-nested.output.json rename to test/unit/style-spec/fixture/unknown-keys-nested.output.json diff --git a/test/js/style-spec/fixture/v6.input.json b/test/unit/style-spec/fixture/v6.input.json similarity index 100% rename from test/js/style-spec/fixture/v6.input.json rename to test/unit/style-spec/fixture/v6.input.json diff --git a/test/js/style-spec/fixture/v6.output.json b/test/unit/style-spec/fixture/v6.output.json similarity index 100% rename from test/js/style-spec/fixture/v6.output.json rename to test/unit/style-spec/fixture/v6.output.json diff --git a/test/js/style-spec/fixture/v7-migrate/style-basic.input.json b/test/unit/style-spec/fixture/v7-migrate/style-basic.input.json similarity index 100% rename from test/js/style-spec/fixture/v7-migrate/style-basic.input.json rename to test/unit/style-spec/fixture/v7-migrate/style-basic.input.json diff --git a/test/js/style-spec/fixture/v7-migrate/style-basic.output.json b/test/unit/style-spec/fixture/v7-migrate/style-basic.output.json similarity index 100% rename from test/js/style-spec/fixture/v7-migrate/style-basic.output.json rename to test/unit/style-spec/fixture/v7-migrate/style-basic.output.json diff --git a/test/js/style-spec/format.test.js b/test/unit/style-spec/format.test.js similarity index 92% rename from test/js/style-spec/format.test.js rename to test/unit/style-spec/format.test.js index d999e55c3da..16e2e1c5bb8 100644 --- a/test/js/style-spec/format.test.js +++ b/test/unit/style-spec/format.test.js @@ -1,7 +1,7 @@ 'use strict'; const t = require('mapbox-gl-js-test').test, - format = require('../../../js/style-spec/format'); + format = require('../../../src/style-spec/format'); function roundtrip(style) { return JSON.parse(format(style)); diff --git a/test/js/style-spec/function.test.js b/test/unit/style-spec/function.test.js similarity index 99% rename from test/js/style-spec/function.test.js rename to test/unit/style-spec/function.test.js index c3e08d36d00..cea030d60fd 100644 --- a/test/js/style-spec/function.test.js +++ b/test/unit/style-spec/function.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const createFunction = require('../../../js/style-spec/function'); +const createFunction = require('../../../src/style-spec/function'); test('constant function', (t) => { t.test('number', (t) => { diff --git a/test/js/style-spec/group_by_layout.test.js b/test/unit/style-spec/group_by_layout.test.js similarity index 95% rename from test/js/style-spec/group_by_layout.test.js rename to test/unit/style-spec/group_by_layout.test.js index 33aef4716d9..a703336e942 100644 --- a/test/js/style-spec/group_by_layout.test.js +++ b/test/unit/style-spec/group_by_layout.test.js @@ -1,7 +1,7 @@ 'use strict'; const t = require('mapbox-gl-js-test').test, - group = require('../../../js/style-spec/group_by_layout'); + group = require('../../../src/style-spec/group_by_layout'); t('group layers whose ref properties are identical', (t) => { const a = { diff --git a/test/js/style-spec/migrate.test.js b/test/unit/style-spec/migrate.test.js similarity index 79% rename from test/js/style-spec/migrate.test.js rename to test/unit/style-spec/migrate.test.js index c2c20ef48a0..bbe5435b3b6 100644 --- a/test/js/style-spec/migrate.test.js +++ b/test/unit/style-spec/migrate.test.js @@ -4,11 +4,11 @@ const t = require('mapbox-gl-js-test').test, fs = require('fs'), glob = require('glob'), - spec = require('../../../js/style-spec'), + spec = require('../../../src/style-spec'), path = require('path'), - validate = require('../../../js/style-spec').validate, - v8 = require('../../../js/style-spec/reference/v8'), - migrate = require('../../../js/style-spec').migrate; + validate = require('../../../src/style-spec').validate, + v8 = require('../../../src/style-spec/reference/v8'), + migrate = require('../../../src/style-spec').migrate; const UPDATE = !!process.env.UPDATE; diff --git a/test/js/style-spec/migrate/v7.js b/test/unit/style-spec/migrate/v7.js similarity index 83% rename from test/js/style-spec/migrate/v7.js rename to test/unit/style-spec/migrate/v7.js index f496b0ea1b3..37ce8f12274 100644 --- a/test/js/style-spec/migrate/v7.js +++ b/test/unit/style-spec/migrate/v7.js @@ -1,7 +1,7 @@ 'use strict'; const t = require('mapbox-gl-js-test').test, - migrate = require('../../../../js/style-spec/migrate/v7'); + migrate = require('../../../../src/style-spec/migrate/v7'); t('remove prerendered layer', (t) => { t.deepEqual(migrate({ diff --git a/test/js/style-spec/migrate/v8.js b/test/unit/style-spec/migrate/v8.js similarity index 99% rename from test/js/style-spec/migrate/v8.js rename to test/unit/style-spec/migrate/v8.js index c5c6b5c9852..fa5bed8e43c 100644 --- a/test/js/style-spec/migrate/v8.js +++ b/test/unit/style-spec/migrate/v8.js @@ -1,7 +1,7 @@ 'use strict'; const t = require('mapbox-gl-js-test').test, - migrate = require('../../../../js/style-spec/migrate/v8'); + migrate = require('../../../../src/style-spec/migrate/v8'); t('split text-font', (t) => { const input = { diff --git a/test/js/style-spec/migrate/v9.js b/test/unit/style-spec/migrate/v9.js similarity index 96% rename from test/js/style-spec/migrate/v9.js rename to test/unit/style-spec/migrate/v9.js index 8a0fcefade6..9c4aba4d625 100644 --- a/test/js/style-spec/migrate/v9.js +++ b/test/unit/style-spec/migrate/v9.js @@ -1,7 +1,7 @@ 'use strict'; const t = require('mapbox-gl-js-test').test, - migrate = require('../../../../js/style-spec/migrate/v9'); + migrate = require('../../../../src/style-spec/migrate/v9'); t('deref layers', (t) => { const input = { diff --git a/test/js/style-spec/parse_color.js b/test/unit/style-spec/parse_color.js similarity index 83% rename from test/js/style-spec/parse_color.js rename to test/unit/style-spec/parse_color.js index 9052e8123b8..c52d4ac4553 100644 --- a/test/js/style-spec/parse_color.js +++ b/test/unit/style-spec/parse_color.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const parseColor = require('../../../js/style-spec/util/parse_color'); +const parseColor = require('../../../src/style-spec/util/parse_color'); test('parseColor', (t) => { t.deepEqual(parseColor('red'), [ 1, 0, 0, 1 ]); diff --git a/test/js/style-spec/spec.test.js b/test/unit/style-spec/spec.test.js similarity index 99% rename from test/js/style-spec/spec.test.js rename to test/unit/style-spec/spec.test.js index 4b0816eb333..44e3fcf9c19 100644 --- a/test/js/style-spec/spec.test.js +++ b/test/unit/style-spec/spec.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const spec = require('../../../js/style-spec'); +const spec = require('../../../src/style-spec'); ['v6', 'v7', 'v8', 'latest'].forEach((version) => { ['', 'min'].forEach((kind) => { diff --git a/test/js/style-spec/validate.test.js b/test/unit/style-spec/validate.test.js similarity index 91% rename from test/js/style-spec/validate.test.js rename to test/unit/style-spec/validate.test.js index 5c40ccc98ef..ffd90a5f5a5 100644 --- a/test/js/style-spec/validate.test.js +++ b/test/unit/style-spec/validate.test.js @@ -5,7 +5,7 @@ const t = require('mapbox-gl-js-test').test, glob = require('glob'), fs = require('fs'), path = require('path'), - validate = require('../../../js/style-spec').validate; + validate = require('../../../src/style-spec').validate; const UPDATE = !!process.env.UPDATE; @@ -23,7 +23,7 @@ glob.sync(`${__dirname}/fixture/*.input.json`).forEach((file) => { const fixtures = glob.sync(`${__dirname}/fixture/*.input.json`); const style = JSON.parse(fs.readFileSync(fixtures[0])); -const reference = require('../../../js/style-spec/reference/latest'); +const reference = require('../../../src/style-spec/reference/latest'); t('validate.parsed exists', (t) => { t.equal(typeof validate.parsed, 'function'); diff --git a/test/js/style/animation_loop.test.js b/test/unit/style/animation_loop.test.js similarity index 88% rename from test/js/style/animation_loop.test.js rename to test/unit/style/animation_loop.test.js index 7e93b161a76..8fbb1e20418 100644 --- a/test/js/style/animation_loop.test.js +++ b/test/unit/style/animation_loop.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const AnimationLoop = require('../../../js/style/animation_loop'); +const AnimationLoop = require('../../../src/style/animation_loop'); test('animationloop', (t) => { const loop = new AnimationLoop(); diff --git a/test/js/style/light.test.js b/test/unit/style/light.test.js similarity index 96% rename from test/js/style/light.test.js rename to test/unit/style/light.test.js index b6ac70eaf75..d119e56c183 100644 --- a/test/js/style/light.test.js +++ b/test/unit/style/light.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Light = require('../../../js/style/light'); -const spec = require('../../../js/style-spec/reference/latest').light; +const Light = require('../../../src/style/light'); +const spec = require('../../../src/style-spec/reference/latest').light; test('Light', (t) => { t.test('creates default light with no options', (t) => { diff --git a/test/js/style/style.test.js b/test/unit/style/style.test.js similarity index 98% rename from test/js/style/style.test.js rename to test/unit/style/style.test.js index 7411755c3f4..75233b39c57 100644 --- a/test/js/style/style.test.js +++ b/test/unit/style/style.test.js @@ -2,12 +2,12 @@ const test = require('mapbox-gl-js-test').test; const proxyquire = require('proxyquire'); -const Style = require('../../../js/style/style'); -const SourceCache = require('../../../js/source/source_cache'); -const StyleLayer = require('../../../js/style/style_layer'); -const util = require('../../../js/util/util'); -const Evented = require('../../../js/util/evented'); -const window = require('../../../js/util/window'); +const Style = require('../../../src/style/style'); +const SourceCache = require('../../../src/source/source_cache'); +const StyleLayer = require('../../../src/style/style_layer'); +const util = require('../../../src/util/util'); +const Evented = require('../../../src/util/evented'); +const window = require('../../../src/util/window'); function createStyleJSON(properties) { return util.extend({ @@ -92,7 +92,7 @@ test('Style', (t) => { }); t.test('skips validation for mapbox:// styles', (t) => { - const Style = proxyquire('../../../js/style/style', { + const Style = proxyquire('../../../src/style/style', { '../util/mapbox': { isMapboxURL: function(url) { t.equal(url, 'mapbox://styles/test/test'); @@ -1108,7 +1108,7 @@ test('Style#setLayerZoomRange', (t) => { test('Style#queryRenderedFeatures', (t) => { let style; // eslint-disable-line prefer-const - const Style = proxyquire('../../../js/style/style', { + const Style = proxyquire('../../../src/style/style', { '../source/query_features': { rendered: function(source, layers, queryGeom, params) { if (source.id !== 'mapbox') { @@ -1353,7 +1353,7 @@ test('Style#query*Features', (t) => { test('Style#addSourceType', (t) => { const _types = { 'existing': function () {} }; - const Style = proxyquire('../../../js/style/style', { + const Style = proxyquire('../../../src/style/style', { '../source/source': { getType: function (name) { return _types[name]; }, setType: function (name, create) { _types[name] = create; } diff --git a/test/js/style/style_declaration.test.js b/test/unit/style/style_declaration.test.js similarity index 97% rename from test/js/style/style_declaration.test.js rename to test/unit/style/style_declaration.test.js index 45ddb86b492..352d7d702b0 100644 --- a/test/js/style/style_declaration.test.js +++ b/test/unit/style/style_declaration.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const StyleDeclaration = require('../../../js/style/style_declaration'); +const StyleDeclaration = require('../../../src/style/style_declaration'); test('StyleDeclaration', (t) => { t.test('constant', (t) => { diff --git a/test/js/style/style_layer.test.js b/test/unit/style/style_layer.test.js similarity index 99% rename from test/js/style/style_layer.test.js rename to test/unit/style/style_layer.test.js index 47e00de1a41..4e780c5c307 100644 --- a/test/js/style/style_layer.test.js +++ b/test/unit/style/style_layer.test.js @@ -1,9 +1,9 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const StyleLayer = require('../../../js/style/style_layer'); -const FillStyleLayer = require('../../../js/style/style_layer/fill_style_layer'); -const util = require('../../../js/util/util'); +const StyleLayer = require('../../../src/style/style_layer'); +const FillStyleLayer = require('../../../src/style/style_layer/fill_style_layer'); +const util = require('../../../src/util/util'); test('StyleLayer', (t) => { t.test('instantiates the correct subclass', (t) => { diff --git a/test/js/style/style_layer_index.test.js b/test/unit/style/style_layer_index.test.js similarity index 96% rename from test/js/style/style_layer_index.test.js rename to test/unit/style/style_layer_index.test.js index 639b06dcbcd..388cfbbcbb5 100644 --- a/test/js/style/style_layer_index.test.js +++ b/test/unit/style/style_layer_index.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const util = require('../../../js/util/util'); -const StyleLayerIndex = require('../../../js/style/style_layer_index'); +const util = require('../../../src/util/util'); +const StyleLayerIndex = require('../../../src/style/style_layer_index'); test('StyleLayerIndex#replace', (t) => { const index = new StyleLayerIndex([ diff --git a/test/js/style/style_transition.test.js b/test/unit/style/style_transition.test.js similarity index 88% rename from test/js/style/style_transition.test.js rename to test/unit/style/style_transition.test.js index bedc4945612..f09a69abd3a 100644 --- a/test/js/style/style_transition.test.js +++ b/test/unit/style/style_transition.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const StyleDeclaration = require('../../../js/style/style_declaration'); -const StyleTransition = require('../../../js/style/style_transition'); +const StyleDeclaration = require('../../../src/style/style_declaration'); +const StyleTransition = require('../../../src/style/style_transition'); test('StyleTransition', (t) => { diff --git a/test/js/symbol/anchor.test.js b/test/unit/symbol/anchor.test.js similarity index 91% rename from test/js/symbol/anchor.test.js rename to test/unit/symbol/anchor.test.js index 7deec17f889..b30cd08782b 100644 --- a/test/js/symbol/anchor.test.js +++ b/test/unit/symbol/anchor.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Anchor = require('../../../js/symbol/anchor'); +const Anchor = require('../../../src/symbol/anchor'); test('Anchor', (t) => { t.test('#constructor', (t) => { diff --git a/test/js/symbol/check_max_angle.test.js b/test/unit/symbol/check_max_angle.test.js similarity index 94% rename from test/js/symbol/check_max_angle.test.js rename to test/unit/symbol/check_max_angle.test.js index 295b047f2c4..c770477ff62 100644 --- a/test/js/symbol/check_max_angle.test.js +++ b/test/unit/symbol/check_max_angle.test.js @@ -2,8 +2,8 @@ const test = require('mapbox-gl-js-test').test; const Point = require('point-geometry'); -const checkMaxAngle = require('../../../js/symbol/check_max_angle'); -const Anchor = require('../../../js/symbol/anchor'); +const checkMaxAngle = require('../../../src/symbol/check_max_angle'); +const Anchor = require('../../../src/symbol/anchor'); test('line with no sharp angles', (t) => { const line = [ new Point(0, 0), new Point(20, -1), new Point(40, 1), new Point(60, 0) ]; diff --git a/test/js/symbol/collision_feature.js b/test/unit/symbol/collision_feature.js similarity index 95% rename from test/js/symbol/collision_feature.js rename to test/unit/symbol/collision_feature.js index 53579c3c5f9..d3e02683b74 100644 --- a/test/js/symbol/collision_feature.js +++ b/test/unit/symbol/collision_feature.js @@ -1,10 +1,10 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const CollisionFeature = require('../../../js/symbol/collision_feature'); -const Anchor = require('../../../js/symbol/anchor'); +const CollisionFeature = require('../../../src/symbol/collision_feature'); +const Anchor = require('../../../src/symbol/anchor'); const Point = require('point-geometry'); -const CollisionBoxArray = require('../../../js/symbol/collision_box'); +const CollisionBoxArray = require('../../../src/symbol/collision_box'); test('CollisionFeature', (t) => { diff --git a/test/js/symbol/get_anchors.test.js b/test/unit/symbol/get_anchors.test.js similarity index 98% rename from test/js/symbol/get_anchors.test.js rename to test/unit/symbol/get_anchors.test.js index 7c87fe5609a..4cd92abea94 100644 --- a/test/js/symbol/get_anchors.test.js +++ b/test/unit/symbol/get_anchors.test.js @@ -2,7 +2,7 @@ const test = require('mapbox-gl-js-test').test; const Point = require('point-geometry'); -const getAnchors = require('../../../js/symbol/get_anchors'); +const getAnchors = require('../../../src/symbol/get_anchors'); const TILE_EXTENT = 4096; diff --git a/test/js/symbol/mergelines.test.js b/test/unit/symbol/mergelines.test.js similarity index 94% rename from test/js/symbol/mergelines.test.js rename to test/unit/symbol/mergelines.test.js index 567bfe806cd..0cc1c3db39d 100644 --- a/test/js/symbol/mergelines.test.js +++ b/test/unit/symbol/mergelines.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const mergeLines = require('../../../js/symbol/mergelines'); +const mergeLines = require('../../../src/symbol/mergelines'); const Point = require('point-geometry'); function makeFeatures(lines) { diff --git a/test/js/symbol/quads.test.js b/test/unit/symbol/quads.test.js similarity index 98% rename from test/js/symbol/quads.test.js rename to test/unit/symbol/quads.test.js index 30e10e26190..a4e158bcbb4 100644 --- a/test/js/symbol/quads.test.js +++ b/test/unit/symbol/quads.test.js @@ -2,8 +2,8 @@ const test = require('mapbox-gl-js-test').test; -const getIconQuads = require('../../../js/symbol/quads').getIconQuads; -const Anchor = require('../../../js/symbol/anchor'); +const getIconQuads = require('../../../src/symbol/quads').getIconQuads; +const Anchor = require('../../../src/symbol/anchor'); const Point = require('point-geometry'); function createLayer(layer) { diff --git a/test/js/symbol/resolve_text.test.js b/test/unit/symbol/resolve_text.test.js similarity index 94% rename from test/js/symbol/resolve_text.test.js rename to test/unit/symbol/resolve_text.test.js index 026dba37d22..45a98645e7e 100644 --- a/test/js/symbol/resolve_text.test.js +++ b/test/unit/symbol/resolve_text.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const StyleLayer = require('../../../js/style/style_layer'); -const resolveText = require('../../../js/symbol/resolve_text'); +const StyleLayer = require('../../../src/style/style_layer'); +const resolveText = require('../../../src/symbol/resolve_text'); function createLayer(layout) { return new StyleLayer({ diff --git a/test/js/symbol/shaping.test.js b/test/unit/symbol/shaping.test.js similarity index 98% rename from test/js/symbol/shaping.test.js rename to test/unit/symbol/shaping.test.js index 0fa39dafc29..4d40a45d321 100644 --- a/test/js/symbol/shaping.test.js +++ b/test/unit/symbol/shaping.test.js @@ -3,7 +3,7 @@ const test = require('mapbox-gl-js-test').test; const fs = require('fs'); const path = require('path'); -const shaping = require('../../../js/symbol/shaping'); +const shaping = require('../../../src/symbol/shaping'); const WritingMode = shaping.WritingMode; let UPDATE = false; diff --git a/test/js/ui/camera.test.js b/test/unit/ui/camera.test.js similarity index 99% rename from test/js/ui/camera.test.js rename to test/unit/ui/camera.test.js index 11a80712d7a..afcda5358c0 100644 --- a/test/js/ui/camera.test.js +++ b/test/unit/ui/camera.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Camera = require('../../../js/ui/camera'); -const Transform = require('../../../js/geo/transform'); +const Camera = require('../../../src/ui/camera'); +const Transform = require('../../../src/geo/transform'); const fixed = require('mapbox-gl-js-test/fixed'); const fixedLngLat = fixed.LngLat; diff --git a/test/js/ui/control/attribution.test.js b/test/unit/ui/control/attribution.test.js similarity index 95% rename from test/js/ui/control/attribution.test.js rename to test/unit/ui/control/attribution.test.js index c7dcbf5430f..d24e666082d 100644 --- a/test/js/ui/control/attribution.test.js +++ b/test/unit/ui/control/attribution.test.js @@ -1,9 +1,9 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const window = require('../../../../js/util/window'); -const Map = require('../../../../js/ui/map'); -const AttributionControl = require('../../../../js/ui/control/attribution_control'); +const window = require('../../../../src/util/window'); +const Map = require('../../../../src/ui/map'); +const AttributionControl = require('../../../../src/ui/control/attribution_control'); function createMap() { const container = window.document.createElement('div'); diff --git a/test/js/ui/control/logo.test.js b/test/unit/ui/control/logo.test.js similarity index 91% rename from test/js/ui/control/logo.test.js rename to test/unit/ui/control/logo.test.js index 9b8cfe2bcaa..c80b074b8ee 100644 --- a/test/js/ui/control/logo.test.js +++ b/test/unit/ui/control/logo.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const VectorTileSource = require('../../../../js/source/vector_tile_source'); -const window = require('../../../../js/util/window'); -const Map = require('../../../../js/ui/map'); +const VectorTileSource = require('../../../../src/source/vector_tile_source'); +const window = require('../../../../src/util/window'); +const Map = require('../../../../src/ui/map'); function createMap(logoPosition, logoRequired) { const container = window.document.createElement('div'); diff --git a/test/js/ui/hash.test.js b/test/unit/ui/hash.test.js similarity index 94% rename from test/js/ui/hash.test.js rename to test/unit/ui/hash.test.js index 81be9f9978a..b0f366cca76 100644 --- a/test/js/ui/hash.test.js +++ b/test/unit/ui/hash.test.js @@ -1,9 +1,9 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Hash = require('../../../js/ui/hash'); -const window = require('../../../js/util/window'); -const Map = require('../../../js/ui/map'); +const Hash = require('../../../src/ui/hash'); +const window = require('../../../src/util/window'); +const Map = require('../../../src/ui/map'); test('hash', (t) => { function createHash() { diff --git a/test/js/ui/map.test.js b/test/unit/ui/map.test.js similarity index 99% rename from test/js/ui/map.test.js rename to test/unit/ui/map.test.js index 9ccb5279eba..0014b25918b 100755 --- a/test/js/ui/map.test.js +++ b/test/unit/ui/map.test.js @@ -1,10 +1,10 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const util = require('../../../js/util/util'); -const window = require('../../../js/util/window'); -const Map = require('../../../js/ui/map'); -const LngLat = require('../../../js/geo/lng_lat'); +const util = require('../../../src/util/util'); +const window = require('../../../src/util/window'); +const Map = require('../../../src/ui/map'); +const LngLat = require('../../../src/geo/lng_lat'); const fixed = require('mapbox-gl-js-test/fixed'); const fixedNum = fixed.Num; diff --git a/test/js/ui/marker.test.js b/test/unit/ui/marker.test.js similarity index 92% rename from test/js/ui/marker.test.js rename to test/unit/ui/marker.test.js index 08df35dc8a5..47ba1d695d6 100644 --- a/test/js/ui/marker.test.js +++ b/test/unit/ui/marker.test.js @@ -1,10 +1,10 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const window = require('../../../js/util/window'); -const Map = require('../../../js/ui/map'); -const Marker = require('../../../js/ui/marker'); -const Popup = require('../../../js/ui/popup'); +const window = require('../../../src/util/window'); +const Map = require('../../../src/ui/map'); +const Marker = require('../../../src/ui/marker'); +const Popup = require('../../../src/ui/popup'); function createMap() { const container = window.document.createElement('div'); diff --git a/test/js/ui/popup.test.js b/test/unit/ui/popup.test.js similarity index 98% rename from test/js/ui/popup.test.js rename to test/unit/ui/popup.test.js index 9857a41d37b..1e95d69b73e 100644 --- a/test/js/ui/popup.test.js +++ b/test/unit/ui/popup.test.js @@ -1,10 +1,10 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const window = require('../../../js/util/window'); -const Map = require('../../../js/ui/map'); -const Popup = require('../../../js/ui/popup'); -const LngLat = require('../../../js/geo/lng_lat'); +const window = require('../../../src/util/window'); +const Map = require('../../../src/ui/map'); +const Popup = require('../../../src/ui/popup'); +const LngLat = require('../../../src/geo/lng_lat'); const Point = require('point-geometry'); const simulateClick = require('mapbox-gl-js-test/simulate_interaction').click; diff --git a/test/js/util/actor.test.js b/test/unit/util/actor.test.js similarity index 91% rename from test/js/util/actor.test.js rename to test/unit/util/actor.test.js index c696cb168f3..a75f2660e54 100644 --- a/test/js/util/actor.test.js +++ b/test/unit/util/actor.test.js @@ -2,11 +2,11 @@ const test = require('mapbox-gl-js-test').test; const proxyquire = require('proxyquire'); -const Actor = require('../../../js/util/actor'); +const Actor = require('../../../src/util/actor'); test('Actor', (t) => { t.test('forwards resopnses to correct callback', (t) => { - const WebWorker = proxyquire('../../../js/util/web_worker', { + const WebWorker = proxyquire('../../../src/util/web_worker', { '../source/worker': function Worker(self) { this.self = self; this.actor = new Actor(self, this); @@ -35,7 +35,7 @@ test('Actor', (t) => { t.test('targets worker-initiated messages to correct map instance', (t) => { let workerActor; - const WebWorker = proxyquire('../../../js/util/web_worker', { + const WebWorker = proxyquire('../../../src/util/web_worker', { '../source/worker': function Worker(self) { this.self = self; this.actor = workerActor = new Actor(self, this); diff --git a/test/js/util/ajax.test.js b/test/unit/util/ajax.test.js similarity index 88% rename from test/js/util/ajax.test.js rename to test/unit/util/ajax.test.js index 0f6e9e94a09..8ad0f39d101 100644 --- a/test/js/util/ajax.test.js +++ b/test/unit/util/ajax.test.js @@ -1,8 +1,8 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const ajax = require('../../../js/util/ajax'); -const window = require('../../../js/util/window'); +const ajax = require('../../../src/util/ajax'); +const window = require('../../../src/util/window'); test('ajax', (t) => { t.beforeEach(callback => { diff --git a/test/js/util/browser.test.js b/test/unit/util/browser.test.js similarity index 94% rename from test/js/util/browser.test.js rename to test/unit/util/browser.test.js index 785d9706989..af63b6fae80 100644 --- a/test/js/util/browser.test.js +++ b/test/unit/util/browser.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const browser = require('../../../js/util/browser'); +const browser = require('../../../src/util/browser'); test('browser', (t) => { t.test('frame', (t) => { diff --git a/test/js/util/classify_rings.test.js b/test/unit/util/classify_rings.test.js similarity index 98% rename from test/js/util/classify_rings.test.js rename to test/unit/util/classify_rings.test.js index 44ec113dc65..3d455ec6ac7 100644 --- a/test/js/util/classify_rings.test.js +++ b/test/unit/util/classify_rings.test.js @@ -5,7 +5,7 @@ const fs = require('fs'); const path = require('path'); const Protobuf = require('pbf'); const VectorTile = require('vector-tile').VectorTile; -const classifyRings = require('../../../js/util/classify_rings'); +const classifyRings = require('../../../src/util/classify_rings'); // Load a fill feature from fixture tile. const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))); diff --git a/test/js/util/dispatcher.test.js b/test/unit/util/dispatcher.test.js similarity index 75% rename from test/js/util/dispatcher.test.js rename to test/unit/util/dispatcher.test.js index 5124dca75aa..77f73832fec 100644 --- a/test/js/util/dispatcher.test.js +++ b/test/unit/util/dispatcher.test.js @@ -2,8 +2,8 @@ const test = require('mapbox-gl-js-test').test; const proxyquire = require('proxyquire'); -const Dispatcher = require('../../../js/util/dispatcher'); -const WebWorker = require('../../../js/util/web_worker'); +const Dispatcher = require('../../../src/util/dispatcher'); +const WebWorker = require('../../../src/util/web_worker'); test('Dispatcher', (t) => { t.test('requests and releases workers from pool', (t) => { @@ -29,9 +29,9 @@ test('Dispatcher', (t) => { }); t.test('creates Actors with unique map id', (t) => { - const Dispatcher = proxyquire('../../../js/util/dispatcher', {'./actor': Actor }); - const WorkerPool = proxyquire('../../../js/util/worker_pool', { - '../mapbox-gl': { workerCount: 1 } + const Dispatcher = proxyquire('../../../src/util/dispatcher', {'./actor': Actor }); + const WorkerPool = proxyquire('../../../src/util/worker_pool', { + '../': { workerCount: 1 } }); const ids = []; @@ -45,13 +45,13 @@ test('Dispatcher', (t) => { }); t.test('#remove destroys actors', (t) => { - const Dispatcher = proxyquire('../../../js/util/dispatcher', {'./actor': Actor }); + const Dispatcher = proxyquire('../../../src/util/dispatcher', {'./actor': Actor }); const actorsRemoved = []; function Actor() { this.remove = function() { actorsRemoved.push(this); }; } - const WorkerPool = proxyquire('../../../js/util/worker_pool', { - '../mapbox-gl': { workerCount: 4 } + const WorkerPool = proxyquire('../../../src/util/worker_pool', { + '../': { workerCount: 4 } }); const workerPool = new WorkerPool(); diff --git a/test/js/util/evented.test.js b/test/unit/util/evented.test.js similarity index 98% rename from test/js/util/evented.test.js rename to test/unit/util/evented.test.js index 74ad2c52888..0c76ab8229c 100644 --- a/test/js/util/evented.test.js +++ b/test/unit/util/evented.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Evented = require('../../../js/util/evented'); +const Evented = require('../../../src/util/evented'); test('Evented', (t) => { diff --git a/test/js/util/find_pole_of_inaccessibility.test.js b/test/unit/util/find_pole_of_inaccessibility.test.js similarity index 87% rename from test/js/util/find_pole_of_inaccessibility.test.js rename to test/unit/util/find_pole_of_inaccessibility.test.js index 68bf4f006d0..1ee298c55a9 100644 --- a/test/js/util/find_pole_of_inaccessibility.test.js +++ b/test/unit/util/find_pole_of_inaccessibility.test.js @@ -2,7 +2,7 @@ const test = require('mapbox-gl-js-test').test; const Point = require('point-geometry'); -const findPoleOfInaccessibility = require('../../../js/util/find_pole_of_inaccessibility'); +const findPoleOfInaccessibility = require('../../../src/util/find_pole_of_inaccessibility'); test('polygon_poi', (t) => { diff --git a/test/js/util/interpolate.test.js b/test/unit/util/interpolate.test.js similarity index 89% rename from test/js/util/interpolate.test.js rename to test/unit/util/interpolate.test.js index 0c960f5ed61..aed058912cc 100644 --- a/test/js/util/interpolate.test.js +++ b/test/unit/util/interpolate.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const interpolate = require('../../../js/util/interpolate'); +const interpolate = require('../../../src/util/interpolate'); test('interpolate.number', (t) => { t.equal(interpolate(0, 1, 0.5), 0.5); diff --git a/test/js/util/lru_cache.test.js b/test/unit/util/lru_cache.test.js similarity index 97% rename from test/js/util/lru_cache.test.js rename to test/unit/util/lru_cache.test.js index 1f53d523ffe..8ebb2e38c03 100644 --- a/test/js/util/lru_cache.test.js +++ b/test/unit/util/lru_cache.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const LRUCache = require('../../../js/util/lru_cache'); +const LRUCache = require('../../../src/util/lru_cache'); test('LRUCache', (t) => { const cache = new LRUCache(10, (removed) => { diff --git a/test/js/util/mapbox.test.js b/test/unit/util/mapbox.test.js similarity index 98% rename from test/js/util/mapbox.test.js rename to test/unit/util/mapbox.test.js index 1692b266585..9f95943d497 100644 --- a/test/js/util/mapbox.test.js +++ b/test/unit/util/mapbox.test.js @@ -1,10 +1,10 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const mapbox = require('../../../js/util/mapbox'); -const config = require('../../../js/util/config'); -const browser = require('../../../js/util/browser'); -const window = require('../../../js/util/window'); +const mapbox = require('../../../src/util/mapbox'); +const config = require('../../../src/util/config'); +const browser = require('../../../src/util/browser'); +const window = require('../../../src/util/window'); test("mapbox", (t) => { const mapboxSource = 'mapbox://user.map'; diff --git a/test/js/util/struct_array.test.js b/test/unit/util/struct_array.test.js similarity index 96% rename from test/js/util/struct_array.test.js rename to test/unit/util/struct_array.test.js index dda30695e31..313ea4bc26b 100644 --- a/test/js/util/struct_array.test.js +++ b/test/unit/util/struct_array.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const createStructArrayType = require('../../../js/util/struct_array'); +const createStructArrayType = require('../../../src/util/struct_array'); test('StructArray', (t) => { diff --git a/test/js/util/token.test.js b/test/unit/util/token.test.js similarity index 93% rename from test/js/util/token.test.js rename to test/unit/util/token.test.js index db697669f97..06cc3135359 100644 --- a/test/js/util/token.test.js +++ b/test/unit/util/token.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const resolveTokens = require('../../../js/util/token'); +const resolveTokens = require('../../../src/util/token'); test('token', (t) => { t.equal('literal', resolveTokens({name:'14th St NW'}, 'literal')); diff --git a/test/js/util/util.test.js b/test/unit/util/util.test.js similarity index 98% rename from test/js/util/util.test.js rename to test/unit/util/util.test.js index e13cd01d0fd..547b486c01a 100644 --- a/test/js/util/util.test.js +++ b/test/unit/util/util.test.js @@ -2,8 +2,8 @@ // @flow const test = require('mapbox-gl-js-test').test; -const Coordinate = require('../../../js/geo/coordinate'); -const util = require('../../../js/util/util'); +const Coordinate = require('../../../src/geo/coordinate'); +const util = require('../../../src/util/util'); test('util', (t) => { t.equal(util.easeCubicInOut(0), 0, 'easeCubicInOut=0'); diff --git a/test/js/util/worker_pool.test.js b/test/unit/util/worker_pool.test.js similarity index 84% rename from test/js/util/worker_pool.test.js rename to test/unit/util/worker_pool.test.js index c2886731285..e1dcd5ffa21 100644 --- a/test/js/util/worker_pool.test.js +++ b/test/unit/util/worker_pool.test.js @@ -5,8 +5,8 @@ const proxyquire = require('proxyquire'); test('WorkerPool', (t) => { t.test('#acquire', (t) => { - const WorkerPool = proxyquire('../../../js/util/worker_pool', { - '../mapbox-gl': { workerCount: 4 } + const WorkerPool = proxyquire('../../../src/util/worker_pool', { + '../': { workerCount: 4 } }); const pool = new WorkerPool(); @@ -24,8 +24,8 @@ test('WorkerPool', (t) => { t.test('#release', (t) => { let workersTerminated = 0; - const WorkerPool = proxyquire('../../../js/util/worker_pool', { - '../mapbox-gl': { workerCount: 4 } + const WorkerPool = proxyquire('../../../src/util/worker_pool', { + '../': { workerCount: 4 } }); const pool = new WorkerPool();