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

min/max for geojson tiling #568

Merged
merged 3 commits into from
Jan 22, 2024
Merged

min/max for geojson tiling #568

merged 3 commits into from
Jan 22, 2024

Conversation

maerki
Copy link
Contributor

@maerki maerki commented Jan 12, 2024

Summary by CodeRabbit

  • New Features

    • Introduced the ability to specify minimum zoom levels for GeoJSON data layers.
  • Enhancements

    • Enabled handling of zoom level properties for better map layer customization.
  • Bug Fixes

    • Corrected zoom level assignments to ensure consistent map rendering based on data type.

Copy link
Contributor

coderabbitai bot commented Jan 12, 2024

Walkthrough

The codebase has been updated to handle minimum and maximum zoom levels for GeoJSON data. A new virtual method to fetch the minimum zoom level was added to the GeoJSONVTInterface, and GeoJsonVTFactory functions now take an Options parameter to accommodate zoom level settings. The Options struct itself was updated with a minZoom field, and logic was added to discard tiles below this minimum zoom.

Changes

File Path Change Summary
shared/public/GeoJsonTypes.h Added getMinZoom() method to GeoJSONVTInterface.
shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayerParserHelper.cpp
shared/src/map/layers/tiled/vector/geojson/GeoJsonVTFactory.h
Included Options to handle minzoom and maxzoom. Updated getGeoJsonVt to accept Options parameter.
shared/src/map/layers/tiled/vector/geojson/geojsonvt/geojsonvt.hpp Added minZoom to Options, updated maxZoom assignment, added getMinZoom, and conditional tile erasure for z < minZoom.

Poem

🐇 "In the realm of zooms and tiles," said the rabbit, "we now thrive,
🗺️ For min and max are set, making our maps come alive.
🛠️ With code we weave, a digital tapestry so grand,
🎉 Celebrate the change, for more control is at hand!"

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: 0

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between 8ebf024 and f467165.
Files selected for processing (4)
  • shared/public/GeoJsonTypes.h (1 hunks)
  • shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayerParserHelper.cpp (1 hunks)
  • shared/src/map/layers/tiled/vector/geojson/GeoJsonVTFactory.h (1 hunks)
  • shared/src/map/layers/tiled/vector/geojson/geojsonvt/geojsonvt.hpp (6 hunks)
Additional comments: 10
shared/src/map/layers/tiled/vector/geojson/GeoJsonVTFactory.h (2)
  • 20-22: The method getGeoJsonVt has been updated to accept an Options parameter with a default value. This is a good use of default parameters to maintain backward compatibility.

  • 25-27: The second overload of getGeoJsonVt also correctly accepts an Options parameter with a default value. The method properly constructs a GeoJSONVT object with the provided options and calls load(), which is expected behavior.

shared/public/GeoJsonTypes.h (1)
  • 83-83: The addition of the virtual method getMinZoom to the GeoJSONVTInterface class is consistent with the PR's objective to introduce minimum zoom level constraints. This method will allow different implementations to specify their own minimum zoom levels.
shared/src/map/layers/tiled/vector/geojson/geojsonvt/geojsonvt.hpp (4)
  • 29-31: The addition of the minZoom member to the Options struct aligns with the PR's goal to manage zoom level constraints.

  • 59-59: The conditional assignment of maxZoom based on the hasOnlyPoints condition is a logical optimization to avoid unnecessary tiling for point-only GeoJSON data.

  • 156-158: The getMinZoom method has been correctly implemented to return the minZoom value from the options struct.

  • 328-331: The conditional check to erase tiles if z is smaller than minZoom is a good performance optimization to prevent processing of tiles that won't be displayed.

shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayerParserHelper.cpp (3)
  • 183-190: The Options object is correctly initialized and the minzoom and maxzoom properties are set based on the JSON configuration. This allows for dynamic configuration of zoom levels based on external data.

  • 192-192: The GeoJsonVTFactory::getGeoJsonVt function is correctly called with the options object, ensuring that the zoom level constraints are applied to the GeoJSON tiling process.

  • 195-195: The GeoJsonVTFactory::getGeoJsonVt function is also correctly called with the options object when the GeoJSON data is directly provided as an object.

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: 0

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between f467165 and 955d9dc.
Files selected for processing (1)
  • shared/src/map/layers/tiled/vector/geojson/geojsonvt/geojsonvt.hpp (7 hunks)
Files skipped from review as they are similar to previous changes (1)
  • shared/src/map/layers/tiled/vector/geojson/geojsonvt/geojsonvt.hpp

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: 0

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between 955d9dc and 6146851.
Files selected for processing (1)
  • shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayerParserHelper.cpp (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayerParserHelper.cpp

@maurhofer-ubique maurhofer-ubique merged commit 123c264 into develop Jan 22, 2024
2 checks passed
@maurhofer-ubique maurhofer-ubique deleted the bugfix/geojson-tiling branch January 22, 2024 06:43
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.

3 participants