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

Keep geojson feature ids optional #595

Merged
merged 1 commit into from
Feb 13, 2024
Merged

Conversation

maurhofer-ubique
Copy link
Contributor

@maurhofer-ubique maurhofer-ubique commented Feb 12, 2024

Summary by CodeRabbit

  • Bug Fixes
    • Improved the handling of the "id" field in GeoJSON features to enhance parsing robustness.

Copy link
Contributor

coderabbitai bot commented Feb 12, 2024

Walkthrough

The recent updates focus on improving the handling of the "id" field in GeoJSON features within the GeoJsonParser. By ensuring the presence and verifying the type of the "id" field as a string before any operations are performed, the changes significantly enhance the parser's ability to accurately process GeoJSON data, making the system more robust and reliable when dealing with diverse GeoJSON inputs.

Changes

File Path Change Summary
.../vector/geojson/GeoJsonParser.h Updated conditions for checking the "id" field in GeoJSON features, including existence and type verification as a string.

🐰✨
In the realm of code, where data streams flow,
A change was made, with precision, aglow.
"Handle with care," the developers did say,
As the "id" field found its rightful way.
Through checks and balances, it now does stride,
Ensuring no error on the parsing ride.
🌟📚🐇

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>.
    • Generate unit-tests for this file.
  • 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 tests 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 generate interesting stats about this repository from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

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 as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • 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/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

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.

Review Status

Actionable comments generated: 2

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between dd18515 and e0850f7.
Files selected for processing (1)
  • shared/src/map/layers/tiled/vector/geojson/GeoJsonParser.h (2 hunks)

@@ -87,7 +87,7 @@ class GeoJsonParser {

const auto &properties = parseProperties(feature["properties"]);

if(feature["id"].is_string()) {
if(feature.contains("id") && feature["id"].is_string()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

The logic to handle the "id" field checks for its existence and type correctly. However, consider extracting this logic into a separate method to improve readability and maintainability.

// Suggested refactor: Extract ID handling logic into a separate method.
std::string getFeatureId(const nlohmann::json &feature, UUIDGenerator &generator) {
    if(feature.contains("id") && feature["id"].is_string()) {
        return feature["id"].get<std::string>();
    } else {
        return std::to_string(generator.generateUUID());
    }
}
// Usage within getGeoJson method:
geometry->featureContext = std::make_shared<FeatureContext>(geomType, properties, getFeatureId(feature, generator));

@@ -124,7 +124,7 @@ class GeoJsonParser {
continue;
}

if(!feature["id"].is_string()) {
if(!feature.contains("id") || !feature["id"].is_string()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

The condition to skip features without a string "id" field is correctly implemented according to the PR objectives. However, this approach might exclude valid GeoJSON features that do not have an "id" field, which could be against the intention of making "id" handling more flexible. Reconsider if skipping these features is the desired behavior.

@maerki maerki merged commit a907f7b into develop Feb 13, 2024
1 of 2 checks passed
@maerki maerki deleted the bugfix/geojson-feature-id branch February 13, 2024 17:18
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