Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Globe - symbols & symbol bugfixes #4067

Merged
merged 22 commits into from
May 20, 2024

Commits on May 2, 2024

  1. Configuration menu
    Copy the full SHA
    e1e9cac View commit details
    Browse the repository at this point in the history
  2. Fix import

    kubapelc committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7074752 View commit details
    Browse the repository at this point in the history
  3. Remove unused code

    kubapelc committed May 2, 2024
    Configuration menu
    Copy the full SHA
    320a773 View commit details
    Browse the repository at this point in the history
  4. Remove unused imports

    kubapelc committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e163616 View commit details
    Browse the repository at this point in the history
  5. Update build size test

    kubapelc committed May 2, 2024
    Configuration menu
    Copy the full SHA
    09e3dce View commit details
    Browse the repository at this point in the history
  6. Remove unused function

    kubapelc committed May 2, 2024
    Configuration menu
    Copy the full SHA
    195b70a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a935dad View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8acaf31 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9ace7e4 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    12db443 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    7093b93 View commit details
    Browse the repository at this point in the history
  12. Update build size

    kubapelc committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d6c84a8 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge remote-tracking branch 'upstream/globe' into kubapelc/globe-pr-…

    …symbols
    
    # Conflicts:
    #	CHANGELOG.md
    #	src/data/bucket/symbol_bucket.test.ts
    #	src/geo/projection/globe.ts
    #	src/geo/projection/mercator.ts
    #	src/geo/projection/projection.ts
    #	src/render/draw_collision_debug.ts
    #	src/render/draw_symbol.ts
    #	src/render/program/collision_program.ts
    #	src/shaders/collision_box.vertex.glsl
    #	src/shaders/symbol_icon.vertex.glsl
    #	src/shaders/symbol_sdf.vertex.glsl
    #	src/shaders/symbol_text_and_icon.vertex.glsl
    #	src/style/pauseable_placement.ts
    #	src/symbol/collision_index.test.ts
    #	src/symbol/collision_index.ts
    #	src/symbol/placement.ts
    #	src/symbol/projection.test.ts
    #	src/symbol/projection.ts
    #	src/symbol/symbol_layout.ts
    #	test/build/min.test.ts
    #	test/integration/render/tests/debug/collision-text-translate/rotation-alignment-map/pitch-alignment-map/text-translate-anchor-map/expected.png
    #	test/integration/render/tests/debug/collision-text-translate/rotation-alignment-map/pitch-alignment-map/text-translate-anchor-viewport/expected.png
    #	test/integration/render/tests/debug/collision-text-translate/rotation-alignment-viewport/pitch-alignment-map/text-translate-anchor-map/expected.png
    #	test/integration/render/tests/debug/collision-text-translate/rotation-alignment-viewport/pitch-alignment-map/text-translate-anchor-viewport/expected.png
    kubapelc committed May 15, 2024
    Configuration menu
    Copy the full SHA
    3eb69eb View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Fix merge

    kubapelc committed May 16, 2024
    Configuration menu
    Copy the full SHA
    3b7e46a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    17c91ea View commit details
    Browse the repository at this point in the history
  3. Update build size

    The 10 kb size increase seems to come from the main branch
    kubapelc committed May 16, 2024
    Configuration menu
    Copy the full SHA
    b59ac22 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'upstream/globe' into kubapelc/globe-pr-…

    …symbols
    
    # Conflicts:
    #	test/build/min.test.ts
    kubapelc committed May 16, 2024
    Configuration menu
    Copy the full SHA
    9655e1c View commit details
    Browse the repository at this point in the history
  5. Minor refactor

    kubapelc committed May 16, 2024
    Configuration menu
    Copy the full SHA
    7e37507 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1a493c9 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bbf4fce View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Configuration menu
    Copy the full SHA
    7e6bb83 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    66b7891 View commit details
    Browse the repository at this point in the history