Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Add functions for numeric layout properties #799

Merged
merged 1 commit into from
Feb 4, 2015
Merged

Conversation

lbud
Copy link
Contributor

@lbud lbud commented Jan 31, 2015

@lbud lbud mentioned this pull request Jan 31, 2015
@jfirebaugh
Copy link
Contributor

@lbud Can you rebase this on master? Should fix the build errors.

void TileParser::parse() {
parseStyleLayers(style->layers);
void TileParser::parse(float z) {
parseStyleLayers(style->layers, z);
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you can avoid needing to thread z through by using tile.id.z instead.

@lbud
Copy link
Contributor Author

lbud commented Feb 3, 2015

Trying to root out a few weird test failures here — 

  • symbol-min-distance — icon rotation is weird
  • text-max-angle
  • raster-saturation-function
  • keep-upright (suspect the same problem as max-angle)

std::string name;
util::ptr<StyleSource> style_source;
std::string source_layer;
FilterExpression filter;
ClassProperties layout;
StyleBucketRender render = std::false_type();
float min_zoom = -std::numeric_limits<float>::infinity();
float max_zoom = std::numeric_limits<float>::infinity();
VisibilityType visibility = VisibilityType::Visible;
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this visibility unused now that StyleBucket* all have their own visibility?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jfirebaugh good point — there was some trickery here since layout properties became parsed differently; about to push a fix that removes all individual StyleBucket* visibility properties.

@jfirebaugh jfirebaugh merged commit 895d904 into master Feb 4, 2015
@jfirebaugh jfirebaugh deleted the layoutFunctions branch February 4, 2015 00:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants