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
This commit is contained in:
Éric Lemoine
2013-12-13 12:46:55 +01:00
167 changed files with 678 additions and 505 deletions

View File

@@ -36,9 +36,9 @@
<form class="form-inline">
<label>Geometry type &nbsp;</label>
<select id="type">
<option value="polygon">Polygon</option>
<option value="linestring">Linestring</option>
<option value="point">Point</option>
<option value="Polygon">Polygon</option>
<option value="LineString">Linestring</option>
<option value="Point">Point</option>
</select>
</form>