Commit Graph

1385 Commits

Author SHA1 Message Date
ahocevar
bdfa2cc88c Fixing return type to make Closure compiler happy 2013-03-02 17:44:15 +01:00
ahocevar
f4a4522eb4 Giving vector layers the style they deserve
Now vector layers can have a style. ol.Style instances have an
apply method to get the symbolizer literals for a feature. If the
layer does not have a style defined, there is also a static
applyDefaultStyle function on ol.Style to get the default
symbolizer literals for a feature. The vector layer also got a
groupFeaturesBySymbolizerLiteral method, which returns an array
with features grouped by symbolizer, as needed by the canvas
renderer.
2013-03-02 17:38:01 +01:00
ahocevar
fcd5804d2d Symbolizer and SymbolizerLiteral as base class, not interface 2013-03-02 14:08:52 +01:00
ahocevar
da7820121f Renaming the 'evaluate' method to 'applies' 2013-03-02 12:50:53 +01:00
Tim Schaub
7ce89f1fbe Proper getAttributes method
With a59aa9bb37 we can now provide an object with user set attributes.
2013-02-20 10:33:42 -07:00
Tim Schaub
0f2f26969d Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-02-20 10:18:09 -07:00
Tim Schaub
a59aa9bb37 Merge pull request #217 from tschaub/safer-object
Allow ol.Object to be used with arbitrary keys.  Add a getKeys method.
2013-02-20 07:56:07 -08:00
Tim Schaub
689f8c9d9d Merge pull request #206 from tschaub/interim-tiles
Share common code to find loaded tiles
2013-02-20 00:52:49 -08:00
Bart van den Eijnden
efefb2554a Merge pull request #204 from bartvde/wmscapsfixes
fixes for the WMS capabilities parser (r=@elemoine)
2013-02-20 00:48:30 -08:00
Tim Schaub
8f578b88b1 Removing the typed arrays
Its not clear that we will be able to leverage the Float64Array.  It may also be that the overhead of constructing these small arrays negates any benefit of faster access.  And for all coordinate arrays, we'll need arrays that grow/shrink.
2013-02-20 01:15:39 -07:00
Tim Schaub
176f18c937 Merge branch 'master' of github.com:openlayers/ol3 into vector
Resolved conflicts:
  src/ol/renderer/canvas/canvasrenderer.js
2013-02-20 00:38:07 -07:00
Tim Schaub
9cac8ec2f6 Moving GeoJSON into parser package
Need to discuss whether we want all to require constructing a new parser.  I liked the simple `ol.io.geojson.read` function.
2013-02-20 00:09:38 -07:00
Tim Schaub
735f490f56 Treating geometry as just another attribute
The first set geometry is considered the default.  As an added bonus, we're back to a single argument constructor.  Later, we could allow a schema to be set.  This would be done before setting values (calling constructor with no args).
2013-02-20 00:02:50 -07:00
Tim Schaub
0015e466dc Allow instanceof checks for geometries 2013-02-19 23:21:05 -07:00
Tim Schaub
438664a190 Renaming literals 2013-02-19 22:35:29 -07:00
Tim Schaub
7141721bb1 Symbolizers with method for creating literals 2013-02-19 22:24:21 -07:00
Tim Schaub
1faa6214f1 Expression literal 2013-02-19 21:38:10 -07:00
Tim Schaub
360e37146c Rule is filter and symbolizer, style is collection of rules 2013-02-19 21:37:40 -07:00
Tim Schaub
2919906ba6 Add method for getting keys 2013-02-19 14:47:49 -07:00
Tim Schaub
d6ff58305d Using a dedicated object for value storage
Without this, we are limited in the key names that we can accept from users.  And because of compiler renaming, we don't know ahead of time what the limitations are (e.g. the key 'a' may clobber the 'set' method).
2013-02-19 14:35:11 -07:00
Tim Schaub
0707deb465 Properties set with set should not be accessed with bracket 2013-02-19 14:28:59 -07:00
Tim Schaub
052e995f2e Key in obj check not appropriate for user supplied keys 2013-02-19 14:19:40 -07:00
Tim Schaub
6cfc36d8cc Using hasOwnProperty is better for user keys on objects we control 2013-02-19 14:17:58 -07:00
Tim Schaub
b9507de3ea Removing unnecessary overhead 2013-02-19 14:14:36 -07:00
Tim Schaub
3698049543 View needs to call constructor on super 2013-02-19 14:03:48 -07:00
Tim Schaub
80dc7b5bf7 Accept custom isLoaded method in findLoadedTiles method 2013-02-19 12:13:58 -07:00
Bruno Binet
6e08f5ef1b Merge pull request #216 from bbinet/remove_tilegrid_extent
Remove tilegrid extent_ property
2013-02-19 08:59:06 -08:00
Frédéric Junod
cb0fb64dd9 Merge pull request #214 from fredj/supported-const
Rename *.isSupported functions to *.SUPPORTED constants
2013-02-19 08:35:59 -08:00
Bruno Binet
0835fd6b0a Remove tile grid extent_ property
This is never used in ol3.
2013-02-19 17:22:24 +01:00
Bart van den Eijnden
793a956211 Several fixes to the WMS Capabilities parser
Make sure the object structure returned is not mangled by Closure

Do not use closure XHR or JSON in the example

Use Jasmine's async support in the test cases

Get rid of some backwards compatibility now that we have a fresh start
2013-02-19 17:12:02 +01:00
Tim Schaub
b061e23606 Merge branch 'master' of github.com:openlayers/ol3 into interim-tiles 2013-02-19 08:59:23 -07:00
Frederic Junod
c117fbbf7c Rename ol.Geolocation.isSupported to ol.Geolocation.SUPPORTED.
And add the 'const' JSDoc Tags.
2013-02-19 16:51:59 +01:00
Éric Lemoine
a04774cd96 Merge pull request #210 from elemoine/imageattribution
Image layer support to attribution control
2013-02-19 07:49:43 -08:00
Bart van den Eijnden
a2bcf51272 Merge pull request #213 from bartvde/wmtsclean
Implement WMTS GetCapabilities parser.
2013-02-19 07:45:08 -08:00
Tim Schaub
1f4b34cdb8 Merge pull request #207 from tschaub/tilerange
Make tile range calculation consistent.  Tile ranges are always inclusive in their min/max values.
2013-02-19 07:43:27 -08:00
Bart van den Eijnden
5e29830462 Add WMTS GetCapabilities parser
Implements WMTS GetCapabilities parser, which depends partly on
an OWSCommon parser.

Integration with the layer source will be done at a later stage.
2013-02-19 16:32:56 +01:00
Frederic Junod
7e3dcf36a0 Rename ol.*.isSupported function to ol.*.SUPPORTED const 2013-02-19 16:14:37 +01:00
Tim Schaub
5148ad038c Sharing code with rectangle
We cannot use the rectangle constructor here because a rectangle makes an assertion about min being less than max and a range may have equal min/max.
2013-02-19 07:30:54 -07:00
Tim Schaub
797dba2cdb Correct range for extent and resolution
Tile ranges are inclusive.  When getting the tile range for an extent, the top-right corner of the extent should be considered with a different intersection policy than the bottom-left corner.
2013-02-19 07:21:42 -07:00
Éric Lemoine
82aa44fdd1 Attribution control reads attribs from frame state 2013-02-19 15:19:44 +01:00
Éric Lemoine
f540dd8689 Image layer renderers add attributions to frame state 2013-02-19 15:19:44 +01:00
Tim Schaub
a55a6bda3b Merge pull request #208 from tschaub/shift-with-care
Calculating resolution by left shifting tile sizes, we're unnecessarily restricted in the number of zoom levels we can have.
2013-02-19 06:00:39 -08:00
Tom Payne
f27c749e49 Allow Proj4js to be non-global and cache test result 2013-02-19 09:12:40 +01:00
Tim Schaub
46e31f9f9a Lint and names 2013-02-18 22:20:50 -07:00
Tim Schaub
0a5dae9ed0 Avoid left shift in resolution calculations 2013-02-18 18:37:27 -07:00
Tim Schaub
ce4b95f960 Decoupling canvas tile grid from vector source grid
If we have a gridded vector source, the grid should have something to do with the source data (e.g. the vector data is available in a regular grid).  The vector layer renderer's internal grid is for rendering canvas tiles and doesn't have anything to do with the source.
2013-02-18 17:54:13 -07:00
Tim Schaub
8b19751264 Making it explicit that this is a range of tiles
With tile range extending rectangle, a tile range that represented a single tile was not allowed.
2013-02-18 17:07:31 -07:00
Tim Schaub
0d6c54847b Removing logic that assumes occasionally stretched tiles
When the dom renderer included logic to stretch tiles so that gaps were properly filled for fractional zoom levels, we needed to take this into account when getting a tile coordinate for a given coordinate and resolution.  This was never the proper logic for a renderer that wasn't stretching occassional tiles (e.g. the WebGL renderer, the Canvas renderer, or the new DOM renderer).
2013-02-18 15:55:27 -07:00
Tim Schaub
6aa4e99fe5 Fix return from findLoadedTiles
Previously, the findInterimTiles method was returning undefined if the min x/y coord for a tile range was already in the lookup.  The return says it indicates whether all tiles for the given z are loaded.  This change corrects the return.

This change also reveals a misunderstanding of the tile range returned by `getTileRangeForExtentAndZ`.  The previous findInterimTiles method was treating max values as inclusive.  This is intuitive.  It looks like the method returns a range where max values are exclusive.
2013-02-18 14:51:39 -07:00
Tim Schaub
ddf993f0c9 Factor out common code and test
The findInterimTiles method was used in three renderers.  This change makes it available on the tile source and adds some basic tests.
2013-02-18 14:18:08 -07:00