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

Require feature check when checking for mall #4603

Merged
merged 1 commit into from
Jul 24, 2022

Conversation

pnorman
Copy link
Collaborator

@pnorman pnorman commented Jul 14, 2022

#3759 + previous PRs changed the text-points feature=shop_mall into feature=shop shop=mall. This was done incorrectly in one place where the [feature='shop'] condition was not added, leading to having to check for shop=mall on everything else in the layer, even if it didn't have feature=shop.

This change brings compilation time from 9s to 6.5s and the text-point layer from 2.3s to 1.1s. The total XML decreases from 46670 to 45404 lines.

ref #1941

Without this, CartoCSS has to check for mall on all non-shop
features, a significant combinatorial explosion.
@pnorman
Copy link
Collaborator Author

pnorman commented Jul 14, 2022

There might be changes to objects tagged with tags like leisure=fitness_station shop=mall, but just to restore the rendering to what they were prior to the previously mentioned PRs. I couldn't find any examples.

@pnorman
Copy link
Collaborator Author

pnorman commented Jul 24, 2022

Pinging for PR review.

Copy link
Collaborator

@imagico imagico left a comment

Choose a reason for hiding this comment

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

Looks good and i also did not observe any rendering differences in various tagging combination tested.

@pnorman pnorman merged commit 89e266e into gravitystorm:master Jul 24, 2022
@pnorman pnorman deleted the mall_check branch July 24, 2022 18: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.

2 participants