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

5812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Jansen
e690f28517 replace tab with spaces 2012-04-21 00:14:24 +03:00
Éric Lemoine
a57738e817 Merge branch '2.12' 2012-04-20 15:29:46 +02:00
Éric Lemoine
f36fd5f0d1 Merge pull request #393 from elemoine/393 
grid layers may be misplaced
 2012-04-20 06:27:27 -07:00
ahocevar
bd4c092943 Merge pull request #419 from ahocevar/bing-attribution 
Incorrect Bing attribution when custom maxResolution is set. r=@elemoine
 2012-04-20 06:11:31 -07:00
ahocevar
9ab6d08fb0 Calculate zoom level from serverResolutions. 
The previous way of hard-coding an offset of 1 causes an incorrect attribution for layers with a custom maxResolution.
 2012-04-20 15:08:45 +02:00
Éric Lemoine
e998335718 Merge pull request #399 from elemoine/399 
adding an OverviewMap to an OSM map no longer just works
 2012-04-20 05:10:34 -07:00
ahocevar
a73d9e3804 Merge pull request #407 from ahocevar/alwaysInRange 
alwaysInRange not updated when using addOptions. r=@elemoine,@bartvde
 2012-04-19 09:00:26 -07:00
ahocevar
70161c5628 Merge pull request #421 from ahocevar/bing-overlay 
Make sure tiles are loaded for Bing overlays. r=@bartvde
 2012-04-19 07:03:56 -07:00
ahocevar
551f509b49 Make sure tiles are loaded for Bing overlays. 
Previously, Bing overlays that were added to an existing map had empty tiles, because tiles are added before the layer url is set in initLayer. This change makes sure tiles are only rendered when the layer url is available, by not processing the tile queue before the layer url is set.
 2012-04-19 16:02:23 +02:00
ahocevar
363f837acb Using resolution instead of zoom level for initial center (see #418). 2012-04-19 13:29:56 +02:00
ahocevar
ef33f01504 Respect alwaysInRange from prototype, but allow changes in addOptions. 2012-04-19 12:02:18 +02:00
Tim Schaub
bce40d9e42 Merge branch 'master' of github.com:openlayers/openlayers 2012-04-17 12:12:38 -04:00
Tim Schaub
f70b500aac Merge branch '2.12' of github.com:openlayers/openlayers 2012-04-17 12:11:38 -04:00
Bart van den Eijnden
ce18994664 Merge pull request #413 from bartvde/extendeddate 
allow the regex for date parsing to be specified, so that applications can potentially deal with dates before BC in ISO-8601 (r=@ahocevar)
 2012-04-17 08:41:11 -07:00
Bart van den Eijnden
a96d32d284 rename to dateRegEx and provide default value in api docs 2012-04-17 17:39:37 +02:00
Bart van den Eijnden
f07660e8c5 implement @ahocevar's suggestion instead 2012-04-17 15:57:51 +02:00
Frédéric Junod
7ec0071823 Merge pull request #403 from fredj/403 
Util.html test fail with Chrome and Chromium. r=elemoine
 2012-04-17 06:53:43 -07:00
Bart van den Eijnden
90a8ac9c71 allow for negative years in dates 2012-04-17 14:23:56 +02:00
Frederic Junod
e14d7d686e Fix Util.html test for Chrome/Chromium browsers. 2012-04-16 10:41:07 +02:00
ahocevar
b683c9bae1 No csstidy, because it changes the css and breaks the zoom buttons. 2012-04-14 18:35:51 +02:00
Éric Lemoine
342f647135 Merge branch '2.12' 2012-04-14 15:00:14 +02:00
Éric Lemoine
c88a610f21 Merge pull request #406 from elemoine/406 
TMS zoomOffset test sets NaN maxResolution values in the map
 2012-04-14 05:25:07 -07:00
Éric Lemoine
bfd6be634f if maxResolution is "auto" calculate maxResolution based on maxExtent and map size, else calculate maxResolution based on maxExtent and tile size 2012-04-11 17:45:34 +02:00
Éric Lemoine
ebfbb354ed fix the TMS zoomOffset test 2012-04-11 17:43:17 +02:00
Frédéric Junod
6adac12fab Merge pull request #405 from fredj/handler-options 
Move handlerOptions to the Control prototype.
 2012-04-11 05:08:54 -07:00
Éric Lemoine
6a039fd700 Merge branch '2.12' 2012-04-11 12:58:06 +02:00
Frederic Junod
1a59e47737 Move handlerOptions to the Control prototype. 2012-04-11 12:46:20 +02:00
Bart van den Eijnden
344e2124c9 Merge pull request #400 from bartvde/bing 
fix Bing attribution issue caused by reverse axis order (r=@elemoine). Thanks Eric Blasenheim for the detailed report.
 2012-04-10 06:02:30 -07:00
Bart van den Eijnden
59cc18d85b fix Bing attribution issue reported by PitneyBowes 2012-04-10 14:31:20 +02:00
Éric Lemoine
ae75fdacd7 Revert "Merge pull request #116 from elemoine/redraw" 
This reverts commit 7a5b469192, reversing
changes made to a719de7e93.

Conflicts:

	tests/Tile/Image.html
 2012-04-07 21:07:03 +02:00
Éric Lemoine
58e86a37f5 Revert "Declare zoomChanged." 
This reverts commit b910a5f4d0.
 2012-04-07 21:02:24 +02:00
Éric Lemoine
4df1104b7a Revert "Merge pull request #312 from elemoine/redraw" 
This reverts commit 7f94945244, reversing
changes made to dfa70fafac.

Conflicts:

	lib/OpenLayers/Layer/Vector.js
 2012-04-07 21:01:52 +02:00
Éric Lemoine
685eae7c04 Merge pull request #390 from elemoine/scriptlocation 
_getScriptLocation regexp not robust enough
 2012-04-04 21:43:08 -07:00
Tim Schaub
24d421a449 Merge branch '2.12' of git://github.com/openlayers/openlayers 2012-04-04 14:50:53 -10:00
Tim Schaub
0554637c56 Merge pull request #388 from tschaub/offline 
Make cache writing work when cross-origin.
 2012-04-04 17:49:24 -07:00
Éric Lemoine
b1b4736315 make _getScriptLocation RegExp more robust, p=jpfiset, t,r=me 2012-04-04 20:30:50 +02:00
Tim Schaub
2582e762b7 Avoid undefined url. 2012-04-03 16:49:23 -10:00
Marc Jansen
326598a75c Merge pull request #361 from sdikiy/patch-1 
accurate calculation of the centroid for small objects with large coordinates (p=sdikiy,r=marcjansen,sbrunner)
 2012-04-03 11:58:57 -07:00
Éric Lemoine
5c597de900 Merge pull request #384 from elemoine/gridclass 
renaming from olLayerGridTile to olLayerGrid
 2012-04-03 08:55:49 -07:00
ahocevar
96e5241507 Vector layer should not be a base layer any more. 2012-04-03 17:16:20 +02:00
ahocevar
fef8b98f32 Merge branch 'master' of github.com:openlayers/openlayers 2012-04-03 17:16:06 +02:00
ahocevar
530952551f Merge pull request #382 from ahocevar/wps 
WPS example and improvements. r=@marcjansen,@bartvde
 2012-04-03 06:30:15 -07:00
ahocevar
f21678f55b Addressing review comments from @bartvde and @marcjansen. 2012-04-03 15:28:44 +02:00
Frederic Junod
f2dd130256 update mapbox example. 
* use Zoom control instead of ZoomPanel
 * wrap date line
 * attribution control already at the bottom of the map
 * use html entities for the copyright symbol
 * layer has 17 levels, update numZoomLevels
 2012-04-02 21:13:42 -10:00
Éric Lemoine
f870417a30 class name olLayerGridTile renamed olLayerGrid 2012-04-03 06:28:06 +02:00
Éric Lemoine
160ccef8d3 Merge branch '2.12' 2012-04-02 21:10:19 +02:00
Éric Lemoine
eb2d62dacb Merge pull request #365 from elemoine/anim2 
Display issues with backbuffer delay on single tiled transparent layers
 2012-04-02 12:02:05 -07:00
Éric Lemoine
9d23b81dae update 2.12 notes 2012-04-02 21:00:20 +02:00
Éric Lemoine
d650ba20d9 Layer.Grid - better docs for transitionEffect, removeBackBufferDelay, and className 2012-04-02 20:59:16 +02:00
Éric Lemoine
d8473f9249 make Layer.Grid.prototype.className an API property 2012-04-02 17:57:37 +02:00