ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,729 Commits 5 Branches 232 Tags
1d6e428e8f71a4740f55b358e2a11ce840edd9ca
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Schaub cd14753495 Merge pull request #831 from tschaub/kml-example 
Nicer KML example
 2013-06-27 14:38:57 -07:00
Tim Schaub a2bc986785 Timezone offset in a tooltip 2013-06-27 14:51:04 -06:00
Tim Schaub aab5c8472c Update example to use expression parsing 2013-06-27 10:17:40 -06:00
Tim Schaub b7412552a5 Adding a prettier KML example 2013-06-27 10:17:40 -06:00
Tim Schaub fa4d2d485d Merge pull request #829 from tschaub/kml 
Parse MultiGeometry in KML
 2013-06-27 06:35:50 -07:00
Tim Schaub a7ca22dde0 Merge pull request #790 from tschaub/expression 
Expression parsing
 2013-06-26 16:40:08 -07:00
Tim Schaub 71153d26d1 Prefer if/else to switch 2013-06-26 17:01:27 -06:00
Tim Schaub 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
Tim Schaub 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
Tim Schaub f06208920f Merge pull request #828 from tschaub/shortdesc 
Minor edits to shortdesc in examples
 2013-06-26 10:59:58 -07:00
Tim Schaub 0958674765 Shortdesc edits 2013-06-26 10:57:36 -06:00
Tim Schaub e0a3f8ca07 Removing markup from shortdesc element (see #827) 
The text in `shortdesc` is shown on the example index page.  It shouldn't have any markup in it.
 2013-06-26 10:28:15 -06:00
Tim Schaub 4ccff4e8b6 Merge pull request #817 from tschaub/vector-exports 
Proper vector exports to get vector examples working
 2013-06-25 18:17:37 -07:00
Tim Schaub 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
Tim Schaub 72532b7dd6 Export individual geometry types 
This makes the style-rules.html example work with built lib.
 2013-06-25 13:21:13 -06:00
Tim Schaub 34acea5366 Merge pull request #821 from tschaub/generated-file-linting 
Create separate target for linting generated files
 2013-06-25 12:20:45 -07:00
Tim Schaub 4e5ef05e5e Expression for evaluating feature ids 2013-06-25 12:15:34 -06:00
Tim Schaub 1eaf82ead5 Enum for checking built-in lib functions internally 2013-06-25 12:15:34 -06:00
Tim Schaub 70fef73869 Testing operator precedence 2013-06-25 12:15:34 -06:00
Tim Schaub c81057780a More tests for binary operators 2013-06-25 12:15:34 -06:00
Tim Schaub 1f23a245e4 More tests for unary expression 2013-06-25 12:15:34 -06:00
Tim Schaub 2577d3f7d6 Rename ol.expression to ol.expr 2013-06-25 12:15:34 -06:00
Tim Schaub 9928730bd3 Tests for ol.expression.register() 2013-06-25 12:15:33 -06:00
Tim Schaub 233595ac75 Allow registration of custom functions for expressions 2013-06-25 12:15:33 -06:00
Tim Schaub 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
Tim Schaub 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
Tim Schaub c7da7e4c2e Using new expressions in text symbolizer 2013-06-25 12:15:33 -06:00
Tim Schaub 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
Tim Schaub a663d8fcae Accept an expression string for rule filter 2013-06-25 12:11:50 -06:00
Tim Schaub 38b784d672 Support +/- unary operators for literals 2013-06-25 12:11:50 -06:00
Tim Schaub d70a9eba01 Lib for well-known functions 
This reveals a lexer bug that needs addressing.
 2013-06-25 12:11:50 -06:00
Tim Schaub bd5d9d572e Lint 2013-06-25 12:11:50 -06:00
Tim Schaub 5e309e244b Using ol.expression.parse 2013-06-25 12:11:50 -06:00
Tim Schaub 53abedaada Correct doc and arg order 2013-06-25 12:11:50 -06:00
Tim Schaub 72d32ec71a Correct index for tokens 2013-06-25 12:11:50 -06:00
Tim Schaub f0567f5053 Expect the unexpected 2013-06-25 12:11:49 -06:00
Tim Schaub 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
Tim Schaub 62eb0dd72b Give token an index and throw unexpected token from a common place 2013-06-25 12:11:49 -06:00
Tim Schaub bb1b0cba95 Getter for not expression argument 2013-06-25 12:11:49 -06:00
Tim Schaub c05fb8c61b Getters for member expression properties 2013-06-25 12:11:49 -06:00
Tim Schaub 2528581642 Getters for math expression properties 2013-06-25 12:11:49 -06:00
Tim Schaub 4a617871da Getters for logical expression properties 2013-06-25 12:11:49 -06:00
Tim Schaub 3de330eb99 Getter for literal expression value 2013-06-25 12:11:49 -06:00
Tim Schaub 6d6ec357e1 Getter for identifier expression name 2013-06-25 12:11:48 -06:00
Tim Schaub 582a52849c Getters for comparison expression properties 2013-06-25 12:11:48 -06:00
Tim Schaub be636d7f46 Getters for call expression properties 2013-06-25 12:11:48 -06:00
Tim Schaub 6458f98996 Describing the extent of support for ES-5 expressions 2013-06-25 12:11:48 -06:00
Tim Schaub 2fd8f4cb00 Integration testing for binary logical operators 2013-06-25 12:11:48 -06:00
Tim Schaub 973606e67a Integration tests for equality operators 2013-06-25 12:11:48 -06:00
Tim Schaub 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
Tim Schaub 3a3f9bc20b Integration testing for relational operators 
No `instanceof` or `in` operator support.
 2013-06-25 12:11:47 -06:00
Tim Schaub 9d5424236c Integration testing for additive operators 2013-06-25 12:11:47 -06:00
Tim Schaub 7c2550fefa Integration testing for multiplicative operators 2013-06-25 12:11:47 -06:00
Tim Schaub 2492515e8f Integration testing for unary operators 
Only supporting ! at the moment.
 2013-06-25 12:11:47 -06:00
Tim Schaub e6f03c8f22 Confirm whitespace is consumed as expected 2013-06-25 12:11:47 -06:00
Tim Schaub 26a7d907a2 Test unary expression parsing 2013-06-25 12:11:47 -06:00
Tim Schaub a0bd736948 Left-hand-side expression parsing 2013-06-25 12:11:47 -06:00
Tim Schaub 803b3a3f7d Binary expression parsing 2013-06-25 12:11:46 -06:00
Tim Schaub 40b12410f0 Increment after scanning >= and <= (and expect EOF in tests) 2013-06-25 12:11:46 -06:00
Tim Schaub 379ac82688 Test argument parsing 2013-06-25 12:11:46 -06:00
Tim Schaub 38c8927ae2 Doc and method reorg 2013-06-25 12:11:46 -06:00
Tim Schaub 6d0badcf2a Optional scope (works for expressions without identifiers) 2013-06-25 12:11:46 -06:00
Tim Schaub d920d8e578 Test left-hand-side expression parsing 2013-06-25 12:11:46 -06:00
Tim Schaub 13d0b8b084 Provide ol.expression.parse method 
This is the only method needed in the API.
 2013-06-25 12:11:46 -06:00
Tim Schaub 3643ea164f Cast boolean and null before creating literal expression 2013-06-25 12:11:46 -06:00
Tim Schaub ce67aa2617 Make way for convenience functions in ol.expression package 2013-06-25 12:11:45 -06:00
Tim Schaub 737d669e4a Correct types 2013-06-25 12:11:45 -06:00
Tim Schaub 7a1e69e288 Initial parsing tests 2013-06-25 12:11:45 -06:00
Tim Schaub cb9725bdfb Provide static method to check for valid operators 2013-06-25 12:11:45 -06:00
Tim Schaub 29b77a2dac Member expressions 2013-06-25 12:11:45 -06:00
Tim Schaub fbb028e15e Call expressions 2013-06-25 12:11:45 -06:00
Tim Schaub 2f7e74ab35 Create binary expressions when parsing 2013-06-25 12:11:45 -06:00
Tim Schaub f050546fe2 Logical expressions 2013-06-25 12:11:44 -06:00
Tim Schaub 153df45f95 Math expressions 
Just simple binary type expressions supported here.  These can be serialized in a variety of formats.  More complex operations to be supported by call expressions.
 2013-06-25 12:11:44 -06:00
Tim Schaub b2ff793ea1 Comparison expressions 2013-06-25 12:11:44 -06:00
Tim Schaub c4867bafec Smaller subset of binary operators 2013-06-25 12:11:44 -06:00
Tim Schaub 7800e9b0cc Comments, links, copyrights 2013-06-25 12:11:44 -06:00
Tim Schaub 052b973b39 Reduce to a single literal 2013-06-25 12:11:44 -06:00
Tim Schaub 20b66fc447 Proper specs 2013-06-25 12:11:43 -06:00
Tim Schaub 0abcbb9854 Stray not 2013-06-25 12:11:43 -06:00
Tim Schaub ed2e21dffa Parsing 2013-06-25 12:11:43 -06:00
Tim Schaub 1f68522837 Utility methods on the lexer 2013-06-25 12:11:43 -06:00
Tim Schaub a87ebfe97b Specific expression types 2013-06-25 12:11:43 -06:00
Tim Schaub d7e0d043f3 Consistently number 2013-06-25 12:11:43 -06:00
Tim Schaub 063b461ffd Fewer calls to charCodeAt 2013-06-25 12:11:43 -06:00
Tim Schaub 9edc9ebcc5 Use next instead 2013-06-25 12:11:42 -06:00
Tim Schaub f272350e00 Expose next and peek methods 2013-06-25 12:11:42 -06:00
Tim Schaub 5baa38b82c Test punctuator scanning 2013-06-25 12:11:42 -06:00
Tim Schaub 957b6db3d7 Skip whitespace 2013-06-25 12:11:42 -06:00
Tim Schaub 50f94911b1 Scan string literals 2013-06-25 12:11:42 -06:00
Tim Schaub 4d62cea700 Escape sequences in our identifiers have already been handled 2013-06-25 12:11:42 -06:00
Tim Schaub 0844df8cc2 Scanning identifiers 
This includes code that is likely not necessary.  The escape sequence scanning will likely not be used in our case, but I'm committing it here so it can be brought back if needed later.
 2013-06-25 12:11:42 -06:00
Tim Schaub a748665646 Space and comment 2013-06-25 12:11:42 -06:00
Tim Schaub 040c80a5ad Expectations about token type 2013-06-25 12:11:42 -06:00
Tim Schaub 193cf4de50 Scan numeric literals 2013-06-25 12:11:41 -06:00
Tim Schaub 81b344715a Renaming for clarity 2013-06-25 12:11:41 -06:00
Tim Schaub a5343161bf Separate lexer 2013-06-25 12:11:41 -06:00
Tim Schaub 84a9fb40ef More char code tests 2013-06-25 12:11:41 -06:00
Tim Schaub 88fd0fda64 Initial bits for parser 2013-06-25 12:11:41 -06:00
Tim Schaub 48130670ca Create separate target for linting generated files 
This allows us to ignore specific error codes (e.g. LINE_TOO_LONG) for externs, exports, types, etc. (any auto-generated files).
 2013-06-25 10:43:27 -06:00