diff --git a/src/shaders/symbol.vertex.glsl b/src/shaders/symbol.vertex.glsl index a62bf022724..296d34d8df2 100644 --- a/src/shaders/symbol.vertex.glsl +++ b/src/shaders/symbol.vertex.glsl @@ -137,7 +137,7 @@ struct SymbolPaintProperties { struct PropertyType { /// Whether the property is data-driven and has value in data-driven block or constant uniform. bool isDataDriven; - /// Whether the property is zoom-dependent and has two values that need to be interpolated between zooms. + /// Whether the property is zoom-dependent and has two values that need to be interpolated between zooms. bool isZoomDependent; /// Local offset within the data-driven block (in dwords). /// @@ -419,7 +419,7 @@ void main() { float size; // When rendering appearances, we use a_size_max to store the size - if (a_apperance == USING_APPEARANCE) { + if (a_appearance == USING_APPEARANCE) { size = a_size_max / 128.0; } else if (!u_is_size_zoom_constant && !u_is_size_feature_constant) { size = mix(a_size_min, a_size_max, u_size_t) / 128.0; @@ -539,8 +539,8 @@ void main() { #ifdef DEPTH_OCCLUSION float depth_occlusion = occlusionFadeMultiSample(projected_point); - float depth_occlusion_multplier = mix(occlusion_opacity, 1.0, depth_occlusion); - out_fade_opacity *= depth_occlusion_multplier; + float depth_occlusion_multiplier = mix(occlusion_opacity, 1.0, depth_occlusion); + out_fade_opacity *= depth_occlusion_multiplier; #endif #ifdef OCCLUSION_QUERIES diff --git a/src/style-spec/expression/definitions/config.ts b/src/style-spec/expression/definitions/config.ts index dd75e3a55a8..c82f1a0caeb 100644 --- a/src/style-spec/expression/definitions/config.ts +++ b/src/style-spec/expression/definitions/config.ts @@ -164,7 +164,7 @@ class Config implements Expression { serialize(): SerializedExpression { const res = ["config", this.key]; if (this.scope) { - res.concat(this.scope); + res.push(this.scope); } return res; }