Update package version to 3.18.1

Move to 90° along the circle, not 0°

CONTRIBUTING.md

@@ -80,7 +80,7 @@ include:
 ### Follow OpenLayers 3's coding style
 
 OpenLayers 3 follows [Google's JavaScript Style
-Guide](http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml).
+Guide](https://google.github.io/styleguide/javascriptguide.xml).
 This is checked using [ESLint](http://eslint.org/), you
 can run the linter locally on your machine before committing using the `lint`
 target:

Makefile

@@ -2,7 +2,7 @@ OS := $(shell uname)
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 
 SRC_GLSL := $(shell find src -type f -name '*.glsl')
-SRC_SHADER_JS := $(patsubst %.glsl,%shader.js,$(SRC_GLSL))
+SRC_SHADER_JS := $(patsubst %shader.glsl,%shader.js,$(SRC_GLSL))
 SRC_JS := $(filter-out $(SRC_SHADER_JS),$(shell find src -name '*.js'))
 SRC_JSDOC = $(shell find src -type f -name '*.jsdoc')
 
@@ -180,7 +180,7 @@ build/timestamps/check-%-timestamp: $(BUILD_HOSTED)/examples/%.html \
                                     $(BUILD_HOSTED)/build/ol.js \
                                     $(BUILD_HOSTED)/css/ol.css
 	@mkdir -p $(@D)
-	./node_modules/.bin/phantomjs --local-to-remote-url-access=true --ssl-protocol=any --ignore-ssl-errors=true bin/check-example.js $<
+	node tasks/check-example.js $<
 	@touch $@
 
 build/compiled-examples/all.js: $(EXAMPLES_JS)
@@ -252,7 +252,7 @@ build/timestamps/eslint-timestamp: $(SRC_JS) $(SPEC_JS) $(SPEC_RENDERING_JS) \
                                    build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	@echo "Running eslint..."
-	@./node_modules/.bin/eslint $?
+	@./node_modules/.bin/eslint --quiet tasks test test_rendering src examples
 	@touch $@
 
 build/timestamps/node-modules-timestamp: package.json
@@ -298,5 +298,5 @@ build/test_rendering_requires.js: $(SPEC_RENDERING_JS)
 	@mkdir -p $(@D)
 	@node tasks/generate-requires.js $^ > $@
 
-%shader.js: %.glsl src/ol/webgl/shader.mustache bin/pyglslunit.py build/timestamps/node-modules-timestamp
+%shader.js: %shader.glsl src/ol/webgl/shader.mustache bin/pyglslunit.py build/timestamps/node-modules-timestamp
 	@python bin/pyglslunit.py --input $< | ./node_modules/.bin/mustache - src/ol/webgl/shader.mustache > $@

README.md

@@ -4,7 +4,7 @@
 [![Coverage Status](https://coveralls.io/repos/openlayers/ol3/badge.svg?branch=master)](https://coveralls.io/r/openlayers/ol3?branch=master)
 [![OSGeo Project](https://img.shields.io/badge/OSGeo-Project-brightgreen.svg)](http://osgeo.org/)
 
-[OpenLayers 3](http://openlayers.org/) is a high-performance, feature-packed library for creating interactive maps on the web.
+[OpenLayers 3](http://openlayers.org/) is a high-performance, feature-packed library for creating interactive maps on the web. It can display map tiles, vector data and markers loaded from any source on any web page. OpenLayers has been developed to further the use of geographic information of all kinds. It is completely free, Open Source JavaScript, released under the 2-clause BSD License (also known as the FreeBSD).
 
 ## Getting Started
 
@@ -12,9 +12,13 @@
 - Install with npm: `npm install openlayers`
 - Clone the repo: `git clone git@github.com:openlayers/ol3.git`
 
+## Supported Browsers
+
+OpenLayers runs on all modern browsers that support [HTML5](https://html.spec.whatwg.org/multipage/) and [ECMAScript 5](http://www.ecma-international.org/ecma-262/5.1/). This includes Chrome, Firefox, Safari and Edge. For older browsers and platforms like Internet Explorer (down to version 9) and Android 4.x, [polyfills](http://polyfill.io) for `requestAnimationFrame` and `Element.prototype.classList` are required, and using the KML format requires a polyfill for `URL`.
+
 ## Documentation
 
-Check out the [hosted examples](http://openlayers.org/en/master/examples/), the [workshop](http://openlayers.org/workshop/) or [API docs](http://openlayers.org/en/master/apidoc/).
+Check out the [hosted examples](http://openlayers.org/en/latest/examples/), the [workshop](http://openlayers.org/workshop/) or the [API documentation](http://openlayers.org/en/latest/apidoc/).
 
 ## Bugs
 

changelog/upgrade-notes.md

@@ -1,5 +1,41 @@
 ## Upgrade notes
 
+### v3.18.0
+
+#### Changes in the way assertions are handled
+
+Previously, minified builds of the library did not have any assertions. This caused applications to fail silently or with cryptic stack traces. Starting with this release, developers get notified of many runtime errors through the new `ol.AssertionError`. This error has a `code` property. The meaning of the code can be found on http://openlayers.org/en/latest/doc/errors/. There are additional console assertion checks in debug mode when the `goog.DEBUG` compiler flag is `true`. As this is `true` by default, it is recommended that those creating custom builds set this to `false` so these assertions are stripped.'
+
+#### Removal of `ol.ENABLE_NAMED_COLORS`
+
+This option was previously needed to use named colors with the WebGL renderer but is no longer needed.
+
+#### KML format now uses URL()
+
+The URL constructor is supported by all modern browsers, but not by older ones, such as IE. To use the KML format in such older browsers, a URL polyfill will have to be loaded before use.
+
+#### Changes only relevant to those who compile their applications together with the Closure Compiler
+
+A number of internal types have been renamed.  This will not affect those who use the API provided by the library, but if you are compiling your application together with OpenLayers and using type names, you'll need to do the following:
+
+ * rename `ol.CollectionEventType` to `ol.Collection.EventType`
+ * rename `ol.CollectionEvent` to `ol.Collection.Event`
+ * rename `ol.ViewHint` to `ol.View.Hint`
+ * rename `ol.ViewProperty` to `ol.View.Property`
+ * rename `ol.render.webgl.imagereplay.shader.Default.Locations` to `ol.render.webgl.imagereplay.defaultshader.Locations`
+ * rename `ol.render.webgl.imagereplay.shader.DefaultFragment` to `ol.render.webgl.imagereplay.defaultshader.Fragment`
+ * rename `ol.render.webgl.imagereplay.shader.DefaultVertex` to `ol.render.webgl.imagereplay.defaultshader.Vertex`
+ * rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations`
+ * rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations`
+ * rename `ol.renderer.webgl.map.shader.DefaultFragment` to `ol.renderer.webgl.defaultmapshader.Fragment`
+ * rename `ol.renderer.webgl.map.shader.DefaultVertex` to `ol.renderer.webgl.defaultmapshader.Vertex`
+ * rename `ol.renderer.webgl.tilelayer.shader.Fragment` to `ol.renderer.webgl.tilelayershader.Fragment`
+ * rename `ol.renderer.webgl.tilelayer.shader.Locations` to `ol.renderer.webgl.tilelayershader.Locations`
+ * rename `ol.renderer.webgl.tilelayer.shader.Vertex` to `ol.renderer.webgl.tilelayershader.Vertex`
+ * rename `ol.webgl.WebGLContextEventType` to `ol.webgl.ContextEventType`
+ * rename `ol.webgl.shader.Fragment` to `ol.webgl.Fragment`
+ * rename `ol.webgl.shader.Vertex` to `ol.webgl.Vertex`
+
 ### v3.17.0
 
 #### `ol.source.MapQuest` removal

changelog/v3.18.0.md

@@ -0,0 +1,170 @@
+# v3.18.0
+
+## Summary
+
+The v3.18.0 release includes features and fixes from almost 120 pull requests since the v3.17.1 release. Most of the changes are bug fixes and continuing removal of the dependency on Closure Library. New features include:
+
+ * Addition of `Intersects` and `Within` filters to `ol.format.ogc.filter` [#5668](https://github.com/openlayers/ol3/pull/5668)
+ * New `overlaps` option for `ol.source.Vector` and `ol.source.VectorTile` to improve rendering performance for polygon topologies [#5196](https://github.com/openlayers/ol3/pull/5196)
+ * New `rotateWithView` option for `ol.style.Text` to control appearance of text on rotated views [#5050](https://github.com/openlayers/ol3/pull/5050)
+ * Add a `#scale()` method to `ol.geom.Geometry` and subclasses [#5685](https://github.com/openlayers/ol3/pull/5685)
+ * Parse `id` of features in `ol.format.MVT` [#5613](https://github.com/openlayers/ol3/pull/5613)
+
+## Upgrade notes
+
+#### Changes in the way assertions are handled
+
+Previously, minified builds of the library did not have any assertions. This caused applications to fail silently or with cryptic stack traces. Starting with this release, developers get notified of many runtime errors through the new `ol.AssertionError`. This error has a `code` property. The meaning of the code can be found on http://openlayers.org/en/latest/doc/errors/. There are additional console assertion checks in debug mode when the `goog.DEBUG` compiler flag is `true`. As this is `true` by default, it is recommended that those creating custom builds set this to `false` so these assertions are stripped.'
+
+#### Removal of `ol.ENABLE_NAMED_COLORS`
+
+This option was previously needed to use named colors with the WebGL renderer but is no longer needed.
+
+#### KML format now uses URL()
+
+The URL constructor is supported by all modern browsers, but not by older ones, such as IE. To use the KML format in such older browsers, a URL polyfill will have to be loaded before use.
+
+#### Changes only relevant to those who compile their applications together with the Closure Compiler
+
+A number of internal types have been renamed.  This will not affect those who use the API provided by the library, but if you are compiling your application together with OpenLayers and using type names, you'll need to do the following:
+
+ * rename `ol.CollectionEventType` to `ol.Collection.EventType`
+ * rename `ol.CollectionEvent` to `ol.Collection.Event`
+ * rename `ol.ViewHint` to `ol.View.Hint`
+ * rename `ol.ViewProperty` to `ol.View.Property`
+ * rename `ol.render.webgl.imagereplay.shader.Default.Locations` to `ol.render.webgl.imagereplay.defaultshader.Locations`
+ * rename `ol.render.webgl.imagereplay.shader.DefaultFragment` to `ol.render.webgl.imagereplay.defaultshader.Fragment`
+ * rename `ol.render.webgl.imagereplay.shader.DefaultVertex` to `ol.render.webgl.imagereplay.defaultshader.Vertex`
+ * rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations`
+ * rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations`
+ * rename `ol.renderer.webgl.map.shader.DefaultFragment` to `ol.renderer.webgl.defaultmapshader.Fragment`
+ * rename `ol.renderer.webgl.map.shader.DefaultVertex` to `ol.renderer.webgl.defaultmapshader.Vertex`
+ * rename `ol.renderer.webgl.tilelayer.shader.Fragment` to `ol.renderer.webgl.tilelayershader.Fragment`
+ * rename `ol.renderer.webgl.tilelayer.shader.Locations` to `ol.renderer.webgl.tilelayershader.Locations`
+ * rename `ol.renderer.webgl.tilelayer.shader.Vertex` to `ol.renderer.webgl.tilelayershader.Vertex`
+ * rename `ol.webgl.WebGLContextEventType` to `ol.webgl.ContextEventType`
+ * rename `ol.webgl.shader.Fragment` to `ol.webgl.Fragment`
+ * rename `ol.webgl.shader.Vertex` to `ol.webgl.Vertex`
+
+## Full list of changes
+
+ * [#5782](https://github.com/openlayers/ol3/pull/5782) - Compare URLs in an IE compatible way ([@ahocevar](https://github.com/ahocevar))
+ * [#5778](https://github.com/openlayers/ol3/pull/5778) - Use Mapzen instead of openstreetmap.us tiles ([@ahocevar](https://github.com/ahocevar))
+ * [#5774](https://github.com/openlayers/ol3/pull/5774) - Update glob to version 7.0.6 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5708](https://github.com/openlayers/ol3/pull/5708) - Remove unnecessary closePath() instructions ([@ahocevar](https://github.com/ahocevar))
+ * [#5196](https://github.com/openlayers/ol3/pull/5196) - Batch polygon and circle fills and strokes ([@ahocevar](https://github.com/ahocevar))
+ * [#5768](https://github.com/openlayers/ol3/pull/5768) - Enable extent clipping for vector layers ([@ahocevar](https://github.com/ahocevar))
+ * [#4753](https://github.com/openlayers/ol3/pull/4753) - Export ol.geom.Geometry#containsCoordinate function ([@fredj](https://github.com/fredj))
+ * [#5050](https://github.com/openlayers/ol3/pull/5050) - Add rotateWithView option to ol.style.Text ([@fredj](https://github.com/fredj))
+ * [#5767](https://github.com/openlayers/ol3/pull/5767) - Accept feature without geometry in ol.interaction.Modify ([@fredj](https://github.com/fredj))
+ * [#5334](https://github.com/openlayers/ol3/pull/5334) - Load the examples resources with HTTPS ([@fredj](https://github.com/fredj))
+ * [#5766](https://github.com/openlayers/ol3/pull/5766) - Use HTTPS to access tiles at tileserver.maptiler.com in examples ([@klokantech](https://github.com/klokantech))
+ * [#5765](https://github.com/openlayers/ol3/pull/5765) - Force a map render when the view is not updated ([@fredj](https://github.com/fredj))
+ * [#5724](https://github.com/openlayers/ol3/pull/5724) - Fix clipping of the tile layer extent on HiDPI devices ([@ahocevar](https://github.com/ahocevar))
+ * [#5764](https://github.com/openlayers/ol3/pull/5764) - Remove unnecessary map.render() calls ([@bartvde](https://github.com/bartvde))
+ * [#5763](https://github.com/openlayers/ol3/pull/5763) - Fix assert namespace ([@ahocevar](https://github.com/ahocevar))
+ * [#5616](https://github.com/openlayers/ol3/pull/5616) - Fix event type and documentation of ol.events.condition.mouseOnly ([@ahocevar](https://github.com/ahocevar))
+ * [#5755](https://github.com/openlayers/ol3/pull/5755) - Increase the size of the map in ol.layer.Tile rendering tests ([@fredj](https://github.com/fredj))
+ * [#5757](https://github.com/openlayers/ol3/pull/5757) - Add ol.source.Cluster#setDistance function ([@fredj](https://github.com/fredj))
+ * [#5752](https://github.com/openlayers/ol3/pull/5752) - Set proper replay canvas size and offset for rotated view ([@ahocevar](https://github.com/ahocevar))
+ * [#5754](https://github.com/openlayers/ol3/pull/5754) - Update istanbul to version 0.4.5 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5727](https://github.com/openlayers/ol3/pull/5727) - Add missing goog require ([@fredj](https://github.com/fredj))
+ * [#5273](https://github.com/openlayers/ol3/pull/5273) - Take the pixelRatio into account when computing the gutter ([@fredj](https://github.com/fredj))
+ * [#5753](https://github.com/openlayers/ol3/pull/5753) - Update proj4 to version 2.3.15 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5741](https://github.com/openlayers/ol3/pull/5741) - Point to the English workshop ([@bartvde](https://github.com/bartvde))
+ * [#5721](https://github.com/openlayers/ol3/pull/5721) - Update metalsmith to version 2.2.0 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5733](https://github.com/openlayers/ol3/pull/5733) - Fix #5730 - Ignore null/undef. values in uri.appendParams ([@adube](https://github.com/adube))
+ * [#5736](https://github.com/openlayers/ol3/pull/5736) - Show `resultType` attribute in docs ([@tsauerwein](https://github.com/tsauerwein))
+ * [#5735](https://github.com/openlayers/ol3/pull/5735) - Update eslint to version 3.3.1 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5731](https://github.com/openlayers/ol3/pull/5731) - Added a pixelRatio adjust to the canvasTileLayer 'forEachLayerAtPixel… ([@Benjaki2](https://github.com/Benjaki2))
+ * [#5732](https://github.com/openlayers/ol3/pull/5732) - Add missing curly braces in type annotations ([@fredj](https://github.com/fredj))
+ * [#5728](https://github.com/openlayers/ol3/pull/5728) - Update closure-util to version 1.15.1 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5717](https://github.com/openlayers/ol3/pull/5717) - Update phantomjs-prebuilt to version 2.1.12 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5725](https://github.com/openlayers/ol3/pull/5725) - Remove tilerange assert from tilegrid/wmts ([@probins](https://github.com/probins))
+ * [#5723](https://github.com/openlayers/ol3/pull/5723) - Update eslint to version 3.3.0 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5702](https://github.com/openlayers/ol3/pull/5702) - Add rule to identify missing requires ([@tschaub](https://github.com/tschaub))
+ * [#5670](https://github.com/openlayers/ol3/pull/5670) - Added image data value to 'forEachLayerAtPixel' method callback ([@Benjaki2](https://github.com/Benjaki2))
+ * [#5720](https://github.com/openlayers/ol3/pull/5720) - Fix typo in tilegrid/wmts ([@probins](https://github.com/probins))
+ * [#5715](https://github.com/openlayers/ol3/pull/5715) - Create a check-example task for smarter example checking with PhantomJS ([@ahocevar](https://github.com/ahocevar))
+ * [#5714](https://github.com/openlayers/ol3/pull/5714) - Add FAQ entry about renderBuffer ([@tsauerwein](https://github.com/tsauerwein))
+ * [#5713](https://github.com/openlayers/ol3/pull/5713) - Check examples with http protocol instead of file ([@ahocevar](https://github.com/ahocevar))
+ * [#5689](https://github.com/openlayers/ol3/pull/5689) - Fix cursor change in translate interaction ([@pgiraud](https://github.com/pgiraud))
+ * [#5165](https://github.com/openlayers/ol3/pull/5165) - Remove goog.addSingletonGetter function ([@fredj](https://github.com/fredj))
+ * [#5701](https://github.com/openlayers/ol3/pull/5701) - Update phantomjs-prebuilt to version 2.1.11 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5698](https://github.com/openlayers/ol3/pull/5698) - Custom rule to identify unused goog.require() calls ([@tschaub](https://github.com/tschaub))
+ * [#5699](https://github.com/openlayers/ol3/pull/5699) - Update mocha to version 3.0.2 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5697](https://github.com/openlayers/ol3/pull/5697) - Re-enable ESLint config ([@tschaub](https://github.com/tschaub))
+ * [#5693](https://github.com/openlayers/ol3/pull/5693) - Reorganize files so they are named like their default export ([@tschaub](https://github.com/tschaub))
+ * [#5694](https://github.com/openlayers/ol3/pull/5694) - layer.Base in Map not required ([@probins](https://github.com/probins))
+ * [#5695](https://github.com/openlayers/ol3/pull/5695) - Remove unneeded requires in renderers ([@probins](https://github.com/probins))
+ * [#5692](https://github.com/openlayers/ol3/pull/5692) - Small text fix ([@bngsudheer](https://github.com/bngsudheer))
+ * [#5682](https://github.com/openlayers/ol3/pull/5682) - Update mocha to version 3.0.1 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5619](https://github.com/openlayers/ol3/pull/5619) - Remove goog.asserts.* ([@ahocevar](https://github.com/ahocevar))
+ * [#5685](https://github.com/openlayers/ol3/pull/5685) - Add a method to scale geometries ([@tschaub](https://github.com/tschaub))
+ * [#5674](https://github.com/openlayers/ol3/pull/5674) - Support fractional zoom levels in ol.View#getZoom and #setZoom ([@ahocevar](https://github.com/ahocevar))
+ * [#5681](https://github.com/openlayers/ol3/pull/5681) - Remove extra goog.require ([@fredj](https://github.com/fredj))
+ * [#5680](https://github.com/openlayers/ol3/pull/5680) - Update phantomjs-prebuilt to version 2.1.10 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5668](https://github.com/openlayers/ol3/pull/5668) - Added Intersects and Within filters into ol.format.wfs ([@cpsTinK](https://github.com/cpsTinK))
+ * [#5675](https://github.com/openlayers/ol3/pull/5675) - Remove unused goog.provide ([@fredj](https://github.com/fredj))
+ * [#5673](https://github.com/openlayers/ol3/pull/5673) - Add missing semicolon ([@ahocevar](https://github.com/ahocevar))
+ * [#5587](https://github.com/openlayers/ol3/pull/5587) - Lazily create KML style defaults ([@ahocevar](https://github.com/ahocevar))
+ * [#5599](https://github.com/openlayers/ol3/pull/5599) - Allow subpixel center on view ([@ahocevar](https://github.com/ahocevar))
+ * [#5630](https://github.com/openlayers/ol3/pull/5630) - chore(build): guard against unterminated scripts ([@tlvince](https://github.com/tlvince))
+ * [#5669](https://github.com/openlayers/ol3/pull/5669) - Fix Github links to specific lines on jsdoc pages ([@dtreiter](https://github.com/dtreiter))
+ * [#5667](https://github.com/openlayers/ol3/pull/5667) - Do not return undefined from ol.proj.get ([@ahocevar](https://github.com/ahocevar))
+ * [#5665](https://github.com/openlayers/ol3/pull/5665) - Update eslint to version 3.2.2 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5632](https://github.com/openlayers/ol3/pull/5632) - Improve docs for the ol.LoadingStrategy type ([@ahocevar](https://github.com/ahocevar))
+ * [#5641](https://github.com/openlayers/ol3/pull/5641) - De-randomize the listener map property ([@ahocevar](https://github.com/ahocevar))
+ * [#5664](https://github.com/openlayers/ol3/pull/5664) - Update eslint to version 3.2.1 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5658](https://github.com/openlayers/ol3/pull/5658) - Update marked to version 0.3.6 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5657](https://github.com/openlayers/ol3/pull/5657) - Update phantomjs-prebuilt to version 2.1.9 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5652](https://github.com/openlayers/ol3/pull/5652) - Make XHR work for file:// urls ([@ahocevar](https://github.com/ahocevar))
+ * [#5653](https://github.com/openlayers/ol3/pull/5653) - Fix namespace in filter docs ([@ahocevar](https://github.com/ahocevar))
+ * [#5651](https://github.com/openlayers/ol3/pull/5651) - Update coveralls to version 2.11.12 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5649](https://github.com/openlayers/ol3/pull/5649) - Fix DateTime parsing with non-Zulu times ([@ahocevar](https://github.com/ahocevar))
+ * [#5648](https://github.com/openlayers/ol3/pull/5648) - Update sinon to version 1.17.5 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5646](https://github.com/openlayers/ol3/pull/5646) - Update phantomjs-prebuilt to version 2.1.8 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5644](https://github.com/openlayers/ol3/pull/5644) - Update browserify to version 13.1.0 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5640](https://github.com/openlayers/ol3/pull/5640) - Add example for usage of HERE Map Tile API ([@chrismayer](https://github.com/chrismayer))
+ * [#5579](https://github.com/openlayers/ol3/pull/5579) - Update jquery to version 3.1.0 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5636](https://github.com/openlayers/ol3/pull/5636) - Update clean-css to version 3.4.19 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5634](https://github.com/openlayers/ol3/pull/5634) - Update async to version 2.0.1 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5622](https://github.com/openlayers/ol3/pull/5622) - Update TileWMS.coordKeyPrefix_ on setUrls ([@rrutkows](https://github.com/rrutkows))
+ * [#5611](https://github.com/openlayers/ol3/pull/5611) - Fix broken link to Google JavaScript Style Guide ([@ischas](https://github.com/ischas))
+ * [#5620](https://github.com/openlayers/ol3/pull/5620) - Replace goog.getUid with ol.getUid ([@probins](https://github.com/probins))
+ * [#5614](https://github.com/openlayers/ol3/pull/5614) - Replace goog.abstractMethod ([@probins](https://github.com/probins))
+ * [#5613](https://github.com/openlayers/ol3/pull/5613) - Parse MVT id property ([@drnextgis](https://github.com/drnextgis))
+ * [#5612](https://github.com/openlayers/ol3/pull/5612) - Update vector-tile to version 1.3.0 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5609](https://github.com/openlayers/ol3/pull/5609) - Update eslint to version 3.1.1 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5605](https://github.com/openlayers/ol3/pull/5605) - Remove goog.isObject not in assertions ([@probins](https://github.com/probins))
+ * [#5603](https://github.com/openlayers/ol3/pull/5603) - Update eslint to version 3.1.0 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5597](https://github.com/openlayers/ol3/pull/5597) - Avoid unnecessary getImageData calls in hit detection ([@schmidtk](https://github.com/schmidtk))
+ * [#5429](https://github.com/openlayers/ol3/pull/5429) - Remove enums from tests ([@probins](https://github.com/probins))
+ * [#5516](https://github.com/openlayers/ol3/pull/5516) - Remove goog.Uri from KML format ([@probins](https://github.com/probins))
+ * [#5598](https://github.com/openlayers/ol3/pull/5598) - Clarify that default source.Vector loader only handles features ([@probins](https://github.com/probins))
+ * [#5595](https://github.com/openlayers/ol3/pull/5595) - Use tile keys instead of coord keys ([@ahocevar](https://github.com/ahocevar))
+ * [#5594](https://github.com/openlayers/ol3/pull/5594) - Add renderBuffer option for ol.source.ImageVector ([@ahocevar](https://github.com/ahocevar))
+ * [#5592](https://github.com/openlayers/ol3/pull/5592) - Update coveralls to version 2.11.11 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#5593](https://github.com/openlayers/ol3/pull/5593) - Update async to version 2.0.0 🚀 ([@openlayers](https://github.com/openlayers))
+ * [#4194](https://github.com/openlayers/ol3/pull/4194) - Remove usage of goog.color and closure named colors ([@bjornharrtell](https://github.com/bjornharrtell))
+ * [#5583](https://github.com/openlayers/ol3/pull/5583) - Fix dead link for change event in API docs ([@ahocevar](https://github.com/ahocevar))
+ * [#5560](https://github.com/openlayers/ol3/pull/5560) - Get rid of goog.isArrayLike ([@fredj](https://github.com/fredj))
+ * [#5573](https://github.com/openlayers/ol3/pull/5573) - Determine ol.global in a way that works in more environments ([@ahocevar](https://github.com/ahocevar))
+ * [#5558](https://github.com/openlayers/ol3/pull/5558) - Remove goog.Uri from tests ([@probins](https://github.com/probins))
+ * [#5578](https://github.com/openlayers/ol3/pull/5578) - Add polyfills to copy/paste code ([@ahocevar](https://github.com/ahocevar))
+ * [#5577](https://github.com/openlayers/ol3/pull/5577) - Fix olx.source.OSMOptions#url default value documentation ([@fredj](https://github.com/fredj))
+ * [#5576](https://github.com/openlayers/ol3/pull/5576) -  Use the word "documentation" ([@ahocevar](https://github.com/ahocevar))
+ * [#5575](https://github.com/openlayers/ol3/pull/5575) - Add a bit more info about the library to the README ([@ahocevar](https://github.com/ahocevar))
+ * [#5574](https://github.com/openlayers/ol3/pull/5574) - Add paragraph about supported browsers and polyfills ([@ahocevar](https://github.com/ahocevar))
+ * [#5570](https://github.com/openlayers/ol3/pull/5570) - Upgrade JSTS in example to 1.2.0 ([@bjornharrtell](https://github.com/bjornharrtell))
+ * [#5566](https://github.com/openlayers/ol3/pull/5566) - Fix ol.style.Image#getAnchor documentation ([@fredj](https://github.com/fredj))
+ * [#5546](https://github.com/openlayers/ol3/pull/5546) - Remove useless target argument from ol.Event and subclass constructors ([@ahocevar](https://github.com/ahocevar))
+ * [#5565](https://github.com/openlayers/ol3/pull/5565) - Reinsert goog.provide for enums in olx.js ([@probins](https://github.com/probins))
+ * [#5561](https://github.com/openlayers/ol3/pull/5561) - Add unit tests for ol.View.createCenterConstraint ([@fredj](https://github.com/fredj))
+ * [#5563](https://github.com/openlayers/ol3/pull/5563) - Return if a vertex was removed in ol.interaction.Modify#removeVertex_ ([@fredj](https://github.com/fredj))
+ * [#5533](https://github.com/openlayers/ol3/pull/5533) - Make sure reprojected tiles are recreated on updateParams ([@ahocevar](https://github.com/ahocevar))
+ * [#5534](https://github.com/openlayers/ol3/pull/5534) - Fix ScaleLine control documentation ([@ahocevar](https://github.com/ahocevar))
+ * [#5541](https://github.com/openlayers/ol3/pull/5541) - Replace goog.isNumber ([@probins](https://github.com/probins))
+ * [#5552](https://github.com/openlayers/ol3/pull/5552) - Replace goog.webgl. ([@probins](https://github.com/probins))
+ * [#5550](https://github.com/openlayers/ol3/pull/5550) - Remove use of ol.vec.Mat4 calls remaining after #5482 ([@ahocevar](https://github.com/ahocevar))
+ * [#5507](https://github.com/openlayers/ol3/pull/5507) - Remove use of goog.vec.* ([@ahocevar](https://github.com/ahocevar))

changelog/v3.18.1.md

@@ -0,0 +1,10 @@
+# v3.18.1
+
+## Summary
+
+The v3.18.1 release is a patch release that addresses two regressions in the v3.18.0 release.  See the [v3.18.0 release notes](https://github.com/openlayers/ol3/releases/tag/v3.18.0) for details on upgrading from v3.17.x.
+
+## Fixes
+
+ * [#5798](https://github.com/openlayers/ol3/pull/5798) - Move to 90° along the circle, not 0° ([@ahocevar](https://github.com/ahocevar))
+ * [#5790](https://github.com/openlayers/ol3/pull/5790) - Fix vector tile rotation on HiDPI devices ([@ahocevar](https://github.com/ahocevar))

config/examples/example.html

@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="./resources/layout.css" type="text/css">
     {{{ extraHead.local }}}
     {{{ css.tag }}}
-    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=fetch,requestAnimationFrame,Element.prototype.classList"></script>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=fetch,requestAnimationFrame,Element.prototype.classList,URL"></script>
     <script src="./resources/zeroclipboard/ZeroClipboard.min.js"></script>
     <title>{{ title }}</title>
   </head>
@@ -61,7 +61,7 @@
           <a id="copy-button"><i class="fa fa-clipboard"></i> Copy</a>
           <a id="jsfiddle-button"><i class="fa fa-jsfiddle"></i> Edit</a>
         </div>
-        <form method="POST" id="jsfiddle-form" target="_blank" action="http://jsfiddle.net/api/post/library/pure/">
+        <form method="POST" id="jsfiddle-form" target="_blank" action="https://jsfiddle.net/api/post/library/pure/">
           <textarea class="hidden" name="js">{{ js.source }}</textarea>
           <textarea class="hidden" name="css">{{ css.source }}</textarea>
           <textarea class="hidden" name="html">{{ contents }}</textarea>
@@ -73,6 +73,8 @@
   &lt;head&gt;
     &lt;title&gt;{{ title }}&lt;/title&gt;
     &lt;link rel="stylesheet" href="http://openlayers.org/en/v{{ olVersion }}/css/ol.css" type="text/css"&gt;
+    &lt;!-- The line below is only needed for old environments like Internet Explorer and Android 4.x --&gt;
+    &lt;script src="http://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"&gt;&lt;/script&gt;
     &lt;script src="http://openlayers.org/en/v{{ olVersion }}/build/ol.js"&gt;&lt;/script&gt;{{#if extraHead.remote}}
 {{ indent extraHead.remote spaces=4 }}{{/if}}{{#if css.source}}
     &lt;style&gt;

config/jsdoc/api/template/static/scripts/main.js

@@ -88,7 +88,7 @@ $(function () {
       var link = 'https://github.com/openlayers/ol3/blob/v' + currentVersion + '/' +
           textParts[0];
       el.innerHTML = '<a href="' + link + '">' + textParts[0] + '</a>, ' +
-          '<a href="' + link + textParts[1].replace('line ', '#l') + '">' +
+          '<a href="' + link + textParts[1].replace('line ', '#L') + '">' +
           textParts[1] + '</a>';
     });
 

config/jsdoc/api/template/static/styles/jaguar.css

@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Quattrocento+Sans:400,400italic,700);
+@import url(https://fonts.googleapis.com/css?family=Quattrocento+Sans:400,400italic,700);
 .navbar-inverse {
   border: 0;
 }

doc/errors/index.md

@@ -0,0 +1,226 @@
+---
+title: Errors
+layout: doc.hbs
+---
+
+# Errors
+
+### 1
+
+The view center is not defined.
+
+### 2
+
+The view resolution is not defined.
+
+### 3
+
+The view rotation is not defined.
+
+### 4
+
+`image` and `src` cannot be provided at the same time.
+
+### 5
+
+`imgSize` must be set when `image` is provided.
+
+### 6
+
+A defined and non-empty `src` or `image` must be provided.
+
+### 7
+
+`format` must be set when `url` is set.
+
+### 8
+
+Unknown `serverType` configured.
+
+### 9
+
+`url` must be configured or set using `#setUrl()`.
+
+### 10
+
+The default `geometryFunction` can only handle `ol.geom.Point` geometries.
+
+### 11
+
+`options.featureTypes` should be an Array.
+
+### 12
+
+`options.geometryName` must also be provided when `options.bbox` is set.
+
+### 13
+
+Invalid corner. Valid corners are `top-left`, `top-right`, `bottom-right` and `bottom-left`.
+
+### 14
+
+Invalid color. Valid colors are all [CSS colors](https://developer.mozilla.org/en-US/docs/Web/CSS/color).
+
+### 15
+
+Tried to get a value for a key that does not exist in the cache.
+
+### 16
+
+Tried to set a value for a key that is used already.
+
+### 17
+
+`resolutions` must be sorted in descending order.
+
+### 18
+
+Either `origin` or `origins` must be configured, never both.
+
+### 19
+
+Number of `tileSizes` and `resolutions` must be equal.
+
+### 20
+
+Number of `origins` and `resolutions` must be equal.
+
+### 22
+
+Either `tileSize` or `tileSizes` must be configured, never both.
+
+### 23
+
+The passed `ol.TileCoord`s must all have the same `z` value.
+
+### 24
+
+Invalid extent or geometry provided as `geometry`.
+
+### 25
+
+Cannot fit empty extent provided as `geometry`.
+
+### 26
+
+Features for `deletes` must have an id set by the feature reader or  `ol.Feature#setId()`.
+
+### 27
+
+Features for `updates` must have an id set by the feature reader or `ol.Feature#setId()`.
+
+### 28
+
+`renderMode` must be `'image'`, `'hybrid'` or `'vector'`.
+
+### 29
+
+`x` must be greater than `0`.
+
+### 30
+
+The passed `feature` was already added to the source.
+
+### 31
+
+Tried to enqueue an `element` that was already added to the queue.
+
+### 32
+
+Transformation matrix cannot be inverted.
+
+### 33
+
+Invalid `units`. `'degrees'`, `'imperial'`, `'nautical'`, `'metric'` or `'us'` required.
+
+### 34
+
+Invalid geometry layout. Must be `XY`, `XYZ`, `XYM` or `XYZM`.
+
+### 35
+
+Unknown GeoJSON object type. Expected `"Feature"` or `"FeatureCollection"`.
+
+### 36
+
+Unknown SRS type. Expected `"name"` or `"EPSG"`.
+
+### 37
+
+Unknown geometry type found. Expected `'Point'`, `'LineString'`, `'Polygon'` or `'GeometryCollection'`.
+
+### 38
+
+`styleMapValue` has an unknown type.
+
+### 39
+
+Unknown geometry type found. Expected `'GeometryCollection'`, `'MultiPoint'`, `'MultiLineString'` or `'MultiPolygon'`.
+
+### 40
+
+Expected `feature` to have a geometry.
+
+### 41
+
+Expected an `ol.style.Style` or an array of `ol.style.Style`.
+
+### 42
+
+Expected an `ol.Feature`, but got an `ol.RenderFeature`.
+
+### 43
+
+Expected `layers` to be an array or an `ol.Collection`.
+
+### 44
+
+`logo.href` should be a string.
+
+### 45
+
+`logo.src` should be a string.
+
+### 46
+
+Incorrect format for `renderer` option.
+
+### 47
+
+Expected `controls` to be an array or an `ol.Collection`.
+
+### 48
+
+Expected `interactions` to be an array or an `ol.Collection`.
+
+### 49
+
+Expected `overlays` to be an array or an `ol.Collection`.
+
+### 50
+
+Cannot determine Rest Service from url.
+
+### 51
+
+Either `url` or `tileJSON` options must be provided.
+
+### 52
+
+Unknown `serverType` configured.
+
+### 53
+
+Unknown `tierSizeCalculation` configured.
+
+### 54
+
+Hex color should have 3 or 6 digits.
+
+### 55
+
+The `{-y}` placeholder requires a tile grid with extent.
+
+### 56
+
+`mapBrowserEvent` must originate from a pointer event.

doc/faq.md

@@ -20,6 +20,7 @@ Table of contents:
 * [Why is the order of a coordinate [lon,lat], and not [lat,lon]?](#why-is-the-order-of-a-coordinate-lon-lat-and-not-lat-lon-)
 * [Why aren't there any features in my source?](#why-aren-t-there-any-features-in-my-source-)
 * [How do I force a re-render of the map?](#how-do-i-force-a-re-render-of-the-map-)
+* [Why are my features not found?](#why-are-my-features-not-found-)
 * [How do I create a custom build of OpenLayers?](#how-do-i-create-a-custom-build-of-openlayers-)
 * [Do I need to write my own code using Closure library?](#do-i-need-to-write-my-own-code-using-closure-library-)
 * [Do I need to compress my code with Closure compiler?](#do-i-need-to-compress-my-code-with-closure-compiler-)
@@ -316,6 +317,24 @@ map.render();
 map.renderSync();
 ```
 
+## Why are my features not found?
+
+You are using `ol.Map#forEachFeatureAtPixel` or `ol.Map#hasFeatureAtPixel`, but
+it sometimes does not work for large icons or labels? The *hit detection* only
+checks features that are within a certain distance of the given position. For large
+icons, the actual geometry of a feature might be too far away and is not considered.
+
+In this case, set the `renderBuffer` property of `ol.layer.Vector` (the default
+value is 100px):
+
+```javascript
+var vectorLayer = new ol.layer.Vector({
+  ...
+  renderBuffer: 200
+});
+```
+
+The recommended value is the size of the largest symbol, line width or label.
 
 ## How do I create a custom build of OpenLayers?
 

doc/index.hbs

@@ -9,7 +9,7 @@ If you're eager to get your first OpenLayers 3 map on a page, dive into the [qui
 
 For a more in-depth overview of OpenLayers 3 core concepts, check out the [tutorials](tutorials/).
 
-Make sure to also check out the [OpenLayers 3 workshop](/workshop/).
+Make sure to also check out the [OpenLayers 3 workshop](/workshop/en/).
 
 Find additional reference material in the [API docs](../apidoc).
 

doc/quickstart.hbs

@@ -60,6 +60,12 @@ To include a map a web page you will need 3 things:
 
 The first part is to include the JavaScript library. For the purpose of this tutorial, here we simply point to the openlayers.org website to get the whole library. In a production environment, we would build a custom version of the library including only the module needed for our application.
 
+**Optional:** If the application is intended to run on old platforms like Internet Explorer or Android 4.x, another script needs to be included before OpenLayers:
+
+```xml
+  <script src="http://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList"></script>
+```
+
 
 ### `<div>` to contain the map
 
@@ -121,7 +127,7 @@ The `layers: [ ... ]` array is used to define the list of layers available in th
 
 Layers in OpenLayers 3 are defined with a type (Image, Tile or Vector) which contains a source. The source is the protocol used to get the map tiles. You can consult the list of [available layer sources here](/en/{{ latest }}/apidoc/ol.source.html)
 
-The next part of the `Map` object is the `View`. The view allow to specify the center, resolution, and rotation of the map. The simplest way to define a view is to define a center point and a zoom level.  Note that zoom level 0 is zoomed out.
+The next part of the `Map` object is the `View`. The view allows to specify the center, resolution, and rotation of the map. The simplest way to define a view is to define a center point and a zoom level.  Note that zoom level 0 is zoomed out.
 
 ```js
     view: new ol.View({

doc/tutorials/introduction.md

@@ -24,7 +24,9 @@ Although Closure library functions are widely used within OL3, none of them are
 Unlike in, say, Node, where a module's exports are fixed in the source, with Closure Compiler, exports can be defined at compile time. This makes it easy to create builds that are customized to the needs of a particular site or application: a __custom build__ only exports those properties and methods needed by the site or application. As the full build is large, and will probably become larger as new features are added to the API, it's recommended that sites create a custom build for production software.
 
 ## Renderers and Browser Support
-The library currently includes three renderers: Canvas, DOM, and WebGL. All three support both raster data from tile/image servers, and vector data; WebGL however only supports Point vectors and does not support labels. Clearly only those browsers that [support Canvas](http://caniuse.com/canvas) can use the Canvas renderer. Equally, the WebGL renderer can only be used on those devices and [browsers](http://caniuse.com/webgl) that support WebGL. Internet Explorer versions before 9 are not supported at all.
+The library currently includes three renderers: Canvas, DOM, and WebGL. All three support both raster data from tile/image servers, and vector data; WebGL however only supports Point vectors and does not support labels. Clearly only those browsers that [support Canvas](http://caniuse.com/canvas) can use the Canvas renderer. Equally, the WebGL renderer can only be used on those devices and [browsers](http://caniuse.com/webgl) that support WebGL.
+
+OpenLayers runs on all modern browsers that support [HTML5](https://html.spec.whatwg.org/multipage/) and [ECMAScript 5](http://www.ecma-international.org/ecma-262/5.1/). This includes Chrome, Firefox, Safari and Edge. For older browsers and platforms like Internet Explorer (down to version 9) and Android 4.x, [polyfills](http://polyfill.io) for `requestAnimationFrame` and `Element.prototype.classList` are required, and using the KML format requires a polyfill for `URL`.
 
 The library is intended for use on both desktop/laptop and mobile devices.
 

examples/center.js

@@ -2,8 +2,6 @@ goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.control');
 goog.require('ol.format.GeoJSON');
-goog.require('ol.geom.Point');
-goog.require('ol.geom.SimpleGeometry');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.OSM');

examples/cluster.html

@@ -7,3 +7,7 @@ docs: >
 tags: "cluster, vector"
 ---
 <div id="map" class="map"></div>
+<form>
+  <label>cluster distance</label>
+  <input id="distance" type="range" min="0" max="100" step="1" value="40"/>
+</form>

examples/cluster.js

@@ -14,6 +14,8 @@ goog.require('ol.style.Style');
 goog.require('ol.style.Text');
 
 
+var distance = document.getElementById('distance');
+
 var count = 20000;
 var features = new Array(count);
 var e = 4500000;
@@ -27,7 +29,7 @@ var source = new ol.source.Vector({
 });
 
 var clusterSource = new ol.source.Cluster({
-  distance: 40,
+  distance: parseInt(distance.value, 10),
   source: source
 });
 
@@ -74,3 +76,7 @@ var map = new ol.Map({
     zoom: 2
   })
 });
+
+distance.addEventListener('input', function() {
+  clusterSource.setDistance(parseInt(distance.value, 10));
+});

examples/custom-icon.js

@@ -8,7 +8,7 @@ logoElement.href = 'http://www.osgeo.org/';
 logoElement.target = '_blank';
 
 var logoImage = document.createElement('img');
-logoImage.src = 'http://www.osgeo.org/sites/all/themes/osgeo/logo.png';
+logoImage.src = 'https://www.osgeo.org/sites/all/themes/osgeo/logo.png';
 
 logoElement.appendChild(logoImage);
 

examples/custom-interactions.js

@@ -1,3 +1,4 @@
+goog.require('ol');
 goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.View');
@@ -149,7 +150,7 @@ var map = new ol.Map({
   layers: [
     new ol.layer.Tile({
       source: new ol.source.TileJSON({
-        url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.json'
+        url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure'
       })
     }),
     new ol.layer.Vector({

examples/d3.html

@@ -6,7 +6,7 @@ docs: >
   <p>The example loads TopoJSON geometries and uses d3 (<code>d3.geo.path</code>) to render these geometries to a canvas element that is then used as the image of an ol3 image layer.</p>
 tags: "d3"
 resources:
-  - http://d3js.org/d3.v3.min.js
-  - http://d3js.org/topojson.v1.min.js
+  - https://d3js.org/d3.v3.min.js
+  - https://d3js.org/topojson.v1.min.js
 ---
 <div id="map" class="map"></div>

examples/dynamic-data.js

@@ -1,4 +1,3 @@
-goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.geom.MultiPoint');

examples/flight-animation.js

@@ -1,5 +1,4 @@
 // NOCOMPILE
-goog.require('ol.Attribution');
 goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.View');

examples/here-maps.html

@@ -0,0 +1,21 @@
+---
+layout: example.html
+title: HERE Map Tile API
+shortdesc: Example of a map with map tiles from HERE.
+docs: >
+  <p><a href="https://developer.here.com/rest-apis/documentation/enterprise-map-tile">HERE Map Tile API</a> used with <code>ol.source.XYZ</code>.</p>
+  <p>Be sure to respect the <a href="https://legal.here.com/en/terms/serviceterms/us/">HERE Service Terms</a> when using their tile API.</p>
+tags: "here, here-maps, here-tile-api"
+cloak:
+  a2qhegvZZFIuJDkkqjhQ: Your HERE Maps appId from https://developer.here.com/
+  lPJ3iaFLJDhD8fIAyU582A: Your HERE Maps appCode from https://developer.here.com/
+---
+<div id="map" class="map"></div>
+<select id="layer-select">
+  <option value="normal.day" selected>Normal Day</option>
+  <option value="normal.day.transit">Normal Day Transit</option>
+  <option value="pedestrian.day">Pedestrian Day</option>
+  <option value="terrain.day">Terrain Day</option>
+  <option value="satellite.day">Satellite Day</option>
+  <option value="hybrid.day">Hybrid Day</option>
+</select>

examples/here-maps.js

@@ -0,0 +1,100 @@
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.layer.Tile');
+goog.require('ol.source.XYZ');
+
+var appId = 'a2qhegvZZFIuJDkkqjhQ';
+var appCode = 'lPJ3iaFLJDhD8fIAyU582A';
+var hereLayers = [
+  {
+    base: 'base',
+    type: 'maptile',
+    scheme: 'normal.day',
+    app_id: appId,
+    app_code: appCode
+  },
+  {
+    base: 'base',
+    type: 'maptile',
+    scheme: 'normal.day.transit',
+    app_id: appId,
+    app_code: appCode
+  },
+  {
+    base: 'base',
+    type: 'maptile',
+    scheme: 'pedestrian.day',
+    app_id: appId,
+    app_code: appCode
+  },
+  {
+    base: 'aerial',
+    type: 'maptile',
+    scheme: 'terrain.day',
+    app_id: appId,
+    app_code: appCode
+  },
+  {
+    base: 'aerial',
+    type: 'maptile',
+    scheme: 'satellite.day',
+    app_id: appId,
+    app_code: appCode
+  },
+  {
+    base: 'aerial',
+    type: 'maptile',
+    scheme: 'hybrid.day',
+    app_id: appId,
+    app_code: appCode
+  }
+];
+var urlTpl = 'https://{1-4}.{base}.maps.cit.api.here.com' +
+  '/{type}/2.1/maptile/newest/{scheme}/{z}/{x}/{y}/256/png' +
+  '?app_id={app_id}&app_code={app_code}';
+var layers = [];
+var i, ii;
+for (i = 0, ii = hereLayers.length; i < ii; ++i) {
+  var layerDesc = hereLayers[i];
+  layers.push(new ol.layer.Tile({
+    visible: false,
+    preload: Infinity,
+    source: new ol.source.XYZ({
+      url: createUrl(urlTpl, layerDesc),
+      attributions: 'Map Tiles &copy; 2016 ' +
+        '<a href="http://developer.here.com">HERE</a>'
+    })
+  }));
+}
+
+var map = new ol.Map({
+  layers: layers,
+  renderer: common.getRendererFromQueryString(),
+  // Improve user experience by loading tiles while dragging/zooming. Will make
+  // zooming choppy on mobile or slow devices.
+  loadTilesWhileInteracting: true,
+  target: 'map',
+  view: new ol.View({
+    center: [921371.9389, 6358337.7609],
+    zoom: 10
+  })
+});
+
+function createUrl(tpl, layerDesc) {
+  return tpl
+    .replace('{base}', layerDesc.base)
+    .replace('{type}', layerDesc.type)
+    .replace('{scheme}', layerDesc.scheme)
+    .replace('{app_id}', layerDesc.app_id)
+    .replace('{app_code}', layerDesc.app_code);
+}
+
+var select = document.getElementById('layer-select');
+function onChange() {
+  var scheme = select.value;
+  for (var i = 0, ii = layers.length; i < ii; ++i) {
+    layers[i].setVisible(hereLayers[i].scheme === scheme);
+  }
+}
+select.addEventListener('change', onChange);
+onChange();

examples/icon-color.js

@@ -55,7 +55,7 @@ var vectorLayer = new ol.layer.Vector({
 
 var rasterLayer = new ol.layer.Tile({
   source: new ol.source.TileJSON({
-    url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.json',
+    url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure',
     crossOrigin: ''
   })
 });

examples/icon.js

@@ -39,7 +39,7 @@ var vectorLayer = new ol.layer.Vector({
 
 var rasterLayer = new ol.layer.Tile({
   source: new ol.source.TileJSON({
-    url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.json',
+    url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure',
     crossOrigin: ''
   })
 });

examples/igc.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.View');

examples/jsts.html

@@ -7,6 +7,6 @@ docs: >
   with OpenLayers 3.
 tags: "vector, jsts, buffer"
 resources:
-  - https://cdn.rawgit.com/bjornharrtell/jsts/gh-pages/1.0.2/jsts.min.js
+  - https://cdn.rawgit.com/bjornharrtell/jsts/gh-pages/1.2.0/jsts.min.js
 ---
 <div id="map" class="map"></div>

examples/jsts.js

@@ -1,6 +1,5 @@
 // NOCOMPILE
 // this example uses JSTS for which we don't have an externs file.
-goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.format.GeoJSON');

examples/layer-extent.js

@@ -17,8 +17,7 @@ var extents = {
 
 var base = new ol.layer.Tile({
   source: new ol.source.TileJSON({
-    url: 'http://api.tiles.mapbox.com/v3/' +
-        'mapbox.world-light.json',
+    url: 'https://api.tiles.mapbox.com/v3/mapbox.world-light.json?secure',
     crossOrigin: 'anonymous'
   })
 });
@@ -26,8 +25,7 @@ var base = new ol.layer.Tile({
 var overlay = new ol.layer.Tile({
   extent: extents.India,
   source: new ol.source.TileJSON({
-    url: 'http://api.tiles.mapbox.com/v3/' +
-        'mapbox.world-black.json',
+    url: 'https://api.tiles.mapbox.com/v3/mapbox.world-black.json?secure',
     crossOrigin: 'anonymous'
   })
 });

examples/layer-group.js

@@ -14,15 +14,13 @@ var map = new ol.Map({
       layers: [
         new ol.layer.Tile({
           source: new ol.source.TileJSON({
-            url: 'http://api.tiles.mapbox.com/v3/' +
-                'mapbox.20110804-hoa-foodinsecurity-3month.json',
+            url: 'https://api.tiles.mapbox.com/v3/mapbox.20110804-hoa-foodinsecurity-3month.json?secure',
             crossOrigin: 'anonymous'
           })
         }),
         new ol.layer.Tile({
           source: new ol.source.TileJSON({
-            url: 'http://api.tiles.mapbox.com/v3/' +
-                'mapbox.world-borders-light.json',
+            url: 'https://api.tiles.mapbox.com/v3/mapbox.world-borders-light.json?secure',
             crossOrigin: 'anonymous'
           })
         })

examples/localized-openstreetmap.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.control');

examples/mapbox-vector-tiles-advanced.js

@@ -1,4 +1,4 @@
-goog.require('ol.Attribution');
+/* eslint-disable openlayers-internal/no-unused-requires */
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.format.MVT');
@@ -31,7 +31,7 @@ for (var z = zoomOffset / reuseZoomLevels; z <= 22 / reuseZoomLevels; ++z) {
   resolutions.push(156543.03392804097 / Math.pow(2, z * reuseZoomLevels));
 }
 function tileUrlFunction(tileCoord) {
-  return ('http://{a-d}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/' +
+  return ('https://{a-d}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/' +
       '{z}/{x}/{y}.vector.pbf?access_token=' + key)
       .replace('{z}', String(tileCoord[0] * reuseZoomLevels + zoomOffset))
       .replace('{x}', String(tileCoord[1]))

examples/mapbox-vector-tiles.js

@@ -1,4 +1,5 @@
-goog.require('ol.Attribution');
+/* eslint-disable openlayers-internal/no-unused-requires */
+
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.format.MVT');
@@ -9,6 +10,7 @@ goog.require('ol.style.Icon');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 goog.require('ol.style.Text');
+goog.require('ol.tilegrid');
 
 
 var key = 'pk.eyJ1IjoiYWhvY2V2YXIiLCJhIjoiRk1kMWZaSSJ9.E5BkluenyWQMsBLsuByrmg';
@@ -23,7 +25,7 @@ var map = new ol.Map({
         format: new ol.format.MVT(),
         tileGrid: ol.tilegrid.createXYZ({maxZoom: 22}),
         tilePixelRatio: 16,
-        url: 'http://{a-d}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/' +
+        url: 'https://{a-d}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/' +
             '{z}/{x}/{y}.vector.pbf?access_token=' + key
       }),
       style: createMapboxStreetsV6Style()

examples/min-max-resolution.js

@@ -18,8 +18,7 @@ var map = new ol.Map({
     }),
     new ol.layer.Tile({
       source: new ol.source.TileJSON({
-        url: 'http://api.tiles.mapbox.com/v3/' +
-            'mapbox.natural-earth-hypso-bathy.json',
+        url: 'https://api.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy.json?secure',
         crossOrigin: 'anonymous'
       }),
       minResolution: 2000,

examples/osm-vector-tiles.html

@@ -3,7 +3,9 @@ layout: example.html
 title: OSM Vector Tiles
 shortdesc: Using OpenStreetMap vector tiles.
 docs: >
-  A simple vector tiles map with OpenStreetMap vector tiles. **Note**: The tiles used in this example are not optimized for rendering - they clip tiles exactly at the tile boundary instead of adding a buffer, and use geographic coordinates instead of tile relative pixel coordinates in view projection.
-tags: "vector, tiles, osm"
+  A simple vector tiles map with Mapzen vector tiles. **Note**: TopoJSON vector tiles are not optimized for rendering - they might clip geometries exactly at the tile boundary instead of adding a buffer, and use geographic coordinates instead of tile relative pixel coordinates in view projection.
+tags: "vector, tiles, osm, mapzen"
+cloak:
+  vector-tiles-5eJz6JX: Your Mapzen API key from https://mapzen.com/developers
 ---
 <div id="map" class="map"></div>

examples/osm-vector-tiles.js

@@ -7,8 +7,14 @@ goog.require('ol.source.VectorTile');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
+goog.require('ol.tilegrid');
 
 
+var key = 'vector-tiles-5eJz6JX';
+
+var attribution = [new ol.Attribution({
+  html: '© OpenStreetMap contributors, Who’s On First, Natural Earth, and openstreetmapdata.com'
+})];
 var format = new ol.format.TopoJSON();
 var tileGrid = ol.tilegrid.createXYZ({maxZoom: 19});
 var roadStyleCache = {};
@@ -17,7 +23,6 @@ var roadColor = {
   'minor_road': '#ccb',
   'highway': '#f39'
 };
-var landuseStyleCache = {};
 var buildingStyle = new ol.style.Style({
   fill: new ol.style.Fill({
     color: '#666',
@@ -33,10 +38,10 @@ var map = new ol.Map({
   layers: [
     new ol.layer.VectorTile({
       source: new ol.source.VectorTile({
+        attributions: attribution,
         format: format,
         tileGrid: tileGrid,
-        url: 'http://{a-c}.tile.openstreetmap.us/' +
-            'vectiles-water-areas/{z}/{x}/{y}.topojson'
+        url: 'https://vector.mapzen.com/osm/water/{z}/{x}/{y}.topojson?api_key=' + key
       }),
       style: new ol.style.Style({
         fill: new ol.style.Fill({
@@ -46,10 +51,10 @@ var map = new ol.Map({
     }),
     new ol.layer.VectorTile({
       source: new ol.source.VectorTile({
+        attributions: attribution,
         format: format,
         tileGrid: tileGrid,
-        url: 'http://{a-c}.tile.openstreetmap.us/' +
-            'vectiles-highroad/{z}/{x}/{y}.topojson'
+        url: 'https://vector.mapzen.com/osm/roads/{z}/{x}/{y}.topojson?api_key=' + key
       }),
       style: function(feature) {
         var kind = feature.get('kind');
@@ -80,55 +85,14 @@ var map = new ol.Map({
     }),
     new ol.layer.VectorTile({
       source: new ol.source.VectorTile({
+        attributions: attribution,
         format: format,
         tileGrid: tileGrid,
-        url: 'http://{a-c}.tile.openstreetmap.us/' +
-            'vectiles-buildings/{z}/{x}/{y}.topojson'
+        url: 'https://vector.mapzen.com/osm/buildings/{z}/{x}/{y}.topojson?api_key=' + key
       }),
       style: function(f, resolution) {
         return (resolution < 10) ? buildingStyle : null;
       }
-    }),
-    new ol.layer.VectorTile({
-      source: new ol.source.VectorTile({
-        format: format,
-        tileGrid: tileGrid,
-        url: 'http://{a-c}.tile.openstreetmap.us/' +
-            'vectiles-land-usages/{z}/{x}/{y}.topojson'
-      }),
-      visible: false,
-      style: function(feature) {
-        var kind = feature.get('kind');
-        var styleKey = kind;
-        var style = landuseStyleCache[styleKey];
-        if (!style) {
-          var color, width;
-          color = {
-            'parking': '#ddd',
-            'industrial': '#aaa',
-            'urban area': '#aaa',
-            'park': '#76C759',
-            'school': '#DA10E7',
-            'garden': '#76C759',
-            'pitch': '#D58F8D',
-            'scrub': '#3E7D28',
-            'residential': '#4C9ED9'
-          }[kind];
-          width = kind == 'highway' ? 1.5 : 1;
-          style = new ol.style.Style({
-            stroke: new ol.style.Stroke({
-              color: color,
-              width: width
-            }),
-            fill: new ol.style.Fill({
-              color: color,
-              opacity: 0.5
-            })
-          });
-          landuseStyleCache[styleKey] = style;
-        }
-        return style;
-      }
     })
   ],
   target: 'map',

examples/popup.js

@@ -45,8 +45,7 @@ var map = new ol.Map({
   layers: [
     new ol.layer.Tile({
       source: new ol.source.TileJSON({
-        url: 'http://api.tiles.mapbox.com/v3/' +
-            'mapbox.natural-earth-hypso-bathy.json',
+        url: 'https://api.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy.json?secure',
         crossOrigin: 'anonymous'
       })
     })

examples/raster.html

@@ -20,7 +20,7 @@ docs: >
   </p>
 tags: "raster, pixel"
 resources:
-  - http://d3js.org/d3.v3.min.js
+  - https://d3js.org/d3.v3.min.js
 cloak:
   AkGbxXx6tDWf1swIhPJyoAVp06H0s0gDTYslNWWHZ6RoPqMpB9ld5FY1WutX8UoF: Your Bing Maps Key from http://www.bingmapsportal.com/ here
 ---

examples/reprojection-by-code.html

@@ -8,7 +8,7 @@ docs: >
   in <a href="http://epsg.io/">EPSG.io</a> database.
 tags: "reprojection, projection, proj4js, epsg.io"
 resources:
-  - http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
+  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
 ---
 <div id="map" class="map"></div>
 <form class="form-inline">

examples/reprojection-image.html

@@ -6,6 +6,6 @@ docs: >
   This example shows client-side reprojection of single image source.
 tags: "reprojection, projection, proj4js, image, imagestatic"
 resources:
-  - http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
+  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
 ---
 <div id="map" class="map"></div>

examples/reprojection.html

@@ -6,7 +6,7 @@ docs: >
   This example shows client-side raster reprojection between various projections.
 tags: "reprojection, projection, proj4js, osm, wms, wmts, hidpi"
 resources:
-  - http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
+  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
 ---
 <div id="map" class="map"></div>
 <form class="form-inline">

examples/reprojection.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.extent');
@@ -58,7 +57,7 @@ var layers = {};
 layers['bng'] = new ol.layer.Tile({
   source: new ol.source.XYZ({
     projection: 'EPSG:27700',
-    url: 'http://tileserver.maptiler.com/miniscale/{z}/{x}/{y}.png',
+    url: 'https://tileserver.maptiler.com/miniscale/{z}/{x}/{y}.png',
     crossOrigin: '',
     maxZoom: 6
   })
@@ -88,7 +87,7 @@ layers['wms21781'] = new ol.layer.Tile({
       'LAYERS': 'ch.swisstopo.pixelkarte-farbe-pk1000.noscale',
       'FORMAT': 'image/jpeg'
     },
-    url: 'http://wms.geo.admin.ch/',
+    url: 'https://wms.geo.admin.ch/',
     projection: 'EPSG:21781'
   })
 });
@@ -112,7 +111,7 @@ fetch(url).then(function(response) {
 
 layers['grandcanyon'] = new ol.layer.Tile({
   source: new ol.source.XYZ({
-    url: 'http://tileserver.maptiler.com/grandcanyon@2x/{z}/{x}/{y}.png',
+    url: 'https://tileserver.maptiler.com/grandcanyon@2x/{z}/{x}/{y}.png',
     crossOrigin: '',
     tilePixelRatio: 2,
     maxZoom: 15,

examples/resources/layout.css

@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Quattrocento+Sans:400,400italic,700);
+@import url(https://fonts.googleapis.com/css?family=Quattrocento+Sans:400,400italic,700);
 
 body {
   font-family: 'Quattrocento Sans', sans-serif;

examples/scaleline-indiana-east.html

@@ -6,6 +6,6 @@ docs: >
   This example shows client-side reprojection of OpenStreetMap to NAD83 Indiana East, including a ScaleLine control with US units.
 tags: "reprojection, projection, openstreetmap, nad83, tile, scaleline"
 resources:
-  - http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
+  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
 ---
 <div id="map" class="map"></div>

examples/semi-transparent-layer.js

@@ -13,7 +13,7 @@ var map = new ol.Map({
     }),
     new ol.layer.Tile({
       source: new ol.source.TileJSON({
-        url: 'http://api.tiles.mapbox.com/v3/mapbox.va-quake-aug.json',
+        url: 'https://api.tiles.mapbox.com/v3/mapbox.va-quake-aug.json?secure',
         crossOrigin: 'anonymous'
       })
     })

examples/snap.js

@@ -1,6 +1,5 @@
 goog.require('ol.Map');
 goog.require('ol.View');
-goog.require('ol.interaction');
 goog.require('ol.interaction.Draw');
 goog.require('ol.interaction.Modify');
 goog.require('ol.interaction.Select');

examples/sphere-mollweide.html

@@ -6,6 +6,6 @@ docs: >
   Example of a Sphere Mollweide map with a Graticule component.
 tags: "graticule, Mollweide, projection, proj4js"
 resources:
-  - http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
+  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
 ---
 <div id="map" class="map"></div>

examples/static-image.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.extent');
@@ -22,7 +21,7 @@ var map = new ol.Map({
     new ol.layer.Image({
       source: new ol.source.ImageStatic({
         attributions: '© <a href="http://xkcd.com/license.html">xkcd</a>',
-        url: 'http://imgs.xkcd.com/comics/online_communities.png',
+        url: 'https://imgs.xkcd.com/comics/online_communities.png',
         projection: projection,
         imageExtent: extent
       })

examples/tile-load-events.js

@@ -78,7 +78,7 @@ Progress.prototype.hide = function() {
 var progress = new Progress(document.getElementById('progress'));
 
 var source = new ol.source.TileJSON({
-  url: 'http://api.tiles.mapbox.com/v3/mapbox.world-bright.json',
+  url: 'https://api.tiles.mapbox.com/v3/mapbox.world-bright.json?secure',
   crossOrigin: 'anonymous'
 });
 

examples/tilejson.js

@@ -8,7 +8,7 @@ var map = new ol.Map({
   layers: [
     new ol.layer.Tile({
       source: new ol.source.TileJSON({
-        url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.json',
+        url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure',
         crossOrigin: 'anonymous'
       })
     })

examples/tileutfgrid.js

@@ -9,13 +9,13 @@ var key = 'pk.eyJ1IjoiYWhvY2V2YXIiLCJhIjoiRk1kMWZaSSJ9.E5BkluenyWQMsBLsuByrmg';
 
 var mapLayer = new ol.layer.Tile({
   source: new ol.source.TileJSON({
-    url: 'http://api.tiles.mapbox.com/v4/mapbox.geography-class.json?access_token=' + key
+    url: 'https://api.tiles.mapbox.com/v4/mapbox.geography-class.json?secure&access_token=' + key
   })
 });
 
 
 var gridSource = new ol.source.TileUTFGrid({
-  url: 'http://api.tiles.mapbox.com/v4/mapbox.geography-class.json?access_token=' + key
+  url: 'https://api.tiles.mapbox.com/v4/mapbox.geography-class.json?secure&access_token=' + key
 });
 
 var gridLayer = new ol.layer.Tile({source: gridSource});

examples/topojson.js

@@ -12,7 +12,7 @@ goog.require('ol.style.Style');
 
 var raster = new ol.layer.Tile({
   source: new ol.source.TileJSON({
-    url: 'http://api.tiles.mapbox.com/v3/mapbox.world-dark.json'
+    url: 'https://api.tiles.mapbox.com/v3/mapbox.world-dark.json?secure'
   })
 });
 
@@ -29,7 +29,8 @@ var style = new ol.style.Style({
 var vector = new ol.layer.Vector({
   source: new ol.source.Vector({
     url: 'data/topojson/world-110m.json',
-    format: new ol.format.TopoJSON()
+    format: new ol.format.TopoJSON(),
+    overlaps: false
   }),
   style: function(feature) {
     // don't want to render the full world polygon, which repeats all countries

examples/translate-features.js

@@ -1,4 +1,3 @@
-goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.format.GeoJSON');

examples/turf.js

@@ -1,6 +1,5 @@
 // NOCOMPILE
 // this example uses turf.js for which we don't have an externs file.
-goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.format.GeoJSON');

examples/vector-esri-edit.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.format.EsriJSON');
@@ -12,6 +11,7 @@ goog.require('ol.loadingstrategy');
 goog.require('ol.proj');
 goog.require('ol.source.Vector');
 goog.require('ol.source.XYZ');
+goog.require('ol.tilegrid');
 
 
 var serviceUrl = 'http://services.arcgis.com/rOo16HdIMeOBI4Mb/arcgis/rest/' +
@@ -57,7 +57,7 @@ var raster = new ol.layer.Tile({
   source: new ol.source.XYZ({
     attributions: 'Tiles © <a href="http://services.arcgisonline.com/ArcGIS/' +
         'rest/services/World_Topo_Map/MapServer">ArcGIS</a>',
-    url: 'http://server.arcgisonline.com/ArcGIS/rest/services/' +
+    url: 'https://server.arcgisonline.com/ArcGIS/rest/services/' +
         'World_Topo_Map/MapServer/tile/{z}/{y}/{x}'
   })
 });

examples/vector-esri.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.format.EsriJSON');
@@ -11,6 +10,7 @@ goog.require('ol.source.XYZ');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
+goog.require('ol.tilegrid');
 
 
 var serviceUrl = 'http://sampleserver3.arcgisonline.com/ArcGIS/rest/services/' +
@@ -99,7 +99,7 @@ var raster = new ol.layer.Tile({
   source: new ol.source.XYZ({
     attributions: 'Tiles © <a href="http://services.arcgisonline.com/ArcGIS/' +
         'rest/services/World_Topo_Map/MapServer">ArcGIS</a>',
-    url: 'http://server.arcgisonline.com/ArcGIS/rest/services/' +
+    url: 'https://server.arcgisonline.com/ArcGIS/rest/services/' +
         'World_Topo_Map/MapServer/tile/{z}/{y}/{x}'
   })
 });

examples/vector-osm.js

@@ -12,6 +12,7 @@ goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
+goog.require('ol.tilegrid');
 
 var styles = {
   'amenity': {

examples/vector-wfs-getfeature.js

@@ -40,16 +40,15 @@ var map = new ol.Map({
 });
 
 // generate a GetFeature request
-var f = ol.format.ogc.filter;
 var featureRequest = new ol.format.WFS().writeGetFeature({
   srsName: 'EPSG:3857',
   featureNS: 'http://openstreemap.org',
   featurePrefix: 'osm',
   featureTypes: ['water_areas'],
   outputFormat: 'application/json',
-  filter: f.and(
-    f.like('name', 'Mississippi*'),
-    f.equalTo('waterway', 'riverbank')
+  filter: ol.format.ogc.filter.and(
+    ol.format.ogc.filter.like('name', 'Mississippi*'),
+    ol.format.ogc.filter.equalTo('waterway', 'riverbank')
   )
 });
 

examples/wms-custom-proj.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.control');
@@ -46,7 +45,7 @@ var layers = [
   new ol.layer.Tile({
     extent: extent,
     source: new ol.source.TileWMS({
-      url: 'http://wms.geo.admin.ch/',
+      url: 'https://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
       attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' +
           'en/home.html">Pixelmap 1:1000000 / geo.admin.ch</a>',
@@ -60,7 +59,7 @@ var layers = [
   new ol.layer.Tile({
     extent: extent,
     source: new ol.source.TileWMS({
-      url: 'http://wms.geo.admin.ch/',
+      url: 'https://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
       attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' +
           'en/home.html">National parks / geo.admin.ch</a>',

examples/wms-image-custom-proj.html

@@ -6,7 +6,7 @@ docs: >
   With [Proj4js](http://proj4js.org/) integration, OpenLayers can transform coordinates between arbitrary projections.
 tags: "wms, single image, proj4js, projection"
 resources:
-  - http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
-  - http://epsg.io/21781-1753.js
+  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
+  - https://epsg.io/21781-1753.js
 ---
 <div id="map" class="map"></div>

examples/wms-image-custom-proj.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.control');
@@ -34,7 +33,7 @@ var layers = [
   new ol.layer.Image({
     extent: extent,
     source: new ol.source.ImageWMS({
-      url: 'http://wms.geo.admin.ch/',
+      url: 'https://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
       attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' +
           'en/home.html">Pixelmap 1:1000000 / geo.admin.ch</a>',
@@ -48,7 +47,7 @@ var layers = [
   new ol.layer.Image({
     extent: extent,
     source: new ol.source.ImageWMS({
-      url: 'http://wms.geo.admin.ch/',
+      url: 'https://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
       attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' +
           'en/home.html">National parks / geo.admin.ch</a>',

examples/wms-no-proj.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Image');
@@ -18,7 +17,7 @@ var layers = [
         'LAYERS': 'ch.swisstopo.pixelkarte-farbe-pk1000.noscale',
         'FORMAT': 'image/jpeg'
       },
-      url: 'http://wms.geo.admin.ch/'
+      url: 'https://wms.geo.admin.ch/'
     })
   }),
   new ol.layer.Image({
@@ -28,7 +27,7 @@ var layers = [
       crossOrigin: 'anonymous',
       params: {'LAYERS': 'ch.bafu.schutzgebiete-paerke_nationaler_bedeutung'},
       serverType: 'mapserver',
-      url: 'http://wms.geo.admin.ch/'
+      url: 'https://wms.geo.admin.ch/'
     })
   })
 ];

examples/wmts-dimensions.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.extent');

examples/wmts-hidpi.js

@@ -6,7 +6,7 @@ goog.require('ol.layer.Tile');
 goog.require('ol.source.WMTS');
 
 
-var capabilitiesUrl = 'http://www.basemap.at/wmts/1.0.0/WMTSCapabilities.xml';
+var capabilitiesUrl = 'https://www.basemap.at/wmts/1.0.0/WMTSCapabilities.xml';
 
 // HiDPI support:
 // * Use 'bmaphidpi' layer (pixel ratio 2) for device pixel ratio > 1

examples/wmts-ign.js

@@ -43,7 +43,7 @@ var tileGrid = new ol.tilegrid.WMTS({
 var key = '2mqbg0z6cx7ube8gsou10nrt';
 
 var ign_source = new ol.source.WMTS({
-  url: 'http://wxs.ign.fr/' + key + '/wmts',
+  url: 'https://wxs.ign.fr/' + key + '/wmts',
   layer: 'GEOGRAPHICALGRIDSYSTEMS.MAPS',
   matrixSet: 'PM',
   format: 'image/jpeg',

examples/wmts.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.control');
@@ -32,7 +31,7 @@ var map = new ol.Map({
       source: new ol.source.WMTS({
         attributions: 'Tiles © <a href="http://services.arcgisonline.com/arcgis/rest/' +
             'services/Demographics/USA_Population_Density/MapServer/">ArcGIS</a>',
-        url: 'http://services.arcgisonline.com/arcgis/rest/' +
+        url: 'https://services.arcgisonline.com/arcgis/rest/' +
             'services/Demographics/USA_Population_Density/MapServer/WMTS/',
         layer: '0',
         matrixSet: 'EPSG:3857',

examples/xyz-esri.js

@@ -17,7 +17,7 @@ var map = new ol.Map({
     new ol.layer.Tile({
       source: new ol.source.XYZ({
         attributions: [attribution],
-        url: 'http://server.arcgisonline.com/ArcGIS/rest/services/' +
+        url: 'https://server.arcgisonline.com/ArcGIS/rest/services/' +
             'World_Topo_Map/MapServer/tile/{z}/{y}/{x}'
       })
     })

examples/xyz-retina.js

@@ -1,4 +1,3 @@
-goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
@@ -21,7 +20,7 @@ var map = new ol.Map({
       source: new ol.source.XYZ({
         attributions: 'Tiles © USGS, rendered with ' +
             '<a href="http://www.maptiler.com/">MapTiler</a>',
-        url: 'http://tileserver.maptiler.com/grandcanyon@2x/{z}/{x}/{y}.png',
+        url: 'https://tileserver.maptiler.com/grandcanyon@2x/{z}/{x}/{y}.png',
         tilePixelRatio: 2, // THIS IS IMPORTANT
         minZoom: mapMinZoom,
         maxZoom: mapMaxZoom

examples/zoomify.js

@@ -1,7 +1,6 @@
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
-goog.require('ol.proj');
 goog.require('ol.proj.Projection');
 goog.require('ol.source.Zoomify');
 

externs/closure-compiler.js

@@ -15,3 +15,5 @@
  * @see http://www.w3.org/TR/pointerevents/#the-touch-action-css-property
  */
 CSSProperties.prototype.touchAction;
+
+var global;

externs/oli.js

@@ -9,6 +9,18 @@
 var oli;
 
 
+/**
+ * @interface
+ */
+oli.AssertionError = function() {};
+
+
+/**
+ * @type {number}
+ */
+oli.AssertionError.prototype.code;
+
+
 /**
  * @interface
  */
@@ -40,13 +52,13 @@ oli.events.Event.prototype.stopPropagation = function() {};
 /**
  * @interface
  */
-oli.CollectionEvent = function() {};
+oli.Collection.Event = function() {};
 
 
 /**
  * @type {*}
  */
-oli.CollectionEvent.prototype.element;
+oli.Collection.Event.prototype.element;
 
 
 /**

externs/olx.js

@@ -1260,7 +1260,7 @@ olx.control.OverviewMapOptions.prototype.view;
  *     minWidth: (number|undefined),
  *     render: (function(ol.MapEvent)|undefined),
  *     target: (Element|undefined),
- *     units: (ol.control.ScaleLineUnits|string|undefined)}}
+ *     units: (ol.control.ScaleLine.Units|string|undefined)}}
  */
 olx.control.ScaleLineOptions;
 
@@ -1300,7 +1300,7 @@ olx.control.ScaleLineOptions.prototype.target;
 
 /**
  * Units. Default is `metric`.
- * @type {ol.control.ScaleLineUnits|string|undefined}
+ * @type {ol.control.ScaleLine.Units|string|undefined}
  * @api stable
  */
 olx.control.ScaleLineOptions.prototype.units;
@@ -2014,7 +2014,8 @@ olx.format.WFSOptions.prototype.schemaLocation;
  *     startIndex: (number|undefined),
  *     count: (number|undefined),
  *     bbox: (ol.Extent|undefined),
- *     filter: (ol.format.ogc.filter.Filter|undefined)}}
+ *     filter: (ol.format.ogc.filter.Filter|undefined),
+ *     resultType: (string|undefined)}}
  */
 olx.format.WFSWriteGetFeatureOptions;
 
@@ -2127,6 +2128,15 @@ olx.format.WFSWriteGetFeatureOptions.prototype.bbox;
 olx.format.WFSWriteGetFeatureOptions.prototype.filter;
 
 
+/**
+ * Indicates what response should be returned, E.g. `hits` only includes the
+ * `numberOfFeatures` attribute in the response and no features.
+ * @type {string|undefined}
+ * @api
+ */
+olx.format.WFSWriteGetFeatureOptions.prototype.resultType;
+
+
 /**
  * @typedef {{featureNS: string,
  *     featurePrefix: string,
@@ -4190,7 +4200,7 @@ olx.source.TileUTFGridOptions.prototype.url;
  *            reprojectionErrorThreshold: (number|undefined),
  *            state: (ol.source.State|undefined),
  *            tileClass: (function(new: ol.ImageTile, ol.TileCoord,
- *                                 ol.TileState, string, ?string,
+ *                                 ol.Tile.State, string, ?string,
  *                                 ol.TileLoadFunctionType)|undefined),
  *            tileGrid: (ol.tilegrid.TileGrid|undefined),
  *            tileLoadFunction: (ol.TileLoadFunctionType|undefined),
@@ -4275,7 +4285,7 @@ olx.source.TileImageOptions.prototype.state;
 /**
  * Class used to instantiate image tiles. Default is {@link ol.ImageTile}.
  * @type {function(new: ol.ImageTile, ol.TileCoord,
- *                 ol.TileState, string, ?string,
+ *                 ol.Tile.State, string, ?string,
  *                 ol.TileLoadFunctionType)|undefined}
  * @api
  */
@@ -4356,10 +4366,11 @@ olx.source.TileImageOptions.prototype.wrapX;
  *            cacheSize: (number|undefined),
  *            format: (ol.format.Feature|undefined),
  *            logo: (string|olx.LogoOptions|undefined),
+ *            overlaps: (boolean|undefined),
  *            projection: ol.ProjectionLike,
  *            state: (ol.source.State|undefined),
  *            tileClass: (function(new: ol.VectorTile, ol.TileCoord,
- *                 ol.TileState, string, ol.format.Feature,
+ *                 ol.Tile.State, string, ol.format.Feature,
  *                 ol.TileLoadFunctionType)|undefined),
  *            tileGrid: (ol.tilegrid.TileGrid|undefined),
  *            tileLoadFunction: (ol.TileLoadFunctionType|undefined),
@@ -4405,6 +4416,17 @@ olx.source.VectorTileOptions.prototype.format;
 olx.source.VectorTileOptions.prototype.logo;
 
 
+/**
+ * This source may have overlapping geometries. Default is `true`. Setting this
+ * to `false` (e.g. for sources with polygons that represent administrative
+ * boundaries or TopoJSON sources) allows the renderer to optimise fill and
+ * stroke operations.
+ * @type {boolean|undefined}
+ * @api
+ */
+olx.source.VectorTileOptions.prototype.overlaps;
+
+
 /**
  * Projection.
  * @type {ol.ProjectionLike}
@@ -4424,7 +4446,7 @@ olx.source.VectorTileOptions.prototype.state;
 /**
  * Class used to instantiate image tiles. Default is {@link ol.VectorTile}.
  * @type {function(new: ol.VectorTile, ol.TileCoord,
- *                 ol.TileState, string, ol.format.Feature,
+ *                 ol.Tile.State, string, ol.format.Feature,
  *                 ol.TileLoadFunctionType)|undefined}
  * @api
  */
@@ -4774,7 +4796,7 @@ olx.source.OSMOptions.prototype.tileLoadFunction;
 
 /**
  * URL template. Must include `{x}`, `{y}` or `{-y}`, and `{z}` placeholders.
- * Default is `//{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png`.
+ * Default is `https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png`.
  * @type {string|undefined}
  * @api stable
  */
@@ -4970,6 +4992,7 @@ olx.source.ImageCanvasOptions.prototype.state;
  *     logo: (string|olx.LogoOptions|undefined),
  *     projection: ol.ProjectionLike,
  *     ratio: (number|undefined),
+ *     renderBuffer: (number|undefined),
  *     resolutions: (Array.<number>|undefined),
  *     source: ol.source.Vector,
  *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined)}}
@@ -5011,6 +5034,17 @@ olx.source.ImageVectorOptions.prototype.projection;
 olx.source.ImageVectorOptions.prototype.ratio;
 
 
+/**
+ * The buffer around the viewport extent used by the renderer when getting
+ * features from the vector source for the rendering or hit-detection.
+ * Recommended value: the size of the largest symbol, line width or label.
+ * Default is 100 pixels.
+ * @type {number|undefined}
+ * @api
+ */
+olx.source.ImageVectorOptions.prototype.renderBuffer;
+
+
 /**
  * Resolutions. If specified, new canvases will be created for these resolutions
  * only.
@@ -5775,6 +5809,7 @@ olx.source.TileWMSOptions.prototype.wrapX;
  *     format: (ol.format.Feature|undefined),
  *     loader: (ol.FeatureLoader|undefined),
  *     logo: (string|olx.LogoOptions|undefined),
+ *     overlaps: (boolean|undefined),
  *     strategy: (ol.LoadingStrategy|undefined),
  *     url: (string|ol.FeatureUrlFunction|undefined),
  *     useSpatialIndex: (boolean|undefined),
@@ -5827,6 +5862,17 @@ olx.source.VectorOptions.prototype.loader;
 olx.source.VectorOptions.prototype.logo;
 
 
+/**
+ * This source may have overlapping geometries. Default is `true`. Setting this
+ * to `false` (e.g. for sources with polygons that represent administrative
+ * boundaries or TopoJSON sources) allows the renderer to optimise fill and
+ * stroke operations.
+ * @type {boolean|undefined}
+ * @api
+ */
+olx.source.VectorOptions.prototype.overlaps;
+
+
 /**
  * The loading strategy to use. By default an {@link ol.loadingstrategy.all}
  * strategy is used, a one-off strategy which loads all features at once.
@@ -5837,8 +5883,8 @@ olx.source.VectorOptions.prototype.strategy;
 
 
 /**
- * Setting this option instructs the source to use an XHR loader (see
- * {@link ol.featureloader.xhr}). Use a `string` and an
+ * Setting this option instructs the source to load features using an XHR loader
+ * (see {@link ol.featureloader.xhr}). Use a `string` and an
  * {@link ol.loadingstrategy.all} for a one-off download of all features from
  * the given URL. Use a {@link ol.FeatureUrlFunction} to generate the url with
  * other loading strategies.
@@ -5849,6 +5895,8 @@ olx.source.VectorOptions.prototype.strategy;
  * properly, this transformation will be incorrect. For some formats, the
  * default projection (usually EPSG:4326) can be overridden by setting the
  * defaultDataProjection constructor option on the format.
+ * Note that if a source contains non-feature data, such as a GeoJSON geometry
+ * or a KML NetworkLink, these will be ignored. Use a custom loader to load these.
  * @type {string|ol.FeatureUrlFunction|undefined}
  * @api
  */
@@ -5908,7 +5956,7 @@ olx.source.VectorOptions.prototype.wrapX;
  *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
  *     urls: (Array.<string>|undefined),
  *     tileClass: (function(new: ol.ImageTile, ol.TileCoord,
- *                          ol.TileState, string, ?string,
+ *                          ol.Tile.State, string, ?string,
  *                          ol.TileLoadFunctionType)|undefined),
  *     wrapX: (boolean|undefined)}}
  */
@@ -6003,7 +6051,7 @@ olx.source.WMTSOptions.prototype.style;
 /**
  * Class used to instantiate image tiles. Default is {@link ol.ImageTile}.
  * @type {function(new: ol.ImageTile, ol.TileCoord,
- *                 ol.TileState, string, ?string,
+ *                 ol.Tile.State, string, ?string,
  *                 ol.TileLoadFunctionType)|undefined}
  * @api
  */
@@ -6816,6 +6864,14 @@ olx.style.RegularShapeOptions.prototype.snapToPixel;
 olx.style.RegularShapeOptions.prototype.stroke;
 
 
+/**
+ * Whether to rotate the text with the view. Default is `false`.
+ * @type {boolean|undefined}
+ * @api
+ */
+olx.style.TextOptions.prototype.rotateWithView;
+
+
 /**
  * Rotation in radians (positive rotation clockwise). Default is `0`.
  * @type {number|undefined}
@@ -6913,6 +6969,7 @@ olx.style.StrokeOptions.prototype.width;
  *     offsetX: (number|undefined),
  *     offsetY: (number|undefined),
  *     scale: (number|undefined),
+ *     rotateWithView: (boolean|undefined),
  *     rotation: (number|undefined),
  *     text: (string|undefined),
  *     textAlign: (string|undefined),
@@ -7376,7 +7433,7 @@ olx.view.FitOptions.prototype.maxZoom;
 /**
  * @typedef {{animate: boolean,
  *     attributions: Object.<string, ol.Attribution>,
- *     coordinateToPixelMatrix: ol.vec.Mat4.Number,
+ *     coordinateToPixelTransform: ol.Transform,
  *     extent: (null|ol.Extent),
  *     focus: ol.Coordinate,
  *     index: number,
@@ -7384,7 +7441,7 @@ olx.view.FitOptions.prototype.maxZoom;
  *     layerStatesArray: Array.<ol.LayerState>,
  *     logos: Object.<string, (string|Element)>,
  *     pixelRatio: number,
- *     pixelToCoordinateMatrix: ol.vec.Mat4.Number,
+ *     pixelToCoordinateTransform: ol.Transform,
  *     postRenderFunctions: Array.<ol.PostRenderFunction>,
  *     size: ol.Size,
  *     skippedFeatureUids: Object.<string, boolean>,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openlayers",
-  "version": "3.17.1",
+  "version": "3.18.1",
   "description": "Build tools and sources for developing OpenLayers based mapping applications",
   "keywords": [
     "map",
@@ -30,42 +30,44 @@
     "css/ol.css"
   ],
   "dependencies": {
-    "async": "1.5.2",
-    "browserify": "13.0.1",
-    "closure-util": "1.15.0",
+    "async": "2.0.1",
+    "browserify": "13.1.0",
+    "closure-util": "1.15.1",
     "derequire": "2.0.3",
     "fs-extra": "0.30.0",
-    "glob": "7.0.5",
+    "glob": "7.0.6",
     "handlebars": "4.0.5",
     "jsdoc": "3.4.0",
-    "marked": "0.3.5",
-    "metalsmith": "2.1.0",
+    "marked": "0.3.6",
+    "metalsmith": "2.2.0",
     "metalsmith-layouts": "1.6.5",
     "nomnom": "1.8.1",
     "pbf": "2.0.1",
     "pixelworks": "1.1.0",
     "rbush": "2.0.1",
     "temp": "0.8.3",
-    "vector-tile": "1.2.1",
+    "vector-tile": "1.3.0",
     "walk": "2.3.9"
   },
   "devDependencies": {
-    "clean-css": "3.4.18",
-    "coveralls": "2.11.9",
+    "clean-css": "3.4.19",
+    "coveralls": "2.11.12",
     "debounce": "^1.0.0",
-    "eslint": "2.13.1",
+    "eslint": "3.3.1",
     "eslint-config-openlayers": "5.0.0",
+    "eslint-plugin-openlayers-internal": "2.1.0",
     "expect.js": "0.3.1",
     "gaze": "^1.0.0",
-    "istanbul": "0.4.4",
-    "jquery": "2.2.4",
-    "mocha": "2.5.3",
+    "istanbul": "0.4.5",
+    "jquery": "3.1.0",
+    "mocha": "3.0.2",
     "mocha-phantomjs-core": "^1.3.0",
     "mustache": "2.2.1",
-    "phantomjs-prebuilt": "2.1.7",
-    "proj4": "2.3.14",
+    "phantomjs-prebuilt": "2.1.12",
+    "proj4": "2.3.15",
     "resemblejs": "2.2.1",
-    "sinon": "1.17.4",
+    "serve-files": "1.0.0",
+    "sinon": "1.17.5",
     "slimerjs": "0.906.2"
   },
   "eslintConfig": {
@@ -81,8 +83,26 @@
       "goog": false,
       "proj4": false
     },
+    "plugins": [
+      "openlayers-internal"
+    ],
     "rules": {
-      "no-constant-condition": 0
+      "no-console": [
+        2,
+        {
+          "allow": [
+            "assert"
+          ]
+        }
+      ],
+      "no-constant-condition": 0,
+      "openlayers-internal/no-duplicate-requires": 2,
+      "openlayers-internal/no-missing-requires": 1,
+      "openlayers-internal/no-unused-requires": 2,
+      "openlayers-internal/one-provide": 1,
+      "openlayers-internal/requires-first": 2,
+      "openlayers-internal/valid-provide": 2,
+      "openlayers-internal/valid-requires": 2
     }
   },
   "ext": [

rules/.eslintrc

@@ -0,0 +1,8 @@
+{
+  "env": {
+    "es6": true
+  },
+  "rules": {
+    "strict": [2, "global"]
+  }
+}

rules/index.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  rules: {
+    'no-duplicate-requires': require('./no-duplicate-requires').rule,
+    'no-missing-requires': require('./no-missing-requires').rule,
+    'no-unused-requires': require('./no-unused-requires').rule,
+    'one-provide': require('./one-provide').rule,
+    'requires-first': require('./requires-first').rule,
+    'valid-provide': require('./valid-provide').rule,
+    'valid-requires': require('./valid-requires').rule
+  }
+};

rules/no-duplicate-requires.js

@@ -0,0 +1,48 @@
+'use strict';
+
+const util = require('./util');
+
+exports.rule = {
+  meta: {
+    docs: {
+      description: 'disallow duplicate goog.require() calls'
+    },
+    fixable: 'code'
+  },
+
+  create: function(context) {
+    const alreadyRequired = {};
+
+    return {
+      ExpressionStatement: function(statement) {
+        if (util.isRequireStatement(statement)) {
+          const expression = statement.expression;
+
+          if (!expression.arguments[0]) {
+            return;
+          }
+          const name = expression.arguments[0].value;
+
+          if (alreadyRequired[name]) {
+            const source = context.getSourceCode();
+
+            return context.report({
+              node: statement,
+              message: `Duplicate goog.require('${name}')`,
+              fix: function(fixer) {
+                const afterToken = source.getTokenAfter(statement);
+                const range = [
+                  statement.range[0],
+                  afterToken ? afterToken.range[0] : statement.range[1]
+                ];
+                return fixer.removeRange(range);
+              }
+            });
+          }
+          alreadyRequired[name] = true;
+        }
+      }
+    };
+  }
+
+};

rules/no-missing-requires.js

@@ -0,0 +1,90 @@
+'use strict';
+
+const util = require('./util');
+
+/**
+ * Unfortunately fragile RegExp to follow.  Here is the logic:
+ *
+ * 1. check if a name looks like a const (ol.foo.BOO_HOO must have a "_")
+ *   if so, require the "namespace" (ol.foo)
+ * 2. check if a name looks like a class (ol.foo.Bar or ol.foo.XYZ)
+ *   if so, require the class (ol.foo.Bar)
+ * 3. otherwise, lop off the last part of a name and require the rest
+ *   (e.g. ol.foo.bar would require ol.foo)
+ */
+
+const CONST_RE = /^(ol(\.[a-z]\w*)*)\.[A-Z]+_([_A-Z])+$/;
+const CLASS_RE = /^(ol(\.[a-z]\w*)*\.[A-Z]\w*)(\.\w+)*$/;
+
+exports.rule = {
+  meta: {
+    docs: {
+      description: 'ensure there are goog.require() calls for all used symbols'
+    },
+    fixable: 'code'
+  },
+
+  create: function(context) {
+    const defined = {};
+
+    return {
+
+      ExpressionStatement: function(statement) {
+        if (util.isRequireStatement(statement) || util.isProvideStatement(statement)) {
+          const expression = statement.expression;
+          const arg = expression.arguments[0];
+          if (!arg || !arg.value) {
+            return;
+          }
+          defined[arg.value] = true;
+        }
+      },
+
+      MemberExpression: function(expression) {
+        const parent = expression.parent;
+        if (parent.type !== 'MemberExpression') {
+          const name = util.getName(expression);
+          if (name && name.startsWith('ol.')) {
+            // check if the name looks like a const
+            let match = name.match(CONST_RE);
+            if (match) {
+              if (!defined[match[1]]) {
+                context.report(expression, `Missing goog.require('${match[1]}')`);
+              }
+              return;
+            }
+            // check if the name looks like a class
+            match = name.match(CLASS_RE);
+            if (match) {
+              const className = match[1];
+              const parts = className.split('.');
+              const lastPart = parts[parts.length - 1];
+              if (lastPart.toUpperCase() === lastPart) {
+                // unfortunately ambiguous:
+                // ol.has.WEBGL -> require('ol.has')
+                // ol.source.XYZ -> require('ol.source.XYZ')
+                const objectName = parts.slice(0, -1).join('.');
+                if (!defined[className] && !defined[objectName]) {
+                  context.report(expression, `Missing goog.require('${className}') or goog.require('${objectName}')`);
+                }
+                return;
+              }
+              if (!defined[className]) {
+                context.report(expression, `Missing goog.require('${className}')`);
+              }
+              return;
+            }
+            // otherwise, assume the object should be required
+            const parts = name.split('.');
+            parts.pop();
+            const objectName = parts.join('.');
+            if (!defined[objectName]) {
+              context.report(expression, `Missing goog.require('${objectName}')`);
+            }
+          }
+        }
+      }
+
+    };
+  }
+};

rules/no-unused-requires.js

@@ -0,0 +1,90 @@
+'use strict';
+
+const util = require('./util');
+
+exports.rule = {
+  meta: {
+    docs: {
+      description: 'disallow unused goog.require() calls'
+    },
+    fixable: 'code'
+  },
+
+  create: function(context) {
+
+    // a lookup of goog.require() nodes by argument
+    const requireStatements = {};
+
+    // used names from member expressions that match the goog.require() arg
+    const usedNames = {};
+
+    return {
+
+      ExpressionStatement: function(statement) {
+        if (util.isRequireStatement(statement)) {
+          const expression = statement.expression;
+          const arg = expression.arguments[0];
+          if (!arg || !arg.value) {
+            return;
+          }
+
+          const name = arg.value;
+          requireStatements[name] = statement;
+        }
+      },
+
+      MemberExpression: function(node) {
+        const name = util.getName(node);
+        if (name in requireStatements) {
+          const requiredAncestor = context.getAncestors().some(
+              ancestorNode => !!requireStatements[util.getName(ancestorNode)]);
+          if (!requiredAncestor) {
+            usedNames[name] = true;
+          }
+        }
+      },
+
+      Identifier: function(node) {
+        const name = node.name;
+        if (name in requireStatements) {
+          const ancestors = context.getAncestors();
+          if (ancestors.length && ancestors[0].type === 'MemberExpression') {
+            const requiredAncestor = ancestors.some(
+                ancestorNode => !!requireStatements[util.getName(ancestorNode)]);
+            if (!requiredAncestor) {
+              usedNames[name] = true;
+            }
+          } else {
+            usedNames[name] = true;
+          }
+        }
+      },
+
+      'Program:exit': function(node) {
+        const source = context.getSourceCode();
+
+        for (let name in requireStatements) {
+
+          if (!usedNames[name]) {
+            const unusedRequire = requireStatements[name];
+
+            context.report({
+              node: unusedRequire,
+              message: `Unused ${source.getText(unusedRequire)}`,
+              fix: function(fixer) {
+                const afterToken = source.getTokenAfter(unusedRequire);
+                const range = [
+                  unusedRequire.range[0],
+                  afterToken ? afterToken.range[0] : unusedRequire.range[1]
+                ];
+                return fixer.removeRange(range);
+              }
+            });
+
+          }
+        }
+      }
+
+    };
+  }
+};

rules/one-provide.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const util = require('./util');
+
+exports.rule = {
+  meta: {
+    docs: {
+      description: 'disallow multiple goog.provide() calls'
+    }
+  },
+
+  create: function(context) {
+    let hasProvide = false;
+
+    return {
+      ExpressionStatement: function(statement) {
+        if (util.isProvideStatement(statement)) {
+          if (hasProvide) {
+            const name = statement.expression.arguments[0].value;
+            context.report(statement, `Extra goog.provide('${name}')`);
+          } else {
+            hasProvide = true;
+          }
+        }
+      }
+    };
+  }
+};

rules/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "eslint-plugin-openlayers-internal",
+  "version": "2.1.0",
+  "description": "Custom ESLint rules for the OpenLayers project",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/openlayers/ol3.git"
+  },
+  "license": "BSD-2-Clause"
+}

rules/requires-first.js

@@ -0,0 +1,30 @@
+'use strict';
+
+const util = require('./util');
+
+exports.rule = {
+  meta: {
+    docs: {
+      description: 'require that all goog.require() precede other statements (except goog.provide())'
+    }
+  },
+
+  create: function(context) {
+    return {
+      Program: function(program) {
+        let otherSeen = false;
+
+        program.body.forEach(statement => {
+          if (util.isRequireStatement(statement)) {
+            if (otherSeen) {
+              return context.report(statement, 'Expected goog.require() to precede other statements');
+            }
+          } else if (!util.isProvideStatement(statement)) {
+            otherSeen = true;
+          }
+        });
+
+      }
+    };
+  }
+};

rules/util.js

@@ -0,0 +1,49 @@
+'use strict';
+
+function isGoogCallExpression(node, name) {
+  const callee = node.callee;
+  return callee && callee.type === 'MemberExpression' &&
+      callee.object.type === 'Identifier' && callee.object.name === 'goog' &&
+      callee.property.type === 'Identifier' && !callee.property.computed &&
+      callee.property.name === name;
+}
+
+function isGoogStatement(node, name) {
+  return node.expression && node.expression.type === 'CallExpression' &&
+    isGoogCallExpression(node.expression, name);
+}
+
+exports.isProvideExpression = function(node) {
+  return isGoogCallExpression(node, 'provide');
+};
+
+exports.isProvideStatement = function(node) {
+  return isGoogStatement(node, 'provide');
+};
+
+exports.isRequireExpression = function(node) {
+  return isGoogCallExpression(node, 'require');
+};
+
+exports.isRequireStatement = function(node) {
+  return isGoogStatement(node, 'require');
+};
+
+var getName = exports.getName = function(node) {
+  if (node.type !== 'MemberExpression') {
+    return;
+  }
+  if (node.property.type !== 'Identifier' || node.property.computed) {
+    return;
+  }
+  let objectName;
+  if (node.object.type === 'Identifier' && !node.object.computed) {
+    objectName = node.object.name;
+  } else if (node.object.type === 'MemberExpression' && !node.object.computed) {
+    objectName = getName(node.object);
+  }
+  if (!objectName) {
+    return;
+  }
+  return `${objectName}.${node.property.name}`;
+};

rules/valid-provide.js

@@ -0,0 +1,72 @@
+'use strict';
+
+const path = require('path');
+const util = require('./util');
+
+function longestCommonPrefix(path1, path2) {
+  const parts1 = path.resolve(path1).split(path.sep);
+  const parts2 = path.resolve(path2).split(path.sep);
+  const common = [];
+  for (let i = 0, ii = parts1.length; i < ii; ++i) {
+    if (parts1[i] === parts2[i]) {
+      common.push(parts1[i]);
+    } else {
+      break;
+    }
+  }
+  return common.join(path.sep);
+}
+
+exports.rule = {
+  meta: {
+    docs: {
+      description: 'require the first goog.provide() has an arg named like the file path'
+    }
+  },
+
+  create: function(context) {
+    let gotFirst = false;
+    return {
+      CallExpression: function(expression) {
+        if (gotFirst) {
+          return;
+        }
+        if (util.isProvideExpression(expression)) {
+          gotFirst = true;
+          const parent = expression.parent;
+          if (parent.type !== 'ExpressionStatement') {
+            return context.report(expression, 'Expected goog.provide() to in an expression statement');
+          }
+
+          if (parent.parent.type !== 'Program') {
+            return context.report(expression, 'Expected goog.provide() to be at the top level');
+          }
+
+          if (expression.arguments.length !== 1) {
+            return context.report(expression, 'Expected one argument for goog.require()');
+          }
+
+          const arg = expression.arguments[0];
+          if (arg.type !== 'Literal' || !arg.value || typeof arg.value !== 'string') {
+            return context.report(expression, 'Expected goog.require() to be called with a string');
+          }
+
+          const filePath = context.getFilename();
+          const sourceRoot = path.join(longestCommonPrefix(__dirname, filePath), 'src');
+          const requirePath = path.relative(sourceRoot, filePath);
+          let ext;
+          if (path.basename(requirePath) === 'index.js') {
+            ext = path.sep + 'index.js';
+          } else {
+            ext = '.js';
+          }
+          const name = arg.value;
+          const expectedPath = name.split('.').join(path.sep) + ext;
+          if (expectedPath.toLowerCase() !== requirePath.toLowerCase()) {
+            return context.report(expression, `Expected goog.provide('${name}') to be like ${requirePath}`);
+          }
+        }
+      }
+    };
+  }
+};

rules/valid-requires.js

@@ -0,0 +1,37 @@
+'use strict';
+
+const util = require('./util');
+
+exports.rule = {
+  meta: {
+    docs: {
+      description: 'require that all goog.require() have a valid arg and appear at the top level'
+    }
+  },
+
+  create: function(context) {
+    return {
+      CallExpression: function(expression) {
+        if (util.isRequireExpression(expression)) {
+          const parent = expression.parent;
+          if (parent.type !== 'ExpressionStatement') {
+            return context.report(expression, 'Expected goog.require() to in an expression statement');
+          }
+
+          if (parent.parent.type !== 'Program') {
+            return context.report(expression, 'Expected goog.require() to be at the top level');
+          }
+
+          if (expression.arguments.length !== 1) {
+            return context.report(expression, 'Expected one argument for goog.require()');
+          }
+
+          const arg = expression.arguments[0];
+          if (arg.type !== 'Literal' || !arg.value || typeof arg.value !== 'string') {
+            return context.report(expression, 'Expected goog.require() to be called with a string');
+          }
+        }
+      }
+    };
+  }
+};

src/ol/animation.js

@@ -1,7 +1,7 @@
 goog.provide('ol.animation');
 
 goog.require('ol');
-goog.require('ol.ViewHint');
+goog.require('ol.View');
 goog.require('ol.coordinate');
 goog.require('ol.easing');
 
@@ -28,14 +28,14 @@ ol.animation.bounce = function(options) {
       function(map, frameState) {
         if (frameState.time < start) {
           frameState.animate = true;
-          frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
+          frameState.viewHints[ol.View.Hint.ANIMATING] += 1;
           return true;
         } else if (frameState.time < start + duration) {
           var delta = easing((frameState.time - start) / duration);
           var deltaResolution = resolution - frameState.viewState.resolution;
           frameState.animate = true;
           frameState.viewState.resolution += delta * deltaResolution;
-          frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
+          frameState.viewHints[ol.View.Hint.ANIMATING] += 1;
           return true;
         } else {
           return false;
@@ -67,7 +67,7 @@ ol.animation.pan = function(options) {
       function(map, frameState) {
         if (frameState.time < start) {
           frameState.animate = true;
-          frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
+          frameState.viewHints[ol.View.Hint.ANIMATING] += 1;
           return true;
         } else if (frameState.time < start + duration) {
           var delta = 1 - easing((frameState.time - start) / duration);
@@ -76,7 +76,7 @@ ol.animation.pan = function(options) {
           frameState.animate = true;
           frameState.viewState.center[0] += delta * deltaX;
           frameState.viewState.center[1] += delta * deltaY;
-          frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
+          frameState.viewHints[ol.View.Hint.ANIMATING] += 1;
           return true;
         } else {
           return false;
@@ -109,7 +109,7 @@ ol.animation.rotate = function(options) {
       function(map, frameState) {
         if (frameState.time < start) {
           frameState.animate = true;
-          frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
+          frameState.viewHints[ol.View.Hint.ANIMATING] += 1;
           return true;
         } else if (frameState.time < start + duration) {
           var delta = 1 - easing((frameState.time - start) / duration);
@@ -123,7 +123,7 @@ ol.animation.rotate = function(options) {
             ol.coordinate.rotate(center, deltaRotation);
             ol.coordinate.add(center, anchor);
           }
-          frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
+          frameState.viewHints[ol.View.Hint.ANIMATING] += 1;
           return true;
         } else {
           return false;
@@ -153,7 +153,7 @@ ol.animation.zoom = function(options) {
       function(map, frameState) {
         if (frameState.time < start) {
           frameState.animate = true;
-          frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
+          frameState.viewHints[ol.View.Hint.ANIMATING] += 1;
           return true;
         } else if (frameState.time < start + duration) {
           var delta = 1 - easing((frameState.time - start) / duration);
@@ -161,7 +161,7 @@ ol.animation.zoom = function(options) {
               sourceResolution - frameState.viewState.resolution;
           frameState.animate = true;
           frameState.viewState.resolution += delta * deltaResolution;
-          frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
+          frameState.viewHints[ol.View.Hint.ANIMATING] += 1;
           return true;
         } else {
           return false;

src/ol/array.js

@@ -1,7 +1,5 @@
 goog.provide('ol.array');
 
-goog.require('goog.asserts');
-
 
 /**
  * Performs a binary search on the provided sorted list and returns the index of the item if found. If it can't be found it'll return -1.
@@ -135,9 +133,6 @@ ol.array.linearFindNearest = function(arr, target, direction) {
         }
       }
     }
-    // We should never get here, but the compiler complains
-    // if it finds a path for which no number is returned.
-    goog.asserts.fail();
     return n - 1;
   }
 };
@@ -149,9 +144,9 @@ ol.array.linearFindNearest = function(arr, target, direction) {
  * @param {number} end End index.
  */
 ol.array.reverseSubArray = function(arr, begin, end) {
-  goog.asserts.assert(begin >= 0,
+  goog.DEBUG && console.assert(begin >= 0,
       'Array begin index should be equal to or greater than 0');
-  goog.asserts.assert(end < arr.length,
+  goog.DEBUG && console.assert(end < arr.length,
       'Array end index should be less than the array length');
   while (begin < end) {
     var tmp = arr[begin];
@@ -187,7 +182,7 @@ ol.array.flatten = function(arr) {
  */
 ol.array.extend = function(arr, data) {
   var i;
-  var extension = goog.isArrayLike(data) ? data : [data];
+  var extension = Array.isArray(data) ? data : [data];
   var length = extension.length;
   for (i = 0; i < length; i++) {
     arr[arr.length] = extension[i];

src/ol/assertionerror.js

@@ -0,0 +1,36 @@
+goog.provide('ol.AssertionError');
+
+goog.require('ol');
+
+/**
+ * Error object thrown when an assertion failed. This is an ECMA-262 Error,
+ * extended with a `code` property.
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
+ * @constructor
+ * @extends {Error}
+ * @implements {oli.AssertionError}
+ * @param {number} code Error code.
+ */
+ol.AssertionError = function(code) {
+
+  /**
+   * @type {string}
+   */
+  this.message = 'Assertion failed. See ' +
+      (ol.VERSION ? 'http://openlayers.org/en/' + ol.VERSION.split('-')[0] : '') +
+      '/doc/errors/#' + code + ' for details.';
+
+  /**
+   * Error code. The meaning of the code can be found on
+   * {@link http://openlayers.org/en/latest/errors.html} (replace `latest` with
+   * the version found in the OpenLayers script's header comment if a version
+   * other than the latest is used).
+   * @type {number}
+   * @api
+   */
+  this.code = code;
+
+  this.name = 'AssertionError';
+
+};
+ol.inherits(ol.AssertionError, Error);

src/ol/asserts.js

@@ -0,0 +1,15 @@
+goog.provide('ol.asserts');
+
+goog.require('ol');
+goog.require('ol.AssertionError');
+
+
+/**
+ * @param {*} assertion Assertion we expected to be truthy.
+ * @param {number} errorCode Error code.
+ */
+ol.asserts.assert = function(assertion, errorCode) {
+  if (!assertion) {
+    throw new ol.AssertionError(errorCode);
+  }
+};

src/ol/attribution.js

@@ -2,6 +2,7 @@ goog.provide('ol.Attribution');
 
 goog.require('ol.TileRange');
 goog.require('ol.math');
+goog.require('ol.tilegrid');
 
 
 /**

src/ol/collection.js

@@ -4,59 +4,12 @@
  */
 
 goog.provide('ol.Collection');
-goog.provide('ol.CollectionEvent');
-goog.provide('ol.CollectionEventType');
 
+goog.require('ol');
 goog.require('ol.events.Event');
 goog.require('ol.Object');
 
 
-/**
- * @enum {string}
- */
-ol.CollectionEventType = {
-  /**
-   * Triggered when an item is added to the collection.
-   * @event ol.CollectionEvent#add
-   * @api stable
-   */
-  ADD: 'add',
-  /**
-   * Triggered when an item is removed from the collection.
-   * @event ol.CollectionEvent#remove
-   * @api stable
-   */
-  REMOVE: 'remove'
-};
-
-
-/**
- * @classdesc
- * Events emitted by {@link ol.Collection} instances are instances of this
- * type.
- *
- * @constructor
- * @extends {ol.events.Event}
- * @implements {oli.CollectionEvent}
- * @param {ol.CollectionEventType} type Type.
- * @param {*=} opt_element Element.
- * @param {Object=} opt_target Target.
- */
-ol.CollectionEvent = function(type, opt_element, opt_target) {
-
-  ol.events.Event.call(this, type, opt_target);
-
-  /**
-   * The element that is added to or removed from the collection.
-   * @type {*}
-   * @api stable
-   */
-  this.element = opt_element;
-
-};
-ol.inherits(ol.CollectionEvent, ol.events.Event);
-
-
 /**
  * @enum {string}
  */
@@ -75,7 +28,7 @@ ol.CollectionProperty = {
  *
  * @constructor
  * @extends {ol.Object}
- * @fires ol.CollectionEvent
+ * @fires ol.Collection.Event
  * @param {!Array.<T>=} opt_array Array.
  * @template T
  * @api stable
@@ -182,7 +135,7 @@ ol.Collection.prototype.insertAt = function(index, elem) {
   this.array_.splice(index, 0, elem);
   this.updateLength_();
   this.dispatchEvent(
-      new ol.CollectionEvent(ol.CollectionEventType.ADD, elem, this));
+      new ol.Collection.Event(ol.Collection.EventType.ADD, elem));
 };
 
 
@@ -240,7 +193,7 @@ ol.Collection.prototype.removeAt = function(index) {
   this.array_.splice(index, 1);
   this.updateLength_();
   this.dispatchEvent(
-      new ol.CollectionEvent(ol.CollectionEventType.REMOVE, prev, this));
+      new ol.Collection.Event(ol.Collection.EventType.REMOVE, prev));
   return prev;
 };
 
@@ -257,9 +210,9 @@ ol.Collection.prototype.setAt = function(index, elem) {
     var prev = this.array_[index];
     this.array_[index] = elem;
     this.dispatchEvent(
-        new ol.CollectionEvent(ol.CollectionEventType.REMOVE, prev, this));
+        new ol.Collection.Event(ol.Collection.EventType.REMOVE, prev));
     this.dispatchEvent(
-        new ol.CollectionEvent(ol.CollectionEventType.ADD, elem, this));
+        new ol.Collection.Event(ol.Collection.EventType.ADD, elem));
   } else {
     var j;
     for (j = n; j < index; ++j) {
@@ -276,3 +229,48 @@ ol.Collection.prototype.setAt = function(index, elem) {
 ol.Collection.prototype.updateLength_ = function() {
   this.set(ol.CollectionProperty.LENGTH, this.array_.length);
 };
+
+
+/**
+ * @enum {string}
+ */
+ol.Collection.EventType = {
+  /**
+   * Triggered when an item is added to the collection.
+   * @event ol.Collection.Event#add
+   * @api stable
+   */
+  ADD: 'add',
+  /**
+   * Triggered when an item is removed from the collection.
+   * @event ol.Collection.Event#remove
+   * @api stable
+   */
+  REMOVE: 'remove'
+};
+
+
+/**
+ * @classdesc
+ * Events emitted by {@link ol.Collection} instances are instances of this
+ * type.
+ *
+ * @constructor
+ * @extends {ol.events.Event}
+ * @implements {oli.Collection.Event}
+ * @param {ol.Collection.EventType} type Type.
+ * @param {*=} opt_element Element.
+ */
+ol.Collection.Event = function(type, opt_element) {
+
+  ol.events.Event.call(this, type);
+
+  /**
+   * The element that is added to or removed from the collection.
+   * @type {*}
+   * @api stable
+   */
+  this.element = opt_element;
+
+};
+ol.inherits(ol.Collection.Event, ol.events.Event);

src/ol/color.js

@@ -1,14 +1,7 @@
-// We can't use goog.color or goog.color.alpha because they interally use a hex
-// string representation that encodes each channel in a single byte.  This
-// causes occasional loss of precision and rounding errors, especially in the
-// alpha channel.
-
 goog.provide('ol.color');
 
-goog.require('goog.asserts');
-goog.require('goog.color');
-goog.require('goog.color.names');
 goog.require('ol');
+goog.require('ol.asserts');
 goog.require('ol.math');
 
 
@@ -22,7 +15,7 @@ ol.color.hexColorRe_ = /^#(?:[0-9a-f]{3}){1,2}$/i;
 
 
 /**
- * @see goog.color.rgbColorRe_
+ * Regular expression for matching and capturing RGB style strings.
  * @const
  * @type {RegExp}
  * @private
@@ -32,7 +25,7 @@ ol.color.rgbColorRe_ =
 
 
 /**
- * @see goog.color.alpha.rgbaColorRe_
+ * Regular expression for matching and capturing RGBA style strings.
  * @const
  * @type {RegExp}
  * @private
@@ -41,6 +34,16 @@ ol.color.rgbaColorRe_ =
     /^(?:rgba)?\((0|[1-9]\d{0,2}),\s?(0|[1-9]\d{0,2}),\s?(0|[1-9]\d{0,2}),\s?(0|1|0\.\d{0,10})\)$/i;
 
 
+/**
+ * Regular expression for matching potential named color style strings.
+ * @const
+ * @type {RegExp}
+ * @private
+ */
+ol.color.namedColorRe_ =
+    /^([a-z]*)$/i;
+
+
 /**
  * Return the color as an array. This function maintains a cache of calculated
  * arrays which means the result should not be modified.
@@ -52,8 +55,7 @@ ol.color.asArray = function(color) {
   if (Array.isArray(color)) {
     return color;
   } else {
-    goog.asserts.assert(typeof color === 'string', 'Color should be a string');
-    return ol.color.fromString(color);
+    return ol.color.fromString(/** @type {string} */ (color));
   }
 };
 
@@ -68,11 +70,24 @@ ol.color.asString = function(color) {
   if (typeof color === 'string') {
     return color;
   } else {
-    goog.asserts.assert(Array.isArray(color), 'Color should be an array');
     return ol.color.toString(color);
   }
 };
 
+/**
+ * Return named color as an rgba string.
+ * @param {string} color Named color.
+ * @return {string} Rgb string.
+ */
+ol.color.fromNamed = function(color) {
+  var el = document.createElement('div');
+  el.style.color = color;
+  document.body.appendChild(el);
+  var rgb = window.getComputedStyle(el).color;
+  document.body.removeChild(el);
+  return rgb;
+};
+
 
 /**
  * @param {string} s String.
@@ -137,18 +152,15 @@ ol.color.fromString = (
  * @return {ol.Color} Color.
  */
 ol.color.fromStringInternal_ = function(s) {
+  var r, g, b, a, color, match;
 
-  var isHex = false;
-  if (ol.ENABLE_NAMED_COLORS && goog.color.names.hasOwnProperty(s)) {
-    s = goog.color.names[s];
-    isHex = true;
+  if (ol.color.namedColorRe_.exec(s)) {
+    s = ol.color.fromNamed(s);
   }
 
-  var r, g, b, a, color, match;
-  if (isHex || (match = ol.color.hexColorRe_.exec(s))) { // hex
+  if (ol.color.hexColorRe_.exec(s)) { // hex
     var n = s.length - 1; // number of hex digits
-    goog.asserts.assert(n == 3 || n == 6,
-        'Color string length should be 3 or 6');
+    ol.asserts.assert(n == 3 || n == 6, 54); // Hex color should have 3 or 6 digits
     var d = n == 3 ? 1 : 2; // number of digits per channel
     r = parseInt(s.substr(1 + 0 * d, d), 16);
     g = parseInt(s.substr(1 + 1 * d, d), 16);
@@ -160,26 +172,21 @@ ol.color.fromStringInternal_ = function(s) {
     }
     a = 1;
     color = [r, g, b, a];
-    goog.asserts.assert(ol.color.isValid(color),
-        'Color should be a valid color');
-    return color;
   } else if ((match = ol.color.rgbaColorRe_.exec(s))) { // rgba()
     r = Number(match[1]);
     g = Number(match[2]);
     b = Number(match[3]);
     a = Number(match[4]);
-    color = [r, g, b, a];
-    return ol.color.normalize(color, color);
+    color = ol.color.normalize([r, g, b, a]);
   } else if ((match = ol.color.rgbColorRe_.exec(s))) { // rgb()
     r = Number(match[1]);
     g = Number(match[2]);
     b = Number(match[3]);
-    color = [r, g, b, 1];
-    return ol.color.normalize(color, color);
+    color = ol.color.normalize([r, g, b, 1]);
   } else {
-    goog.asserts.fail(s + ' is not a valid color');
+    ol.asserts.assert(false, 14); // Invalid color
   }
-
+  return /** @type {ol.Color} */ (color);
 };
 
 

src/ol/control/attribution.js

@@ -2,16 +2,13 @@
 
 goog.provide('ol.control.Attribution');
 
-goog.require('goog.asserts');
 goog.require('ol');
 goog.require('ol.dom');
-goog.require('ol.Attribution');
 goog.require('ol.control.Control');
 goog.require('ol.css');
 goog.require('ol.events');
 goog.require('ol.events.EventType');
-goog.require('ol.object');
-goog.require('ol.source.Tile');
+goog.require('ol.obj');
 
 
 /**
@@ -157,33 +154,29 @@ ol.control.Attribution.prototype.getSourceAttributions = function(frameState) {
   var intersectsTileRange;
   var layerStatesArray = frameState.layerStatesArray;
   /** @type {Object.<string, ol.Attribution>} */
-  var attributions = ol.object.assign({}, frameState.attributions);
+  var attributions = ol.obj.assign({}, frameState.attributions);
   /** @type {Object.<string, ol.Attribution>} */
   var hiddenAttributions = {};
-  var projection = frameState.viewState.projection;
-  goog.asserts.assert(projection, 'projection of viewState required');
+  var projection = /** @type {!ol.proj.Projection} */ (frameState.viewState.projection);
   for (i = 0, ii = layerStatesArray.length; i < ii; i++) {
     source = layerStatesArray[i].layer.getSource();
     if (!source) {
       continue;
     }
-    sourceKey = goog.getUid(source).toString();
+    sourceKey = ol.getUid(source).toString();
     sourceAttributions = source.getAttributions();
     if (!sourceAttributions) {
       continue;
     }
     for (j = 0, jj = sourceAttributions.length; j < jj; j++) {
       sourceAttribution = sourceAttributions[j];
-      sourceAttributionKey = goog.getUid(sourceAttribution).toString();
+      sourceAttributionKey = ol.getUid(sourceAttribution).toString();
       if (sourceAttributionKey in attributions) {
         continue;
       }
       tileRanges = frameState.usedTiles[sourceKey];
       if (tileRanges) {
-        goog.asserts.assertInstanceof(source, ol.source.Tile,
-            'source should be an ol.source.Tile');
-        var tileGrid = source.getTileGridForProjection(projection);
-        goog.asserts.assert(tileGrid, 'tileGrid required for projection');
+        var tileGrid = /** @type {ol.source.Tile} */ (source).getTileGridForProjection(projection);
         intersectsTileRange = sourceAttribution.intersectsAnyTileRange(
             tileRanges, tileGrid, projection);
       } else {
@@ -272,14 +265,14 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
   }
 
   var renderVisible =
-      !ol.object.isEmpty(this.attributionElementRenderedVisible_) ||
-      !ol.object.isEmpty(frameState.logos);
+      !ol.obj.isEmpty(this.attributionElementRenderedVisible_) ||
+      !ol.obj.isEmpty(frameState.logos);
   if (this.renderedVisible_ != renderVisible) {
     this.element.style.display = renderVisible ? '' : 'none';
     this.renderedVisible_ = renderVisible;
   }
   if (renderVisible &&
-      ol.object.isEmpty(this.attributionElementRenderedVisible_)) {
+      ol.obj.isEmpty(this.attributionElementRenderedVisible_)) {
     this.element.classList.add('ol-logo-only');
   } else {
     this.element.classList.remove('ol-logo-only');
@@ -329,7 +322,7 @@ ol.control.Attribution.prototype.insertLogos_ = function(frameState) {
     }
   }
 
-  this.logoLi_.style.display = !ol.object.isEmpty(logos) ? '' : 'none';
+  this.logoLi_.style.display = !ol.obj.isEmpty(logos) ? '' : 'none';
 
 };
 

src/ol/control/fullscreen.js

@@ -1,6 +1,5 @@
 goog.provide('ol.control.FullScreen');
 
-goog.require('goog.asserts');
 goog.require('ol.events');
 goog.require('ol.events.EventType');
 goog.require('ol');
@@ -125,7 +124,6 @@ ol.control.FullScreen.prototype.handleFullScreen_ = function() {
     } else {
       element = map.getTargetElement();
     }
-    goog.asserts.assert(element, 'element should be defined');
     if (this.keys_) {
       ol.control.FullScreen.requestFullScreenWithKeys(element);
 

src/ol/control/mouseposition.js

@@ -2,12 +2,12 @@
 
 goog.provide('ol.control.MousePosition');
 
+goog.require('ol');
 goog.require('ol.events');
 goog.require('ol.events.EventType');
 goog.require('ol.Object');
 goog.require('ol.control.Control');
 goog.require('ol.proj');
-goog.require('ol.proj.Projection');
 
 
 /**

src/ol/control/overviewmap.js

@@ -1,8 +1,5 @@
 goog.provide('ol.control.OverviewMap');
 
-goog.require('goog.asserts');
-goog.require('ol.events');
-goog.require('ol.events.EventType');
 goog.require('ol');
 goog.require('ol.Collection');
 goog.require('ol.Map');
@@ -12,11 +9,12 @@ goog.require('ol.ObjectEventType');
 goog.require('ol.Overlay');
 goog.require('ol.OverlayPositioning');
 goog.require('ol.View');
-goog.require('ol.ViewProperty');
 goog.require('ol.control.Control');
 goog.require('ol.coordinate');
 goog.require('ol.css');
 goog.require('ol.dom');
+goog.require('ol.events');
+goog.require('ol.events.EventType');
 goog.require('ol.extent');
 
 
@@ -213,7 +211,7 @@ ol.control.OverviewMap.prototype.handleMapPropertyChange_ = function(event) {
  */
 ol.control.OverviewMap.prototype.bindView_ = function(view) {
   ol.events.listen(view,
-      ol.Object.getChangeEventType(ol.ViewProperty.ROTATION),
+      ol.Object.getChangeEventType(ol.View.Property.ROTATION),
       this.handleRotationChanged_, this);
 };
 
@@ -225,7 +223,7 @@ ol.control.OverviewMap.prototype.bindView_ = function(view) {
  */
 ol.control.OverviewMap.prototype.unbindView_ = function(view) {
   ol.events.unlisten(view,
-      ol.Object.getChangeEventType(ol.ViewProperty.ROTATION),
+      ol.Object.getChangeEventType(ol.View.Property.ROTATION),
       this.handleRotationChanged_, this);
 };
 
@@ -272,18 +270,14 @@ ol.control.OverviewMap.prototype.validateExtent_ = function() {
     return;
   }
 
-  var mapSize = map.getSize();
-  goog.asserts.assertArray(mapSize, 'mapSize should be an array');
+  var mapSize = /** @type {ol.Size} */ (map.getSize());
 
   var view = map.getView();
-  goog.asserts.assert(view, 'view should be defined');
   var extent = view.calculateExtent(mapSize);
 
-  var ovmapSize = ovmap.getSize();
-  goog.asserts.assertArray(ovmapSize, 'ovmapSize should be an array');
+  var ovmapSize = /** @type {ol.Size} */ (ovmap.getSize());
 
   var ovview = ovmap.getView();
-  goog.asserts.assert(ovview, 'ovview should be defined');
   var ovextent = ovview.calculateExtent(ovmapSize);
 
   var topLeftPixel =
@@ -321,18 +315,14 @@ ol.control.OverviewMap.prototype.resetExtent_ = function() {
   var map = this.getMap();
   var ovmap = this.ovmap_;
 
-  var mapSize = map.getSize();
-  goog.asserts.assertArray(mapSize, 'mapSize should be an array');
+  var mapSize = /** @type {ol.Size} */ (map.getSize());
 
   var view = map.getView();
-  goog.asserts.assert(view, 'view should be defined');
   var extent = view.calculateExtent(mapSize);
 
-  var ovmapSize = ovmap.getSize();
-  goog.asserts.assertArray(ovmapSize, 'ovmapSize should be an array');
+  var ovmapSize = /** @type {ol.Size} */ (ovmap.getSize());
 
   var ovview = ovmap.getView();
-  goog.asserts.assert(ovview, 'ovview should be defined');
 
   // get how many times the current map overview could hold different
   // box sizes using the min and max ratio, pick the step in the middle used
@@ -355,10 +345,8 @@ ol.control.OverviewMap.prototype.recenter_ = function() {
   var ovmap = this.ovmap_;
 
   var view = map.getView();
-  goog.asserts.assert(view, 'view should be defined');
 
   var ovview = ovmap.getView();
-  goog.asserts.assert(ovview, 'ovview should be defined');
 
   ovview.setCenter(view.getCenter());
 };
@@ -376,20 +364,13 @@ ol.control.OverviewMap.prototype.updateBox_ = function() {
     return;
   }
 
-  var mapSize = map.getSize();
-  goog.asserts.assertArray(mapSize, 'mapSize should be an array');
+  var mapSize = /** @type {ol.Size} */ (map.getSize());
 
   var view = map.getView();
-  goog.asserts.assert(view, 'view should be defined');
 
   var ovview = ovmap.getView();
-  goog.asserts.assert(ovview, 'ovview should be defined');
-
-  var ovmapSize = ovmap.getSize();
-  goog.asserts.assertArray(ovmapSize, 'ovmapSize should be an array');
 
   var rotation = view.getRotation();
-  goog.asserts.assert(rotation !== undefined, 'rotation should be defined');
 
   var overlay = this.boxOverlay_;
   var box = this.boxOverlay_.getElement();
@@ -422,7 +403,6 @@ ol.control.OverviewMap.prototype.calculateCoordinateRotate_ = function(
 
   var map = this.getMap();
   var view = map.getView();
-  goog.asserts.assert(view, 'view should be defined');
 
   var currentCenter = view.getCenter();