Commit Graph

3805 Commits

Author SHA1 Message Date
Éric Lemoine
35d5158454 Merge remote-tracking branch 'upstream/master' into vector-api
Conflicts:
	src/objectliterals.jsdoc
	src/ol/attribution.js
	src/ol/geom/geometry.js
	src/ol/geom/geometrycollection.js
	src/ol/geom/linestring.js
	src/ol/layer/vectorlayer.exports
	src/ol/layer/vectorlayer.js
	src/ol/map.js
	src/ol/proj/proj.js
	src/ol/renderer/canvas/canvasvectorlayerrenderer.js
	src/ol/source/imagewmssource.js
	src/ol/source/tilewmssource.js
	src/ol/source/vectorsource.exports
	src/ol/source/vectorsource.js
	src/ol/source/wmssource.js
	src/ol/style/style.js
	src/ol/tilegrid/tilegrid.js
	src/ol/tilegrid/wmtstilegrid.js
	src/ol/tilegrid/xyztilegrid.js
2013-12-13 12:53:57 +01:00
Éric Lemoine
93e605b119 Merge pull request #1350 from elemoine/gutter
Add gutter support to ol.source.TileWMS
2013-12-13 01:11:42 -08:00
Éric Lemoine
ca07b4ef47 Merge pull request #1371 from elemoine/getbrowserevent
Add ol.MapBrowserEvent#getBrowserEvent
2013-12-12 23:41:01 -08:00
Éric Lemoine
b8a0112a91 Merge pull request #930 from elemoine/externs
Use @exportSymbol instead of @exportClass|Function
2013-12-12 23:40:44 -08:00
ahocevar
95c717ad32 Merge pull request #1370 from ahocevar/unnest-loops
Unnest loops
2013-12-12 15:12:19 -08:00
ahocevar
c4ec53bbdb Unnest loops
Reusing the iterator in a nested loop is not a good idea. And in
this case it is better to not have nested loops at all, because
we only have to create one array.
2013-12-12 17:57:14 +01:00
Éric Lemoine
b709820777 Use olx for some parser options types 2013-12-12 15:22:47 +01:00
Éric Lemoine
f15694844d Line is too long 2013-12-12 15:22:18 +01:00
Éric Lemoine
f95e0eb785 Treat WMSGetFeatureInfoOptions as other options types 2013-12-12 15:21:49 +01:00
Éric Lemoine
7732c19874 Some options types are defined in the code
The sed script caught those, so manually adjusting here.
2013-12-12 15:19:37 +01:00
Éric Lemoine
7b81bfab5c Change @exportClass to @exportSymbol
sed command used: find src/ol -name '*.exports' -exec sed -ri 's/@exportClass\s+(\S+)\s+(\S+)$/@exportSymbol \1/' \{\} \;
2013-12-12 15:05:52 +01:00
Éric Lemoine
d9e293109e Change @exportFunction to @exportSymbol
sed command used: find src/ol -name '*.exports' -exec sed -ri 's/@exportFunction\s+(\S+)\s+(\S+)\s+(\S+)$/@exportSymbol \1 \1/' \{\} \;
2013-12-12 15:05:39 +01:00
Éric Lemoine
315c42f0a7 Use olx namespace for options types in source code
sed command used: find src/ol -name '*.js' -exec sed -ri 's/\{ol(\.(\w|\.)+Options\=?\})/{olx\1/' \{\} \;
2013-12-12 15:02:03 +01:00
Tom Payne
7b7ebb8609 Add missing "new"s in ol.structs.RBush 2013-12-12 13:01:25 +01:00
Éric Lemoine
701b2d63ef Add gutter support to ol.renderer.webgl.TileLayer 2013-12-12 10:59:32 +01:00
Éric Lemoine
5c71ec4922 Add gutter support to ol.renderer.dom.TileLayer 2013-12-12 10:59:32 +01:00
Éric Lemoine
2db8ce566b Add gutter support to ol.renderer.canvas.TileLayer 2013-12-12 10:59:32 +01:00
Éric Lemoine
55f56aaf03 Add ol.source.Tile#getGutter 2013-12-12 10:59:31 +01:00
Éric Lemoine
e14d8add85 Add gutter support to TileUrlFunction 2013-12-12 10:59:31 +01:00
Éric Lemoine
fd438f232b Add gutter option to ol.source.TileWMS 2013-12-12 10:59:31 +01:00
Tom Payne
e4d85e27b1 Merge pull request #1358 from twpayne/vector-api-geometry-collection
[vector-api] Add ol.geom.GeometryCollection
2013-12-11 13:07:05 -08:00
Tom Payne
bde17b2ac8 Add ol.geom.GeometryCollection support to ol.format.GeoJSON 2013-12-11 17:28:00 +01:00
Tom Payne
4205c01414 Add ol.geom.GeometryCollection rendering 2013-12-11 16:49:47 +01:00
Tom Payne
d7eb4db69e Add ol.geom.GeometryCollection 2013-12-11 16:49:47 +01:00
Tom Payne
802d1644bb Implement clone for simple geometries 2013-12-11 16:49:47 +01:00
Tom Payne
6295fa6088 Add ol.geom.Geometry#clone 2013-12-11 16:49:47 +01:00
Tom Payne
76a6e08ec1 Factor out ol.geom.SimpleGeometry 2013-12-11 16:49:47 +01:00
Éric Lemoine
829381fd43 Always fill polygons for hit detection 2013-12-11 16:16:02 +01:00
Éric Lemoine
ac2a3cd1e8 Rename replayForward functions to replay 2013-12-11 16:16:02 +01:00
Éric Lemoine
8712509300 Rename replayBackward functions to replayHitDetection 2013-12-11 16:16:02 +01:00
Éric Lemoine
3019933cb6 Rename reverseInstructions_ function to reverseHitDetectionInstructions_ 2013-12-11 16:16:02 +01:00
Éric Lemoine
86995a8cb4 Rename reversedInstructions array to hitDetectionInstructions 2013-12-11 16:16:02 +01:00
Éric Lemoine
12e610e374 Merge pull request #1354 from elemoine/vector-api-hit-rotation
[vector-api] hit detect rotated features
2013-12-11 07:15:46 -08:00
Éric Lemoine
fda2217166 Hit detect rotated features 2013-12-11 15:01:58 +01:00
Tom Payne
df975aa558 Add ol.source.GeoJSON 2013-12-11 14:14:32 +01:00
Tom Payne
28c7ecc014 Add ol.source.VectorFile 2013-12-11 14:14:32 +01:00
Tim Schaub
5a5d1dec40 Remove unused handleLayerVisibleChange 2013-12-11 01:38:44 -07:00
Tim Schaub
a792a224f6 Avoid duplicate change event on visibility change 2013-12-11 01:28:55 -07:00
Tim Schaub
858fe14163 No need for handleLayerChange in base layer 2013-12-11 01:23:51 -07:00
Tim Schaub
8fbfac52d4 Avoid firing duplicate change events in ol.layer.Layer 2013-12-11 01:20:07 -07:00
Tim Schaub
3e905d804c Merge pull request #1335 from tschaub/geometry-type
Change geometry type enum and mark as stable.
2013-12-10 08:50:54 -08:00
Tom Payne
ecf9ace190 Add ol.format.GeoJSON 2013-12-10 15:35:50 +01:00
Tom Payne
aa0002d880 Add ol.format.XML 2013-12-10 14:43:45 +01:00
Tom Payne
8c7ff29470 Add ol.format.Text 2013-12-10 14:43:45 +01:00
Tom Payne
409cde83bf Add ol.format.JSON 2013-12-10 14:43:45 +01:00
Tom Payne
1187466ebf Add ol.format.Format 2013-12-10 12:55:22 +01:00
Tom Payne
6d96fbf44d Remove experimental ol.format code 2013-12-10 12:55:22 +01:00
Tom Payne
ed5b8b6512 Merge remote-tracking branch 'openlayers/master' into vector-api 2013-12-10 12:54:27 +01:00
Éric Lemoine
fafb7e487e Add ol.render.FeaturesOverlay 2013-12-10 11:03:10 +01:00
Tom Payne
496c9c4250 Add and improve comments 2013-12-09 18:56:34 +01:00