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

Feature: icon line placement #676

Merged
merged 1 commit into from
Jan 13, 2025
Merged

Conversation

stmitt
Copy link
Contributor

@stmitt stmitt commented Jan 13, 2025

Summary by CodeRabbit

  • Bug Fixes

    • Improved symbol positioning and label rendering accuracy
    • Enhanced text placement logic based on anchor points
    • Refined icon rotation handling for more precise map symbol display
  • New Features

    • Added more flexible angle management for map symbols
    • Introduced advanced text positioning controls

The changes focus on improving the precision and flexibility of map symbol and label rendering, providing more nuanced control over text and icon placement.

Copy link
Contributor

coderabbitai bot commented Jan 13, 2025

Walkthrough

This pull request introduces modifications to several classes related to map vector symbol rendering and positioning. The changes primarily focus on improving the calculation of symbol angles, text positioning, and icon rendering. Key modifications include adjusting the angle calculation in the Tiled2dMapVectorSymbolGroup, removing the optional angle parameter from the Tiled2dMapVectorSymbolLabelObject constructor, and adding more nuanced logic for text placement and icon rotation based on different anchor points and symbol placements.

Changes

File Change Summary
shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolGroup.cpp Modified getPositioning method to correct angle calculation by reversing coordinate subtraction order
shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolLabelObject.cpp - Removed optional angle parameter from constructor
- Enhanced updatePropertiesLine method with anchor-based index calculation
- Added isPlaced flag management
shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolLabelObject.h - Added wasReversed and isPlaced boolean member variables
- Removed optional angle parameter from constructor
shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolObject.cpp - Updated constructor to include angle parameter
- Refined icon rotation logic based on symbol placement and angle
shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolObject.h Added const std::optional<double> angle member variable

Possibly related PRs

Suggested reviewers

  • maerki
  • zimmermannubique
  • maurhofer-ubique

Poem

🐰 Symbols dance on the map's stage,
Angles twirl with a digital rage,
Anchors shift, positions align,
Code's ballet, a geometric design,
Rendering magic, pixel by line! 🗺️

Finishing Touches

  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@stmitt
Copy link
Contributor Author

stmitt commented Jan 13, 2025

@coderabbitai review

Copy link
Contributor

coderabbitai bot commented Jan 13, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolLabelObject.cpp (1)

680-697: Consider adding a default case to the switch statement for robustness

While all expected Anchor enum values are handled in the switch statement, adding a default case can enhance code robustness by catching any unexpected or invalid textAnchor values. This helps prevent potential undefined behavior if new anchor types are introduced in the future.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8e1f45b and 332d1b8.

📒 Files selected for processing (5)
  • shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolGroup.cpp (1 hunks)
  • shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolLabelObject.cpp (3 hunks)
  • shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolLabelObject.h (1 hunks)
  • shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolObject.cpp (4 hunks)
  • shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolObject.h (1 hunks)
👮 Files not reviewed due to content moderation or server errors (2)
  • shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolObject.cpp
  • shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolGroup.cpp
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: Build JVM Project / build
  • GitHub Check: build
🔇 Additional comments (4)
shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolLabelObject.cpp (2)

860-861: Correctly setting isPlaced to true when characters are placed

The isPlaced flag is appropriately set to true when centerPositions are not empty, indicating successful placement of text characters.


876-877: Correctly setting isPlaced to false when characters are not placed

The isPlaced flag is properly set to false when centerPositions are empty, reflecting that text characters could not be placed.

shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolObject.h (1)

209-209: Addition of optional angle member variable enhances flexibility

The new member variable const std::optional<double> angle; is added correctly, allowing the class to store an optional angle value. This enhances the flexibility for handling rotations or orientations as needed.

shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolLabelObject.h (1)

86-88: New member variables wasReversed and isPlaced added appropriately

The addition of bool wasReversed = false; and bool isPlaced = true; enhances the state management within the class. These variables are correctly initialized and will assist in tracking the placement and orientation statuses of symbols.

@maurhofer-ubique maurhofer-ubique merged commit 44212fc into develop Jan 13, 2025
4 checks passed
@maurhofer-ubique maurhofer-ubique deleted the feature/icon-line-placement branch January 13, 2025 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants