ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,684 Commits 5 Branches 232 Tags
d62e91023931f8dd0796ce6aedce77496d22c653
Commit Graph

15684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Jansen
d77a8b0a1d Add an assertion to the dragchange handler. 
This ensures that the result of resolution calculation stays inside of the
allowed bounds.
 2013-03-14 09:37:35 +01:00
Marc Jansen
ce67625b20 Use OSM resolutions as fallback resolutions. 
Hat tip to @twpayne for suggesting this change in the defaults.
 2013-03-14 09:37:35 +01:00
Marc Jansen
f496471273 Simplify example and let it use real resolutions. 
Thanks to @twpayne for the suggestion.
 2013-03-14 09:37:35 +01:00
Marc Jansen
8bf71ebb3a Add a zoomslider control. 2013-03-14 09:37:35 +01:00
Éric Lemoine
ac86cc1058 Merge pull request #362 from Turbo87/test-improvements 
Test improvements
 2013-03-13 10:18:00 -07:00
Bruno Binet
7d675b73b4 Merge pull request #361 from bbinet/factorize-expandurl-code 
Factorize code that expand a template url into multiples urls
 2013-03-13 09:47:17 -07:00
Tobias Bieniek
47261124fc test: Added expect(spy).to.be.called() syntactic sugar 2013-03-13 17:18:23 +01:00
Tobias Bieniek
93577bd335 test: Moved intersectsWith() testing function into test-extensions.js 2013-03-13 17:11:21 +01:00
Marc Jansen
e1bfc0c9dd Merge pull request #355 from marcjansen/screenshot 
Add a screenshot script for our examples. (r=@twpayne,@elemoine)
 2013-03-13 08:56:32 -07:00
Bruno Binet
317676a68f Homogenize wmts tileUrlFunction relative to other sources 2013-03-13 16:52:54 +01:00
Bruno Binet
5eaf4baaa4 Try to expand single url for TiledWMS source 2013-03-13 16:52:54 +01:00
Bruno Binet
875ead58ab Remove expandUrl duplicated code from createFromTemplate 
and make use of expandUrl function instead.
 2013-03-13 16:52:54 +01:00
Bruno Binet
54dfca3419 Move factorizable code in ol.TileUrlFunction.expandUrl 2013-03-13 16:48:22 +01:00
Marc Jansen
2b4545e221 Ignore fewer files and clip correctly. 2013-03-13 16:09:05 +01:00
Marc Jansen
3a863ddf3e Add a screenshot script for our examples. 
This script is supposed to be executed via phantomjs. It will generate
screenshots of the html files in the directory specified by a commandline
option when these files are served through a webserver which can also be
specified. The screenshots will be saved in the passed directory.

Example usage:

    user@host:~/ol3/bin $ phantomjs example-screenshot.js \
                          http://localhost:8000/ol3/examples/ \
                          ../examples/

The above command will generate `*html.png` files in `tools/` for all html files
that are served through `http://localhost:8000/ol3/examples/`.

So if there is a file `my-humpty-example.html` inside of the relative folder
`../examples/` which is being served through the webserver so that
`http://localhost:8000/ol3/examples/my-humpty-example.html` is a valid and
reachable URL, this script will generate a screenshot and store it as
`../examples/my-humpty-example.html.png`.

The query string `?mode=raw` will be appended to the generated URL.

Known limitations:

As phantomjs doesn't support WebGL (see e.g.
https://github.com/ariya/phantomjs/wiki/Supported-Web-Standards and
http://code.google.com/p/phantomjs/issues/detail?id=273) This won't render
OpenLayers maps rendered through the webglrenderer.

In parts based upon this gist: https://gist.github.com/crazy4groovy/3160121
 2013-03-13 15:50:55 +01:00
Frédéric Junod
c4ab34e4a7 Merge pull request #349 from fredj/bing-getStyle 
Add ol.source.BingMaps.getStyle function
 2013-03-13 06:16:11 -07:00
Frederic Junod
02e6937db3 Add a basic layer selector in bing-maps example 2013-03-13 13:36:49 +01:00
Éric Lemoine
edc1bd513b Merge pull request #358 from Turbo87/mocha 
Replaced jasmine testing framework by mocha, expect.js and sinon
 2013-03-13 04:04:17 -07:00
ahocevar
6d8d21b2d5 Merge pull request #360 from ahocevar/demo_dot_opengeo_dot_org 
Using a server that is not down. r=@elemoine
 2013-03-13 02:01:38 -07:00
ahocevar
14d9ff3b81 Using a server that is not down 
fix #353
 2013-03-13 09:59:25 +01:00
Bruno Binet
19acefc6d9 Merge pull request #359 from bbinet/useTile-consistent 
Be more consistent with useTile parent method
 2013-03-13 01:50:54 -07:00
Tobias Bieniek
01f9037782 test: Fixed linter errors 2013-03-13 04:59:20 +01:00
Tobias Bieniek
2245396bda test: Updated README file 2013-03-13 04:55:30 +01:00
Tobias Bieniek
d5d8afc858 Converted "vector" branch unit tests to mocha, expect.js and sinon 2013-03-13 04:48:08 +01:00
Tobias Bieniek
8273d880d5 Merge remote-tracking branch 'origin/master' into mocha 
Conflicts:
	test/jasmine-extensions.js
 2013-03-13 04:46:16 +01:00
Tobias Bieniek
89ab68cde7 Replaced jasmine testing framework by mocha, expect.js and sinon 
as discussed in #319
 2013-03-13 04:32:43 +01:00
Bruno Binet
86c05b4d21 Be more consistent with useTile abstract method 2013-03-12 17:58:29 +01:00
ahocevar
76d1a0c30e Merge pull request #218 from openlayers/vector 
Vector work. p=@tschaub,@ahocevar; r=@twpayne,@marcjansen,@bartvde
 2013-03-12 09:26:46 -07:00
ahocevar
84154d7bb2 Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-03-12 13:27:41 +01:00
Tom Payne
f75d3abf7d Merge pull request #297 from twpayne/fix-297 
Canvas map is not immediately updated when layers are added or removed
 2013-03-12 05:26:25 -07:00
Tom Payne
427c376fc6 Always render map when layers are added or removed 2013-03-12 12:57:22 +01:00
Marc Jansen
06f8d1356d Merge pull request #352 from marcjansen/unselectable-css-const 
Use constant for CSS class 'ol-unselectable'.
 2013-03-12 03:30:38 -07:00
Marc Jansen
5e5e4d110a Use constant for CSS class 'ol-unselectable'. 2013-03-12 10:34:49 +01:00
ahocevar
acd4f50f15 Making the linter happy 2013-03-12 10:23:38 +01:00
ahocevar
eeecd424bf Moving vector rendering to ol.renderer.canvas.VectorRenderer 2013-03-12 10:05:47 +01:00
ahocevar
bb8755eb68 Recovering from bad merge 2013-03-12 08:48:22 +01:00
ahocevar
15375df7ab Line was too long after previous change 2013-03-12 08:41:41 +01:00
ahocevar
fad036aa53 Merge branch 'master' of github.com:openlayers/ol3 into vector 
Conflicts:
	src/objectliterals.exports
 2013-03-12 08:39:16 +01:00
ahocevar
b20a2bae94 Moving RTreeNode_ into ol.structs package 2013-03-12 08:35:57 +01:00
ahocevar
f5b53740e6 Define map at the top 2013-03-12 08:28:24 +01:00
ahocevar
47e5b0475b Since #274 we don't need to create an ol.Collection explicitly 2013-03-12 08:24:31 +01:00
Tom Payne
a0b1d74bb5 Merge pull request #337 from Turbo87/polyline 
Added ol.parser.polyline module
 2013-03-11 13:55:04 -07:00
Tobias Bieniek
1172e58a50 polyline: Replaced "new Array()" by "[]" 2013-03-11 21:41:32 +01:00
Tobias Bieniek
0df5b4cad2 polyline: Improved decoding loops to be more robust 2013-03-11 20:32:25 +01:00
Tobias Bieniek
8330586ee2 test/polyline: Reset testing data manually in encodeFloats test 2013-03-11 20:32:22 +01:00
Tobias Bieniek
8b45637e72 test/polyline: Added missing brackets 2013-03-11 20:32:18 +01:00
Cédric Moullet
d9e1fdf13c Change the way the projection is managed and use ol.projection.configureProj4jsProjection 2013-03-11 20:25:29 +01:00
Tom Payne
f9c080a67d Merge pull request #346 from twpayne/single-map-in-canvas-tiles-example 
Use a single map in the canvas tiles example
 2013-03-11 09:29:32 -07:00
Tom Payne
2a5d07d929 Use a single map in the canvas tiles example 2013-03-11 17:07:27 +01:00
Tom Payne
8b5194da38 Merge pull request #338 from twpayne/snap-center-to-pixel2 
Snap center to pixel
 2013-03-11 08:41:28 -07:00