Commit Graph

6514 Commits

Author SHA1 Message Date
Tim Schaub
faeb691f3a Tests for UTFGrid tiles. 2012-02-25 23:07:31 -07:00
Tim Schaub
8c95a90052 The parseData method doesn't need to know of XHR. 2012-02-25 20:51:03 -07:00
Tim Schaub
12fa9b54ef Consistency with tile loading events.
Since loadstart is being fired here, it makes sense to fire loadend as well.  The isLoading flag also needs to be cleared.  Needs tests still.
2012-02-25 20:45:18 -07:00
Tim Schaub
c18f6a23be Use JSON format for parsing JSON.
To get IE7 support, the OpenLayers.Format.JSON parser should be used.  This leverages the native JSON.parse method where available.  It does add extra weight to UTFGrid builds.  However, as of this commit date, we lose large portions of US govt agencies when we exclude IE7.
2012-02-25 20:18:23 -07:00
Tim Schaub
e6f0aa08e5 Cleanup use of Script protocol.
I would think there would still be an error thrown here.  Will put together a test to determine for sure, but I'd think that the default GeoJSON parser used by the protocol would choke on the UTFGrid json.
2012-02-25 20:09:34 -07:00
Tim Schaub
73e6973ab5 Remove cargo culted image tile bits. 2012-02-25 20:03:40 -07:00
Tim Schaub
65233dd0bc Add dependency on UTFGrid tile. 2012-02-25 20:01:14 -07:00
Tim Schaub
6ffce8cfb6 Remove unused list item. 2012-02-25 20:00:46 -07:00
mperry
bd8e4b55ef Merge remote-tracking branch 'tschaub/utfgrid' into utfgrid 2012-02-25 17:58:51 -08:00
mperry
ede6da8e6f Merge remote-tracking branch 'upstream/master' into utfgrid 2012-02-25 17:51:56 -08:00
Tim Schaub
e1dffacdde Providing a method to get data from the layer.
I think it should be the job of the layer to retrieve data for a given location (instead of the control).  The first part of this change creates a `getData` method on the layer and updates the control to use this method.

The second part of this change removes the assumption that the data returned will be an simple object representing feature attributes.  The UTFGrid specification doesn't say anything about the structure of property values in the optional data member.  The examples given in the spec use string values.  The default callback previously assumed that the data could be rendered in a two column table.  I think it would make more sense not to make this assumption.  With this change, the user must always provide a callback to do anything with returned data.
2012-02-25 17:33:32 -07:00
Tim Schaub
55ffdffd60 Removing debugging method. 2012-02-25 16:42:45 -07:00
Tim Schaub
6284e44d2e Making the UTFGrid examples more like the rest. 2012-02-25 16:18:43 -07:00
Tim Schaub
34a9c46243 Add UTFGrid components to debug loader. 2012-02-25 16:12:19 -07:00
Tim Schaub
f4465c516d Merge branch 'master' into utfgrid 2012-02-25 16:08:11 -07:00
ahocevar
a2d658f75a Merge pull request #245 from probins/mapdefaults
Map: check default controls are in build
2012-02-25 10:12:20 -08:00
Peter Robins
27e5aaf8f0 Map: check default controls are in build 2012-02-25 17:06:30 +00:00
Bart van den Eijnden
12d8220992 add a testcase for the labelAlign to AnchorPoint translation 2012-02-24 18:35:20 +01:00
Bart van den Eijnden
617ba736a2 if labelAlign is set, translate to AnchorPointX and AnchorPointY 2012-02-24 18:20:41 +01:00
Bart van den Eijnden
3b81b423a5 do not use rotation but use labelRotation instead (thanks @ahocevar for the catch) 2012-02-24 17:48:35 +01:00
Bart van den Eijnden
66d3b81929 remove accidentally commited swap file 2012-02-24 17:03:49 +01:00
ahocevar
284ec6a957 Merge pull request #243 from ahocevar/bing-maxresolution
If maxResolution is not set, we want the serverResolution. r=@bartvde
2012-02-24 07:27:28 -08:00
Bart van den Eijnden
63874e55d3 Merge pull request #237 from bartvde/sld
Add a GeoServer profile of SLD version 1.0.0 (r=@ahocevar)
2012-02-24 07:18:21 -08:00
ahocevar
094bedda9a If maxResolution is not set, we want the serverResolution.
After 2fe882f4d8, no default maxResolution is set. To make the Math.min not return 0, we need a fallback if no maxResolution was configured.
2012-02-24 16:04:07 +01:00
Bart van den Eijnden
c7a631c2e5 correct typo 2012-02-24 15:59:14 +01:00
Bart van den Eijnden
f05564cdb3 add support for LinePlacement 2012-02-24 15:42:49 +01:00
Bart van den Eijnden
6411a6c0ef implement TextSymbolizer->PointPlacement 2012-02-24 14:58:36 +01:00
Bart van den Eijnden
2e69d68102 map fill-opacity in TextSymbolizer to fontOpacity 2012-02-23 15:55:40 +01:00
Bart van den Eijnden
330777dd82 Merge branch 'master' of github.com:openlayers/openlayers into sld 2012-02-23 15:37:26 +01:00
ahocevar
8ce712adb6 Merge pull request #238 from ajkopinga/master 2012-02-22 17:26:54 +01:00
ahocevar
69660e3530 Minor coding style improvements. 2012-02-22 17:22:30 +01:00
Bart van den Eijnden
7fb62b6933 more complete inheritance of readers and writers 2012-02-22 16:18:41 +01:00
Arjen Kopinga
bb3ae99713 forgot to actually used featureId in getFeatureIdFromEvent 2012-02-22 15:57:54 +01:00
Arjen Kopinga
65aeaec284 returned graphic-name.js to its original state 2012-02-22 15:52:01 +01:00
Arjen Kopinga
1119146486 Small fix for hit detection on a canvas layer as an illegal feature id might result at a location where the edge of one feature intersects the interior of another. This is due to antialiasing on the hit context canvas which can't be turned off, unfortunately. 2012-02-22 15:39:31 +01:00
Arjen Kopinga
d6e28e5ab9 Added support for named graphics to Canvas renderer 2012-02-22 15:26:21 +01:00
Bart van den Eijnden
941f3c0913 change comment to highlight it's both read and write 2012-02-22 12:23:20 +01:00
Bart van den Eijnden
d4e0947f1a even though the parsing and writing is the same for all VendorOption tags, add a more complete list in the test SLD 2012-02-22 12:18:56 +01:00
Bart van den Eijnden
f0cb98a9bf a bit of restructuring, also making sure that a Graphic in a TextSymbolizer can be read and written (this is a GeoServer extension to produce e.g. highway shields) 2012-02-22 11:57:42 +01:00
Bart van den Eijnden
82a8602b45 use a more clean way to achieve the same 2012-02-22 11:50:37 +01:00
Bart van den Eijnden
b2f95bd537 TextSymbolizer->Fill->CssParameter['fill'] should map to fontColor instead 2012-02-22 11:03:48 +01:00
Bart van den Eijnden
050f72b443 start on a GeoServer profile for SLD 2012-02-22 09:55:45 +01:00
ahocevar
85498cb23f Removing imageOffset and using getImageSize.
This fixes a regression that was introduced with the Tile.Image overhaul. See http://trac.osgeo.org/openlayers/ticket/3625.
2012-02-21 15:06:32 +01:00
Bart van den Eijnden
a569873ff1 Merge pull request #235 from bartvde/bbox
add noAbort option to OpenLayers.Strategy.BBOX (r=@ahocevar)
2012-02-21 03:18:15 -08:00
Bart van den Eijnden
990a33662e incorporate @ahocevar's review 2012-02-21 12:09:19 +01:00
Bart van den Eijnden
815cafd900 add an option to OpenLayers.Strategy.BBOX to allow not aborting previous requests 2012-02-21 07:53:43 +01:00
fredj
79b539c1f9 Simplify parent call (don't use intermediate array) 2012-02-20 13:55:12 +01:00
ahocevar
221d7caf70 Using a blankImgUrl that works for IFrames in IE9.
See http://trac.osgeo.org/openlayers/ticket/3624.
2012-02-20 12:01:56 +01:00
fredj
3fefe91580 Remove tabs 2012-02-17 09:12:59 +01:00
ahocevar
69bac049c4 Merge pull request #227 from ahocevar/tileloaded-event
Making loaded tile available to tileloaded listeners. r=@fredj,@elemoine
2012-02-16 14:34:51 -08:00