Commit Graph

7865 Commits

Author SHA1 Message Date
ahocevar
8cc65756bc Only attempt fast lane for AND filters 2013-02-15 16:25:29 +01:00
Tim Schaub
be255ed6c7 Adding ol.Expression
This simple expression constructor will be used for symbolizer properties and the layer will generate symbolizer literals for rendering by evaluating any expressions with a feature as the this argument and feature attributes as the scope.  This allows generating labels that concatenate multiple attribute values together or displaying point symbols that are sized according to a population attribute divided by an area attribute, for example.

This implementation will not work in environments where the content security policy disallows the use of the Function constructor.  This is the case on browser extensions.  A more content-security-policy-friendly implementation would be to come up with a restricted grammar and write a lex/parser.  This is the road I started down, but this verison is far less code, and I think the security policy limitations are minor at this point.  This version will always be faster/lighter than a parser, so one is written in the future, it should only be pulled in where content security policy mandates it.
2013-02-14 17:19:15 -07:00
Tim Schaub
59a203b2b7 Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-02-14 17:18:00 -07:00
Tom Payne
012cb501df Don't re-lint files that have already passed after a lint failure 2013-02-15 00:33:05 +01:00
Bart van den Eijnden
234f6bc411 Merge pull request #180 from bartvde/wmscapsclean
add WMS GetCapabilities parser for WMS 1.1.0, 1.1.1, 1.1.1 WMS-C profile
2013-02-14 05:02:39 -08:00
Frédéric Junod
b305d7fdfa Merge pull request #192 from fredj/rotation
Change view.rotate params: rotation and optional anchor.
2013-02-14 04:48:42 -08:00
Frederic Junod
34975428c4 Change view.rotate params: rotation and optional anchor. 2013-02-14 12:17:26 +01:00
Éric Lemoine
daaff1611c Merge pull request #193 from elemoine/shaders
Apply transform matrix to text coords
2013-02-14 03:01:18 -08:00
Éric Lemoine
b6b493c198 Use vec2 for vTexCoord 2013-02-14 11:54:01 +01:00
Éric Lemoine
de7a1d8f81 Apply transform matrix to text coords
With this commit the transform matrix is applied to each texture coordinate, as opposed to each fragment. This leads to less calculation on the GPU.
2013-02-14 09:56:45 +01:00
Tim Schaub
2082ba7637 Fewer, bigger tiles 2013-02-13 15:51:06 -07:00
Tim Schaub
f5c627ab51 Only listen once for tile events
Assuming browser garbage collection cannot happen while we have listeners in the global registry, we need to listenOnce to avoid memory leaks with the tile queue.
2013-02-13 15:37:33 -07:00
Bart van den Eijnden
13d95b90a3 use namespace URI instead of prefix as suggested by @tschaub and discussed with @ahocevar 2013-02-13 20:58:48 +01:00
ahocevar
6b43435262 Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-02-13 12:30:16 +01:00
ahocevar
e155f870cd Fixing RTree, and using it for retrieving geometries 2013-02-13 12:29:14 +01:00
Tom Payne
83a00c13fa Don't use problematic glob function 2013-02-12 23:03:15 +01:00
Tom Payne
110720d7d3 Merge pull request #191 from twpayne/windows-build
Windows build
2013-02-12 07:24:39 -08:00
Tom Payne
9a3e090c2b Run tests on Windows 2013-02-12 16:07:34 +01:00
Frédéric Junod
b4bd1a5569 Merge pull request #190 from fredj/rotation
view.getRotation default value already set to 0.
2013-02-12 06:55:34 -08:00
Tom Payne
357ca379db Update build instructions for Windows 2013-02-12 15:47:55 +01:00
Tom Payne
3d34360070 Add build.cmd for Windows developers 2013-02-12 15:47:55 +01:00
Tom Payne
d828fee582 Set path to gjslint on Windows 2013-02-12 15:47:54 +01:00
Frederic Junod
f4e9dd5c37 view.getRotation default value already set to 0. 2013-02-12 15:37:08 +01:00
Tom Payne
169555f2be Use ifind rather than glob to work around Windows path separator nonsense 2013-02-12 15:31:30 +01:00
Tom Payne
a3e7528841 Guess paths to Windows binaries using environment variables 2013-02-12 15:30:36 +01:00
Tom Payne
4481bb011f Update to latest version of pake 2013-02-12 15:30:08 +01:00
Tom Payne
0c09083eb8 Add missing whitespace to satisfy pep8 2013-02-12 15:28:20 +01:00
Marc Jansen
192f29513e Merge pull request #189 from marcjansen/travis-tests
Fix the serve-precommit target. (r=@elemoine/@twpayne)
2013-02-12 06:10:26 -08:00
Marc Jansen
d851cac891 Fix the serve-precommit target.
When the plovr-jar is being invoked in the serve-precommit target, it needs
the JSON files in `test/` as well to have all requirements for headless testing.

This should also reenable running the testsuite on our continuous integration
server.
2013-02-12 14:28:58 +01:00
Marc Jansen
a0932c6cba Merge pull request #177 from marcjansen/build-clean
(Re)add a reallyclean target to the build. (r=@elemoine)
2013-02-12 01:57:01 -08:00
Marc Jansen
6de649f6c6 (Re)add a reallylean target to the build.
Previously we had both a `clean` and `reallyclean` in our Makefile; both
got lost when we switched to a python build.

A clean 'target' can be invoked by calling the build script with the '-c' flag:
  ./build.py -c

This commit readds the `reallyclean` target and lets it clean up a little more
than the Makefiles `clean` or `reallyclean` did. More files are deleted,
but only if these are being ignored inside of the repository (e.g. through
.gitignore files).
2013-02-12 10:11:14 +01:00
Frédéric Junod
03b10204a4 Merge pull request #173 from fredj/geolocation
Add ol.Geolocation
2013-02-08 21:57:11 -08:00
Éric Lemoine
5f5e14f253 Merge pull request #175 from elemoine/control
Simplify control architecture
2013-02-08 14:56:19 -08:00
Tim Schaub
652b7dd696 Merge pull request #184 from tschaub/less-animation
Avoid unnecessary animation loop while tiles load
2013-02-07 15:48:28 -08:00
Tim Schaub
440ea038fe Merge pull request #183 from tschaub/natural-names
More natural names for animations
2013-02-07 13:44:13 -08:00
Tim Schaub
3c4d218ec5 Only listen for first event 2013-02-07 14:06:05 -07:00
Frederic Junod
a36145fc1f Check if the Geolocation API is supported 2013-02-07 16:20:15 +01:00
Frederic Junod
44a5eca437 Add ol.Geolocation.isSupported property 2013-02-07 15:59:12 +01:00
Tom Payne
c884a916bf Merge pull request #178 from twpayne/clean-example-list-xml
Ensure ./build.py -c cleans examples/example-list.xml
2013-02-07 05:27:20 -08:00
Tom Payne
218bf2c78b Improve LRUCache containsKey test, thanks @tschaub 2013-02-07 12:21:12 +01:00
Bart van den Eijnden
f16664cb87 add an example 2013-02-07 10:45:35 +01:00
Frédéric Junod
f7ba03f4dd Merge pull request #179 from fredj/kinetic-update-arg
Change ol.Kinetic.update and begin arguments.
2013-02-07 00:08:01 -08:00
Tim Schaub
5bbd8fd9f3 Using ol.TileCache for managing canvas tiles 2013-02-06 18:23:39 -07:00
Tim Schaub
11b8c0ff47 Don't generate new tiles while animating 2013-02-06 17:47:03 -07:00
Tim Schaub
e079c19413 Don't repeatedly render while waiting for tiles to load
Instead of going into an unnecessary animation loop, we can simply wait to be notified when tiles load.

The WebGL renderer still sets frameState.animate true, but I think this too should be unnecessary (full page example works without it, side-by-side example shows it cannot yet be removed).
2013-02-06 16:10:46 -07:00
Tim Schaub
2bd29ff60e Only track tiles that are actually wanted
Instead of keeping track of wanted tile ranges, we can instead track wanted tiles individually.  This provides enough for the map to know how to prioritize tiles and should be more efficient (no extra calls to extend tile ranges or check for tile containment within a range).
2013-02-06 16:08:24 -07:00
Tim Schaub
e335b7b74a Make frame state available before rendering frame
Without this change, tiles that are enqueued on the first rendering will always get priority `ol.TileQueue.DROP` because `map.frameState_` is not yet defined (meaning a single render call doesn't result in any tiles loading).
2013-02-06 16:02:26 -07:00
Tim Schaub
a2bbdf7ccc More natural names for animations 2013-02-06 13:43:54 -07:00
Tom Payne
0b6aeb5b05 Remove unused and erroneous function, thanks @tschaub 2013-02-06 21:43:48 +01:00
Frédéric Junod
9c9fe4a9b1 Merge pull request #181 from fredj/rotation-anim
Replace ol.animation.createSpin with ol.animation.createRotateFrom
2013-02-06 08:39:22 -08:00