a7ca22dde0
Merge pull request #790 from tschaub/expression
...
Expression parsing
2013-06-26 16:40:08 -07:00
71153d26d1
Prefer if/else to switch
2013-06-26 17:01:27 -06:00
42aa94de21
KML MultiGeometry may contain other MultiGeometry
...
As demonstrated in the tests, a MultiGeometry may contain other MultiGeometry nodes. We can support this with heterogenous GeometryCollection instances - though these are not currently rendered.
2013-06-26 12:31:08 -06:00
30d947521d
The fromParts factories take geometry instances instead of coords
...
The MultiLineString case was correct here. The MultiPoint and MultiPolygon cases should be using the constructor instead of the `fromParts` factories.
2013-06-26 12:23:19 -06:00
16e23a33fb
Merge pull request #823 from elemoine/tilegridbug
...
Tile has a child if z < maxZoom
2013-06-26 10:10:38 -07:00
87dda95b18
Handle ol.ViewHint.INTERACTING in ol.interaction.Touch
2013-06-26 09:27:44 +02:00
ae7b342ee9
Handle ol.ViewHint.INTERACTING in ol.interaction.Drag
2013-06-26 09:27:44 +02:00
020d528e73
Tile has a child if z < maxZoom
2013-06-26 07:18:59 +02:00
3dc8c4bc7b
Properly exporting the transformFeatureInfo option
...
This was previously called getTransformFeatureInfo, which is a method instead of an option. In addition, the generate-exports.py script does not properly export properties whose names appear on a different line than the @property annotation. This makes the vector-layer.html, kml.html, and gpx.html examples work with the built lib.
2013-06-25 13:21:13 -06:00
72532b7dd6
Export individual geometry types
...
This makes the style-rules.html example work with built lib.
2013-06-25 13:21:13 -06:00
4e5ef05e5e
Expression for evaluating feature ids
2013-06-25 12:15:34 -06:00
1eaf82ead5
Enum for checking built-in lib functions internally
2013-06-25 12:15:34 -06:00
c81057780a
More tests for binary operators
2013-06-25 12:15:34 -06:00
2577d3f7d6
Rename ol.expression to ol.expr
2013-06-25 12:15:34 -06:00
233595ac75
Allow registration of custom functions for expressions
2013-06-25 12:15:33 -06:00
8e8b26805f
Uniformly support evaluating symbolizers without features
...
In combination with a (not yet implemented) `Symbolizer#isLiteral` method, calling `Symbolizer#evaluate` without a feature is the fast track for rendering batches of like-styled features. This change also simplifies the handling of undefined symbolizer literal properties (where stroke or fill properties are optional).
2013-06-25 12:15:33 -06:00
cab983f826
We are guarnteed that all TextLiteral properties are defined (see #770 )
...
Instead of using the browser defaults, we use `ol.style.TextDefaults`.
2013-06-25 12:15:33 -06:00
c7da7e4c2e
Using new expressions in text symbolizer
2013-06-25 12:15:33 -06:00
b04a36ede7
Replace use of filter with expressions
...
The canvas vector layer still has the (API candidate) `getFeatures` method that accepts an arbitrary expression (was filter). This, and the `getFeaturesObject` method under it are only used in the tests. The rendering code that was using filters is now calling `layer.getFeaturesObjectForExtent` with an explicit extent and optional geometry type.
2013-06-25 12:15:33 -06:00
a663d8fcae
Accept an expression string for rule filter
2013-06-25 12:11:50 -06:00
38b784d672
Support +/- unary operators for literals
2013-06-25 12:11:50 -06:00
d70a9eba01
Lib for well-known functions
...
This reveals a lexer bug that needs addressing.
2013-06-25 12:11:50 -06:00
bd5d9d572e
Lint
2013-06-25 12:11:50 -06:00
5e309e244b
Using ol.expression.parse
2013-06-25 12:11:50 -06:00
53abedaada
Correct doc and arg order
2013-06-25 12:11:50 -06:00
72d32ec71a
Correct index for tokens
2013-06-25 12:11:50 -06:00
36d10bef11
Custom error for unexpected token
...
This makes it clearer to the compiler where we are throwing.
2013-06-25 12:11:49 -06:00
62eb0dd72b
Give token an index and throw unexpected token from a common place
2013-06-25 12:11:49 -06:00
bb1b0cba95
Getter for not expression argument
2013-06-25 12:11:49 -06:00
c05fb8c61b
Getters for member expression properties
2013-06-25 12:11:49 -06:00
2528581642
Getters for math expression properties
2013-06-25 12:11:49 -06:00
4a617871da
Getters for logical expression properties
2013-06-25 12:11:49 -06:00
3de330eb99
Getter for literal expression value
2013-06-25 12:11:49 -06:00
6d6ec357e1
Getter for identifier expression name
2013-06-25 12:11:48 -06:00
582a52849c
Getters for comparison expression properties
2013-06-25 12:11:48 -06:00
be636d7f46
Getters for call expression properties
2013-06-25 12:11:48 -06:00
6458f98996
Describing the extent of support for ES-5 expressions
2013-06-25 12:11:48 -06:00
973606e67a
Integration tests for equality operators
2013-06-25 12:11:48 -06:00
d5e133b7d8
Satisfy the build/check-requires-timestamp task (see #785 )
...
I think this line should not be required, as `ol.expression.Char` is only used internally in this file.
2013-06-25 12:11:48 -06:00
26a7d907a2
Test unary expression parsing
2013-06-25 12:11:47 -06:00
a0bd736948
Left-hand-side expression parsing
2013-06-25 12:11:47 -06:00
40b12410f0
Increment after scanning >= and <= (and expect EOF in tests)
2013-06-25 12:11:46 -06:00
38c8927ae2
Doc and method reorg
2013-06-25 12:11:46 -06:00
6d0badcf2a
Optional scope (works for expressions without identifiers)
2013-06-25 12:11:46 -06:00
d920d8e578
Test left-hand-side expression parsing
2013-06-25 12:11:46 -06:00
13d0b8b084
Provide ol.expression.parse method
...
This is the only method needed in the API.
2013-06-25 12:11:46 -06:00
3643ea164f
Cast boolean and null before creating literal expression
2013-06-25 12:11:46 -06:00
ce67aa2617
Make way for convenience functions in ol.expression package
2013-06-25 12:11:45 -06:00
737d669e4a
Correct types
2013-06-25 12:11:45 -06:00
7a1e69e288
Initial parsing tests
2013-06-25 12:11:45 -06:00
Tim Schaub
Éric Lemoine
Frederic Junod
Éric Lemoine