Commit Graph

11600 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
Bart van den Eijnden fbf2bae90e Merge pull request #1366 from bartvde/wkt-data
wkt example is broken
2013-12-12 23:59:03 -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
Bart van den Eijnden 15eec2959c use official EPSG code 2013-12-12 17:02:15 +01:00
Éric Lemoine 7fa3a38081 external/src/types.js file no longer exists 2013-12-12 16:57:39 +01:00
Bart van den Eijnden 069f6cce1a remove projection on vector source 2013-12-12 16:54:38 +01:00
Bart van den Eijnden e7fe809227 now that the data option was removed, parse features manually 2013-12-12 16:02:06 +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 cf14d4e41d Add @typedefs to externs file 2013-12-12 15:06:05 +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
Éric Lemoine ef703c7147 Use olx namespace in src/objectliterals.jsdoc
sed comment used: sed -ri 's/ol(\.\S*Options)/olx\1/' src/objectliterals.jsdoc
2013-12-12 15:02:02 +01:00
Éric Lemoine 875b5e1c0e File types.js no longer an input for ol.js 2013-12-12 15:02:02 +01:00
Éric Lemoine a1b7d512eb File types.js no longer an input for ol-whitespace.js 2013-12-12 15:02:02 +01:00
Éric Lemoine f5481ac2f5 File types.js no longer an input for ol-simple.js 2013-12-12 15:02:02 +01:00
Éric Lemoine ff49b89f62 File types.js no longer an input for ol-all.js 2013-12-12 15:02:02 +01:00
Éric Lemoine cfb3e7310f No longer generate src/external/src/types.js 2013-12-12 15:02:02 +01:00
Tom Payne c2a97ced7d Merge pull request #1364 from twpayne/rbush-new-error
Add missing "new"s in ol.structs.RBush
2013-12-12 04:26:26 -08:00
Tom Payne 7b7ebb8609 Add missing "new"s in ol.structs.RBush 2013-12-12 13:01:25 +01:00
Tom Payne cbc71686df Merge pull request #1363 from twpayne/vector-api-fix-geometry-collection-test
[vector-api] Fix ol.geom.GeometryCollection test
2013-12-12 02:37:48 -08:00
Tom Payne ccf96ea415 Fix ol.geom.GeometryCollection test 2013-12-12 11:30:33 +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 dd3c39bb12 Add deep clone test 2013-12-11 22:05:33 +01:00
Tim Schaub d4f20192d4 Merge pull request #1349 from tschaub/fewer-change-events
Clean up layer change event handling.
2013-12-11 10:14:16 -08:00
Tom Payne a03bf6d447 Add GeometryCollection to geojson example 2013-12-11 17:52:24 +01:00
Tom Payne 0943bbf070 Don't use postcompose in geojson example 2013-12-11 17:52:24 +01:00
Tom Payne bde17b2ac8 Add ol.geom.GeometryCollection support to ol.format.GeoJSON 2013-12-11 17:28:00 +01:00
Éric Lemoine 114725a890 Merge pull request #1355 from elemoine/vector-api-hit-fill
[vector-api] Always fill polygons for hit detection
2013-12-11 07:50:16 -08: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