maplibre-gl 2.3.1-pre.1 → 2.3.1-pre.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/build/generate-query-test-fixtures.ts +3 -2
  2. package/build/generate-style-spec.ts +11 -15
  3. package/dist/maplibre-gl-csp.js +1 -1
  4. package/dist/maplibre-gl-dev.js +20 -13
  5. package/dist/maplibre-gl.d.ts +3 -14
  6. package/dist/maplibre-gl.js +2 -2
  7. package/dist/style-spec/index.d.ts +3 -14
  8. package/package.json +6 -6
  9. package/src/render/program.ts +12 -5
  10. package/src/style-spec/feature_filter/feature_filter.test.ts +32 -2
  11. package/src/style-spec/types.g.ts +11 -15
package/build/generate-query-test-fixtures.ts CHANGED
@@ -26,9 +26,10 @@ function generateFixtureJson(rootDirectory: string, suiteDirectory: string, outp
26
26
  const imagePaths = globs[1];
27
27
  //Extract the filedata into a flat dictionary
28
28
  const allFiles = {};
29
- let allPaths = glob.sync(jsonPaths);
29
+ // Using replace() to fixup Windows paths so they are compatible with glob sync.
30
+ let allPaths = glob.sync(jsonPaths.replace(/\\/g, '/'));
30
31
  if (includeImages) {
31
- allPaths = allPaths.concat(glob.sync(imagePaths));
32
+ allPaths = allPaths.concat(glob.sync(imagePaths.replace(/\\/g, '/')));
32
33
  }
33
34
 
34
35
  //A Set that stores test names that are malformed so they can be removed later
package/build/generate-style-spec.ts CHANGED
@@ -187,30 +187,26 @@ export type ExpressionSpecification =
187
187
  | ['any', ...(boolean | ExpressionSpecification)[]] // boolean
188
188
  | ['case', boolean | ExpressionSpecification, ExpressionInputType | ExpressionSpecification,
189
189
  ...(boolean | ExpressionInputType | ExpressionSpecification)[], ExpressionInputType | ExpressionSpecification]
190
- | ['coalesce', ExpressionInputType | ExpressionSpecification, ExpressionInputType | ExpressionSpecification,
191
- ...(ExpressionInputType | ExpressionSpecification)[]]
190
+ | ['coalesce', ...(ExpressionInputType | ExpressionSpecification)[]] // at least two inputs required
192
191
  | ['match', ExpressionInputType | ExpressionSpecification,
193
192
  ExpressionInputType | ExpressionInputType[], ExpressionInputType | ExpressionSpecification,
194
193
  ...(ExpressionInputType | ExpressionInputType[] | ExpressionSpecification)[], // repeated as above
195
194
  ExpressionInputType]
196
195
  | ['within', unknown | ExpressionSpecification]
197
196
  // Ramps, scales, curves
198
- | ['interpolate', InterpolationSpecification,
199
- number | ExpressionSpecification, ...(number | ExpressionInputType | ExpressionSpecification)[]]
200
- | ['interpolate-hcl', InterpolationSpecification,
201
- number | ExpressionSpecification, number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification,
202
- ...(number | ColorSpecification | ExpressionSpecification)[]]
203
- | ['interpolate-lab', InterpolationSpecification,
204
- number | ExpressionSpecification, number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification,
205
- ...(number | ColorSpecification | ExpressionSpecification)[]]
206
- | ['step', number | ExpressionSpecification, number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification,
207
- ...(number | ExpressionInputType | ExpressionSpecification)[]]
197
+ | ['interpolate', InterpolationSpecification, number | ExpressionSpecification,
198
+ ...(number | number[] | ColorSpecification)[]] // alternating number and number | number[] | ColorSpecification
199
+ | ['interpolate-hcl', InterpolationSpecification, number | ExpressionSpecification,
200
+ ...(number | ColorSpecification)[]] // alternating number and ColorSpecificaton
201
+ | ['interpolate-lab', InterpolationSpecification, number | ExpressionSpecification,
202
+ ...(number | ColorSpecification)[]] // alternating number and ColorSpecification
203
+ | ['step', number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification,
204
+ ...(number | ExpressionInputType | ExpressionSpecification)[]] // alternating number and ExpressionInputType | ExpressionSpecification
208
205
  // Variable binding
209
206
  | ['let', string, ExpressionInputType | ExpressionSpecification, ...(string | ExpressionInputType | ExpressionSpecification)[]]
210
207
  | ['var', string]
211
208
  // String
212
- | ['concat', ExpressionInputType | ExpressionSpecification, ExpressionInputType | ExpressionSpecification,
213
- ...(ExpressionInputType | ExpressionSpecification)[]] // string
209
+ | ['concat', ...(ExpressionInputType | ExpressionSpecification)[]] // at least two inputs required -> string
214
210
  | ['downcase', string | ExpressionSpecification] // string
215
211
  | ['is-supported-script', string | ExpressionSpecification] // boolean
216
212
  | ['resolved-locale', CollatorExpressionSpecification] // string
@@ -225,7 +221,7 @@ export type ExpressionSpecification =
225
221
  | ['/', number | ExpressionSpecification, number | ExpressionSpecification] // number
226
222
  | ['%', number | ExpressionSpecification, number | ExpressionSpecification] // number
227
223
  | ['^', number | ExpressionSpecification, number | ExpressionSpecification] // number
228
- | ['+', number | ExpressionSpecification, number | ExpressionSpecification, ...(number | ExpressionSpecification)[]] // number
224
+ | ['+', ...(number | ExpressionSpecification)[]] // at least two inputs required -> number
229
225
  | ['abs', number | ExpressionSpecification] // number
230
226
  | ['acos', number | ExpressionSpecification] // number
231
227
  | ['asin', number | ExpressionSpecification] // number