4.3.0-beta.3

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,7 @@
-Thank you for your interest in making OpenLayers better!
+This issue tracker is for reporting bugs or feature requests, not for asking questions. For usage questions, refer to the (documentation)[http://openlayers.org/en/latest/doc/].
 
-To keep this project manageable for maintainers, we ask you to please check all boxes below before submitting an issue.
+Ready to submit your bug or feature request? Make sure these boxes are checked before submitting your issue. Thank you!
 
-- [ ] I am submitting a bug or feature request, not a usage question. Go to https://stackoverflow.com/questions/tagged/openlayers for questions.
 - [ ] I have searched GitHub to see if a similar bug or feature request has already been reported.
-- [ ] I have verified that the issue is present in the latest version of OpenLayers (see 'LATEST' on https://openlayers.org/).
+- [ ] If reporting a bug, I have tried with the latest version of OpenLayers (see 'LATEST' on https://openlayers.org/)
 - [ ] If reporting a bug, I have created a [CodePen](https://codepen.io) or prepared a stack trace (using the latest version and unminified code, so e.g. `ol-debug.js`, not `ol.js`) that shows the issue.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,5 @@
-Thank you for your interest in making OpenLayers better!
+Make sure these boxes are checked before submitting your pull request. Thank you!
 
-In order to get your proposed changes merged into the master branch, we ask you to please make sure the following boxes are checked *before* submitting your pull request.
-
-- [ ] This pull request addresses an issue that has been marked with the 'Pull request accepted' label & I have added the link to that issue.
+- [ ] This pull request addresses an issue that has been marked with the 'Pull request accepted' label.
 - [ ] It contains one or more small, incremental, logically separate commits, with no merge commits.
 - [ ] I have used clear commit messages.
-- [ ] Existing tests pass for me locally & I have added or updated tests for new or changed functionality.
-- [ ] The work herein is covered by a valid [Contributor License Agreement (CLA)](https://github.com/openlayers/cla).

.gitignore

@@ -1,4 +1,4 @@
 /build/
-/coverage/
-/dist/
 /node_modules/
+/dist/
+/coverage/

.travis.yml

@@ -1,22 +1,33 @@
 sudo: false
+
 language: node_js
+
 node_js:
-- '8'
+  - "6.1"
+
+addons:
+  firefox: "52.0"
+
 cache:
   directories:
-  - node_modules
+    - node_modules
+env:
+  - DISPLAY=:99.0
+
+before_install:
+  - "npm prune"
+
 before_script:
-- rm src/ol/renderer/webgl/*shader.js
-- rm src/ol/renderer/webgl/*shader/locations.js
-script: make ci
+  - "rm src/ol/renderer/webgl/*shader.js"
+  - "sh -e /etc/init.d/xvfb start"
+  - "npm ls || true"
+
+script: "make ci"
+
 after_success:
-- cat coverage/lcov.info | coveralls
+  - "make test-coverage"
+  - "cat coverage/lcov.info | ./node_modules/.bin/coveralls"
+
 branches:
   only:
-  - master
-addons:
-  hosts:
-    - travis.dev
-  jwt:
-    # This is the encrypted SAUCE_ACCESS_KEY
-    secure: bb2Ibzu9RLe6ZlIG7JVcuH7IoLMxa/i3LTM7t8mbsPjVOGs5ycyJ7M9MbvqB/F2EzbeV4XB2c9ufI4TkaLYceY5kdWjfZVN8iasr+GFqKMv1uR4i6bpu8KmHJ+blxwfY1QOQ/cGwEx+fbeycMtpTc3Y3GyXaPlCQLhbZvesMg88=
+    - master

DEVELOPING.md

@@ -17,7 +17,7 @@ The minimum requirements are:
 
 * GNU Make
 * Git
-* [Node.js](http://nodejs.org/) (version 8 and above)
+* [Node.js](http://nodejs.org/) (higher than 0.12.x)
 * Python 2.6 or 2.7
 * Java 7 (JRE and JDK)
 

Makefile

@@ -3,10 +3,12 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 
 SRC_GLSL := $(shell find src -type f -name '*.glsl')
 SRC_SHADER_JS := $(patsubst %shader.glsl,%shader.js,$(SRC_GLSL))
-SRC_SHADERLOCATIONS_JS := $(patsubst %shader.glsl,%shader/locations.js,$(SRC_GLSL))
-SRC_JS := $(filter-out $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS),$(shell find src -name '*.js'))
+SRC_JS := $(filter-out $(SRC_SHADER_JS),$(shell find src -name '*.js'))
 SRC_JSDOC = $(shell find src -type f -name '*.jsdoc')
 
+SPEC_JS := $(shell find test/spec -type f -name '*.js')
+SPEC_RENDERING_JS := $(shell find test_rendering/spec -name '*.js')
+
 EXAMPLES := $(shell find examples -type f)
 EXAMPLES_HTML := $(filter-out examples/index.html,$(shell find examples -maxdepth 1 -type f -name '*.html'))
 EXAMPLES_JS := $(patsubst %.html,%.js,$(EXAMPLES_HTML))
@@ -54,6 +56,7 @@ help:
 	@echo "Other less frequently used targets are:"
 	@echo
 	@echo "- build                   Build ol.js, ol-debug.js, ol.js.map and ol.css"
+	@echo "- lint                    Check the code with the linter"
 	@echo "- ci                      Run the full continuous integration process"
 	@echo "- apidoc                  Build the API documentation using JSDoc"
 	@echo "- cleanall                Remove all the build artefacts"
@@ -67,7 +70,7 @@ apidoc: build/timestamps/jsdoc-$(BRANCH)-timestamp
 build: build/ol.css build/ol.js build/ol-debug.js build/ol.js.map
 
 .PHONY: check
-check: build/ol.js test
+check: lint build/ol.js test
 
 .PHONY: check-examples
 check-examples: $(CHECK_EXAMPLE_TIMESTAMPS)
@@ -83,18 +86,21 @@ check-deps:
 	done ;\
 
 .PHONY: ci
-ci: build test package compile-examples check-examples apidoc
+ci: lint build test test-rendering package compile-examples check-examples apidoc
 
 .PHONY: compile-examples
 compile-examples: build/compiled-examples/all.combined.js
 
 .PHONY: clean
 clean:
+	rm -f build/timestamps/eslint-timestamp
 	rm -f build/timestamps/check-*-timestamp
 	rm -f build/ol.css
 	rm -f build/ol.js
 	rm -f build/ol.js.map
 	rm -f build/ol-debug.js
+	rm -f build/test_requires.js
+	rm -f build/test_rendering_requires.js
 	rm -rf build/examples
 	rm -rf build/compiled-examples
 	rm -rf build/package
@@ -113,19 +119,34 @@ examples: $(BUILD_EXAMPLES)
 .PHONY: install
 install: build/timestamps/node-modules-timestamp
 
+.PHONY: lint
+lint: build/timestamps/eslint-timestamp
+
 .PHONY: npm-install
 npm-install: build/timestamps/node-modules-timestamp
 
 .PHONY: shaders
-shaders: $(SRC_SHADER_JS $(SRC_SHADERLOCATIONS_JS)
+shaders: $(SRC_SHADER_JS)
 
 .PHONY: serve
-serve:
+serve: build/test_requires.js build/test_rendering_requires.js
 	node tasks/serve.js
 
 .PHONY: test
-test: build/timestamps/node-modules-timestamp
-	npm test
+test: build/timestamps/node-modules-timestamp build/test_requires.js
+	node tasks/test.js
+
+.PHONY: test-coverage
+test-coverage: build/timestamps/node-modules-timestamp
+	node tasks/test-coverage.js
+
+.PHONY: test-rendering
+test-rendering: build/timestamps/node-modules-timestamp \
+                build/test_rendering_requires.js
+	@rm -rf build/slimerjs-profile
+	@mkdir -p build/slimerjs-profile
+	@cp -r test_rendering/slimerjs-profile/* build/slimerjs-profile/
+	node tasks/test-rendering.js
 
 .PHONY: host-examples
 host-examples: $(BUILD_HOSTED_EXAMPLES) \
@@ -168,7 +189,7 @@ build/compiled-examples/all.js: $(EXAMPLES_JS)
 	@python bin/combine-examples.py $^ > $@
 
 build/compiled-examples/all.combined.js: config/examples-all.json build/compiled-examples/all.js \
-                                         $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS) \
+                                         $(SRC_JS) $(SRC_SHADER_JS) \
                                          build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	node tasks/build.js $< $@
@@ -179,14 +200,14 @@ build/compiled-examples/%.json: config/example.json build/examples/%.js \
 	@sed -e 's|{{id}}|$*|' $< > $@
 
 build/compiled-examples/%.combined.js: build/compiled-examples/%.json \
-                                       $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS)\
+                                       $(SRC_JS) $(SRC_SHADER_JS) \
                                        build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	node tasks/build.js $< $@
 
 build/timestamps/jsdoc-$(BRANCH)-timestamp: config/jsdoc/api/index.md \
                                             config/jsdoc/api/conf.json $(SRC_JS) \
-                                            $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS) \
+                                            $(SRC_SHADER_JS) \
                                             $(shell find config/jsdoc/api/template -type f) \
                                             build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
@@ -227,6 +248,14 @@ $(BUILD_HOSTED)/build/ol-deps.js: host-libraries
            --root_with_prefix "$(BUILD_HOSTED)/closure-library/third_party ../../third_party" \
            --output_file $@
 
+build/timestamps/eslint-timestamp: $(SRC_JS) $(SPEC_JS) $(SPEC_RENDERING_JS) \
+                                   $(TASKS_JS) $(EXAMPLES_JS) \
+                                   build/timestamps/node-modules-timestamp
+	@mkdir -p $(@D)
+	@echo "Running eslint..."
+	@./node_modules/.bin/eslint tasks test test_rendering src examples
+	@touch $@
+
 build/timestamps/node-modules-timestamp: package.json
 	@mkdir -p $(@D)
 	npm install
@@ -237,7 +266,7 @@ build/ol.css: css/ol.css build/timestamps/node-modules-timestamp
 	@echo "Running cleancss..."
 	@./node_modules/.bin/cleancss $< > $@
 
-build/ol.js: config/ol.json $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS) \
+build/ol.js: config/ol.json $(SRC_JS) $(SRC_SHADER_JS) \
              build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	node tasks/build.js $< $@
@@ -247,12 +276,12 @@ build/ol.js: config/ol.json $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS)
 	@$(STAT_COMPRESSED) /tmp/ol.js.gz
 	@rm /tmp/ol.js.gz
 
-build/ol.js.map: config/ol.json $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS) \
+build/ol.js.map: config/ol.json $(SRC_JS) $(SRC_SHADER_JS) \
                  build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	node tasks/build.js $< $@
 
-build/ol-debug.js: config/ol-debug.json $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS) \
+build/ol-debug.js: config/ol-debug.json $(SRC_JS) $(SRC_SHADER_JS) \
                    build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	node tasks/build.js $< $@
@@ -262,12 +291,16 @@ build/ol-debug.js: config/ol-debug.json $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERL
 	@$(STAT_COMPRESSED) /tmp/ol-debug.js.gz
 	@rm /tmp/ol-debug.js.gz
 
-%shader.js: %shader.glsl src/ol/webgl/shader.mustache tasks/glslunit.js build/timestamps/node-modules-timestamp
-	@node tasks/glslunit.js --input $< | ./node_modules/.bin/mustache - src/ol/webgl/shader.mustache > $@
-
-%shader/locations.js: %shader.glsl src/ol/webgl/shaderlocations.mustache tasks/glslunit.js build/timestamps/node-modules-timestamp
+build/test_requires.js: $(SPEC_JS) $(SRC_JS)
 	@mkdir -p $(@D)
-	@node tasks/glslunit.js --input $< | ./node_modules/.bin/mustache - src/ol/webgl/shaderlocations.mustache > $@
+	@node tasks/generate-requires.js $^ > $@
+
+build/test_rendering_requires.js: $(SPEC_RENDERING_JS)
+	@mkdir -p $(@D)
+	@node tasks/generate-requires.js $^ > $@
+
+%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 > $@
 
 .PHONY: package
 package:

README.md

@@ -11,14 +11,11 @@
 
 Use one of the following methods to use OpenLayers in your project:
 
-* For use with webpack, Rollup, Browserify, or other module bundlers, install the [`ol` package](https://www.npmjs.com/package/ol):
-    ```
-    npm install ol
-    ```
-
-* If you just want to add a `<script>` tag to test things out, you can link directly to one of the full builds from [cdnjs](https://cdnjs.com/libraries/openlayers) (not recommended for production)
-
-* For use with Closure Library (rare), install the [`openlayers` package](https://npmjs.com/package/openlayers) and read the [tutorial](http://openlayers.org/en/latest/doc/tutorials/closure.html).
+- For use with mainstream bundlers and minifiers, install the [ol](https://www.npmjs.com/package/ol) npm package: `npm install ol`
+- Use `ol.js` and `ol.css` from (cdnjs)[https://cdnjs.com/libraries/openlayers]
+- Download the [latest release](https://openlayers.org/download/)
+- Clone the repo: `git clone git@github.com:openlayers/openlayers.git`
+- For use with Closure Library, install the [openlayers](https://npmjs.com/package/openlayers) npm package and read the [tutorial](http://openlayers.org/en/latest/doc/tutorials/closure.html).
 
 ## Supported Browsers
 

bin/pyglslunit.py

@@ -0,0 +1,120 @@
+#!/usr/bin/python
+
+from optparse import OptionParser
+import json
+import re
+import sys
+
+
+
+ESCAPE_SEQUENCE = {
+        '\\': '\\\\',
+        '\n': '\\n',
+        '\t': '\\t'
+        }
+
+
+def js_escape(s):
+    return ''.join(ESCAPE_SEQUENCE.get(c, c) for c in s)
+
+
+def glsl_compress(s, shortNames):
+    # strip leading whitespace
+    s = re.sub(r'\A\s+', '', s)
+    # strip trailing whitespace
+    s = re.sub(r'\s+\Z', '', s)
+    # strip multi-line comments
+    s = re.sub(r'/\*.*?\*/', '', s)
+    # strip single line comments
+    s = re.sub(r'//.*?\n', '', s)
+    # replace multiple whitespace with a single space
+    s = re.sub(r'\s+', ' ', s)
+    # remove whitespace between non-word tokens
+    s = re.sub(r'(\S)\s+([^\w])', r'\1\2', s)
+    s = re.sub(r'([^\w])\s+(\S)', r'\1\2', s)
+    # replace original names with short names
+    for originalName, shortName in shortNames.items():
+        s = s.replace(originalName, shortName)
+    return s
+
+
+def main(argv):
+    option_parser = OptionParser()
+    option_parser.add_option('--input')
+    option_parser.add_option('--output')
+    options, args = option_parser.parse_args(argv[1:])
+
+    context = {}
+    nextShortName = ord('a')
+    shortNames = {}
+
+    common, vertex, fragment = [], [], []
+    attributes, uniforms, varyings = {}, {}, {}
+    block = None
+    for line in open(options.input, 'rU'):
+        if line.startswith('//!'):
+            m = re.match(r'//!\s+NAMESPACE=(\S+)\s*\Z', line)
+            if m:
+                context['namespace'] = m.group(1)
+                continue
+            m = re.match(r'//!\s+CLASS=(\S+)\s*\Z', line)
+            if m:
+                context['className'] = m.group(1)
+                continue
+            m = re.match(r'//!\s+COMMON\s*\Z', line)
+            if m:
+                block = common
+                continue
+            m = re.match(r'//!\s+VERTEX\s*\Z', line)
+            if m:
+                block = vertex
+                continue
+            m = re.match(r'//!\s+FRAGMENT\s*\Z', line)
+            if m:
+                block = fragment
+                continue
+        else:
+            if block is None:
+                assert line.rstrip() == ''
+            else:
+                block.append(line)
+            m = re.match(r'attribute\s+\S+\s+(\S+);\s*\Z', line)
+            if m:
+                attribute = m.group(1)
+                if attribute not in attributes:
+                    shortName = chr(nextShortName)
+                    nextShortName += 1
+                    attributes[attribute] = {'originalName': attribute, 'shortName': shortName}
+                    shortNames[attribute] = shortName
+            m = re.match(r'uniform\s+\S+\s+(\S+);\s*\Z', line)
+            if m:
+                uniform = m.group(1)
+                if uniform not in uniforms:
+                    shortName = chr(nextShortName)
+                    nextShortName += 1
+                    uniforms[uniform] = {'originalName': uniform, 'shortName': shortName}
+                    shortNames[uniform] = shortName
+            m = re.match(r'varying\s+\S+\s+(\S+);\s*\Z', line)
+            if m:
+                varying = m.group(1)
+                if varying not in varyings:
+                    shortName = chr(nextShortName)
+                    nextShortName += 1
+                    shortNames[varying] = shortName
+
+    context['getOriginalFragmentSource'] = js_escape(''.join(common + fragment))
+    context['getOriginalVertexSource'] = js_escape(''.join(common + vertex))
+    context['getFragmentSource'] = glsl_compress(''.join(common + fragment), shortNames)
+    context['getVertexSource'] = glsl_compress(''.join(common + vertex), shortNames)
+    context['getAttributes'] = [attributes[a] for a in sorted(attributes.keys())]
+    context['getUniforms'] = [uniforms[u] for u in sorted(uniforms.keys())]
+
+    if options.output and options.output != '-':
+        output = open(options.output, 'wb')
+    else:
+        output = sys.stdout
+    json.dump(context, output)
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))

changelog/upgrade-notes.md

@@ -1,104 +1,6 @@
 ## Upgrade notes
 
-### Next Release
-
-#### Removed GeoJSON crs workaround for GeoServer
-
-Previous version of GeoServer returned invalid crs in GeoJSON output.  The workaround in `ol.format.GeoJSON` used to read this crs code is now removed.
-
-#### Deprecation of `ol.Attribution`
-
-`ol.Attribution` is deprecated and will be removed in the next major version.  Instead, you can construct a source with a string attribution or an array of strings.  For dynamic attributions, you can provide a function that gets called with the current frame state.
-
-Before:
-```js
-var source = new ol.source.XYZ({
-  attributions: [
-    new ol.Attribution({html: 'some attribution'})
-  ]
-});
-```
-
-After:
-```js
-var source = new ol.source.XYZ({
-  attributions: 'some attribution'
-});
-```
-
-In addition to passing a string or an array of strings for the `attributions` option, you can also pass a function that will get called with the current frame state.
-```js
-var source = new ol.source.XYZ({
-  attributions: function(frameState) {
-    // inspect the frame state and return attributions
-    return 'some attribution'; // or ['multiple', 'attributions'] or null
-  }
-});
-```
-
-### v4.4.0
-
-#### Behavior change for polygon labels
-
-Polygon labels are now only rendered when the label does not exceed the polygon at the label position. To get the old behavior, configure your `ol.style.Text` with `exceedLength: true`.
-
-#### Minor change for custom `tileLoadFunction` with `ol.source.VectorTile`
-
-It is no longer necessary to set the projection on the tile. Instead, the `readFeatures` method must be called with the tile's extent as `extent` option and the view's projection as `featureProjection`.
-
-Before:
-```js
-tile.setLoader(function() {
-  var data = // ... fetch data
-  var format = tile.getFormat();
-  tile.setFeatures(format.readFeatures(data));
-  tile.setProjection(format.readProjection(data));
-  // uncomment the line below for ol.format.MVT only
-  //tile.setExtent(format.getLastExtent());
-});
-```
-
-After:
-```js
-tile.setLoader(function() {
-  var data = // ... fetch data
-  var format = tile.getFormat();
-  tile.setFeatures(format.readFeatures(data, {
-    featureProjection: map.getView().getProjection(),
-    // uncomment the line below for ol.format.MVT only
-    //extent: tile.getExtent()
-  }));
-);
-```
-
-#### Deprecation of `ol.DeviceOrientation`
-
-`ol.DeviceOrientation` is deprecated and will be removed in the next major version.
-The device-orientation example has been updated to use the (gyronorm.js)[https://github.com/dorukeker/gyronorm.js] library.
-
-
-### v4.3.0
-
-#### `ol.source.VectorTile` no longer requires a `tileGrid` option
-
-By default, the `ol.source.VectorTile` constructor creates an XYZ tile grid (in Web Mercator) for 512 pixel tiles and assumes a max zoom level of 22.  If you were creating a vector tile source with an explicit `tileGrid` option, you can now remove this.
-
-Before:
-```js
-var source = new ol.source.VectorTile({
-  tileGrid: ol.tilegrid.createXYZ({tileSize: 512, maxZoom: 22}),
-  url: url
-});
-```
-
-After:
-```js
-var source = new ol.source.VectorTile({
-  url: url
-});
-```
-
-If you need to change the max zoom level, you can pass the source a `maxZoom` option.  If you need to change the tile size, you can pass the source a `tileSize` option.  If you need a completely custom tile grid, you can still pass the source a `tileGrid` option.
+### Next release
 
 #### `ol.interaction.Modify` deletes with `alt` key only
 

changelog/v4.3.0.md

@@ -1,216 +0,0 @@
-# 4.3.0
-
-## Summary
-
-The v4.3.0 release includes features and fixes from 92 pull requests.
-
-#### New `map.getFeaturesAtPixel()` method
-
-When you want to get all features at a given pixel, use the new `map.getFeaturesAtPixel()` method.
-
-Before:
-```js
-var features = [];
-map.forEachFeatureAtPixel(pixel, function(feature) {
-  features.push(feature);
-});
-```
-
-After:
-```js
-var features = map.getFeaturesAtPixel(pixel);
-```
-
-#### `ol.Sphere` functions for spherical measures
-
-The new `ol.Sphere.getArea()` and `ol.Sphere.getLength()` methods can be used to calculate spherical measures on geometries.  This is the recommended over using the `geometry.getArea()` or `geometry.getLength()` methods.
-
-Bad:
-```js
-geometry.getArea();
-```
-
-Good:
-```js
-ol.Sphere.getArea(geometry);
-```
-
-#### `ol.interaction.DragAndDrop` can be configured with a vector source
-
-It is now possible to configure the drag and drop interaction with a vector source:
-
-```js
-var dragAndDrop = new ol.interaction.DragAndDrop({source: source});
-```
-
-Any dropped features will replace all existing features on the source.
-
-#### `ol.interaction.Modify` can be configured with a vector source
-
-It is now possible to configure the modify interaction with a vector source (in addition to a feature collection):
-
-```js
-var modify = new ol.interaction.Modify({source: source});
-```
-
-With this configuration, all features on the source are eligible for modification while the interaction is active.
-
-#### `ol.interaction.Modify` deletes with `alt` key only
-
-To delete features with the modify interaction, press the `alt` key while clicking on an existing vertex.  If you want to configure the modify interaction with a different delete condition, use the `deleteCondition` option.  For example, to allow deletion on a single click with no modifier keys, configure the interaction like this:
-```js
-var interaction = new ol.interaction.Modify({
-  source: source,
-  deleteCondition: function(event) {
-    return ol.events.condition.noModifierKeys(event) && ol.events.condition.singleClick(event);
-  }
-});
-```
-
-The motivation for this change is to make the modify, draw, and snap interactions all work well together.  Previously, the use of these interactions with the default configuration would make it so you couldn't reliably add new vertices (click with no modifier) and delete existing vertices (click with no modifier).
-
-#### `ol.source.VectorTile` no longer requires a `tileGrid` option
-
-By default, the `ol.source.VectorTile` constructor creates an XYZ tile grid (in Web Mercator) for 512 pixel tiles and assumes a max zoom level of 22.  If you were creating a vector tile source with an explicit `tileGrid` option, you can now remove this.
-
-Before:
-```js
-var source = new ol.source.VectorTile({
-  tileGrid: ol.tilegrid.createXYZ({tileSize: 512, maxZoom: 22}),
-  url: url
-});
-```
-
-After:
-```js
-var source = new ol.source.VectorTile({
-  url: url
-});
-```
-
-If you need to change the max zoom level, you can pass the source a `maxZoom` option.  If you need to change the tile size, you can pass the source a `tileSize` option.  If you need a completely custom tile grid, you can still pass the source a `tileGrid` option.
-
-#### `ol.source.VectorTile` no longer has a `tilePixelRatio` option
-
-The `tilePixelRatio` option was only used for tiles in projections with `tile-pixels` as units. For tiles read with `ol.format.MVT` and the default tile loader, or tiles with the default pixel size of 4096 pixels, no changes are necessary. For the very rare cases that do not fall under these categories, a custom `tileLoadFunction` now needs to be configured on the `ol.source.VectorTile`. In addition to calling `tile.setFeatures()` and `tile.setProjection()`, it also needs to contain code like the following:
-```js
-var extent = tile.getFormat() instanceof ol.format.MVT ?
-  tile.getLastExtent() :
-  [0, 0, tilePixelRatio * tileSize, tilePixelRatio * tileSize];
-tile.setExtent(extent);
-```
-
-#### `ol.animate` now takes the shortest arc for rotation animation
-
-Usually rotation animations should animate along the shortest arc. There are rare occasions where a spinning animation effect is desired. So if you previously had something like
-```js
-map.getView().animate({
-  rotation: 2 * Math.PI,
-  duration: 2000
-});
-```
-we recommend to split the animation into two parts and use different easing functions. The code below results in the same effect as the snippet above did with previous versions:
-```js
-map.getView().animate({
-  rotation: Math.PI,
-  easing: ol.easing.easeIn
-}, {
-  rotation: 2 * Math.PI,
-  easing: ol.easing.easeOut
-});
-```
-
-## Full List of Changes
-
- * [#7117](https://github.com/openlayers/openlayers/pull/7117) - Sensible default tilegrid for vector tiles ([@tschaub](https://github.com/tschaub))
- * [#7116](https://github.com/openlayers/openlayers/pull/7116) - fix(package): update rollup to version 0.47.2 ([@openlayers](https://github.com/openlayers))
- * [#7111](https://github.com/openlayers/openlayers/pull/7111) - Remove broken wrapX handling from ol.Graticule ([@ahocevar](https://github.com/ahocevar))
- * [#7107](https://github.com/openlayers/openlayers/pull/7107) - Update rollup to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7106](https://github.com/openlayers/openlayers/pull/7106) - Update proj4 to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7105](https://github.com/openlayers/openlayers/pull/7105) - Functions for spherical calculations ([@tschaub](https://github.com/tschaub))
- * [#7104](https://github.com/openlayers/openlayers/pull/7104) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#6807](https://github.com/openlayers/openlayers/pull/6807) - Initialize hasZ in the constructor of GML3 ([@Jenselme](https://github.com/Jenselme))
- * [#7102](https://github.com/openlayers/openlayers/pull/7102) - Allow drag and drop interaction to be configured with a source ([@tschaub](https://github.com/tschaub))
- * [#6825](https://github.com/openlayers/openlayers/pull/6825) - Read/write Tessellate tag in KML format ([@oterral](https://github.com/oterral))
- * [#7098](https://github.com/openlayers/openlayers/pull/7098) - Use fractional coordinates for CSS positioning ([@ahocevar](https://github.com/ahocevar))
- * [#7064](https://github.com/openlayers/openlayers/pull/7064) - Do not use Array.prototype.forEach when dealing with potentially large arrays ([@ahocevar](https://github.com/ahocevar))
- * [#7093](https://github.com/openlayers/openlayers/pull/7093) - Allow modify interaction to be configured with a source ([@tschaub](https://github.com/tschaub))
- * [#7096](https://github.com/openlayers/openlayers/pull/7096) - Add new Map#getFeaturesAtPixel method ([@ahocevar](https://github.com/ahocevar))
- * [#7094](https://github.com/openlayers/openlayers/pull/7094) - Add missing zIndex options ([@icholy](https://github.com/icholy))
- * [#7087](https://github.com/openlayers/openlayers/pull/7087) - Fix scale line for EPSG:4326 maps ([@ahocevar](https://github.com/ahocevar))
- * [#7088](https://github.com/openlayers/openlayers/pull/7088) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7085](https://github.com/openlayers/openlayers/pull/7085) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7084](https://github.com/openlayers/openlayers/pull/7084) - Fix a typo in the street-labels example ([@ahocevar](https://github.com/ahocevar))
- * [#7082](https://github.com/openlayers/openlayers/pull/7082) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7079](https://github.com/openlayers/openlayers/pull/7079) - Optimize custom renderer code, examples and API ([@ahocevar](https://github.com/ahocevar))
- * [#7080](https://github.com/openlayers/openlayers/pull/7080) - Update jsdoc to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7078](https://github.com/openlayers/openlayers/pull/7078) - Fix return type annotation of ol.layer.VectorTile.getSource ([@geosense](https://github.com/geosense))
- * [#7073](https://github.com/openlayers/openlayers/pull/7073) - Make ol.layer.Group change handling consistent ([@gberaudo](https://github.com/gberaudo))
- * [#7075](https://github.com/openlayers/openlayers/pull/7075) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7072](https://github.com/openlayers/openlayers/pull/7072) - Improve API docs for ol.VectorTile ([@ahocevar](https://github.com/ahocevar))
- * [#7070](https://github.com/openlayers/openlayers/pull/7070) - Get tilePixelRatio from MVT tiles ([@ahocevar](https://github.com/ahocevar))
- * [#7069](https://github.com/openlayers/openlayers/pull/7069) - Update mocha to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7068](https://github.com/openlayers/openlayers/pull/7068) - Update fs-extra to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7066](https://github.com/openlayers/openlayers/pull/7066) - Fix ol.interaction.Extent event type and documentation ([@ahocevar](https://github.com/ahocevar))
- * [#7032](https://github.com/openlayers/openlayers/pull/7032) - Fix KML Export Icon Anchor ([@raiyni](https://github.com/raiyni))
- * [#7065](https://github.com/openlayers/openlayers/pull/7065) - Only use API functions in example ([@ahocevar](https://github.com/ahocevar))
- * [#7022](https://github.com/openlayers/openlayers/pull/7022) - Allow styles to configure a custom renderer ([@ahocevar](https://github.com/ahocevar))
- * [#7061](https://github.com/openlayers/openlayers/pull/7061) - Update docs and issue and pull request instructions ([@ahocevar](https://github.com/ahocevar))
- * [#7059](https://github.com/openlayers/openlayers/pull/7059) - Allow to configure Extent interaction with an extent ([@ahocevar](https://github.com/ahocevar))
- * [#7060](https://github.com/openlayers/openlayers/pull/7060) - Removing invalid urn ([@wnordmann](https://github.com/wnordmann))
- * [#7051](https://github.com/openlayers/openlayers/pull/7051) - Changing the EPSG3857.PROJECTION array assignment and adding urn:ogc:… ([@wnordmann](https://github.com/wnordmann))
- * [#7045](https://github.com/openlayers/openlayers/pull/7045) - Respect pixelRatio when scaling images ([@ahocevar](https://github.com/ahocevar))
- * [#7023](https://github.com/openlayers/openlayers/pull/7023) - Update tile size and resolutions of vector tile examples ([@ahocevar](https://github.com/ahocevar))
- * [#7005](https://github.com/openlayers/openlayers/pull/7005) - Add spatial reference inside geometry in EsriFormat ([@Sol1du2](https://github.com/Sol1du2))
- * [#7034](https://github.com/openlayers/openlayers/pull/7034) - Move non-build dependencies to devDependencies ([@probins](https://github.com/probins))
- * [#7050](https://github.com/openlayers/openlayers/pull/7050) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#6976](https://github.com/openlayers/openlayers/pull/6976) - Example - Earthquake Clusters - Change evt.type of interaction ([@ehanoj](https://github.com/ehanoj))
- * [#7048](https://github.com/openlayers/openlayers/pull/7048) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7041](https://github.com/openlayers/openlayers/pull/7041) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7042](https://github.com/openlayers/openlayers/pull/7042) - Line dash offset ([@gkresic](https://github.com/gkresic))
- * [#6980](https://github.com/openlayers/openlayers/pull/6980) - Added tileClass to TileWMS ([@ZachTRice](https://github.com/ZachTRice))
- * [#7028](https://github.com/openlayers/openlayers/pull/7028) - Fix Graticule use of incorrect min/maxLon values ([@greggian](https://github.com/greggian))
- * [#7021](https://github.com/openlayers/openlayers/pull/7021) - Update fs-extra to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7018](https://github.com/openlayers/openlayers/pull/7018) - Update jsdoc to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7015](https://github.com/openlayers/openlayers/pull/7015) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7014](https://github.com/openlayers/openlayers/pull/7014) - Update jsdoc to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7013](https://github.com/openlayers/openlayers/pull/7013) - Remove ol.sphere.WGS84 and ol.sphere.NORMAL ([@tschaub](https://github.com/tschaub))
- * [#6981](https://github.com/openlayers/openlayers/pull/6981) - Render transparent vector layers to an intermediate canvas ([@gberaudo](https://github.com/gberaudo))
- * [#6899](https://github.com/openlayers/openlayers/pull/6899) - Use number literal for sphere radius ([@probins](https://github.com/probins))
- * [#7011](https://github.com/openlayers/openlayers/pull/7011) - Update jsdoc to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7008](https://github.com/openlayers/openlayers/pull/7008) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7007](https://github.com/openlayers/openlayers/pull/7007) - fix(package): update rollup to version 0.45.0 ([@openlayers](https://github.com/openlayers))
- * [#6996](https://github.com/openlayers/openlayers/pull/6996) - 6987: Memory leak with WMS time source with reprojection ([@ch08532](https://github.com/ch08532))
- * [#7003](https://github.com/openlayers/openlayers/pull/7003) - Update jsdoc to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7004](https://github.com/openlayers/openlayers/pull/7004) - Use https for bing and stamen attributions ([@fredj](https://github.com/fredj))
- * [#6998](https://github.com/openlayers/openlayers/pull/6998) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#6999](https://github.com/openlayers/openlayers/pull/6999) - Make VectorTile source work with multiple layers ([@ahocevar](https://github.com/ahocevar))
- * [#6988](https://github.com/openlayers/openlayers/pull/6988) - Add missing type annotations ([@ahocevar](https://github.com/ahocevar))
- * [#6984](https://github.com/openlayers/openlayers/pull/6984) - Update closure-util to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#6970](https://github.com/openlayers/openlayers/pull/6970) - Fix Bug when adding/removing layer with no cache ([@cmortazavi](https://github.com/cmortazavi))
- * [#6972](https://github.com/openlayers/openlayers/pull/6972) - Handle error tiles properly ([@ahocevar](https://github.com/ahocevar))
- * [#6973](https://github.com/openlayers/openlayers/pull/6973) - Update clean-css-cli to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#6971](https://github.com/openlayers/openlayers/pull/6971) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#6968](https://github.com/openlayers/openlayers/pull/6968) - Shortest arc rotation animation improvements and upgrade notes ([@ahocevar](https://github.com/ahocevar))
- * [#6966](https://github.com/openlayers/openlayers/pull/6966) - Add getResolutionForZoom method for ol.View ([@ahocevar](https://github.com/ahocevar))
- * [#6965](https://github.com/openlayers/openlayers/pull/6965) - Use shortest rotation delta for animation ([@ahocevar](https://github.com/ahocevar))
- * [#6967](https://github.com/openlayers/openlayers/pull/6967) - Add RoadOnDemand imagery set to Bing example ([@ahocevar](https://github.com/ahocevar))
- * [#6964](https://github.com/openlayers/openlayers/pull/6964) - Fix KML ExtendedData reading ([@fredj](https://github.com/fredj))
- * [#6958](https://github.com/openlayers/openlayers/pull/6958) - Remove error tiles after loading is finished ([@ahocevar](https://github.com/ahocevar))
- * [#6793](https://github.com/openlayers/openlayers/pull/6793) - Webgl text ([@GaborFarkas](https://github.com/GaborFarkas))
- * [#6960](https://github.com/openlayers/openlayers/pull/6960) - Queue tiles before loading ([@tschaub](https://github.com/tschaub))
- * [#6957](https://github.com/openlayers/openlayers/pull/6957) - Greenkeeper/eslint 4.1.1 ([@openlayers](https://github.com/openlayers))
- * [#6955](https://github.com/openlayers/openlayers/pull/6955) - Update async to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#6916](https://github.com/openlayers/openlayers/pull/6916) - Upgrade eslint to v4.0.0 ([@marcjansen](https://github.com/marcjansen))
- * [#6943](https://github.com/openlayers/openlayers/pull/6943) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#6939](https://github.com/openlayers/openlayers/pull/6939) - Abort loading when tile is disposed ([@ahocevar](https://github.com/ahocevar))
- * [#6930](https://github.com/openlayers/openlayers/pull/6930) - Handle setActive(false) on an interaction without map ([@openlayers](https://github.com/openlayers))
- * [#6936](https://github.com/openlayers/openlayers/pull/6936) - Do not stop the render loop when all wanted tiles are aborted ([@ahocevar](https://github.com/ahocevar))
- * [#6920](https://github.com/openlayers/openlayers/pull/6920) - Fix minor type strength inconsistency ([@klokantech](https://github.com/klokantech))
- * [#6935](https://github.com/openlayers/openlayers/pull/6935) - Use transparent image from canvas context ([@ahocevar](https://github.com/ahocevar))
- * [#6933](https://github.com/openlayers/openlayers/pull/6933) - Improve proj.get() logic ([@probins](https://github.com/probins))
- * [#6931](https://github.com/openlayers/openlayers/pull/6931) - Make sure we use the default featurePrefix ([@bartvde](https://github.com/bartvde))
- * [#6928](https://github.com/openlayers/openlayers/pull/6928) - Only adjust resolution when center within projection extent ([@ahocevar](https://github.com/ahocevar))
- * [#6923](https://github.com/openlayers/openlayers/pull/6923) - Load tasks/build-ext.js in strict mode ([@fredj](https://github.com/fredj))
- * [#6918](https://github.com/openlayers/openlayers/pull/6918) - Remove unnecessary pixelRatio check ([@ahocevar](https://github.com/ahocevar))
- * [#6917](https://github.com/openlayers/openlayers/pull/6917) - Correct typo in graticule docs ([@probins](https://github.com/probins))

changelog/v4.3.1.md

@@ -1,9 +0,0 @@
-# 4.3.1
-
-The v4.3.1 release includes a few fixes that didn't make it into v4.3.0.  No special upgrade considerations.
-
-## Fixes
-
- * [#7122](https://github.com/openlayers/openlayers/pull/7122) - Immediately complete no-op animations ([@tschaub](https://github.com/tschaub))
- * [#7120](https://github.com/openlayers/openlayers/pull/7120) - Fix hit detection for overzoomed vector tiles ([@ahocevar](https://github.com/ahocevar))
- * [#7114](https://github.com/openlayers/openlayers/pull/7114) - Immediate WebGL text renderer and other improvements ([@GaborFarkas](https://github.com/GaborFarkas))

changelog/v4.3.2.md

@@ -1,7 +0,0 @@
-# 4.3.2
-
-The v4.3.2 release includes a single fix.
-
-## Fixes
-
- * [#7140](https://github.com/openlayers/openlayers/pull/7140) - Export ol.Sphere.getLength and ol.Sphere.getArea ([@fredj](https://github.com/fredj))

changelog/v4.3.3.md

@@ -1,7 +0,0 @@
-# 4.3.3
-
-The v4.3.3 release reverts the fractional pixel positioning of overlays.
-
-## Fixes
-
- * [#7258](https://github.com/openlayers/openlayers/pull/7258) - Revert changes made in #7098 ([@ahocevar](https://github.com/ahocevar))

changelog/v4.3.4.md

@@ -1,7 +0,0 @@
-# 4.3.4
-
-The v4.3.4 release includes a fix for Safari on iOS 11.
-
-## Fixes
-
- * [#7285](https://github.com/openlayers/openlayers/pull/7285) - Convert pointerId to string for object lookups ([@tschaub](https://github.com/tschaub))

changelog/v4.4.0.md

@@ -1,161 +0,0 @@
-# 4.4.0
-
-## Summary
-
-The 4.4.0 release includes features and fixes from 80 pull requests, including first time contributions from @EduardoNogueira, @ath0mas, @f7o, @trevorblades, @viethang, and @wb14123.  There are some really nice rendering enhancements included in this release.  It is now possible to render labels along lines (see [#7239](https://github.com/openlayers/openlayers/pull/7239) for more detail) and polygon labels are only rendered if they fit within the polygon ([#7292](https://github.com/openlayers/openlayers/pull/7292)).  In addition, we now render tiles with an opacity transition, so tiled layers more gracefully fade in ([#7267](https://github.com/openlayers/openlayers/pull/7267)).
-
-### Upgrade notes
-
-#### Behavior change for polygon labels
-
-Polygon labels are now only rendered when the label does not exceed the polygon at the label position. To get the old behavior, configure your `ol.style.Text` with `exceedLength: true`.
-
-#### Minor change for custom `tileLoadFunction` with `ol.source.VectorTile`
-
-It is no longer necessary to set the projection on the tile. Instead, the `readFeatures` method must be called with the tile's extent as `extent` option and the view's projection as `featureProjection`.
-
-Before:
-```js
-tile.setLoader(function() {
-  var data = // ... fetch data
-  var format = tile.getFormat();
-  tile.setFeatures(format.readFeatures(data));
-  tile.setProjection(format.readProjection(data));
-  // uncomment the line below for ol.format.MVT only
-  //tile.setExtent(format.getLastExtent());
-});
-```
-
-After:
-```js
-tile.setLoader(function() {
-  var data = // ... fetch data
-  var format = tile.getFormat();
-  tile.setFeatures(format.readFeatures(data, {
-    featureProjection: map.getView().getProjection(),
-    // uncomment the line below for ol.format.MVT only
-    //extent: tile.getExtent()
-  }));
-);
-```
-
-#### Deprecation of `ol.DeviceOrientation`
-
-`ol.DeviceOrientation` is deprecated and will be removed in the next major version.
-The device-orientation example has been updated to use the (gyronorm.js)[https://github.com/dorukeker/gyronorm.js] library.
-
-
-## Detailed changes
-
-See below for the full list of changes.
-
- * [#7306](https://github.com/openlayers/openlayers/pull/7306) - Enable mouse wheel in freehand draw mode ([@trevorblades](https://github.com/trevorblades))
- * [#7297](https://github.com/openlayers/openlayers/pull/7297) - Fix multipoint instruction set ([@ahocevar](https://github.com/ahocevar))
- * [#7267](https://github.com/openlayers/openlayers/pull/7267) - Render tiles with an opacity transition ([@tschaub](https://github.com/tschaub))
- * [#7292](https://github.com/openlayers/openlayers/pull/7292) - Only render polygon labels when they fit ([@ahocevar](https://github.com/ahocevar))
- * [#7289](https://github.com/openlayers/openlayers/pull/7289) - Release v4.3.4 ([@openlayers](https://github.com/openlayers))
- * [#7287](https://github.com/openlayers/openlayers/pull/7287) - Fix vertical stroke/fill alignment for text along lines ([@ahocevar](https://github.com/ahocevar))
- * [#7285](https://github.com/openlayers/openlayers/pull/7285) - Convert pointerId to string for object lookups ([@tschaub](https://github.com/tschaub))
- * [#7280](https://github.com/openlayers/openlayers/pull/7280) - Updated docs for deleteCondition ([@EduardoNogueira](https://github.com/EduardoNogueira))
- * [#7274](https://github.com/openlayers/openlayers/pull/7274) - Add ability to change the loader of a vector source ([@bartvde](https://github.com/bartvde))
- * [#7259](https://github.com/openlayers/openlayers/pull/7259) - Add missing param doc tag for ol.format.WKT.prototype.writeFeatures ([@fredj](https://github.com/fredj))
- * [#7260](https://github.com/openlayers/openlayers/pull/7260) - Release v4.3.3 ([@openlayers](https://github.com/openlayers))
- * [#7258](https://github.com/openlayers/openlayers/pull/7258) - Revert changes made in #7098. ([@ahocevar](https://github.com/ahocevar))
- * [#7220](https://github.com/openlayers/openlayers/pull/7220) - Mark ol.format.filter.Spatial as abstract class ([@fredj](https://github.com/fredj))
- * [#7249](https://github.com/openlayers/openlayers/pull/7249) - Script to rename files so the case matches the module name ([@ahocevar](https://github.com/ahocevar))
- * [#7252](https://github.com/openlayers/openlayers/pull/7252) - fix osmxml to read ways before the definition of nodes ([@wb14123](https://github.com/wb14123))
- * [#7253](https://github.com/openlayers/openlayers/pull/7253) - Nicer wording in the issue template ([@openlayers](https://github.com/openlayers))
- * [#7236](https://github.com/openlayers/openlayers/pull/7236) - reusing images in ol.style.Icon#clone ([@KlausBenndorf](https://github.com/KlausBenndorf))
- * [#7246](https://github.com/openlayers/openlayers/pull/7246) - Compare measured lengths with a tolerance ([@marcjansen](https://github.com/marcjansen))
- * [#7247](https://github.com/openlayers/openlayers/pull/7247) - Raise tolerance of rendering tests to pass on Firefox 55 (GNU/Linux) ([@marcjansen](https://github.com/marcjansen))
- * [#7239](https://github.com/openlayers/openlayers/pull/7239) - Render text along lines ([@ahocevar](https://github.com/ahocevar))
- * [#7242](https://github.com/openlayers/openlayers/pull/7242) - Use EMPTY and LOADED state properly on ol.VectorImageTile ([@ahocevar](https://github.com/ahocevar))
- * [#7234](https://github.com/openlayers/openlayers/pull/7234) - Fix abort handling of tileload events ([@ahocevar](https://github.com/ahocevar))
- * [#7221](https://github.com/openlayers/openlayers/pull/7221) - update zoomify source to accept tileIndex placeholders and handle iip… ([@thhomas](https://github.com/thhomas))
- * [#6871](https://github.com/openlayers/openlayers/pull/6871) - Correct controls position in Center example ([@ath0mas](https://github.com/ath0mas))
- * [#7229](https://github.com/openlayers/openlayers/pull/7229) - Fix JSDoc paths for custom builds ([@ahocevar](https://github.com/ahocevar))
- * [#7230](https://github.com/openlayers/openlayers/pull/7230) - Remove unused context handling for ol.Image ([@ahocevar](https://github.com/ahocevar))
- * [#7225](https://github.com/openlayers/openlayers/pull/7225) - Fix hit detection for image layers ([@ahocevar](https://github.com/ahocevar))
- * [#7223](https://github.com/openlayers/openlayers/pull/7223) - Transform updates ([@tschaub](https://github.com/tschaub))
- * [#7219](https://github.com/openlayers/openlayers/pull/7219) - Change cartodb domain from cartodb.com to carto.com ([@fredj](https://github.com/fredj))
- * [#7210](https://github.com/openlayers/openlayers/pull/7210) - Avoid unnecessary calculations for a zoom factor of 2 ([@tschaub](https://github.com/tschaub))
- * [#7209](https://github.com/openlayers/openlayers/pull/7209) - Remove grid.getTileRangeForExtentAndResolution() ([@tschaub](https://github.com/tschaub))
- * [#7201](https://github.com/openlayers/openlayers/pull/7201) - Prerender text to images ([@ahocevar](https://github.com/ahocevar))
- * [#7208](https://github.com/openlayers/openlayers/pull/7208) - Do not calculate coverage when running tests locally ([@ahocevar](https://github.com/ahocevar))
- * [#7206](https://github.com/openlayers/openlayers/pull/7206) - Only load source tiles that intersect the source tile grid's extent ([@ahocevar](https://github.com/ahocevar))
- * [#7203](https://github.com/openlayers/openlayers/pull/7203) - Enable Edge tests on SauceLabs ([@ahocevar](https://github.com/ahocevar))
- * [#7194](https://github.com/openlayers/openlayers/pull/7194) - Deprecate ol.DeviceOrientation ([@fredj](https://github.com/fredj))
- * [#7198](https://github.com/openlayers/openlayers/pull/7198) - Use geometry name in WFS updates ([@bartvde](https://github.com/bartvde))
- * [#7205](https://github.com/openlayers/openlayers/pull/7205) - Release v4.3.2 ([@openlayers](https://github.com/openlayers))
- * [#7172](https://github.com/openlayers/openlayers/pull/7172) - added clear method to vectortile source ([@f7o](https://github.com/f7o))
- * [#7196](https://github.com/openlayers/openlayers/pull/7196) - renderSync() to make sure overlay is initially visible ([@ahocevar](https://github.com/ahocevar))
- * [#7193](https://github.com/openlayers/openlayers/pull/7193) - Fix KML links for documents created locally in Safari ([@ahocevar](https://github.com/ahocevar))
- * [#6977](https://github.com/openlayers/openlayers/pull/6977) - Fixed modify feature test ([@KlausBenndorf](https://github.com/KlausBenndorf))
- * [#7190](https://github.com/openlayers/openlayers/pull/7190) - Use jsts version 1.4.0 in example ([@openlayers](https://github.com/openlayers))
- * [#7191](https://github.com/openlayers/openlayers/pull/7191) - Fix provide/require for autogenerated shader files ([@ahocevar](https://github.com/ahocevar))
- * [#7192](https://github.com/openlayers/openlayers/pull/7192) - Fix typo ([@viethang](https://github.com/viethang))
- * [#7133](https://github.com/openlayers/openlayers/pull/7133) - Issue/6991/WFS Write Dimension ([@Sol1du2](https://github.com/Sol1du2))
- * [#7141](https://github.com/openlayers/openlayers/pull/7141) - Issue/6990/Wfs Read srsDimension ([@Sol1du2](https://github.com/Sol1du2))
- * [#7187](https://github.com/openlayers/openlayers/pull/7187) - Simpler tile pixel handling and faster parsing for ol.format.MVT vector tiles ([@ahocevar](https://github.com/ahocevar))
- * [#7182](https://github.com/openlayers/openlayers/pull/7182) - Avoid instanceof checks in global test extensions ([@tschaub](https://github.com/tschaub))
- * [#7168](https://github.com/openlayers/openlayers/pull/7168) - Exclude greenkeeper merges from changelog ([@gberaudo](https://github.com/gberaudo))
- * [#7162](https://github.com/openlayers/openlayers/pull/7162) - Bring back coverage ([@marcjansen](https://github.com/marcjansen))
- * [#7165](https://github.com/openlayers/openlayers/pull/7165) - More assorted test fixes ([@tschaub](https://github.com/tschaub))
- * [#7142](https://github.com/openlayers/openlayers/pull/7142) - Adds unit test to test the projection inside the geometry of esriJson ([@Sol1du2](https://github.com/Sol1du2))
- * [#7163](https://github.com/openlayers/openlayers/pull/7163) - Remove bundling magic for Mapbox styles script ([@ahocevar](https://github.com/ahocevar))
- * [#7160](https://github.com/openlayers/openlayers/pull/7160) - Assorted test updates ([@tschaub](https://github.com/tschaub))
- * [#7158](https://github.com/openlayers/openlayers/pull/7158) - Retain comments when replacing nodes ([@tschaub](https://github.com/tschaub))
- * [#7153](https://github.com/openlayers/openlayers/pull/7153) - Scripts for in-place transforms ([@tschaub](https://github.com/tschaub))
- * [#7154](https://github.com/openlayers/openlayers/pull/7154) - Unused require in examples/d3.js ([@tschaub](https://github.com/tschaub))
- * [#7151](https://github.com/openlayers/openlayers/pull/7151) - Get rid of useless test exports ([@tschaub](https://github.com/tschaub))
- * [#7152](https://github.com/openlayers/openlayers/pull/7152) - Adjust the pull request template (tests, CLA, wording) ([@marcjansen](https://github.com/marcjansen))
- * [#7150](https://github.com/openlayers/openlayers/pull/7150) - Remove problematic spies from scaleline tests ([@marcjansen](https://github.com/marcjansen))
- * [#7149](https://github.com/openlayers/openlayers/pull/7149) - Remove unused requires ([@tschaub](https://github.com/tschaub))
- * [#7148](https://github.com/openlayers/openlayers/pull/7148) - Remove ol.ENABLE_WEBGL wrap from WebGL files ([@ahocevar](https://github.com/ahocevar))
- * [#7147](https://github.com/openlayers/openlayers/pull/7147) - Remove unnecessary import in events.test.js ([@tschaub](https://github.com/tschaub))
- * [#7146](https://github.com/openlayers/openlayers/pull/7146) - Avoid modifying imports ([@openlayers](https://github.com/openlayers))
- * [#7145](https://github.com/openlayers/openlayers/pull/7145) - Spaceless provides ([@tschaub](https://github.com/tschaub))
- * [#7136](https://github.com/openlayers/openlayers/pull/7136) - Use data URI instead of whole empty image ([@ahocevar](https://github.com/ahocevar))
- * [#7137](https://github.com/openlayers/openlayers/pull/7137) - Developer documentation updates ([@tschaub](https://github.com/tschaub))
- * [#7138](https://github.com/openlayers/openlayers/pull/7138) - Improvements to the new test setup ([@ahocevar](https://github.com/ahocevar))
- * [#7140](https://github.com/openlayers/openlayers/pull/7140) - Export ol.Sphere.getLength and ol.Sphere.getArea ([@openlayers](https://github.com/openlayers))
- * [#7131](https://github.com/openlayers/openlayers/pull/7131) - Print ES6 import hint on each doc page ([@ahocevar](https://github.com/ahocevar))
- * [#6953](https://github.com/openlayers/openlayers/pull/6953) - Run tests in real browsers with Karma ([@tschaub](https://github.com/tschaub))
- * [#7127](https://github.com/openlayers/openlayers/pull/7127) - Use static GeoJSON instead of Overpass query for faster loading ([@ahocevar](https://github.com/ahocevar))
- * [#7125](https://github.com/openlayers/openlayers/pull/7125) - Do not try to render error tiles from VectorTile source ([@ahocevar](https://github.com/ahocevar))
- * [#6855](https://github.com/openlayers/openlayers/pull/6855) - Pluggable renderers ([@tschaub](https://github.com/tschaub))
- * [#7128](https://github.com/openlayers/openlayers/pull/7128) - Make view.animate() tolerate undefined views ([@tschaub](https://github.com/tschaub))
- * [#7124](https://github.com/openlayers/openlayers/pull/7124) - Release v4.3.1 ([@openlayers](https://github.com/openlayers))
- * [#7122](https://github.com/openlayers/openlayers/pull/7122) - Immediately complete no-op animations ([@tschaub](https://github.com/tschaub))
- * [#7120](https://github.com/openlayers/openlayers/pull/7120) - Fix hit detection for overzoomed vector tiles ([@ahocevar](https://github.com/ahocevar))
- * [#7114](https://github.com/openlayers/openlayers/pull/7114) - Immediate WebGL text renderer and other improvements ([@GaborFarkas](https://github.com/GaborFarkas))
-
-
-Additionally a number of updates where made to our dependencies:
- * [#7307](https://github.com/openlayers/openlayers/pull/7307) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7302](https://github.com/openlayers/openlayers/pull/7302) - Update mocha to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7298](https://github.com/openlayers/openlayers/pull/7298) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7295](https://github.com/openlayers/openlayers/pull/7295) - chore(package): update coveralls to version 3.0.0 ([@openlayers](https://github.com/openlayers))
- * [#7291](https://github.com/openlayers/openlayers/pull/7291) - Update pbf to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7290](https://github.com/openlayers/openlayers/pull/7290) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7281](https://github.com/openlayers/openlayers/pull/7281) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7273](https://github.com/openlayers/openlayers/pull/7273) - Update clean-css-cli to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7272](https://github.com/openlayers/openlayers/pull/7272) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7269](https://github.com/openlayers/openlayers/pull/7269) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7265](https://github.com/openlayers/openlayers/pull/7265) - Update rollup to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7263](https://github.com/openlayers/openlayers/pull/7263) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7254](https://github.com/openlayers/openlayers/pull/7254) - Update closure-util to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7257](https://github.com/openlayers/openlayers/pull/7257) - Update jsdoc to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7251](https://github.com/openlayers/openlayers/pull/7251) - Update fs-extra to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7243](https://github.com/openlayers/openlayers/pull/7243) - Update mocha to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7240](https://github.com/openlayers/openlayers/pull/7240) - Update mocha to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7238](https://github.com/openlayers/openlayers/pull/7238) - Update mocha to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7212](https://github.com/openlayers/openlayers/pull/7212) - chore(package): update clean-css-cli to version 4.1.9 ([@openlayers](https://github.com/openlayers))
- * [#7213](https://github.com/openlayers/openlayers/pull/7213) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7207](https://github.com/openlayers/openlayers/pull/7207) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7188](https://github.com/openlayers/openlayers/pull/7188) - fix(package): update rollup to version 0.49.1 ([@openlayers](https://github.com/openlayers))
- * [#7166](https://github.com/openlayers/openlayers/pull/7166) - fix(package): update rollup to version 0.48.1 ([@openlayers](https://github.com/openlayers))
- * [#7161](https://github.com/openlayers/openlayers/pull/7161) - Update eslint to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7144](https://github.com/openlayers/openlayers/pull/7144) - Update sinon to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7135](https://github.com/openlayers/openlayers/pull/7135) - Update closure-util to the latest version 🚀 ([@openlayers](https://github.com/openlayers))
- * [#7126](https://github.com/openlayers/openlayers/pull/7126) - Update phantomjs-prebuilt to the latest version 🚀 ([@openlayers](https://github.com/openlayers))

changelog/v4.4.1.md

@@ -1,8 +0,0 @@
-# 4.4.1
-
-The v4.4.1 release includes a fix for the [`ol` package](https://www.npmjs.com/package/ol) and a fix for a tile rendering regression.
-
-## Fixes
-
- * [#7323](https://github.com/openlayers/openlayers/pull/7323) - Only clear the canvas when needed ([@tschaub](https://github.com/tschaub))
- * [#7313](https://github.com/openlayers/openlayers/pull/7313) - Use lowercase module identifiers until ol@5 ([@tschaub](https://github.com/tschaub))

changelog/v4.4.2.md

@@ -1,12 +0,0 @@
-# 4.4.2
-
-The v4.4.2 release fixes a number of rendering issues in the 4.4 releases.
-
-## Fixes
-
- * [#7327](https://github.com/openlayers/openlayers/pull/7327) - Prune the tile cache after updating a source's URL ([@tschaub](https://github.com/tschaub))
- * [#7341](https://github.com/openlayers/openlayers/pull/7341) - Proper rendering of raster sources when there is a tile transition ([@tschaub](https://github.com/tschaub))
- * [#7339](https://github.com/openlayers/openlayers/pull/7339) - Use correct text stroke on HiDPI devices ([@ahocevar](https://github.com/ahocevar))
- * [#7345](https://github.com/openlayers/openlayers/pull/7345) - Handle different lineWidth scaling in Safari ([@ahocevar](https://github.com/ahocevar))
- * [#7346](https://github.com/openlayers/openlayers/pull/7346) - Pre-render text images for configured scale ([@ahocevar](https://github.com/ahocevar))
- * [#7350](https://github.com/openlayers/openlayers/pull/7350) - Calculate correct text box size ([@ahocevar](https://github.com/ahocevar))

config/jsdoc/api/conf.json

@@ -1,7 +1,7 @@
 {
     "opts": {
         "recurse": true,
-        "template": "config/jsdoc/api/template"
+        "template": "../../config/jsdoc/api/template"
     },
     "tags": {
         "allowUnknownTags": true
@@ -17,11 +17,11 @@
     },
     "plugins": [
         "plugins/markdown",
-        "config/jsdoc/api/plugins/inheritdoc",
-        "config/jsdoc/api/plugins/typedefs",
-        "config/jsdoc/api/plugins/events",
-        "config/jsdoc/api/plugins/observable",
-        "config/jsdoc/api/plugins/api"
+        "../../config/jsdoc/api/plugins/inheritdoc",
+        "../../config/jsdoc/api/plugins/typedefs",
+        "../../config/jsdoc/api/plugins/events",
+        "../../config/jsdoc/api/plugins/observable",
+        "../../config/jsdoc/api/plugins/api"
     ],
     "markdown": {
         "parser": "gfm"

config/jsdoc/api/index.md

@@ -34,7 +34,7 @@ Interactions for [vector features](ol.Feature.html)
 <tr><th>Projections</th><th>Observable objects</th><th>Other components</th></tr>
 <tr><td><p>All coordinates and extents need to be provided in view projection (default: EPSG:3857). To transform, use [ol.proj.transform()](ol.proj.html#.transform) and [ol.proj.transformExtent()](ol.proj.html#.transformExtent).</p>
 [ol.proj](ol.proj.html)</td>
-<td><p>Changes to all [ol.Objects](ol.Object.html) can be observed by calling the [object.on('propertychange')](ol.Object.html#on) method.  Listeners receive an [ol.Object.Event](ol.Object.Event.html) with information on the changed property and old value.</p>
+<td><p>Changes to all [ol.Objects](ol.Object.html) can observed by calling the [object.on('propertychange')](ol.Object.html#on) method.  Listeners receive an [ol.Object.Event](ol.Object.Event.html) with information on the changed property and old value.</p>
 <td>[ol.DeviceOrientation](ol.DeviceOrientation.html)<br>
 [ol.Geolocation](ol.Geolocation.html)<br>
 [ol.Overlay](ol.Overlay.html)<br></td>

config/jsdoc/api/template/tmpl/container.tmpl

@@ -10,53 +10,40 @@
 <?js } else { ?>
 
 <section>
-
+    
 <header>
     <h2><?js if (doc.ancestors && doc.ancestors.length) { ?>
         <span class="ancestors"><?js= doc.ancestors.join('') ?></span><?js } ?><?js= doc.name ?>
     <?js if (doc.variation) { ?>
         <sup class="variation"><?js= doc.variation ?></sup>
     <?js } ?></h2>
-    <br>
-    <?js if (doc.stability || doc.kind == 'namespace') {
-      var ancestors = doc.ancestors.map(a => a.replace(/>\./g, '>').replace(/\.</g, '<')).join('/');
-      var name = doc.name.toLowerCase();
-      var parts = [];
-      if (ancestors) {
-        parts.push(ancestors);
-      }
-      parts.push(name);
-      var importPath = parts.join('/');
-    ?>
-    <pre class="prettyprint source"><code>import <?js= doc.name ?> from '<?js= importPath ?>';</code></pre>
-    <?js } ?>
     <?js if (doc.classdesc) { ?>
         <div class="class-description"><?js= doc.classdesc ?></div>
     <?js } ?>
-</header>
+</header>  
 
 <article>
     <div class="container-overview">
     <?js if (doc.kind === 'module' && doc.module) { ?>
         <?js= self.partial('method.tmpl', doc.module) ?>
     <?js } ?>
-
+    
     <?js if (doc.kind === 'class') { ?>
         <?js= self.partial('method.tmpl', doc) ?>
     <?js } else { ?>
         <?js if (doc.description) { ?>
             <div class="description"><?js= doc.description ?></div>
         <?js } ?>
-
+        
         <?js= self.partial('details.tmpl', doc) ?>
-
+        
         <?js if (doc.examples && doc.examples.length) { ?>
             <h3>Example<?js= doc.examples.length > 1? 's':'' ?></h3>
             <?js= self.partial('examples.tmpl', doc.examples) ?>
         <?js } ?>
     <?js } ?>
     </div>
-
+    
     <?js if (doc.kind == 'class') {
       var subclasses = self.find(function() {
         return this.augments && this.augments.indexOf(doc.longname) > -1;
@@ -73,52 +60,52 @@
 
     <?js if (doc.augments && doc.augments.length) { ?>
         <h3 class="subsection-title">Extends</h3>
-
+        
         <ul><?js doc.augments.forEach(function(a) { ?>
             <li><?js= self.linkto(a, a) ?></li>
         <?js }); ?></ul>
     <?js } ?>
-
+    
     <?js if (doc.mixes && doc.mixes.length) { ?>
         <h3 class="subsection-title">Mixes In</h3>
-
+        
         <ul><?js doc.mixes.forEach(function(a) { ?>
             <li><?js= self.linkto(a, a) ?></li>
         <?js }); ?></ul>
     <?js } ?>
-
+    
     <?js if (doc.requires && doc.requires.length) { ?>
         <h3 class="subsection-title">Requires</h3>
-
+        
         <ul><?js doc.requires.forEach(function(r) { ?>
             <li><?js= self.linkto(r, r) ?></li>
         <?js }); ?></ul>
     <?js } ?>
-
+    
     <?js
-        var classes = self.find({kind: 'class', memberof: doc.longname});
-        if (doc.kind !== 'globalobj' && classes && classes.length) {
+        var classes = self.find({kind: 'class', memberof: doc.longname}); 
+        if (doc.kind !== 'globalobj' && classes && classes.length) { 
     ?>
         <h3 class="subsection-title">Classes</h3>
-
+        
         <dl><?js classes.forEach(function(c) { ?>
             <dt><?js= self.linkto(c.longname, c.name) ?></dt>
             <dd><?js if (c.summary) { ?><?js= c.summary ?><?js } ?></dd>
         <?js }); ?></dl>
     <?js } ?>
-
+    
     <?js
-        var namespaces = self.find({kind: 'namespace', memberof: doc.longname});
-        if (doc.kind !== 'globalobj' && namespaces && namespaces.length) {
+        var namespaces = self.find({kind: 'namespace', memberof: doc.longname}); 
+        if (doc.kind !== 'globalobj' && namespaces && namespaces.length) { 
     ?>
         <h3 class="subsection-title">Namespaces</h3>
-
+        
         <dl><?js namespaces.forEach(function(n) { ?>
             <dt><a href="namespaces.html#<?js= n.longname ?>"><?js= self.linkto(n.longname, n.name) ?></a></dt>
             <dd><?js if (n.summary) { ?><?js= n.summary ?><?js } ?></dd>
         <?js }); ?></dl>
     <?js } ?>
-
+    
     <?js
         if (doc.observables && doc.observables.length) {
     ?>
@@ -129,32 +116,32 @@
 
     <?js
         var members = self.find({kind: 'member', memberof: title === 'Global' ? {isUndefined: true} : doc.longname});
-        if (members && members.length && members.forEach) {
+        if (members && members.length && members.forEach) { 
     ?>
         <h3 class="subsection-title">Members</h3>
-
+        
         <dl><?js members.forEach(function(p) { ?>
             <?js= self.partial('members.tmpl', p) ?>
         <?js }); ?></dl>
     <?js } ?>
-
+    
     <?js
         var methods = self.find({kind: 'function', memberof: title === 'Global' ? {isUndefined: true} : doc.longname});
-        if (methods && methods.length && methods.forEach) {
+        if (methods && methods.length && methods.forEach) { 
     ?>
         <h3 class="subsection-title">Methods</h3>
-
+        
         <dl><?js methods.forEach(function(m) { ?>
             <?js= self.partial('method.tmpl', m) ?>
         <?js }); ?></dl>
     <?js } ?>
-
+    
     <?js
-        var typedefs = self.find({kind: 'typedef', memberof: title === 'Global' ? {isUndefined: true} : doc.longname});
-        if (typedefs && typedefs.length && typedefs.forEach) {
+        var typedefs = self.find({kind: 'typedef', memberof: title === 'Global' ? {isUndefined: true} : doc.longname}); 
+        if (typedefs && typedefs.length && typedefs.forEach) { 
     ?>
         <h3 class="subsection-title">Type Definitions</h3>
-
+        
         <dl><?js typedefs.forEach(function(e) {
                 if (e.signature) {
             ?>
@@ -168,20 +155,20 @@
                 }
             }); ?></dl>
     <?js } ?>
-
+    
     <?js
-        var events = self.find({kind: 'event', memberof: title === 'Global' ? {isUndefined: true} : doc.longname});
-        if (events && events.length && events.forEach) {
+        var events = self.find({kind: 'event', memberof: title === 'Global' ? {isUndefined: true} : doc.longname}); 
+        if (events && events.length && events.forEach) { 
     ?>
         <h3 class="subsection-title">Events</h3>
-
+        
         <dl><?js events.forEach(function(e) { ?>
             <?js= self.partial('method.tmpl', e) ?>
         <?js }); ?></dl>
     <?js } ?>
 </article>
 
-</section>
+</section>  
 <?js } ?>
 
 <?js }); ?>

config/jsdoc/info/conf.json

@@ -1,7 +1,7 @@
 {
     "opts": {
         "recurse": true,
-        "template": "config/jsdoc/info"
+        "template": "../../config/jsdoc/info"
     },
     "tags": {
         "allowUnknownTags": true
@@ -10,8 +10,8 @@
         "includePattern": "\\.js$"
     },
     "plugins": [
-        "config/jsdoc/info/api-plugin",
-        "config/jsdoc/info/define-plugin",
-        "config/jsdoc/info/virtual-plugin"
+        "../../config/jsdoc/info/api-plugin",
+        "../../config/jsdoc/info/define-plugin",
+        "../../config/jsdoc/info/virtual-plugin"
     ]
 }

doc/errors/index.md

@@ -224,7 +224,3 @@ At least 2 conditions are required.
 ### 58
 
 Duplicate item added to a unique collection.  For example, it may be that you tried to add the same layer to a map twice.  Check for calls to `map.addLayer()` or other places where the map's layer collection is modified.
-
-### 59
-
-Invalid command found in the PBF.  This indicates that the loaded vector tile may be corrupt.

doc/tutorials/closure.md

@@ -124,7 +124,7 @@ goog.require('ol.source.OSM');
 
 
 /**
- * @type {ol.PluggableMap}
+ * @type {ol.Map}
  */
 app.map = new ol.Map({
   target: 'map',

doc/tutorials/raster-reprojection.md

@@ -45,7 +45,7 @@ The easiest way to use a custom projection is to add the [Proj4js](http://proj4j
 Following example shows definition of a [British National Grid](https://epsg.io/27700):
 
 ``` html
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.4.4/proj4.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.4.3/proj4.js"></script>
 ```
 
 ``` javascript

examples/.eslintrc

@@ -6,7 +6,6 @@
     "createMapboxStreetsV6Style": false,
     "d3": false,
     "geojsonvt": false,
-    "GyroNorm": false,
     "jsPDF": false,
     "jsts": false,
     "saveAs": false,

examples/center.css

@@ -10,11 +10,7 @@ div.ol-zoom {
   top: 178px;
   left: 158px;
 }
-div.ol-rotate {
-  top: 178px;
-  right: 58px;
-}
-.map div.ol-attribution {
+div.ol-attribution {
   bottom: 30px;
   right: 50px;
 }

examples/color-manipulation.js

@@ -102,8 +102,7 @@ function xyz2rgb(x) {
 
 var raster = new ol.source.Raster({
   sources: [new ol.source.Stamen({
-    layer: 'watercolor',
-    transition: 0
+    layer: 'watercolor'
   })],
   operation: function(pixels, data) {
     var hcl = rgb2hcl(pixels[0]);

examples/d3.js

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

examples/device-orientation.html

@@ -4,15 +4,16 @@ title: Device Orientation
 shortdesc: Listen to DeviceOrientation events.
 docs: >
   This example shows how to track changes in device orientation.
-  [gyronorm.js](https://github.com/dorukeker/gyronorm.js) library is used to access and
-  normalize the events from the browser.
-tags: "device, orientation, gyronorm"
-resources:
-  - https://cdn.rawgit.com/dorukeker/gyronorm.js/v2.0.6/dist/gyronorm.complete.min.js
+tags: "orientation, openstreetmap"
 ---
 <div id="map" class="map"></div>
+<label>
+  track changes
+  <input id="track" type="checkbox"/>
+</label>
 <p>
-  <div>α : <code id="alpha"></code></div>
-  <div>β : <code id="beta"></code></div>
-  <div>γ : <code id="gamma"></code></div>
+  α : <code id="alpha"></code>&nbsp;&nbsp;
+  β : <code id="beta"></code>&nbsp;&nbsp;
+  γ : <code id="gamma"></code>&nbsp;&nbsp;
+  heading : <code id="heading"></code>
 </p>

examples/device-orientation.js

@@ -1,9 +1,8 @@
-// NOCOMPILE
+goog.require('ol.DeviceOrientation');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.control');
 goog.require('ol.layer.Tile');
-goog.require('ol.math');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
 
@@ -29,28 +28,32 @@ var map = new ol.Map({
   view: view
 });
 
+var deviceOrientation = new ol.DeviceOrientation();
+
 function el(id) {
   return document.getElementById(id);
 }
 
-
-var gn = new GyroNorm();
-
-gn.init().then(function() {
-  gn.start(function(event) {
-    var center = view.getCenter();
-    var resolution = view.getResolution();
-    var alpha = ol.math.toRadians(event.do.beta);
-    var beta = ol.math.toRadians(event.do.beta);
-    var gamma = ol.math.toRadians(event.do.gamma);
-
-    el('alpha').innerText = alpha + ' [rad]';
-    el('beta').innerText = beta + ' [rad]';
-    el('gamma').innerText = gamma + ' [rad]';
-
-    center[0] -= resolution * gamma * 25;
-    center[1] += resolution * beta * 25;
-
-    view.setCenter(view.constrainCenter(center));
-  });
+el('track').addEventListener('change', function() {
+  deviceOrientation.setTracking(this.checked);
+});
+
+deviceOrientation.on('change', function() {
+  el('alpha').innerText = deviceOrientation.getAlpha() + ' [rad]';
+  el('beta').innerText = deviceOrientation.getBeta() + ' [rad]';
+  el('gamma').innerText = deviceOrientation.getGamma() + ' [rad]';
+  el('heading').innerText = deviceOrientation.getHeading() + ' [rad]';
+});
+
+// tilt the map
+deviceOrientation.on(['change:beta', 'change:gamma'], function(event) {
+  var center = view.getCenter();
+  var resolution = view.getResolution();
+  var beta = event.target.getBeta() || 0;
+  var gamma = event.target.getGamma() || 0;
+
+  center[0] -= resolution * gamma * 25;
+  center[1] += resolution * beta * 25;
+
+  view.setCenter(view.constrainCenter(center));
 });

examples/geojson-vt.js

@@ -6,6 +6,7 @@ goog.require('ol.source.OSM');
 goog.require('ol.source.VectorTile');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.VectorTile');
+goog.require('ol.tilegrid');
 goog.require('ol.proj.Projection');
 
 
@@ -76,6 +77,7 @@ fetch(url).then(function(response) {
   });
   var vectorSource = new ol.source.VectorTile({
     format: new ol.format.GeoJSON(),
+    tileGrid: ol.tilegrid.createXYZ(),
     tileLoadFunction: function(tile) {
       var format = tile.getFormat();
       var tileCoord = tile.getTileCoord();

examples/graticule.js

@@ -10,15 +10,12 @@ goog.require('ol.style.Stroke');
 var map = new ol.Map({
   layers: [
     new ol.layer.Tile({
-      source: new ol.source.OSM({
-        wrapX: false
-      })
+      source: new ol.source.OSM()
     })
   ],
   target: 'map',
   view: new ol.View({
     center: ol.proj.fromLonLat([4.8, 47.75]),
-    extent: ol.proj.get('EPSG:3857').getExtent(),
     zoom: 5
   })
 });

examples/icon-sprite-webgl.js

@@ -80,7 +80,7 @@ var vector = new ol.layer.Vector({
 });
 
 var map = new ol.Map({
-  renderer: /** @type {Array<ol.renderer.Type>} */ (['webgl', 'canvas']),
+  renderer: /** @type {ol.renderer.Type} */ ('webgl'),
   layers: [vector],
   target: document.getElementById('map'),
   view: new ol.View({

examples/jsts.html

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

examples/layer-clipping-webgl.js

@@ -19,7 +19,7 @@ if (!ol.has.WEBGL) {
 
   var map = new ol.Map({
     layers: [osm],
-    renderer: /** @type {Array<ol.renderer.Type>} */ (['webgl', 'canvas']),
+    renderer: /** @type {ol.renderer.Type} */ ('webgl'),
     target: 'map',
     controls: ol.control.defaults({
       attributionOptions: /** @type {olx.control.AttributionOptions} */ ({

examples/mapbox-vector-tiles-advanced.js

@@ -1,3 +1,4 @@
+/* eslint-disable openlayers-internal/no-unused-requires */
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.format.MVT');
@@ -45,7 +46,7 @@ var map = new ol.Map({
         }),
         tileUrlFunction: tileUrlFunction
       }),
-      style: createMapboxStreetsV6Style(ol.style.Style, ol.style.Fill, ol.style.Stroke, ol.style.Icon, ol.style.Text)
+      style: createMapboxStreetsV6Style()
     })
   ],
   target: 'map',
@@ -55,3 +56,6 @@ var map = new ol.Map({
     zoom: 2
   })
 });
+
+// ol.style.Fill, ol.style.Icon, ol.style.Stroke, ol.style.Style and
+// ol.style.Text are required for createMapboxStreetsV6Style()

examples/mapbox-vector-tiles.js

@@ -1,3 +1,5 @@
+/* eslint-disable openlayers-internal/no-unused-requires */
+
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.format.MVT');
@@ -8,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';
@@ -15,16 +18,16 @@ var key = 'pk.eyJ1IjoiYWhvY2V2YXIiLCJhIjoiRk1kMWZaSSJ9.E5BkluenyWQMsBLsuByrmg';
 var map = new ol.Map({
   layers: [
     new ol.layer.VectorTile({
-      declutter: true,
       source: new ol.source.VectorTile({
         attributions: '© <a href="https://www.mapbox.com/map-feedback/">Mapbox</a> ' +
           '© <a href="https://www.openstreetmap.org/copyright">' +
           'OpenStreetMap contributors</a>',
         format: new ol.format.MVT(),
+        tileGrid: ol.tilegrid.createXYZ({tileSize: 512, maxZoom: 22}),
         url: 'https://{a-d}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/' +
             '{z}/{x}/{y}.vector.pbf?access_token=' + key
       }),
-      style: createMapboxStreetsV6Style(ol.style.Style, ol.style.Fill, ol.style.Stroke, ol.style.Icon, ol.style.Text)
+      style: createMapboxStreetsV6Style()
     })
   ],
   target: 'map',
@@ -33,3 +36,6 @@ var map = new ol.Map({
     zoom: 2
   })
 });
+
+// ol.style.Fill, ol.style.Icon, ol.style.Stroke, ol.style.Style and
+// ol.style.Text are required for createMapboxStreetsV6Style()

examples/mapguide-untiled.js

@@ -3,9 +3,9 @@ goog.require('ol.View');
 goog.require('ol.layer.Image');
 goog.require('ol.source.ImageMapGuide');
 
-var mdf = 'Library://Public/Samples/Sheboygan/Maps/Sheboygan.MapDefinition';
+var mdf = 'Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition';
 var agentUrl =
-    'http://www.buoyshark.com/mapguide/mapagent/mapagent.fcgi?';
+    'http://data.mapguide.com/mapguide/mapagent/mapagent.fcgi?USERNAME=Anonymous';
 var bounds = [
   -87.865114442365922,
   43.665065564837931,
@@ -23,9 +23,7 @@ var map = new ol.Map({
         metersPerUnit: 111319.4908, //value returned from mapguide
         params: {
           MAPDEFINITION: mdf,
-          FORMAT: 'PNG',
-          USERNAME: 'OpenLayers',
-          PASSWORD: 'OpenLayers'
+          FORMAT: 'PNG'
         },
         ratio: 2
       })

examples/measure.html

@@ -1,24 +1,20 @@
 ---
 layout: example.html
 title: Measure
-shortdesc: Using a draw interaction to measure lengths and areas.
+shortdesc: Example of using the ol.interaction.Draw interaction to create a simple measuring application.
 docs: >
-  <p>The <code>ol.Sphere.getLength()</code> and <code>ol.Sphere.getArea()</code>
-  functions calculate spherical lengths and areas for geometries.  Lengths are
-  calculated by assuming great circle segments between geometry coordinates.
-  Areas are calculated as if edges of polygons were great circle segments.</p>
-  <p>Note that the <code>geometry.getLength()</code> and <code>geometry.getArea()</code>
-  methods return measures of projected (planar) geometries.  These can be very
-  different than on-the-ground measures in certain situations — in northern
-  and southern latitudes using Web Mercator for example.  For better results,
-  use the functions on <code>ol.Sphere</code>.</p>
+  <p><i>NOTE: By default, length and area are calculated using the projected coordinates. This is not accurate for projections like Mercator where the projected meters do not correspond to meters on the ground. To get a standarized measurement across all projections, use the geodesic measures.</i></p>
 tags: "draw, edit, measure, vector"
 ---
 <div id="map" class="map"></div>
 <form class="form-inline">
   <label>Measurement type &nbsp;</label>
-  <select id="type">
-    <option value="length">Length (LineString)</option>
-    <option value="area">Area (Polygon)</option>
-  </select>
+    <select id="type">
+      <option value="length">Length (LineString)</option>
+      <option value="area">Area (Polygon)</option>
+    </select>
+    <label class="checkbox">
+      <input type="checkbox" id="geodesic">
+      use geodesic measures
+    </label>
 </form>

examples/measure.js

@@ -8,6 +8,7 @@ goog.require('ol.geom.Polygon');
 goog.require('ol.interaction.Draw');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
+goog.require('ol.proj');
 goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Circle');
@@ -16,6 +17,8 @@ goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 
 
+var wgs84Sphere = new ol.Sphere(6378137);
+
 var raster = new ol.layer.Tile({
   source: new ol.source.OSM()
 });
@@ -134,6 +137,7 @@ map.getViewport().addEventListener('mouseout', function() {
 });
 
 var typeSelect = document.getElementById('type');
+var geodesicCheckbox = document.getElementById('geodesic');
 
 var draw; // global so we can remove it later
 
@@ -144,7 +148,19 @@ var draw; // global so we can remove it later
  * @return {string} The formatted length.
  */
 var formatLength = function(line) {
-  var length = ol.Sphere.getLength(line);
+  var length;
+  if (geodesicCheckbox.checked) {
+    var coordinates = line.getCoordinates();
+    length = 0;
+    var sourceProj = map.getView().getProjection();
+    for (var i = 0, ii = coordinates.length - 1; i < ii; ++i) {
+      var c1 = ol.proj.transform(coordinates[i], sourceProj, 'EPSG:4326');
+      var c2 = ol.proj.transform(coordinates[i + 1], sourceProj, 'EPSG:4326');
+      length += wgs84Sphere.haversineDistance(c1, c2);
+    }
+  } else {
+    length = Math.round(line.getLength() * 100) / 100;
+  }
   var output;
   if (length > 100) {
     output = (Math.round(length / 1000 * 100) / 100) +
@@ -163,7 +179,16 @@ var formatLength = function(line) {
  * @return {string} Formatted area.
  */
 var formatArea = function(polygon) {
-  var area = ol.Sphere.getArea(polygon);
+  var area;
+  if (geodesicCheckbox.checked) {
+    var sourceProj = map.getView().getProjection();
+    var geom = /** @type {ol.geom.Polygon} */(polygon.clone().transform(
+        sourceProj, 'EPSG:4326'));
+    var coordinates = geom.getLinearRing(0).getCoordinates();
+    area = Math.abs(wgs84Sphere.geodesicArea(coordinates));
+  } else {
+    area = polygon.getArea();
+  }
   var output;
   if (area > 10000) {
     output = (Math.round(area / 1000000 * 100) / 100) +

examples/modify-test.js

@@ -225,7 +225,7 @@ var modify = new ol.interaction.Modify({
   style: overlayStyle,
   insertVertexCondition: function() {
     // prevent new vertices to be added to the polygons
-    return !select.getFeatures().getArray().every(function(feature) {
+    return !this.features_.getArray().every(function(feature) {
       return feature.getGeometry().getType().match(/Polygon/);
     });
   }

examples/osm-vector-tiles.js

@@ -7,6 +7,8 @@ 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';
 
@@ -68,7 +70,7 @@ var map = new ol.Map({
           layerName: 'layer',
           layers: ['water', 'roads', 'buildings']
         }),
-        maxZoom: 19,
+        tileGrid: ol.tilegrid.createXYZ({tileSize: 512, maxZoom: 19}),
         url: 'https://tile.mapzen.com/mapzen/vector/v1/all/{z}/{x}/{y}.topojson?api_key=' + key
       }),
       style: function(feature, resolution) {

examples/reprojection-by-code.html

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

examples/resources/mapbox-streets-v6-style.js

@@ -1,20 +1,20 @@
 // Styles for the mapbox-streets-v6 vector tile data set. Loosely based on
 // http://a.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6.json
 
-function createMapboxStreetsV6Style(Style, Fill, Stroke, Icon, Text) {
-  var fill = new Fill({color: ''});
-  var stroke = new Stroke({color: '', width: 1});
-  var polygon = new Style({fill: fill});
-  var strokedPolygon = new Style({fill: fill, stroke: stroke});
-  var line = new Style({stroke: stroke});
-  var text = new Style({text: new Text({
+function createMapboxStreetsV6Style() {
+  var fill = new ol.style.Fill({color: ''});
+  var stroke = new ol.style.Stroke({color: '', width: 1});
+  var polygon = new ol.style.Style({fill: fill});
+  var strokedPolygon = new ol.style.Style({fill: fill, stroke: stroke});
+  var line = new ol.style.Style({stroke: stroke});
+  var text = new ol.style.Style({text: new ol.style.Text({
     text: '', fill: fill, stroke: stroke
   })});
   var iconCache = {};
   function getIcon(iconName) {
     var icon = iconCache[iconName];
     if (!icon) {
-      icon = new Style({image: new Icon({
+      icon = new ol.style.Style({image: new ol.style.Icon({
         src: 'https://cdn.rawgit.com/mapbox/maki/master/icons/' + iconName + '-15.svg',
         imgSize: [15, 15]
       })});

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:
-  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.4.4/proj4.js
+  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.4.3/proj4.js
 ---
 <div id="map" class="map"></div>

examples/sea-level.js

@@ -26,8 +26,7 @@ function flood(pixels, data) {
 var key = 'pk.eyJ1IjoidHNjaGF1YiIsImEiOiJjaW5zYW5lNHkxMTNmdWttM3JyOHZtMmNtIn0.CDIBD8H-G2Gf-cPkIuWtRg';
 var elevation = new ol.source.XYZ({
   url: 'https://api.mapbox.com/v4/mapbox.terrain-rgb/{z}/{x}/{y}.pngraw?access_token=' + key,
-  crossOrigin: 'anonymous',
-  transition: 0
+  crossOrigin: 'anonymous'
 });
 
 var raster = new ol.source.Raster({

examples/shaded-relief.js

@@ -104,8 +104,7 @@ function shade(inputs, data) {
 
 var elevation = new ol.source.XYZ({
   url: 'https://{a-d}.tiles.mapbox.com/v3/aj.sf-dem/{z}/{x}/{y}.png',
-  crossOrigin: 'anonymous',
-  transition: 0
+  crossOrigin: 'anonymous'
 });
 
 var raster = new ol.source.Raster({

examples/side-by-side.js

@@ -22,7 +22,7 @@ var map1 = new ol.Map({
 if (ol.has.WEBGL) {
   var map2 = new ol.Map({
     target: 'webglMap',
-    renderer: /** @type {Array<ol.renderer.Type>} */ (['webgl', 'canvas']),
+    renderer: /** @type {ol.renderer.Type} */ ('webgl'),
     layers: [layer],
     view: view
   });

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:
-  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.4.4/proj4.js
+  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.4.3/proj4.js
 ---
 <div id="map" class="map"></div>

examples/street-labels.html

@@ -3,8 +3,14 @@ layout: example.html
 title: Street Labels
 shortdesc: Render street names with a custom render.
 docs: >
-  Example showing the use of a text style with `placement: 'line'` to render text along a path.
-tags: "vector, label, streets"
+  Example showing the use of a custom renderer to render text along a path. [Labelgun](https://github.com/Geovation/labelgun) is used to avoid label collisions. [label-segment](https://github.com/ahocevar/label-segment) makes sure that labels are placed on suitable street segments. [textpath](https://github.com/ahocevar/textpath) arranges the letters of a label along the geometry. The data is fetched from OSM using the [Overpass API](https://overpass-api.de).
+tags: "vector, label, collision detection, labelgun, linelabel, overpass"
+resources:
+  - https://cdn.polyfill.io/v2/polyfill.min.js?features=Set"
+  - https://unpkg.com/rbush@2.0.1/rbush.min.js
+  - https://unpkg.com/labelgun@0.1.1/lib/labelgun.min.js
+  - https://unpkg.com/textpath@1.0.1/dist/textpath.js
+  - https://unpkg.com/label-segment@1.0.0/dist/label-segment.js
 cloak:
   As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5: Your Bing Maps Key from http://www.bingmapsportal.com/ here
 ---

examples/street-labels.js

@@ -1,43 +1,82 @@
+// NOCOMPILE
+/* global labelgun, labelSegment, textPath */
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.extent');
-goog.require('ol.format.GeoJSON');
+goog.require('ol.format.OSMXML');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.BingMaps');
 goog.require('ol.source.Vector');
-goog.require('ol.style.Fill');
 goog.require('ol.style.Style');
-goog.require('ol.style.Text');
+
+var emptyFn = function() {};
+var labelEngine = new labelgun['default'](emptyFn, emptyFn);
+
+var context, pixelRatio; // Will be set in the map's postcompose listener
+function measureText(text) {
+  return context.measureText(text).width * pixelRatio;
+}
+
+var extent, letters; // Will be set in the style's renderer function
+function collectDrawData(letter, x, y, angle) {
+  ol.extent.extend(extent, [x, y, x, y]);
+  letters.push([x, y, angle, letter]);
+}
 
 var style = new ol.style.Style({
-  text: new ol.style.Text({
-    font: 'bold 11px "Open Sans", "Arial Unicode MS", "sans-serif"',
-    placement: 'line',
-    fill: new ol.style.Fill({
-      color: 'white'
-    })
+  renderer: function(coords, context) {
+    var feature = context.feature;
+    var text = feature.get('name');
+    // Only create label when geometry has a long and straight segment
+    var path = labelSegment(coords, Math.PI / 8, measureText(text));
+    if (path) {
+      extent = ol.extent.createEmpty();
+      letters = [];
+      textPath(text, path, measureText, collectDrawData);
+      ol.extent.buffer(extent, 5 * pixelRatio, extent);
+      var bounds = {
+        bottomLeft: ol.extent.getBottomLeft(extent),
+        topRight: ol.extent.getTopRight(extent)
+      };
+      labelEngine.ingestLabel(bounds, feature.getId(), 1, letters, text, false);
+    }
+  }
+});
+
+var rasterLayer = new ol.layer.Tile({
+  source: new ol.source.BingMaps({
+    key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
+    imagerySet: 'Aerial'
   })
 });
 
+var source = new ol.source.Vector();
+// Request streets from OSM, using the Overpass API
+fetch('https://overpass-api.de/api/interpreter', {
+  method: 'POST',
+  body: '(way["highway"](48.19642,16.32580,48.22050,16.41986));(._;>;);out meta;'
+}).then(function(response) {
+  return response.text();
+}).then(function(responseText) {
+  var features = new ol.format.OSMXML().readFeatures(responseText, {
+    featureProjection: 'EPSG:3857'
+  });
+  source.addFeatures(features);
+});
+
+var vectorLayer = new ol.layer.Vector({
+  source: source,
+  style: function(feature) {
+    if (feature.getGeometry().getType() == 'LineString' && feature.get('name')) {
+      return style;
+    }
+  }
+});
+
 var viewExtent = [1817379, 6139595, 1827851, 6143616];
 var map = new ol.Map({
-  layers: [new ol.layer.Tile({
-    source: new ol.source.BingMaps({
-      key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
-      imagerySet: 'Aerial'
-    })
-  }), new ol.layer.Vector({
-    declutter: true,
-    source: new ol.source.Vector({
-      format: new ol.format.GeoJSON(),
-      url: 'data/geojson/vienna-streets.geojson'
-    }),
-    style: function(feature) {
-      style.getText().setText(feature.get('name'));
-      return style;
-    }
-  })],
+  layers: [rasterLayer, vectorLayer],
   target: 'map',
   view: new ol.View({
     extent: viewExtent,
@@ -46,3 +85,31 @@ var map = new ol.Map({
     minZoom: 14
   })
 });
+
+vectorLayer.on('precompose', function() {
+  labelEngine.destroy();
+});
+vectorLayer.on('postcompose', function(e) {
+  context = e.context;
+  pixelRatio = e.frameState.pixelRatio;
+  context.save();
+  context.font = 'normal 11px "Open Sans", "Arial Unicode MS"';
+  context.fillStyle = 'white';
+  context.textBaseline = 'middle';
+  context.textAlign = 'center';
+  var labels = labelEngine.getShown();
+  for (var i = 0, ii = labels.length; i < ii; ++i) {
+    // Render label letter by letter
+    var letters = labels[i].labelObject;
+    for (var j = 0, jj = letters.length; j < jj; ++j) {
+      var labelData = letters[j];
+      context.save();
+      context.translate(labelData[0], labelData[1]);
+      context.rotate(labelData[2]);
+      context.scale(pixelRatio, pixelRatio);
+      context.fillText(labelData[3], 0, 0);
+      context.restore();
+    }
+  }
+  context.restore();
+});

examples/symbol-atlas-webgl.js

@@ -107,7 +107,7 @@ var vector = new ol.layer.Vector({
 });
 
 var map = new ol.Map({
-  renderer: /** @type {Array<ol.renderer.Type>} */ (['webgl', 'canvas']),
+  renderer: /** @type {ol.renderer.Type} */ ('webgl'),
   layers: [vector],
   target: document.getElementById('map'),
   view: new ol.View({

examples/tile-transitions.html

@@ -1,15 +0,0 @@
----
-layout: example.html
-title: Tile Transitions
-shortdesc: Custom configuration for opacity transitions on tiles.
-docs: >
-  By default tiles are rendered with an opacity transition - fading in over
-  250 ms.  To disable this behavior, set the <code>transition</code> option
-  of the tile source to 0.
-tags: "fade, transition"
----
-<div id="map" class="map"></div>
-<label>
-  render with an opacity transition
-  <input id="transition" type="checkbox" checked>
-</label>

examples/tile-transitions.js

@@ -1,31 +0,0 @@
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.layer.Tile');
-goog.require('ol.source.XYZ');
-
-var url = 'https://{a-c}.tiles.mapbox.com/v3/mapbox.world-bright/{z}/{x}/{y}.png';
-
-var withTransition = new ol.layer.Tile({
-  source: new ol.source.XYZ({url: url})
-});
-
-var withoutTransition = new ol.layer.Tile({
-  source: new ol.source.XYZ({url: url, transition: 0}),
-  visible: false
-});
-
-var map = new ol.Map({
-  layers: [withTransition, withoutTransition],
-  target: 'map',
-  view: new ol.View({
-    center: [0, 0],
-    zoom: 2,
-    maxZoom: 11
-  })
-});
-
-document.getElementById('transition').addEventListener('change', function(event) {
-  var transition = event.target.checked;
-  withTransition.setVisible(transition);
-  withoutTransition.setVisible(!transition);
-});

examples/vector-label-decluttering.html

@@ -4,8 +4,10 @@ title: Vector Label Decluttering
 shortdesc: Label decluttering with a custom renderer.
 resources:
   - https://cdn.polyfill.io/v2/polyfill.min.js?features=Set"
+  - https://unpkg.com/rbush@2.0.1/rbush.min.js
+  - https://unpkg.com/labelgun@0.1.1/lib/labelgun.min.js
 docs: >
-  Decluttering is used to avoid overlapping labels with `exceedLength: true` set on the text style. For MultiPolygon geometries, only the widest polygon is selected in a custom `geometry` function.
-tags: "vector, decluttering, labels"
+  A custom `renderer` function is used instead of an `ol.style.Text` to label the countries of the world. Only texts that are not wider than their country's bounding box are considered and handed over to [Labelgun](https://github.com/Geovation/labelgun) for decluttering.
+tags: "vector, renderer, labelgun, label"
 ---
 <div id="map" class="map"></div>

examples/vector-label-decluttering.js

@@ -1,3 +1,5 @@
+// NOCOMPILE
+/* global labelgun */
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.extent');
@@ -7,7 +9,26 @@ goog.require('ol.source.Vector');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
-goog.require('ol.style.Text');
+
+// Style for labels
+function setStyle(context) {
+  context.font = '12px Calibri,sans-serif';
+  context.fillStyle = '#000';
+  context.strokeStyle = '#fff';
+  context.lineWidth = 3;
+  context.textBaseline = 'hanging';
+  context.textAlign = 'start';
+}
+
+// A separate canvas context for measuring label width and height.
+var textMeasureContext = document.createElement('CANVAS').getContext('2d');
+setStyle(textMeasureContext);
+
+// The label height is approximated by the width of the text 'WI'.
+var height = textMeasureContext.measureText('WI').width;
+
+// A cache for reusing label images once they have been created.
+var textCache = {};
 
 var map = new ol.Map({
   target: 'map',
@@ -17,35 +38,30 @@ var map = new ol.Map({
   })
 });
 
+var emptyFn = function() {};
+var labelEngine = new labelgun['default'](emptyFn, emptyFn);
+
+function createLabel(canvas, text, coord) {
+  var halfWidth = canvas.width / 2;
+  var halfHeight = canvas.height / 2;
+  var bounds = {
+    bottomLeft: [Math.round(coord[0] - halfWidth), Math.round(coord[1] - halfHeight)],
+    topRight: [Math.round(coord[0] + halfWidth), Math.round(coord[1] + halfHeight)]
+  };
+  labelEngine.ingestLabel(bounds, coord.toString(), 1, canvas, text, false);
+}
+
+// For multi-polygons, we only label the widest polygon. This is done by sorting
+// by extent width in descending order, and take the first from the array.
+function sortByWidth(a, b) {
+  return ol.extent.getWidth(b.getExtent()) - ol.extent.getWidth(a.getExtent());
+}
+
 var labelStyle = new ol.style.Style({
-  geometry: function(feature) {
-    var geometry = feature.getGeometry();
-    if (geometry.getType() == 'MultiPolygon') {
-      // Only render label for the widest polygon of a multipolygon
-      var polygons = geometry.getPolygons();
-      var widest = 0;
-      for (var i = 0, ii = polygons.length; i < ii; ++i) {
-        var polygon = polygons[i];
-        var width = ol.extent.getWidth(polygon.getExtent());
-        if (width > widest) {
-          widest = width;
-          geometry = polygon;
-        }
-      }
-    }
-    return geometry;
-  },
-  text: new ol.style.Text({
-    font: '12px Calibri,sans-serif',
-    exceedLength: true,
-    fill: new ol.style.Fill({
-      color: '#000'
-    }),
-    stroke: new ol.style.Stroke({
-      color: '#fff',
-      width: 3
-    })
-  })
+  renderer: function(coords, state) {
+    var text = state.feature.get('name');
+    createLabel(textCache[text], text, coords);
+  }
 });
 var countryStyle = new ol.style.Style({
   fill: new ol.style.Fill({
@@ -56,18 +72,54 @@ var countryStyle = new ol.style.Style({
     width: 1
   })
 });
-var style = [countryStyle, labelStyle];
+var styleWithLabel = [countryStyle, labelStyle];
+var styleWithoutLabel = [countryStyle];
 
+var pixelRatio; // This is set by the map's precompose listener
 var vectorLayer = new ol.layer.Vector({
   source: new ol.source.Vector({
     url: 'data/geojson/countries.geojson',
     format: new ol.format.GeoJSON()
   }),
-  style: function(feature) {
-    labelStyle.getText().setText(feature.get('name'));
-    return style;
-  },
-  declutter: true
+  style: function(feature, resolution) {
+    var text = feature.get('name');
+    var width = textMeasureContext.measureText(text).width;
+    var geometry = feature.getGeometry();
+    if (geometry.getType() == 'MultiPolygon') {
+      geometry = geometry.getPolygons().sort(sortByWidth)[0];
+    }
+    var extentWidth = ol.extent.getWidth(geometry.getExtent());
+    if (extentWidth / resolution > width) {
+      // Only consider label when it fits its geometry's extent
+      if (!(text in textCache)) {
+        // Draw the label to its own canvas and cache it.
+        var canvas = textCache[text] = document.createElement('CANVAS');
+        canvas.width = width * pixelRatio;
+        canvas.height = height * pixelRatio;
+        var context = canvas.getContext('2d');
+        context.scale(pixelRatio, pixelRatio);
+        setStyle(context);
+        context.strokeText(text, 0, 0);
+        context.fillText(text, 0, 0);
+      }
+      labelStyle.setGeometry(geometry.getInteriorPoint());
+      return styleWithLabel;
+    } else {
+      return styleWithoutLabel;
+    }
+  }
+});
+vectorLayer.on('precompose', function(e) {
+  pixelRatio = e.frameState.pixelRatio;
+  labelEngine.destroy();
+});
+vectorLayer.on('postcompose', function(e) {
+  var labels = labelEngine.getShown();
+  for (var i = 0, ii = labels.length; i < ii; ++i) {
+    var label = labels[i];
+    // Draw label to the map canvas
+    e.context.drawImage(label.labelObject, label.minX, label.minY);
+  }
 });
 
 map.addLayer(vectorLayer);

examples/vector-labels.html

@@ -6,8 +6,7 @@ docs: >
   This example showcases a number of options that can be set on text styles.
   When "Text/Wrap" is chosen (for example for the line features), the label is
   wrapped by inserting the character `\n`, which will create a multi-line
-  label. The "Open Sans" web font will be loaded on demand, to show dynamic font
-  loading.
+  label.
 tags: "geojson, vector, openstreetmap, label"
 ---
 <div id="map" class="map"></div>
@@ -70,8 +69,8 @@ tags: "geojson, vector, openstreetmap, label"
     <label>Font: </label>
     <select id="points-font">
       <option value="Arial" selected="selected">Arial</option>
-      <option value="'Courier New'">Courier New</option>
-      <option value="'Open Sans'">Open Sans</option>
+      <option value="Courier New">Courier New</option>
+      <option value="Quattrocento Sans">Quattrocento</option>
       <option value="Verdana">Verdana</option>
     </select>
     <br />
@@ -81,25 +80,6 @@ tags: "geojson, vector, openstreetmap, label"
       <option value="normal" selected="selected">Normal</option>
     </select>
     <br />
-    <label>Placement: </label>
-    <select disabled id="points-placement">
-      <option value="line">Line</option>
-      <option value="point" selected="selected">Point</option>
-    </select>
-    <br />
-    <label>Max Angle: </label>
-    <select disabled id="points-maxangle">
-      <option value="0.7853981633974483" selected="selected">45°</option>
-      <option value="2.0943951023931953">120°</option>
-      <option value="6.283185307179586">360°</option>
-    </select>
-    <br />
-    <label>Exceed Len: </label>
-    <select disabled id="points-exceedlength">
-      <option value="true">True</option>
-      <option value="false" selected="selected">False</option>
-    </select>
-    <br />
     <label>Size: </label>
     <input type="text" value="12px" id="points-size" />
     <br />
@@ -151,8 +131,7 @@ tags: "geojson, vector, openstreetmap, label"
     <br />
     <label>Align: </label>
     <select id="lines-align">
-      <option value="" selected="selected"></option>
-      <option value="center">Center</option>
+      <option value="center" selected="selected">Center</option>
       <option value="end">End</option>
       <option value="left">Left</option>
       <option value="right">Right</option>
@@ -179,8 +158,8 @@ tags: "geojson, vector, openstreetmap, label"
     <label>Font: </label>
     <select id="lines-font">
       <option value="Arial">Arial</option>
-      <option value="'Courier New'" selected="selected">Courier New</option>
-      <option value="'Open Sans'">Open Sans</option>
+      <option value="Courier New" selected="selected">Courier New</option>
+      <option value="Quattrocento Sans">Quattrocento</option>
       <option value="Verdana">Verdana</option>
     </select>
     <br />
@@ -190,25 +169,6 @@ tags: "geojson, vector, openstreetmap, label"
       <option value="normal">Normal</option>
     </select>
     <br />
-    <label>Placement: </label>
-    <select id="lines-placement">
-      <option value="line">Line</option>
-      <option value="point" selected="selected">Point</option>
-    </select>
-    <br />
-    <label>Max Angle: </label>
-    <select id="lines-maxangle">
-      <option value="0.7853981633974483" selected="selected">45°</option>
-      <option value="2.0943951023931953">120°</option>
-      <option value="6.283185307179586">360°</option>
-    </select>
-    <br />
-    <label>Exceed Len: </label>
-    <select id="lines-exceedlength">
-      <option value="true">True</option>
-      <option value="false" selected="selected">False</option>
-    </select>
-    <br />
     <label>Size: </label>
     <input type="text" value="12px" id="lines-size" />
     <br />
@@ -260,8 +220,7 @@ tags: "geojson, vector, openstreetmap, label"
     <br />
     <label>Align: </label>
     <select id="polygons-align">
-      <option value="" selected="selected"></option>
-      <option value="center">Center</option>
+      <option value="center" selected="selected">Center</option>
       <option value="end">End</option>
       <option value="left">Left</option>
       <option value="right">Right</option>
@@ -288,8 +247,8 @@ tags: "geojson, vector, openstreetmap, label"
     <label>Font: </label>
     <select id="polygons-font">
       <option value="Arial">Arial</option>
-      <option value="'Courier New'">Courier New</option>
-      <option value="'Open Sans'">Open Sans</option>
+      <option value="Courier New">Courier New</option>
+      <option value="Quattrocento Sans">Quattrocento</option>
       <option value="Verdana" selected="selected">Verdana</option>
     </select>
     <br />
@@ -299,25 +258,6 @@ tags: "geojson, vector, openstreetmap, label"
       <option value="normal">Normal</option>
     </select>
     <br />
-    <label>Placement: </label>
-    <select id="polygons-placement">
-      <option value="line">Line</option>
-      <option value="point" selected="selected">Point</option>
-    </select>
-    <br />
-    <label>Max Angle: </label>
-    <select id="polygons-maxangle">
-      <option value="0.7853981633974483" selected="selected">45°</option>
-      <option value="2.0943951023931953">120°</option>
-      <option value="6.283185307179586">360°</option>
-    </select>
-    <br />
-    <label>Exceed Len: </label>
-    <select id="polygons-exceedlength">
-      <option value="true">True</option>
-      <option value="false" selected="selected">False</option>
-    </select>
-    <br />
     <label>Size: </label>
     <input type="text" value="10px" id="polygons-size" />
     <br />

examples/vector-labels.js

@@ -11,7 +11,6 @@ goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 goog.require('ol.style.Text');
 
-var openSansAdded = false;
 
 var myDom = {
   points: {
@@ -36,9 +35,6 @@ var myDom = {
     rotation: document.getElementById('lines-rotation'),
     font: document.getElementById('lines-font'),
     weight: document.getElementById('lines-weight'),
-    placement: document.getElementById('lines-placement'),
-    maxangle: document.getElementById('lines-maxangle'),
-    exceedlength: document.getElementById('lines-exceedlength'),
     size: document.getElementById('lines-size'),
     offsetX: document.getElementById('lines-offset-x'),
     offsetY: document.getElementById('lines-offset-y'),
@@ -54,9 +50,6 @@ var myDom = {
     rotation: document.getElementById('polygons-rotation'),
     font: document.getElementById('polygons-font'),
     weight: document.getElementById('polygons-weight'),
-    placement: document.getElementById('polygons-placement'),
-    maxangle: document.getElementById('polygons-maxangle'),
-    exceedlength: document.getElementById('polygons-exceedlength'),
     size: document.getElementById('polygons-size'),
     offsetX: document.getElementById('polygons-offset-x'),
     offsetY: document.getElementById('polygons-offset-y'),
@@ -78,7 +71,7 @@ var getText = function(feature, resolution, dom) {
     text = '';
   } else if (type == 'shorten') {
     text = text.trunc(12);
-  } else if (type == 'wrap' && dom.placement.value != 'line') {
+  } else if (type == 'wrap') {
     text = stringDivider(text, 16, '\n');
   }
 
@@ -93,24 +86,14 @@ var createTextStyle = function(feature, resolution, dom) {
   var offsetX = parseInt(dom.offsetX.value, 10);
   var offsetY = parseInt(dom.offsetY.value, 10);
   var weight = dom.weight.value;
-  var placement = dom.placement ? dom.placement.value : undefined;
-  var maxAngle = dom.maxangle ? parseFloat(dom.maxangle.value) : undefined;
-  var exceedLength = dom.exceedlength ? (dom.exceedlength.value == 'true') : undefined;
   var rotation = parseFloat(dom.rotation.value);
-  if (dom.font.value == '\'Open Sans\'' && !openSansAdded) {
-    var openSans = document.createElement('link');
-    openSans.href = 'https://fonts.googleapis.com/css?family=Open+Sans';
-    openSans.rel = 'stylesheet';
-    document.getElementsByTagName('head')[0].appendChild(openSans);
-    openSansAdded = true;
-  }
   var font = weight + ' ' + size + ' ' + dom.font.value;
   var fillColor = dom.color.value;
   var outlineColor = dom.outline.value;
   var outlineWidth = parseInt(dom.outlineWidth.value, 10);
 
   return new ol.style.Text({
-    textAlign: align == '' ? undefined : align,
+    textAlign: align,
     textBaseline: baseline,
     font: font,
     text: getText(feature, resolution, dom),
@@ -118,9 +101,6 @@ var createTextStyle = function(feature, resolution, dom) {
     stroke: new ol.style.Stroke({color: outlineColor, width: outlineWidth}),
     offsetX: offsetX,
     offsetY: offsetY,
-    placement: placement,
-    maxAngle: maxAngle,
-    exceedLength: exceedLength,
     rotation: rotation
   });
 };

examples/vector-layer.html

@@ -3,8 +3,8 @@ layout: example.html
 title: Vector Layer
 shortdesc: Example of a countries vector layer with country information.
 docs: >
-  The countries are loaded from a GeoJSON file. Information about countries is shown on hover and click.
-tags: "vector, geojson"
+  The countries are loaded from a GeoJSON file. Information about countries is shown on hover and click. Zoom in a few times to see country name labels.
+tags: "vector, osm, xml, loading, server"
 ---
 <div id="map" class="map"></div>
 <div id="info">&nbsp;</div>

examples/vector-layer.js

@@ -1,7 +1,9 @@
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.format.GeoJSON');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
@@ -34,14 +36,19 @@ var vectorLayer = new ol.layer.Vector({
     url: 'data/geojson/countries.geojson',
     format: new ol.format.GeoJSON()
   }),
-  style: function(feature) {
-    style.getText().setText(feature.get('name'));
+  style: function(feature, resolution) {
+    style.getText().setText(resolution < 5000 ? feature.get('name') : '');
     return style;
   }
 });
 
 var map = new ol.Map({
-  layers: [vectorLayer],
+  layers: [
+    new ol.layer.Tile({
+      source: new ol.source.OSM()
+    }),
+    vectorLayer
+  ],
   target: 'map',
   view: new ol.View({
     center: [0, 0],
@@ -49,32 +56,36 @@ var map = new ol.Map({
   })
 });
 
-var highlightStyle = new ol.style.Style({
-  stroke: new ol.style.Stroke({
-    color: '#f00',
-    width: 1
-  }),
-  fill: new ol.style.Fill({
-    color: 'rgba(255,0,0,0.1)'
-  }),
-  text: new ol.style.Text({
-    font: '12px Calibri,sans-serif',
-    fill: new ol.style.Fill({
-      color: '#000'
-    }),
-    stroke: new ol.style.Stroke({
-      color: '#f00',
-      width: 3
-    })
-  })
-});
+var highlightStyleCache = {};
 
 var featureOverlay = new ol.layer.Vector({
   source: new ol.source.Vector(),
   map: map,
-  style: function(feature) {
-    highlightStyle.getText().setText(feature.get('name'));
-    return highlightStyle;
+  style: function(feature, resolution) {
+    var text = resolution < 5000 ? feature.get('name') : '';
+    if (!highlightStyleCache[text]) {
+      highlightStyleCache[text] = new ol.style.Style({
+        stroke: new ol.style.Stroke({
+          color: '#f00',
+          width: 1
+        }),
+        fill: new ol.style.Fill({
+          color: 'rgba(255,0,0,0.1)'
+        }),
+        text: new ol.style.Text({
+          font: '12px Calibri,sans-serif',
+          text: text,
+          fill: new ol.style.Fill({
+            color: '#000'
+          }),
+          stroke: new ol.style.Stroke({
+            color: '#f00',
+            width: 3
+          })
+        })
+      });
+    }
+    return highlightStyleCache[text];
   }
 });
 

examples/vector-tile-info.css

@@ -1,16 +0,0 @@
-#map {
-  position: relative;
-}
-
-#info {
-  z-index: 1;
-  opacity: 0;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  margin: 0;
-  background: rgba(0,60,136,0.7);
-  color: white;
-  border: 0;
-  transition: opacity 100ms ease-in;
-}

examples/vector-tile-info.html

@@ -1,11 +0,0 @@
----
-layout: example.html
-title: Vector Tile Info
-shortdesc: Getting feature information from vector tiles.
-docs: >
-  <p>Move your pointer over rendered features to display feature properties.</p>
-tags: "vector tiles"
----
-<div id="map" class="map">
-  <pre id="info"/>
-</div>

examples/vector-tile-info.js

@@ -1,34 +0,0 @@
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.format.MVT');
-goog.require('ol.layer.VectorTile');
-goog.require('ol.source.VectorTile');
-
-var map = new ol.Map({
-  target: 'map',
-  view: new ol.View({
-    center: [0, 0],
-    zoom: 2
-  }),
-  layers: [new ol.layer.VectorTile({
-    source: new ol.source.VectorTile({
-      format: new ol.format.MVT(),
-      url: 'https://basemaps.arcgis.com/v1/arcgis/rest/services/World_Basemap/VectorTileServer/tile/{z}/{y}/{x}.pbf'
-    })
-  })]
-});
-
-map.on('pointermove', showInfo);
-
-var info = document.getElementById('info');
-function showInfo(event) {
-  var features = map.getFeaturesAtPixel(event.pixel);
-  if (!features) {
-    info.innerText = '';
-    info.style.opacity = 0;
-    return;
-  }
-  var properties = features[0].getProperties();
-  info.innerText = JSON.stringify(properties, null, 2);
-  info.style.opacity = 1;
-}

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:
-  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.4.4/proj4.js
+  - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.4.3/proj4.js
   - https://epsg.io/21781-1753.js
 ---
 <div id="map" class="map"></div>

examples/wmts-ign.js

@@ -1,3 +1,4 @@
+goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.control');
@@ -49,9 +50,11 @@ var ign_source = new ol.source.WMTS({
   projection: 'EPSG:3857',
   tileGrid: tileGrid,
   style: 'normal',
-  attributions: '<a href="http://www.geoportail.fr/" target="_blank">' +
+  attributions: [new ol.Attribution({
+    html: '<a href="http://www.geoportail.fr/" target="_blank">' +
         '<img src="https://api.ign.fr/geoportail/api/js/latest/' +
         'theme/geoportal/img/logo_gp.gif"></a>'
+  })]
 });
 
 var ign = new ol.layer.Tile({

examples/xyz-esri-4326-512.js

@@ -1,9 +1,14 @@
+goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.XYZ');
 
+var attribution = new ol.Attribution({
+  html: 'Copyright:© 2013 ESRI, i-cubed, GeoEye'
+});
+
 var projection = ol.proj.get('EPSG:4326');
 
 // The tile size supported by the ArcGIS tile service.
@@ -17,7 +22,7 @@ var map = new ol.Map({
   layers: [
     new ol.layer.Tile({
       source: new ol.source.XYZ({
-        attributions: 'Copyright:© 2013 ESRI, i-cubed, GeoEye',
+        attributions: [attribution],
         maxZoom: 16,
         projection: projection,
         tileSize: tileSize,

examples/xyz-esri.js

@@ -1,3 +1,4 @@
+goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
@@ -5,13 +6,17 @@ goog.require('ol.proj');
 goog.require('ol.source.XYZ');
 
 
+var attribution = new ol.Attribution({
+  html: 'Tiles © <a href="https://services.arcgisonline.com/ArcGIS/' +
+      'rest/services/World_Topo_Map/MapServer">ArcGIS</a>'
+});
+
 var map = new ol.Map({
   target: 'map',
   layers: [
     new ol.layer.Tile({
       source: new ol.source.XYZ({
-        attributions: 'Tiles © <a href="https://services.arcgisonline.com/ArcGIS/' +
-            'rest/services/World_Topo_Map/MapServer">ArcGIS</a>',
+        attributions: [attribution],
         url: 'https://server.arcgisonline.com/ArcGIS/rest/services/' +
             'World_Topo_Map/MapServer/tile/{z}/{y}/{x}'
       })

examples/zoomify.html

@@ -3,13 +3,7 @@ layout: example.html
 title: Zoomify
 shortdesc: Example of a Zoomify source.
 docs: >
-  Zoomify is a format for deep-zooming into high resolution images. This example shows how to use the Zoomify source with a pixel projection. Internet Imaging Protocol (IIP) with JTL extension is also handled.
-tags: "zoomify, deep zoom, IIP, pixel, projection"
+  Zoomify is a format for deep-zooming into high resolution images. This example shows how to use the Zoomify source with a pixel projection.
+tags: "zoomify, deep zoom, pixel, projection"
 ---
 <div id="map" class="map"></div>
-<div class="controls">
-  <select id="zoomifyProtocol">
-    <option value="zoomify">Zoomify</option>
-    <option value="iip">IIP</option>
-  </select>
-</div>

examples/zoomify.js

@@ -6,47 +6,26 @@ goog.require('ol.source.Zoomify');
 var imgWidth = 9911;
 var imgHeight = 6100;
 
-var zoomifyUrl = 'http://vips.vtech.fr/cgi-bin/iipsrv.fcgi?zoomify=' +
-    '/mnt/MD1/AD00/plan_CHU-4HD-01/FOND.TIF/';
-var iipUrl = 'http://vips.vtech.fr/cgi-bin/iipsrv.fcgi?FIF=' + '/mnt/MD1/AD00/plan_CHU-4HD-01/FOND.TIF' +  '&JTL={z},{tileIndex}';
-
-var layer = new ol.layer.Tile({
-  source: new ol.source.Zoomify({
-    url: zoomifyUrl,
-    size: [imgWidth, imgHeight],
-    crossOrigin: 'anonymous'
-  })
+var source = new ol.source.Zoomify({
+  url: 'http://vips.vtech.fr/cgi-bin/iipsrv.fcgi?zoomify=' +
+      '/mnt/MD1/AD00/plan_CHU-4HD-01/FOND.TIF/',
+  size: [imgWidth, imgHeight],
+  crossOrigin: 'anonymous'
 });
-
 var extent = [0, -imgHeight, imgWidth, 0];
 
 var map = new ol.Map({
-  layers: [layer],
+  layers: [
+    new ol.layer.Tile({
+      source: source
+    })
+  ],
   target: 'map',
   view: new ol.View({
     // adjust zoom levels to those provided by the source
-    resolutions: layer.getSource().getTileGrid().getResolutions(),
+    resolutions: source.getTileGrid().getResolutions(),
     // constrain the center: center cannot be set outside this extent
     extent: extent
   })
 });
 map.getView().fit(extent);
-
-var control = document.getElementById('zoomifyProtocol');
-control.addEventListener('change', function(event) {
-  var value = event.currentTarget.value;
-  if (value === 'iip') {
-    layer.setSource(new ol.source.Zoomify({
-      url: iipUrl,
-      size: [imgWidth, imgHeight],
-      crossOrigin: 'anonymous'
-    }));
-  } else if (value === 'zoomify') {
-    layer.setSource(new ol.source.Zoomify({
-      url: zoomifyUrl,
-      size: [imgWidth, imgHeight],
-      crossOrigin: 'anonymous'
-    }));
-  }
-
-});

examples/zoomslider.js

@@ -9,7 +9,7 @@ goog.require('ol.source.OSM');
  * Helper method for map-creation.
  *
  * @param {string} divId The id of the div for the map.
- * @return {ol.PluggableMap} The ol.Map instance.
+ * @return {ol.Map} The ol.Map instance.
  */
 var createMap = function(divId) {
   var source, layer, map, zoomslider;

externs/example.js

@@ -13,12 +13,7 @@ common.getRendererFromQueryString = function(opt_default) {};
 
 
 /**
- * @param {function(new:ol.style.Style, olx.style.StyleOptions=)} Style Style constructor.
- * @param {function(new:ol.style.Fill, olx.style.FillOptions=)} Fill Fill constructor.
- * @param {function(new:ol.style.Stroke, olx.style.StrokeOptions=)} Stroke Stroke constructor.
- * @param {function(new:ol.style.Icon, olx.style.IconOptions=)} Icon Icon constructor.
- * @param {function(new:ol.style.Text, olx.style.TextOptions=)} Text Text constructor.
  * @return {function((ol.Feature|ol.render.Feature), number):
  *     Array.<ol.style.Style>}
  */
-var createMapboxStreetsV6Style = function(Style, Fill, Stroke, Icon, Text) {};
+var createMapboxStreetsV6Style = function() {};

externs/geojson.js

@@ -46,11 +46,33 @@ GeoJSONCRS.prototype.type;
 
 
 /**
- * @type {!GeoJSONCRSName|!GeoJSONLink}
+ * TODO: remove GeoJSONCRSCode when http://jira.codehaus.org/browse/GEOS-5996
+ * is fixed and widely deployed.
+ * @type {!GeoJSONCRSCode|!GeoJSONCRSName|!GeoJSONLink}
  */
 GeoJSONCRS.prototype.properties;
 
 
+
+/**
+ * `GeoJSONCRSCode` is not part of the GeoJSON specification, but is generated
+ * by GeoServer.
+ * TODO: remove GeoJSONCRSCode when http://jira.codehaus.org/browse/GEOS-5996
+ * is fixed and widely deployed.
+ * @constructor
+ */
+var GeoJSONCRSCode = function() {};
+
+
+/**
+ * TODO: remove this when http://jira.codehaus.org/browse/GEOS-5996 is fixed
+ * and widely deployed.
+ * @type {string}
+ */
+GeoJSONCRSCode.prototype.code;
+
+
+
 /**
  * @constructor
  */
@@ -118,11 +140,6 @@ GeoJSONFeature.prototype.id;
 GeoJSONFeature.prototype.properties;
 
 
-/**
- * @type {string|undefined}
- */
-GeoJSONFeature.prototype.geometry_name;
-
 
 /**
  * @constructor

externs/oli.js

@@ -181,7 +181,7 @@ oli.MapEvent = function() {};
 
 
 /**
- * @type {ol.PluggableMap}
+ * @type {ol.Map}
  */
 oli.MapEvent.prototype.map;
 
@@ -229,7 +229,7 @@ oli.control.Control = function() {};
 
 
 /**
- * @param {ol.PluggableMap} map Map.
+ * @param {ol.Map} map Map.
  * @return {undefined} Undefined.
  */
 oli.control.Control.prototype.setMap = function(map) {};

externs/olx.js

@@ -109,7 +109,7 @@ olx.LogoOptions.prototype.src;
 
 
 /**
- * @typedef {{map: (ol.PluggableMap|undefined),
+ * @typedef {{map: (ol.Map|undefined),
  *     maxLines: (number|undefined),
  *     strokeStyle: (ol.style.Stroke|undefined),
  *     targetSize: (number|undefined),
@@ -126,7 +126,7 @@ olx.GraticuleOptions;
 
 /**
  * Reference to an `ol.Map` object.
- * @type {ol.PluggableMap|undefined}
+ * @type {ol.Map|undefined}
  * @api
  */
 olx.GraticuleOptions.prototype.map;
@@ -273,10 +273,9 @@ olx.interaction.InteractionOptions;
 
 /**
  * Method called by the map to notify the interaction that a browser event was
- * dispatched to the map. If the function returns a falsy value,
+ * dispatched to the map. The function may return `false` to prevent the
  * propagation of the event to other interactions in the map's interactions
- * chain will be prevented (this includes functions with no explicit return). See 
- * {@link https://developer.mozilla.org/en-US/docs/Glossary/Falsy}
+ * chain.
  * @type {function(ol.MapBrowserEvent):boolean}
  * @api
  */
@@ -437,50 +436,6 @@ olx.MapOptions.prototype.target;
 olx.MapOptions.prototype.view;
 
 
-/**
- * Object literal with options for the {@link ol.Sphere.getLength} or
- * {@link ol.Sphere.getArea} functions.
- * @typedef {{projection: (ol.ProjectionLike|undefined),
- *    radius: (number|undefined)}}
- */
-olx.SphereMetricOptions;
-
-
-/**
- * Projection of the geometry.  By default, the geometry is assumed to be in
- * EPSG:3857 (Web Mercator).
- * @type {(ol.ProjectionLike|undefined)}
- * @api
- */
-olx.SphereMetricOptions.prototype.projection;
-
-
-/**
- * Sphere radius.  By default, the radius of the earth is used (Clarke 1866
- * Authalic Sphere).
- * @type {(number|undefined)}
- * @api
- */
-olx.SphereMetricOptions.prototype.radius;
-
-
-/**
- * Options for tile constructors.
- * @typedef {{transition: (number|undefined)}}
- */
-olx.TileOptions;
-
-
-/**
- * A duration for tile opacity transitions.  By default, tiles will render with
- * an opacity transition that lasts 250 ms.  To change the duration, pass a
- * number in milliseconds.  A duration of 0 disables the opacity transition.
- * @type {number|undefined}
- * @api
- */
-olx.TileOptions.prototype.transition;
-
-
 /**
  * Object literal with options for the {@link ol.Map#forEachFeatureAtPixel} and
  * {@link ol.Map#hasFeatureAtPixel} methods.
@@ -522,8 +477,7 @@ olx.AtPixelOptions.prototype.hitTolerance;
  *     insertFirst: (boolean|undefined),
  *     autoPan: (boolean|undefined),
  *     autoPanAnimation: (olx.OverlayPanOptions|undefined),
- *     autoPanMargin: (number|undefined),
- *     className: (string|undefined)}}
+ *     autoPanMargin: (number|undefined)}}
  */
 olx.OverlayOptions;
 
@@ -625,12 +579,6 @@ olx.OverlayOptions.prototype.autoPanAnimation;
  */
 olx.OverlayOptions.prototype.autoPanMargin;
 
-/**
- * CSS class name. Default is `ol-overlay-container ol-selectable`.
- * @type {string|undefined}
- * @api
- */
-olx.OverlayOptions.prototype.className;
 
 /**
  * @typedef {{
@@ -1182,7 +1130,7 @@ olx.control;
  *     label: (string|Node|undefined),
  *     collapseLabel: (string|Node|undefined),
  *     render: (function(ol.MapEvent)|undefined),
- *     target: (Element|string|undefined)}}
+ *     target: (Element|undefined)}}
  */
 olx.control.AttributionOptions;
 
@@ -1196,9 +1144,8 @@ olx.control.AttributionOptions.prototype.className;
 
 
 /**
- * Specify a target if you want the control to be rendered outside of the map's
- * viewport.
- * @type {Element|string|undefined}
+ * Target.
+ * @type {Element|undefined}
  * @api
  */
 olx.control.AttributionOptions.prototype.target;
@@ -1358,7 +1305,7 @@ olx.control.DefaultsOptions.prototype.zoomOptions;
  *     labelActive: (string|Node|undefined),
  *     tipLabel: (string|undefined),
  *     keys: (boolean|undefined),
- *     target: (Element|string|undefined),
+ *     target: (Element|undefined),
  *     source: (Element|string|undefined)}}
  */
 olx.control.FullScreenOptions;
@@ -1408,9 +1355,8 @@ olx.control.FullScreenOptions.prototype.keys;
 
 
 /**
- * Specify a target if you want the control to be rendered outside of the map's
- * viewport.
- * @type {Element|string|undefined}
+ * Target.
+ * @type {Element|undefined}
  * @api
  */
 olx.control.FullScreenOptions.prototype.target;
@@ -1427,7 +1373,7 @@ olx.control.FullScreenOptions.prototype.source;
  *     coordinateFormat: (ol.CoordinateFormatType|undefined),
  *     projection: ol.ProjectionLike,
  *     render: (function(ol.MapEvent)|undefined),
- *     target: (Element|string|undefined),
+ *     target: (Element|undefined),
  *     undefinedHTML: (string|undefined)}}
  */
 olx.control.MousePositionOptions;
@@ -1467,9 +1413,8 @@ olx.control.MousePositionOptions.prototype.render;
 
 
 /**
- * Specify a target if you want the control to be rendered outside of the map's
- * viewport.
- * @type {Element|string|undefined}
+ * Target.
+ * @type {Element|undefined}
  * @api
  */
 olx.control.MousePositionOptions.prototype.target;
@@ -1490,7 +1435,7 @@ olx.control.MousePositionOptions.prototype.undefinedHTML;
  *     label: (string|Node|undefined),
  *     layers: (Array.<ol.layer.Layer>|ol.Collection.<ol.layer.Layer>|undefined),
  *     render: (function(ol.MapEvent)|undefined),
- *     target: (Element|string|undefined),
+ *     target: (Element|undefined),
  *     tipLabel: (string|undefined),
  *     view: (ol.View|undefined)}}
  */
@@ -1553,7 +1498,7 @@ olx.control.OverviewMapOptions.prototype.render;
 /**
  * Specify a target if you want the control to be rendered outside of the map's
  * viewport.
- * @type {Element|string|undefined}
+ * @type {Element|undefined}
  * @api
  */
 olx.control.OverviewMapOptions.prototype.target;
@@ -1580,7 +1525,7 @@ olx.control.OverviewMapOptions.prototype.view;
  * @typedef {{className: (string|undefined),
  *     minWidth: (number|undefined),
  *     render: (function(ol.MapEvent)|undefined),
- *     target: (Element|string|undefined),
+ *     target: (Element|undefined),
  *     units: (ol.control.ScaleLineUnits|string|undefined)}}
  */
 olx.control.ScaleLineOptions;
@@ -1612,9 +1557,8 @@ olx.control.ScaleLineOptions.prototype.render;
 
 
 /**
- * Specify a target if you want the control to be rendered outside of the map's
- * viewport.
- * @type {Element|string|undefined}
+ * Target.
+ * @type {Element|undefined}
  * @api
  */
 olx.control.ScaleLineOptions.prototype.target;
@@ -1633,7 +1577,7 @@ olx.control.ScaleLineOptions.prototype.units;
  *     className: (string|undefined),
  *     label: (string|Element|undefined),
  *     tipLabel: (string|undefined),
- *     target: (Element|string|undefined),
+ *     target: (Element|undefined),
  *     render: (function(ol.MapEvent)|undefined),
  *     resetNorth: (function()|undefined),
  *     autoHide: (boolean|undefined)}}
@@ -1701,9 +1645,8 @@ olx.control.RotateOptions.prototype.resetNorth;
 
 
 /**
- * Specify a target if you want the control to be rendered outside of the map's
- * viewport.
- * @type {Element|string|undefined}
+ * Target.
+ * @type {Element|undefined}
  * @api
  */
 olx.control.RotateOptions.prototype.target;
@@ -1717,7 +1660,7 @@ olx.control.RotateOptions.prototype.target;
  *     zoomInTipLabel: (string|undefined),
  *     zoomOutTipLabel: (string|undefined),
  *     delta: (number|undefined),
- *     target: (Element|string|undefined)}}
+ *     target: (Element|undefined)}}
  */
 olx.control.ZoomOptions;
 
@@ -1781,9 +1724,8 @@ olx.control.ZoomOptions.prototype.delta;
 
 
 /**
- * Specify a target if you want the control to be rendered outside of the map's
- * viewport.
- * @type {Element|string|undefined}
+ * Target.
+ * @type {Element|undefined}
  * @api
  */
 olx.control.ZoomOptions.prototype.target;
@@ -1842,7 +1784,7 @@ olx.control.ZoomSliderOptions.prototype.render;
 
 /**
  * @typedef {{className: (string|undefined),
- *     target: (Element|string|undefined),
+ *     target: (Element|undefined),
  *     label: (string|Node|undefined),
  *     tipLabel: (string|undefined),
  *     extent: (ol.Extent|undefined)}}
@@ -1859,9 +1801,8 @@ olx.control.ZoomToExtentOptions.prototype.className;
 
 
 /**
- * Specify a target if you want the control to be rendered outside of the map's
- * viewport.
- * @type {Element|string|undefined}
+ * Target.
+ * @type {Element|undefined}
  * @api
  */
 olx.control.ZoomToExtentOptions.prototype.target;
@@ -1902,7 +1843,6 @@ olx.format;
 
 /**
  * @typedef {{dataProjection: ol.ProjectionLike,
- *     extent: (ol.Extent|undefined),
  *     featureProjection: ol.ProjectionLike,
  *     rightHanded: (boolean|undefined)}}
  */
@@ -1921,15 +1861,6 @@ olx.format.ReadOptions;
 olx.format.ReadOptions.prototype.dataProjection;
 
 
-/**
- * Tile extent of the tile being read. This is only used and required for
- * {@link ol.format.MVT}.
- * @type {ol.Extent}
- * @api
- */
-olx.format.ReadOptions.prototype.extent;
-
-
 /**
  * Projection of the feature geometries created by the format reader. If not
  * provided, features will be returned in the `dataProjection`.
@@ -2002,7 +1933,6 @@ olx.format.WriteOptions.prototype.decimals;
 /**
  * @typedef {{defaultDataProjection: ol.ProjectionLike,
  *     geometryName: (string|undefined),
- *     extractGeometryName: (boolean|undefined),
  *     featureProjection: ol.ProjectionLike}}
  */
 olx.format.GeoJSONOptions;
@@ -2033,18 +1963,6 @@ olx.format.GeoJSONOptions.prototype.featureProjection;
 olx.format.GeoJSONOptions.prototype.geometryName;
 
 
-/**
- * Certain GeoJSON providers include the geometry_name field in the feature
- * geoJSON. If set to `true` the geoJSON reader will look for that field to
- * set the geometry name. If both this field is set to `true` and a
- * `geometryName` is provided, the `geometryName` will take precedence.
- * Default is `false`.
- * @type {boolean|undefined}
- * @api
- */
-olx.format.GeoJSONOptions.prototype.extractGeometryName;
-
-
 /**
  * @typedef {{geometryName: (string|undefined)}}
  */
@@ -2792,7 +2710,6 @@ olx.interaction.DoubleClickZoomOptions.prototype.delta;
 
 /**
  * @typedef {{formatConstructors: (Array.<function(new: ol.format.Feature)>|undefined),
- *     source: (ol.source.Vector|undefined),
  *     projection: ol.ProjectionLike,
  *     target: (Element|undefined)}}
  */
@@ -2807,18 +2724,6 @@ olx.interaction.DragAndDropOptions;
 olx.interaction.DragAndDropOptions.prototype.formatConstructors;
 
 
-/**
- * Optional vector source where features will be added.  If a source is provided
- * all existing features will be removed and new features will be added when
- * they are dropped on the target.  If you want to add features to a vector
- * source without removing the existing features (append only), instead of
- * providing the source option listen for the "addfeatures" event.
- * @type {ol.source.Vector|undefined}
- * @api
- */
-olx.interaction.DragAndDropOptions.prototype.source;
-
-
 /**
  * Target projection. By default, the map's view's projection is used.
  * @type {ol.ProjectionLike}
@@ -3159,7 +3064,6 @@ olx.interaction.DrawOptions.prototype.wrapX;
 /**
  * @typedef {{extent: (ol.Extent|undefined),
  *     boxStyle: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
- *     pixelTolerance: (number|undefined),
  *     pointerStyle: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
  *     wrapX: (boolean|undefined)}}
  * @api
@@ -3181,14 +3085,6 @@ olx.interaction.ExtentOptions.prototype.extent;
  */
 olx.interaction.ExtentOptions.prototype.boxStyle;
 
-/**
- * Pixel tolerance for considering the pointer close enough to a segment or
- * vertex for editing. Default is `10`.
- * @type {number|undefined}
- * @api
- */
-olx.interaction.ExtentOptions.prototype.pixelTolerance;
-
 /**
  * Style for the cursor used to draw the extent.
  * Defaults to ol.style.Style.createDefaultEditing()[ol.geom.GeometryType.POINT]
@@ -3346,7 +3242,7 @@ olx.interaction.ModifyOptions.prototype.condition;
  * A function that takes an {@link ol.MapBrowserEvent} and returns a boolean
  * to indicate whether that event should be handled.
  * By default, {@link ol.events.condition.singleClick} with
- * {@link ol.events.condition.altKeyOnly} results in a vertex deletion.
+ * {@link ol.events.condition.noModifierKeys} results in a vertex deletion.
  * @type {ol.EventsConditionType|undefined}
  * @api
  */
@@ -4075,7 +3971,7 @@ olx.layer.HeatmapOptions.prototype.zIndex;
 
 /**
  * @typedef {{opacity: (number|undefined),
- *     map: (ol.PluggableMap|undefined),
+ *     map: (ol.Map|undefined),
  *     source: (ol.source.Image|undefined),
  *     visible: (boolean|undefined),
  *     extent: (ol.Extent|undefined),
@@ -4107,7 +4003,7 @@ olx.layer.ImageOptions.prototype.source;
  * layers collection, and the layer will be rendered on top. This is useful for
  * temporary layers. The standard way to add a layer to a map and have it
  * managed by the map is to use {@link ol.Map#addLayer}.
- * @type {ol.PluggableMap|undefined}
+ * @type {ol.Map|undefined}
  * @api
  */
 olx.layer.ImageOptions.prototype.map;
@@ -4159,7 +4055,7 @@ olx.layer.ImageOptions.prototype.zIndex;
  * @typedef {{opacity: (number|undefined),
  *     preload: (number|undefined),
  *     source: (ol.source.Tile|undefined),
- *     map: (ol.PluggableMap|undefined),
+ *     map: (ol.Map|undefined),
  *     visible: (boolean|undefined),
  *     extent: (ol.Extent|undefined),
  *     minResolution: (number|undefined),
@@ -4200,7 +4096,7 @@ olx.layer.TileOptions.prototype.source;
  * layers collection, and the layer will be rendered on top. This is useful for
  * temporary layers. The standard way to add a layer to a map and have it
  * managed by the map is to use {@link ol.Map#addLayer}.
- * @type {ol.PluggableMap|undefined}
+ * @type {ol.Map|undefined}
  * @api
  */
 olx.layer.TileOptions.prototype.map;
@@ -4263,8 +4159,7 @@ olx.layer.TileOptions.prototype.zIndex;
  *     opacity: (number|undefined),
  *     renderBuffer: (number|undefined),
  *     source: (ol.source.Vector|undefined),
- *     map: (ol.PluggableMap|undefined),
- *     declutter: (boolean|undefined),
+ *     map: (ol.Map|undefined),
  *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
  *     updateWhileAnimating: (boolean|undefined),
  *     updateWhileInteracting: (boolean|undefined),
@@ -4289,7 +4184,7 @@ olx.layer.VectorOptions.prototype.renderOrder;
  * layers collection, and the layer will be rendered on top. This is useful for
  * temporary layers. The standard way to add a layer to a map and have it
  * managed by the map is to use {@link ol.Map#addLayer}.
- * @type {ol.PluggableMap|undefined}
+ * @type {ol.Map|undefined}
  * @api
  */
 olx.layer.VectorOptions.prototype.map;
@@ -4347,16 +4242,6 @@ olx.layer.VectorOptions.prototype.renderBuffer;
 olx.layer.VectorOptions.prototype.source;
 
 
-/**
- * Declutter images and text. Decluttering is applied to all image and text
- * styles, and the priority is defined by the z-index of the style. Lower
- * z-index means higher priority. Default is `false`.
- * @type {boolean|undefined}
- * @api
- */
-olx.layer.VectorOptions.prototype.declutter;
-
-
 /**
  * Layer style. See {@link ol.style} for default style which will be used if
  * this is not defined.
@@ -4405,7 +4290,7 @@ olx.layer.VectorOptions.prototype.zIndex;
 
 /**
  * @typedef {{extent: (ol.Extent|undefined),
- *     map: (ol.PluggableMap|undefined),
+ *     map: (ol.Map|undefined),
  *     minResolution: (number|undefined),
  *     maxResolution: (number|undefined),
  *     opacity: (number|undefined),
@@ -4414,7 +4299,6 @@ olx.layer.VectorOptions.prototype.zIndex;
  *     renderMode: (ol.layer.VectorTileRenderType|string|undefined),
  *     renderOrder: (ol.RenderOrderFunction|undefined),
  *     source: (ol.source.VectorTile|undefined),
- *     declutter: (boolean|undefined),
  *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
  *     updateWhileAnimating: (boolean|undefined),
  *     updateWhileInteracting: (boolean|undefined),
@@ -4448,8 +4332,7 @@ olx.layer.VectorTileOptions.prototype.renderBuffer;
  *  * `'vector'`: Vector tiles are rendered as vectors. Most accurate rendering
  *    even during animations, but slower performance than the other options.
  *
- * When `declutter` is set to `true`, `'hybrid'` will be used instead of
- * `'image'`. The default is `'hybrid'`.
+ * The default is `'hybrid'`.
  * @type {ol.layer.VectorTileRenderType|string|undefined}
  * @api
  */
@@ -4469,7 +4352,7 @@ olx.layer.VectorTileOptions.prototype.renderOrder;
  * layers collection, and the layer will be rendered on top. This is useful for
  * temporary layers. The standard way to add a layer to a map and have it
  * managed by the map is to use {@link ol.Map#addLayer}.
- * @type {ol.PluggableMap|undefined}
+ * @type {ol.Map|undefined}
  * @api
  */
 olx.layer.VectorTileOptions.prototype.map;
@@ -4525,17 +4408,6 @@ olx.layer.VectorTileOptions.prototype.preload;
 olx.layer.VectorTileOptions.prototype.source;
 
 
-/**
- * Declutter images and text. Decluttering is applied to all image and text
- * styles, and the priority is defined by the z-index of the style. Lower
- * z-index means higher priority. When set to `true`, a `renderMode` of
- * `'image'` will be overridden with `'hybrid'`. Default is `false`.
- * @type {boolean|undefined}
- * @api
- */
-olx.layer.VectorTileOptions.prototype.declutter;
-
-
 /**
  * Layer style. See {@link ol.style} for default style which will be used if
  * this is not defined.
@@ -4675,8 +4547,7 @@ olx.source;
  *     maxZoom: (number|undefined),
  *     reprojectionErrorThreshold: (number|undefined),
  *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
- *     wrapX: (boolean|undefined),
- *     transition: (number|undefined)}}
+ *     wrapX: (boolean|undefined)}}
  */
 olx.source.BingMapsOptions;
 
@@ -4760,15 +4631,6 @@ olx.source.BingMapsOptions.prototype.tileLoadFunction;
 olx.source.BingMapsOptions.prototype.wrapX;
 
 
-/**
- * Duration of the opacity transition for rendering.  To disable the opacity
- * transition, pass `transition: 0`.
- * @type {number|undefined}
- * @api
- */
-olx.source.BingMapsOptions.prototype.transition;
-
-
 /**
  * @typedef {{attributions: (ol.AttributionLike|undefined),
  *     distance: (number|undefined),
@@ -4933,8 +4795,7 @@ olx.source.TileUTFGridOptions.prototype.url;
  *            tileUrlFunction: (ol.TileUrlFunctionType|undefined),
  *            url: (string|undefined),
  *            urls: (Array.<string>|undefined),
- *            wrapX: (boolean|undefined),
- *            transition: (number|undefined)}}
+ *            wrapX: (boolean|undefined)}}
  */
 olx.source.TileImageOptions;
 
@@ -5087,15 +4948,6 @@ olx.source.TileImageOptions.prototype.urls;
 olx.source.TileImageOptions.prototype.wrapX;
 
 
-/**
- * Duration of the opacity transition for rendering.  To disable the opacity
- * transition, pass `transition: 0`.
- * @type {number|undefined}
- * @api
- */
-olx.source.TileImageOptions.prototype.transition;
-
-
 /**
  * @typedef {{attributions: (ol.AttributionLike|undefined),
  *            cacheSize: (number|undefined),
@@ -5112,8 +4964,7 @@ olx.source.TileImageOptions.prototype.transition;
  *            tileUrlFunction: (ol.TileUrlFunctionType|undefined),
  *            url: (string|undefined),
  *            urls: (Array.<string>|undefined),
- *            wrapX: (boolean|undefined),
- *            transition: (number|undefined)}}
+ *            wrapX: (boolean|undefined)}}
  */
 olx.source.VectorTileOptions;
 
@@ -5203,11 +5054,10 @@ olx.source.VectorTileOptions.prototype.tileGrid;
  *   tile.setLoader(function() {
  *     var data = // ... fetch data
  *     var format = tile.getFormat();
- *     tile.setFeatures(format.readFeatures(data, {
- *       // uncomment the line below for ol.format.MVT only
- *       extent: tile.getExtent(),
- *       featureProjection: map.getView().getProjection()
- *     }));
+ *     tile.setFeatures(format.readFeatures(data));
+ *     tile.setProjection(format.readProjection(data));
+ *     // uncomment the line below for ol.format.MVT only
+ *     //tile.setExtent(format.getLastExtent());
  *   };
  * });
  * ```
@@ -5253,15 +5103,6 @@ olx.source.VectorTileOptions.prototype.urls;
 olx.source.VectorTileOptions.prototype.wrapX;
 
 
-/**
- * Duration of the opacity transition for rendering.  To disable the opacity
- * transition, pass `transition: 0`.
- * @type {number|undefined}
- * @api
- */
-olx.source.VectorTileOptions.prototype.transition;
-
-
 /**
  * @typedef {{url: (string|undefined),
  *     displayDpi: (number|undefined),
@@ -5548,7 +5389,7 @@ olx.source.OSMOptions.prototype.wrapX;
 
 
 /**
- * @typedef {{attributions: (ol.AttributionLike|undefined),
+ * @typedef {{attributions: (Array.<ol.Attribution>|undefined),
  *     crossOrigin: (null|string|undefined),
  *     hidpi: (boolean|undefined),
  *     logo: (string|olx.LogoOptions|undefined),
@@ -5564,7 +5405,7 @@ olx.source.ImageArcGISRestOptions;
 
 /**
  * Attributions.
- * @type {ol.AttributionLike|undefined}
+ * @type {Array.<ol.Attribution>|undefined}
  * @api
  */
 olx.source.ImageArcGISRestOptions.prototype.attributions;
@@ -6178,8 +6019,7 @@ olx.source.ImageStaticOptions.prototype.url;
  *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
  *     url: (string|undefined),
  *     urls: (Array.<string>|undefined),
- *     wrapX: (boolean|undefined),
- *     transition: (number|undefined)}}
+ *     wrapX: (boolean|undefined)}}
  */
 olx.source.TileArcGISRestOptions;
 
@@ -6293,15 +6133,6 @@ olx.source.TileArcGISRestOptions.prototype.url;
 olx.source.TileArcGISRestOptions.prototype.wrapX;
 
 
-/**
- * Duration of the opacity transition for rendering.  To disable the opacity
- * transition, pass `transition: 0`.
- * @type {number|undefined}
- * @api
- */
-olx.source.TileArcGISRestOptions.prototype.transition;
-
-
 /**
  * ArcGIS Rest service urls. Use this instead of `url` when the ArcGIS Service supports multiple
  * urls for export requests.
@@ -6320,8 +6151,7 @@ olx.source.TileArcGISRestOptions.prototype.urls;
  *     tileJSON: (TileJSON|undefined),
  *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
  *     url: (string|undefined),
- *     wrapX: (boolean|undefined),
- *     transition: (number|undefined)}}
+ *     wrapX: (boolean|undefined)}}
  */
 olx.source.TileJSONOptions;
 
@@ -6412,15 +6242,6 @@ olx.source.TileJSONOptions.prototype.url;
 olx.source.TileJSONOptions.prototype.wrapX;
 
 
-/**
- * Duration of the opacity transition for rendering.  To disable the opacity
- * transition, pass `transition: 0`.
- * @type {number|undefined}
- * @api
- */
-olx.source.TileJSONOptions.prototype.transition;
-
-
 /**
  * @typedef {{attributions: (ol.AttributionLike|undefined),
  *     cacheSize: (number|undefined),
@@ -6439,8 +6260,7 @@ olx.source.TileJSONOptions.prototype.transition;
  *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
  *     url: (string|undefined),
  *     urls: (Array.<string>|undefined),
- *     wrapX: (boolean|undefined),
- *     transition: (number|undefined)}}
+ *     wrapX: (boolean|undefined)}}
  */
 olx.source.TileWMSOptions;
 
@@ -6604,15 +6424,6 @@ olx.source.TileWMSOptions.prototype.urls;
 olx.source.TileWMSOptions.prototype.wrapX;
 
 
-/**
- * Duration of the opacity transition for rendering.  To disable the opacity
- * transition, pass `transition: 0`.
- * @type {number|undefined}
- * @api
- */
-olx.source.TileWMSOptions.prototype.transition;
-
-
 /**
  * @typedef {{attributions: (ol.AttributionLike|undefined),
  *     features: (Array.<ol.Feature>|ol.Collection.<ol.Feature>|undefined),
@@ -6768,8 +6579,7 @@ olx.source.VectorOptions.prototype.wrapX;
  *     tileClass: (function(new: ol.ImageTile, ol.TileCoord,
  *                          ol.TileState, string, ?string,
  *                          ol.TileLoadFunctionType)|undefined),
- *     wrapX: (boolean|undefined),
- *     transition: (number|undefined)}}
+ *     wrapX: (boolean|undefined)}}
  */
 olx.source.WMTSOptions;
 
@@ -6953,15 +6763,6 @@ olx.source.WMTSOptions.prototype.urls;
 olx.source.WMTSOptions.prototype.wrapX;
 
 
-/**
- * Duration of the opacity transition for rendering.  To disable the opacity
- * transition, pass `transition: 0`.
- * @type {number|undefined}
- * @api
- */
-olx.source.WMTSOptions.prototype.transition;
-
-
 /**
  * @typedef {{attributions: (ol.AttributionLike|undefined),
  *     cacheSize: (number|undefined),
@@ -6979,8 +6780,7 @@ olx.source.WMTSOptions.prototype.transition;
  *     tileUrlFunction: (ol.TileUrlFunctionType|undefined),
  *     url: (string|undefined),
  *     urls: (Array.<string>|undefined),
- *     wrapX: (boolean|undefined),
- *     transition: (number|undefined)}}
+ *     wrapX: (boolean|undefined)}}
  */
 olx.source.XYZOptions;
 
@@ -7136,16 +6936,6 @@ olx.source.XYZOptions.prototype.urls;
  */
 olx.source.XYZOptions.prototype.wrapX;
 
-
-/**
- * Duration of the opacity transition for rendering.  To disable the opacity
- * transition, pass `transition: 0`.
- * @type {number|undefined}
- * @api
- */
-olx.source.XYZOptions.prototype.transition;
-
-
 /**
  * @typedef {{attributions: (ol.AttributionLike|undefined),
  *     cacheSize: (number|undefined),
@@ -7270,10 +7060,7 @@ olx.source.CartoDBOptions.prototype.account;
  *     reprojectionErrorThreshold: (number|undefined),
  *     url: !string,
  *     tierSizeCalculation: (string|undefined),
- *     size: ol.Size,
- *     extent: (ol.Extent|undefined),
- *     transition: (number|undefined),
- *     tileSize: (number|undefined)}}
+ *     size: ol.Size}}
  */
 olx.source.ZoomifyOptions;
 
@@ -7337,9 +7124,6 @@ olx.source.ZoomifyOptions.prototype.reprojectionErrorThreshold;
  * `http://my.zoomify.info/IMAGE.TIF/`. A URL template must include
  * `{TileGroup}`, `{x}`, `{y}`, and `{z}` placeholders, e.g.
  * `http://my.zoomify.info/IMAGE.TIF/{TileGroup}/{z}-{x}-{y}.jpg`.
- * Internet Imaging Protocol (IIP) with JTL extension can be also used with
- * `{tileIndex}` and `{z}` placeholders, e.g.
- * `http://my.zoomify.info?FIF=IMAGE.TIF&JTL={z},{tileIndex}`.
  * A `{?-?}` template pattern, for example `subdomain{a-f}.domain.com`, may be
  * used instead of defining each one separately in the `urls` option.
  * @type {!string}
@@ -7364,35 +7148,6 @@ olx.source.ZoomifyOptions.prototype.tierSizeCalculation;
 olx.source.ZoomifyOptions.prototype.size;
 
 
-/**
- * Extent for the TileGrid that is created. Default sets the TileGrid in the
- * fourth quadrant, meaning extent is `[0, -height, width, 0]`. To change the
- * extent to the first quadrant (the default for OpenLayers 2) set the extent
- * as `[0, 0, width, height]`.
- * @type {ol.Extent|undefined}
- * @api
- */
-olx.source.ZoomifyOptions.prototype.extent;
-
-
-/**
- * Duration of the opacity transition for rendering.  To disable the opacity
- * transition, pass `transition: 0`.
- * @type {number|undefined}
- * @api
- */
-olx.source.ZoomifyOptions.prototype.transition;
-
-
-/**
- * Tile size. Same tile size is used for all zoom levels. Default value is
- * `OpenLayers.DEFAULT_TILE_SIZE`.
- * @type {number|undefined}
- * @api
- */
-olx.source.ZoomifyOptions.prototype.tileSize;
-
-
 /**
  * Namespace.
  * @type {Object}
@@ -7849,11 +7604,8 @@ olx.style.StrokeOptions.prototype.width;
 
 /**
  * @typedef {{font: (string|undefined),
- *     exceedLength: (boolean|undefined),
- *     maxAngle: (number|undefined),
  *     offsetX: (number|undefined),
  *     offsetY: (number|undefined),
- *     placement: (ol.style.TextPlacement|string|undefined),
  *     scale: (number|undefined),
  *     rotateWithView: (boolean|undefined),
  *     rotation: (number|undefined),
@@ -7866,16 +7618,6 @@ olx.style.StrokeOptions.prototype.width;
 olx.style.TextOptions;
 
 
-/**
- * For polygon labels or when `placement` is set to `'line'`, allow text to
- * exceed the width of the polygon at the the label position or the length of
- * the path that it follows. Default is `false`.
- * @type {boolean|undefined}
- * @api
- */
-olx.style.TextOptions.prototype.exceedLength;
-
-
 /**
  * Font style as CSS 'font' value, see:
  * {@link https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/font}.
@@ -7886,16 +7628,6 @@ olx.style.TextOptions.prototype.exceedLength;
 olx.style.TextOptions.prototype.font;
 
 
-/**
- * When `placement` is set to `'line'`, allow a maximum angle between adjacent
- * characters. The expected value is in radians, and the default is 45°
- * (`Math.PI / 4`).
- * @type {number|undefined}
- * @api
- */
-olx.style.TextOptions.prototype.maxAngle;
-
-
 /**
  * Horizontal text offset in pixels. A positive will shift the text right.
  * Default is `0`.
@@ -7914,14 +7646,6 @@ olx.style.TextOptions.prototype.offsetX;
 olx.style.TextOptions.prototype.offsetY;
 
 
-/**
- * Text placement.
- * @type {ol.style.TextPlacement|undefined}
- * @api
- */
-olx.style.TextOptions.prototype.placement;
-
-
 /**
  * Scale.
  * @type {number|undefined}
@@ -7956,9 +7680,7 @@ olx.style.TextOptions.prototype.text;
 
 /**
  * Text alignment. Possible values: 'left', 'right', 'center', 'end' or 'start'.
- * Default is 'center' for `placement: 'point'`. For `placement: 'line'`, the
- * default is to let the renderer choose a placement where `maxAngle` is not
- * exceeded.
+ * Default is 'start'.
  * @type {string|undefined}
  * @api
  */
@@ -7967,7 +7689,7 @@ olx.style.TextOptions.prototype.textAlign;
 
 /**
  * Text base line. Possible values: 'bottom', 'top', 'middle', 'alphabetic',
- * 'hanging', 'ideographic'. Default is 'middle'.
+ * 'hanging', 'ideographic'. Default is 'alphabetic'.
  * @type {string|undefined}
  * @api
  */
@@ -8412,6 +8134,7 @@ olx.view.FitOptions.prototype.callback;
 
 /**
  * @typedef {{animate: boolean,
+ *     attributions: Object.<string, ol.Attribution>,
  *     coordinateToPixelTransform: ol.Transform,
  *     extent: (null|ol.Extent),
  *     focus: ol.Coordinate,
@@ -8459,8 +8182,7 @@ olx.FrameState.prototype.viewState;
  * @typedef {{center: ol.Coordinate,
  *     projection: ol.proj.Projection,
  *     resolution: number,
- *     rotation: number,
- *     zoom: number}}
+ *     rotation: number}}
  */
 olx.ViewState;
 
@@ -8493,14 +8215,6 @@ olx.ViewState.prototype.resolution;
 olx.ViewState.prototype.rotation;
 
 
-/**
- * The current zoom level.
- * @type {number}
- * @api
- */
-olx.ViewState.prototype.zoom;
-
-
 /**
  * @typedef {{initialSize: (number|undefined),
  *     maxSize: (number|undefined),
@@ -8536,49 +8250,3 @@ olx.style.AtlasManagerOptions.prototype.maxSize;
  * @api
  */
 olx.style.AtlasManagerOptions.prototype.space;
-
-
-/**
- * @typedef {{handles: function(ol.renderer.Type):boolean,
- *     create: function(Element, ol.PluggableMap):ol.renderer.Map}}
- */
-olx.MapRendererPlugin;
-
-
-/**
- * Determine if this renderer handles the provided layer.
- * @type {function(ol.renderer.Type):boolean}
- * @api
- */
-olx.MapRendererPlugin.prototype.handles;
-
-
-/**
- * Create the map renderer.
- * @type {function(Element, ol.PluggableMap):ol.renderer.Map}
- * @api
- */
-olx.MapRendererPlugin.prototype.create;
-
-
-/**
- * @typedef {{handles: function(ol.renderer.Type, ol.layer.Layer):boolean,
- *     create: function(ol.renderer.Map, ol.layer.Layer):ol.renderer.Layer}}
- */
-olx.LayerRendererPlugin;
-
-
-/**
- * Determine if this renderer handles the provided layer.
- * @type {function(ol.renderer.Type, ol.layer.Layer):boolean}
- * @api
- */
-olx.LayerRendererPlugin.prototype.handles;
-
-
-/**
- * Create a layer renderer.
- * @type {function(ol.renderer.Map, ol.layer.Layer):ol.renderer.Layer}
- * @api
- */
-olx.LayerRendererPlugin.prototype.create;

externs/readme.md

@@ -53,7 +53,7 @@ For custom subclasses in applications, which can be created using `ol.inherits`,
 oli.control.Control = function() {};
 
 /**
- * @param {ol.PluggableMap} map Map.
+ * @param {ol.Map} map Map.
  * @return {undefined} Undefined.
  */
 oli.control.Control.prototype.setMap = function(map) {};
@@ -74,7 +74,7 @@ ol.control.Control = function(options) {
 
 /**
  * Application subclasses may override this.
- * @param {ol.PluggableMap} map Map.
+ * @param {ol.Map} map Map.
  * @api
  */
 ol.control.Control.prototype.setMap = function(map) {

externs/topojson.js

@@ -75,11 +75,6 @@ TopoJSONGeometry.prototype.type;
 TopoJSONGeometry.prototype.id;
 
 
-/**
- * @type {Object.<string, *>|undefined}
- */
-TopoJSONGeometry.prototype.properties;
-
 
 /**
  * @constructor

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openlayers",
-  "version": "4.5.0-beta.1",
+  "version": "4.3.0-beta.3",
   "description": "Build tools and sources for developing OpenLayers based mapping applications",
   "keywords": [
     "map",
@@ -12,17 +12,10 @@
     "install": "node tasks/install.js",
     "postinstall": "closure-util update",
     "start": "node tasks/serve.js",
-    "lint": "eslint tasks test src examples transforms",
+    "pretest": "eslint tasks test test_rendering src examples",
     "lint-package": "eslint --fix build/package",
-    "pretest": "npm run lint",
-    "test": "npm run karma -- --single-run",
-    "debug-server": "node tasks/serve-lib.js",
-    "karma": "node tasks/test.js start test/karma.config.js",
-    "transform-src": "jscodeshift --transform transforms/module.js src",
-    "changecase-src": "node tasks/filename-case-from-module.js",
-    "transform-examples": "jscodeshift --transform transforms/module.js examples",
-    "transform-test": "jscodeshift --transform transforms/module.js test",
-    "transform": "npm run changecase-src && npm run transform-src && npm run transform-examples && npm run transform-test && npm run lint -- --fix"
+    "test": "node tasks/test.js",
+    "debug-server": "node tasks/serve-lib.js"
   },
   "main": "dist/ol.js",
   "repository": {
@@ -38,60 +31,51 @@
     "css/ol.css"
   ],
   "dependencies": {
-    "async": "2.6.0",
-    "closure-util": "1.25.0",
-    "fs-extra": "4.0.2",
-    "jsdoc": "3.5.5",
+    "async": "2.5.0",
+    "closure-util": "1.22.0",
+    "fs-extra": "4.0.1",
+    "jsdoc": "3.5.4",
     "nomnom": "1.8.1",
-    "pbf": "3.1.0",
+    "pbf": "3.0.5",
     "pixelworks": "1.1.0",
     "rbush": "2.0.1",
-    "rollup": "^0.50.0",
-    "rollup-plugin-cleanup": "^2.0.0",
+    "rollup": "^0.45.0",
+    "rollup-plugin-cleanup": "^1.0.0",
     "rollup-plugin-commonjs": "^8.0.2",
     "rollup-plugin-node-resolve": "^3.0.0",
     "temp": "0.8.3",
+    "@mapbox/vector-tile": "1.3.0",
     "walk": "2.3.9"
   },
   "devDependencies": {
-    "clean-css-cli": "4.1.10",
-    "coveralls": "3.0.0",
+    "clean-css-cli": "4.1.6",
+    "coveralls": "2.13.1",
     "debounce": "^1.0.0",
-    "eslint": "4.10.0",
+    "eslint": "4.4.1",
     "eslint-config-openlayers": "7.0.0",
     "eslint-plugin-openlayers-internal": "^3.1.0",
     "expect.js": "0.3.1",
     "gaze": "^1.0.0",
     "glob": "7.1.1",
-    "handlebars": "4.0.11",
+    "handlebars": "4.0.10",
     "istanbul": "0.4.5",
     "jquery": "3.2.1",
     "jscodeshift": "^0.3.30",
-    "karma": "^1.7.0",
-    "karma-chrome-launcher": "^2.1.1",
-    "karma-coverage": "^1.1.1",
-    "karma-firefox-launcher": "^1.0.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sauce-launcher": "^1.1.0",
     "marked": "0.3.6",
     "metalsmith": "2.3.0",
     "metalsmith-layouts": "1.8.1",
-    "mocha": "4.0.1",
+    "mocha": "3.5.0",
     "mocha-phantomjs-core": "^2.1.0",
     "mustache": "2.3.0",
-    "phantomjs-prebuilt": "2.1.16",
-    "pixelmatch": "^4.0.2",
-    "proj4": "2.4.4",
+    "phantomjs-prebuilt": "2.1.14",
+    "proj4": "2.4.3",
+    "resemblejs": "2.2.4",
     "serve-files": "1.0.1",
-    "sinon": "4.1.2",
-    "slimerjs": "0.10.3",
-    "url-polyfill": "^1.0.7"
+    "sinon": "3.1.0",
+    "slimerjs": "0.10.3"
   },
   "eslintConfig": {
     "extends": "openlayers",
-    "parserOptions": {
-      "sourceType": "module"
-    },
     "globals": {
       "ArrayBuffer": false,
       "Float32Array": false,
@@ -149,6 +133,11 @@
     {
       "module": "pixelworks",
       "import": "Processor"
+    },
+    {
+      "module": "@mapbox/vector-tile",
+      "name": "vectortile",
+      "import": "VectorTile"
     }
   ]
 }

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "ol",
-  "version": "4.4.2",
+  "version": "4.2.0",
   "description": "OpenLayers as ES2015 modules",
   "main": "index.js",
   "module": "index.js",
   "license": "BSD-2-Clause",
   "dependencies": {
-    "pbf": "3.1.0",
+    "pbf": "3.0.5",
     "pixelworks": "1.1.0",
-    "rbush": "2.0.1"
+    "rbush": "2.0.1",
+    "@mapbox/vector-tile": "1.3.0"
   },
   "browserify": {
     "transform": [

src/ol/attribution.js

@@ -22,7 +22,6 @@ goog.require('ol.tilegrid');
  *     ..
  *
  * @constructor
- * @deprecated This class is deprecated and will removed in the next major release.
  * @param {olx.AttributionOptions} options Attribution options.
  * @struct
  * @api

src/ol/canvasmap.js

@@ -1,86 +0,0 @@
-goog.provide('ol.CanvasMap');
-
-goog.require('ol');
-goog.require('ol.PluggableMap');
-goog.require('ol.PluginType');
-goog.require('ol.control');
-goog.require('ol.interaction');
-goog.require('ol.obj');
-goog.require('ol.plugins');
-goog.require('ol.renderer.canvas.ImageLayer');
-goog.require('ol.renderer.canvas.Map');
-goog.require('ol.renderer.canvas.TileLayer');
-goog.require('ol.renderer.canvas.VectorLayer');
-goog.require('ol.renderer.canvas.VectorTileLayer');
-
-
-ol.plugins.register(ol.PluginType.MAP_RENDERER, ol.renderer.canvas.Map);
-ol.plugins.registerMultiple(ol.PluginType.LAYER_RENDERER, [
-  ol.renderer.canvas.ImageLayer,
-  ol.renderer.canvas.TileLayer,
-  ol.renderer.canvas.VectorLayer,
-  ol.renderer.canvas.VectorTileLayer
-]);
-
-
-/**
- * @classdesc
- * The map is the core component of OpenLayers. For a map to render, a view,
- * one or more layers, and a target container are needed:
- *
- *     var map = new ol.CanvasMap({
- *       view: new ol.View({
- *         center: [0, 0],
- *         zoom: 1
- *       }),
- *       layers: [
- *         new ol.layer.Tile({
- *           source: new ol.source.OSM()
- *         })
- *       ],
- *       target: 'map'
- *     });
- *
- * The above snippet creates a map using a {@link ol.layer.Tile} to display
- * {@link ol.source.OSM} OSM data and render it to a DOM element with the
- * id `map`.
- *
- * The constructor places a viewport container (with CSS class name
- * `ol-viewport`) in the target element (see `getViewport()`), and then two
- * further elements within the viewport: one with CSS class name
- * `ol-overlaycontainer-stopevent` for controls and some overlays, and one with
- * CSS class name `ol-overlaycontainer` for other overlays (see the `stopEvent`
- * option of {@link ol.Overlay} for the difference). The map itself is placed in
- * a further element within the viewport.
- *
- * Layers are stored as a `ol.Collection` in layerGroups. A top-level group is
- * provided by the library. This is what is accessed by `getLayerGroup` and
- * `setLayerGroup`. Layers entered in the options are added to this group, and
- * `addLayer` and `removeLayer` change the layer collection in the group.
- * `getLayers` is a convenience function for `getLayerGroup().getLayers()`.
- * Note that `ol.layer.Group` is a subclass of `ol.layer.Base`, so layers
- * entered in the options or added with `addLayer` can be groups, which can
- * contain further groups, and so on.
- *
- * @constructor
- * @extends {ol.PluggableMap}
- * @param {olx.MapOptions} options Map options.
- * @fires ol.MapBrowserEvent
- * @fires ol.MapEvent
- * @fires ol.render.Event#postcompose
- * @fires ol.render.Event#precompose
- * @api
- */
-ol.CanvasMap = function(options) {
-  options = ol.obj.assign({}, options);
-  delete options.renderer;
-  if (!options.controls) {
-    options.controls = ol.control.defaults();
-  }
-  if (!options.interactions) {
-    options.interactions = ol.interaction.defaults();
-  }
-
-  ol.PluggableMap.call(this, options);
-};
-ol.inherits(ol.CanvasMap, ol.PluggableMap);

src/ol/control/attribution.js

@@ -3,13 +3,11 @@
 goog.provide('ol.control.Attribution');
 
 goog.require('ol');
-goog.require('ol.array');
+goog.require('ol.dom');
 goog.require('ol.control.Control');
 goog.require('ol.css');
-goog.require('ol.dom');
 goog.require('ol.events');
 goog.require('ol.events.EventType');
-goog.require('ol.layer.Layer');
 goog.require('ol.obj');
 
 
@@ -118,19 +116,24 @@ ol.control.Attribution = function(opt_options) {
     target: options.target
   });
 
-  /**
-   * A list of currently rendered resolutions.
-   * @type {Array.<string>}
-   * @private
-   */
-  this.renderedAttributions_ = [];
-
   /**
    * @private
    * @type {boolean}
    */
   this.renderedVisible_ = true;
 
+  /**
+   * @private
+   * @type {Object.<string, Element>}
+   */
+  this.attributionElements_ = {};
+
+  /**
+   * @private
+   * @type {Object.<string, boolean>}
+   */
+  this.attributionElementRenderedVisible_ = {};
+
   /**
    * @private
    * @type {Object.<string, Element>}
@@ -142,62 +145,59 @@ ol.inherits(ol.control.Attribution, ol.control.Control);
 
 
 /**
- * Get a list of visible attributions.
- * @param {olx.FrameState} frameState Frame state.
- * @return {Array.<string>} Attributions.
- * @private
+ * @param {?olx.FrameState} frameState Frame state.
+ * @return {Array.<Object.<string, ol.Attribution>>} Attributions.
  */
-ol.control.Attribution.prototype.getSourceAttributions_ = function(frameState) {
-  /**
-   * Used to determine if an attribution already exists.
-   * @type {Object.<string, boolean>}
-   */
-  var lookup = {};
-
-  /**
-   * A list of visible attributions.
-   * @type {Array.<string>}
-   */
-  var visibleAttributions = [];
-
+ol.control.Attribution.prototype.getSourceAttributions = function(frameState) {
+  var i, ii, j, jj, tileRanges, source, sourceAttribution,
+      sourceAttributionKey, sourceAttributions, sourceKey;
+  var intersectsTileRange;
   var layerStatesArray = frameState.layerStatesArray;
-  var resolution = frameState.viewState.resolution;
-  for (var i = 0, ii = layerStatesArray.length; i < ii; ++i) {
-    var layerState = layerStatesArray[i];
-    if (!ol.layer.Layer.visibleAtResolution(layerState, resolution)) {
-      continue;
-    }
-
-    var source = layerState.layer.getSource();
+  /** @type {Object.<string, ol.Attribution>} */
+  var attributions = ol.obj.assign({}, frameState.attributions);
+  /** @type {Object.<string, ol.Attribution>} */
+  var hiddenAttributions = {};
+  var uniqueAttributions = {};
+  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;
     }
-
-    var attributionGetter = source.getAttributions2();
-    if (!attributionGetter) {
+    sourceKey = ol.getUid(source).toString();
+    sourceAttributions = source.getAttributions();
+    if (!sourceAttributions) {
       continue;
     }
-
-    var attributions = attributionGetter(frameState);
-    if (!attributions) {
-      continue;
-    }
-
-    if (Array.isArray(attributions)) {
-      for (var j = 0, jj = attributions.length; j < jj; ++j) {
-        if (!(attributions[j] in lookup)) {
-          visibleAttributions.push(attributions[j]);
-          lookup[attributions[j]] = true;
-        }
+    for (j = 0, jj = sourceAttributions.length; j < jj; j++) {
+      sourceAttribution = sourceAttributions[j];
+      sourceAttributionKey = ol.getUid(sourceAttribution).toString();
+      if (sourceAttributionKey in attributions) {
+        continue;
       }
-    } else {
-      if (!(attributions in lookup)) {
-        visibleAttributions.push(attributions);
-        lookup[attributions] = true;
+      tileRanges = frameState.usedTiles[sourceKey];
+      if (tileRanges) {
+        var tileGrid = /** @type {ol.source.Tile} */ (source).getTileGridForProjection(projection);
+        intersectsTileRange = sourceAttribution.intersectsAnyTileRange(
+            tileRanges, tileGrid, projection);
+      } else {
+        intersectsTileRange = false;
+      }
+      if (intersectsTileRange) {
+        if (sourceAttributionKey in hiddenAttributions) {
+          delete hiddenAttributions[sourceAttributionKey];
+        }
+        var html = sourceAttribution.getHTML();
+        if (!(html in uniqueAttributions)) {
+          uniqueAttributions[html] = true;
+          attributions[sourceAttributionKey] = sourceAttribution;
+        }
+      } else {
+        hiddenAttributions[sourceAttributionKey] = sourceAttribution;
       }
     }
   }
-  return visibleAttributions;
+  return [attributions, hiddenAttributions];
 };
 
 
@@ -217,6 +217,7 @@ ol.control.Attribution.render = function(mapEvent) {
  * @param {?olx.FrameState} frameState Frame state.
  */
 ol.control.Attribution.prototype.updateElement_ = function(frameState) {
+
   if (!frameState) {
     if (this.renderedVisible_) {
       this.element.style.display = 'none';
@@ -225,38 +226,65 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
     return;
   }
 
-  var attributions = this.getSourceAttributions_(frameState);
-  if (ol.array.equals(attributions, this.renderedAttributions_)) {
-    return;
+  var attributions = this.getSourceAttributions(frameState);
+  /** @type {Object.<string, ol.Attribution>} */
+  var visibleAttributions = attributions[0];
+  /** @type {Object.<string, ol.Attribution>} */
+  var hiddenAttributions = attributions[1];
+
+  var attributionElement, attributionKey;
+  for (attributionKey in this.attributionElements_) {
+    if (attributionKey in visibleAttributions) {
+      if (!this.attributionElementRenderedVisible_[attributionKey]) {
+        this.attributionElements_[attributionKey].style.display = '';
+        this.attributionElementRenderedVisible_[attributionKey] = true;
+      }
+      delete visibleAttributions[attributionKey];
+    } else if (attributionKey in hiddenAttributions) {
+      if (this.attributionElementRenderedVisible_[attributionKey]) {
+        this.attributionElements_[attributionKey].style.display = 'none';
+        delete this.attributionElementRenderedVisible_[attributionKey];
+      }
+      delete hiddenAttributions[attributionKey];
+    } else {
+      ol.dom.removeNode(this.attributionElements_[attributionKey]);
+      delete this.attributionElements_[attributionKey];
+      delete this.attributionElementRenderedVisible_[attributionKey];
+    }
+  }
+  for (attributionKey in visibleAttributions) {
+    attributionElement = document.createElement('LI');
+    attributionElement.innerHTML =
+        visibleAttributions[attributionKey].getHTML();
+    this.ulElement_.appendChild(attributionElement);
+    this.attributionElements_[attributionKey] = attributionElement;
+    this.attributionElementRenderedVisible_[attributionKey] = true;
+  }
+  for (attributionKey in hiddenAttributions) {
+    attributionElement = document.createElement('LI');
+    attributionElement.innerHTML =
+        hiddenAttributions[attributionKey].getHTML();
+    attributionElement.style.display = 'none';
+    this.ulElement_.appendChild(attributionElement);
+    this.attributionElements_[attributionKey] = attributionElement;
   }
 
-  // remove everything but the logo
-  while (this.ulElement_.lastChild !== this.logoLi_) {
-    this.ulElement_.removeChild(this.ulElement_.lastChild);
+  var renderVisible =
+      !ol.obj.isEmpty(this.attributionElementRenderedVisible_) ||
+      !ol.obj.isEmpty(frameState.logos);
+  if (this.renderedVisible_ != renderVisible) {
+    this.element.style.display = renderVisible ? '' : 'none';
+    this.renderedVisible_ = renderVisible;
   }
-
-  // append the attributions
-  for (var i = 0, ii = attributions.length; i < ii; ++i) {
-    var element = document.createElement('LI');
-    element.innerHTML = attributions[i];
-    this.ulElement_.appendChild(element);
-  }
-
-
-  if (attributions.length === 0 && this.renderedAttributions_.length > 0) {
+  if (renderVisible &&
+      ol.obj.isEmpty(this.attributionElementRenderedVisible_)) {
     this.element.classList.add('ol-logo-only');
-  } else if (this.renderedAttributions_.length === 0 && attributions.length > 0) {
+  } else {
     this.element.classList.remove('ol-logo-only');
   }
 
-  var visible = attributions.length > 0 || !ol.obj.isEmpty(frameState.logos);
-  if (this.renderedVisible_ != visible) {
-    this.element.style.display = visible ? '' : 'none';
-    this.renderedVisible_ = visible;
-  }
-
-  this.renderedAttributions_ = attributions;
   this.insertLogos_(frameState);
+
 };
 
 

src/ol/control/control.js

@@ -54,7 +54,7 @@ ol.control.Control = function(options) {
 
   /**
    * @private
-   * @type {ol.PluggableMap}
+   * @type {ol.Map}
    */
   this.map_ = null;
 
@@ -88,7 +88,7 @@ ol.control.Control.prototype.disposeInternal = function() {
 
 /**
  * Get the map associated with this control.
- * @return {ol.PluggableMap} Map.
+ * @return {ol.Map} Map.
  * @api
  */
 ol.control.Control.prototype.getMap = function() {
@@ -100,7 +100,7 @@ ol.control.Control.prototype.getMap = function() {
  * Remove the control from its current map and attach it to the new map.
  * Subclasses may set up event handlers to get notified about changes to
  * the map here.
- * @param {ol.PluggableMap} map Map.
+ * @param {ol.Map} map Map.
  * @override
  * @api
  */

src/ol/control/overviewmap.js

@@ -2,7 +2,7 @@ goog.provide('ol.control.OverviewMap');
 
 goog.require('ol');
 goog.require('ol.Collection');
-goog.require('ol.PluggableMap');
+goog.require('ol.Map');
 goog.require('ol.MapEventType');
 goog.require('ol.MapProperty');
 goog.require('ol.Object');
@@ -97,10 +97,10 @@ ol.control.OverviewMap = function(opt_options) {
   this.ovmapDiv_.className = 'ol-overviewmap-map';
 
   /**
-   * @type {ol.PluggableMap}
+   * @type {ol.Map}
    * @private
    */
-  this.ovmap_ = new ol.PluggableMap({
+  this.ovmap_ = new ol.Map({
     controls: new ol.Collection(),
     interactions: new ol.Collection(),
     view: options.view
@@ -551,7 +551,7 @@ ol.control.OverviewMap.prototype.getCollapsed = function() {
 
 /**
  * Return the overview map.
- * @return {ol.PluggableMap} Overview map.
+ * @return {ol.Map} Overview map.
  * @api
  */
 ol.control.OverviewMap.prototype.getOverviewMap = function() {

src/ol/css.js

@@ -43,30 +43,3 @@ ol.css.CLASS_UNSUPPORTED = 'ol-unsupported';
  * @type {string}
  */
 ol.css.CLASS_CONTROL = 'ol-control';
-
-
-/**
- * Get the list of font families from a font spec.  Note that this doesn't work
- * for font families that have commas in them.
- * @param {string} The CSS font property.
- * @return {Object.<string>} The font families (or null if the input spec is invalid).
- */
-ol.css.getFontFamilies = (function() {
-  var style;
-  var cache = {};
-  return function(font) {
-    if (!style) {
-      style = document.createElement('div').style;
-    }
-    if (!(font in cache)) {
-      style.font = font;
-      var family = style.fontFamily;
-      style.font = '';
-      if (!family) {
-        return null;
-      }
-      cache[font] = family.split(/,\s?/);
-    }
-    return cache[font];
-  };
-})();

src/ol/deviceorientation.js

@@ -57,8 +57,6 @@ goog.require('ol.math');
  *
  * @see {@link http://www.w3.org/TR/orientation-event/}
  *
- * @deprecated This class is deprecated and will removed in the next major release.
- *
  * @constructor
  * @extends {ol.Object}
  * @param {olx.DeviceOrientationOptions=} opt_options Options.

src/ol/events/eventtype.js

@@ -12,7 +12,6 @@ ol.events.EventType = {
    */
   CHANGE: 'change',
 
-  CLEAR: 'clear',
   CLICK: 'click',
   DBLCLICK: 'dblclick',
   DRAGENTER: 'dragenter',

src/ol/format/filter.js

@@ -2,7 +2,6 @@ goog.provide('ol.format.filter');
 
 goog.require('ol.format.filter.And');
 goog.require('ol.format.filter.Bbox');
-goog.require('ol.format.filter.Contains');
 goog.require('ol.format.filter.During');
 goog.require('ol.format.filter.EqualTo');
 goog.require('ol.format.filter.GreaterThan');
@@ -72,21 +71,6 @@ ol.format.filter.bbox = function(geometryName, extent, opt_srsName) {
   return new ol.format.filter.Bbox(geometryName, extent, opt_srsName);
 };
 
-/**
- * Create a `<Contains>` operator to test whether a geometry-valued property
- * contains a given geometry.
- *
- * @param {!string} geometryName Geometry name to use.
- * @param {!ol.geom.Geometry} geometry Geometry.
- * @param {string=} opt_srsName SRS name. No srsName attribute will be
- *    set on geometries when this is not provided.
- * @returns {!ol.format.filter.Contains} `<Contains>` operator.
- * @api
- */
-ol.format.filter.contains = function(geometryName, geometry, opt_srsName) {
-  return new ol.format.filter.Contains(geometryName, geometry, opt_srsName);
-};
-
 /**
  * Create a `<Intersects>` operator to test whether a geometry-valued property
  * intersects a given geometry.

src/ol/format/filter/and.js

@@ -7,10 +7,7 @@ goog.require('ol.format.filter.LogicalNary');
  * @classdesc
  * Represents a logical `<And>` operator between two or more filter conditions.
  *
- * deprecated: This class will no longer be exported starting from the next major version.
- *
  * @constructor
- * @abstract
  * @param {...ol.format.filter.Filter} conditions Conditions.
  * @extends {ol.format.filter.LogicalNary}
  * @api

src/ol/format/filter/comparison.js

@@ -9,10 +9,7 @@ goog.require('ol.format.filter.Filter');
  * Abstract class; normally only used for creating subclasses and not instantiated in apps.
  * Base class for WFS GetFeature property comparison filters.
  *
- * deprecated: This class will no longer be exported starting from the next major version.
- *
  * @constructor
- * @abstract
  * @param {!string} tagName The XML tag name for this filter.
  * @param {!string} propertyName Name of the context property to compare.
  * @extends {ol.format.filter.Filter}

src/ol/format/filter/comparisonbinary.js

@@ -9,10 +9,7 @@ goog.require('ol.format.filter.Comparison');
  * Abstract class; normally only used for creating subclasses and not instantiated in apps.
  * Base class for WFS GetFeature property binary comparison filters.
  *
- * deprecated: This class will no longer be exported starting from the next major version.
- *
  * @constructor
- * @abstract
  * @param {!string} tagName The XML tag name for this filter.
  * @param {!string} propertyName Name of the context property to compare.
  * @param {!(string|number)} expression The value to compare.

src/ol/format/filter/contains.js

@@ -1,25 +0,0 @@
-goog.provide('ol.format.filter.Contains');
-
-goog.require('ol');
-goog.require('ol.format.filter.Spatial');
-
-
-/**
- * @classdesc
- * Represents a `<Contains>` operator to test whether a geometry-valued property
- * contains a given geometry.
- *
- * @constructor
- * @param {!string} geometryName Geometry name to use.
- * @param {!ol.geom.Geometry} geometry Geometry.
- * @param {string=} opt_srsName SRS name. No srsName attribute will be
- *    set on geometries when this is not provided.
- * @extends {ol.format.filter.Spatial}
- * @api
- */
-ol.format.filter.Contains = function(geometryName, geometry, opt_srsName) {
-
-  ol.format.filter.Spatial.call(this, 'Contains', geometryName, geometry, opt_srsName);
-
-};
-ol.inherits(ol.format.filter.Contains, ol.format.filter.Spatial);

src/ol/format/filter/filter.js

@@ -6,10 +6,7 @@ goog.provide('ol.format.filter.Filter');
  * Abstract class; normally only used for creating subclasses and not instantiated in apps.
  * Base class for WFS GetFeature filters.
  *
- * deprecated: This class will no longer be exported starting from the next major version.
- *
  * @constructor
- * @abstract
  * @param {!string} tagName The XML tag name for this filter.
  * @struct
  * @api

src/ol/format/filter/logicalnary.js

@@ -11,7 +11,6 @@ goog.require('ol.format.filter.Filter');
  * Base class for WFS GetFeature n-ary logical filters.
  *
  * @constructor
- * @abstract
  * @param {!string} tagName The XML tag name for this filter.
  * @param {...ol.format.filter.Filter} conditions Conditions.
  * @extends {ol.format.filter.Filter}

src/ol/format/filter/spatial.js

@@ -6,14 +6,10 @@ goog.require('ol.format.filter.Filter');
 
 /**
  * @classdesc
- * Abstract class; normally only used for creating subclasses and not instantiated in apps.
  * Represents a spatial operator to test whether a geometry-valued property
  * relates to a given geometry.
  *
- * deprecated: This class will no longer be exported starting from the next major version.
- *
  * @constructor
- * @abstract
  * @param {!string} tagName The XML tag name for this filter.
  * @param {!string} geometryName Geometry name to use.
  * @param {!ol.geom.Geometry} geometry Geometry.

src/ol/format/geojson.js

@@ -53,13 +53,6 @@ ol.format.GeoJSON = function(opt_options) {
    */
   this.geometryName_ = options.geometryName;
 
-  /**
-   * Look for the geometry name in the feature GeoJSON
-   * @type {boolean|undefined}
-   * @private
-   */
-  this.extractGeometryName_ = options.extractGeometryName;
-
 };
 ol.inherits(ol.format.GeoJSON, ol.format.JSONFeature);
 
@@ -384,8 +377,6 @@ ol.format.GeoJSON.prototype.readFeatureFromObject = function(
   var feature = new ol.Feature();
   if (this.geometryName_) {
     feature.setGeometryName(this.geometryName_);
-  } else if (this.extractGeometryName_ && geoJSONFeature.geometry_name !== undefined) {
-    feature.setGeometryName(geoJSONFeature.geometry_name);
   }
   feature.setGeometry(geometry);
   if (geoJSONFeature.id !== undefined) {
@@ -466,6 +457,12 @@ ol.format.GeoJSON.prototype.readProjectionFromObject = function(object) {
   if (crs) {
     if (crs.type == 'name') {
       projection = ol.proj.get(crs.properties.name);
+    } else if (crs.type == 'EPSG') {
+      // 'EPSG' is not part of the GeoJSON specification, but is generated by
+      // GeoServer.
+      // TODO: remove this when http://jira.codehaus.org/browse/GEOS-5996
+      // is fixed and widely deployed.
+      projection = ol.proj.get('EPSG:' + crs.properties.code);
     } else {
       ol.asserts.assert(false, 36); // Unknown SRS type
     }

src/ol/format/gml3.js

@@ -67,13 +67,6 @@ ol.format.GML3 = function(opt_options) {
   this.schemaLocation = options.schemaLocation ?
     options.schemaLocation : ol.format.GML3.schemaLocation_;
 
-  /**
-   * @private
-   * @type {boolean}
-   */
-  this.hasZ = options.hasZ !== undefined ?
-    options.hasZ : false;
-
 };
 ol.inherits(ol.format.GML3, ol.format.GMLBase);
 
@@ -352,7 +345,7 @@ ol.format.GML3.prototype.readFlatPosList_ = function(node, objectStack) {
   var s = ol.xml.getAllTextContent(node, false).replace(/^\s*|\s*$/g, '');
   var context = objectStack[0];
   var containerSrs = context['srsName'];
-  var contextDimension = context['srsDimension'];
+  var containerDimension = node.parentNode.getAttribute('srsDimension');
   var axisOrientation = 'enu';
   if (containerSrs) {
     var proj = ol.proj.get(containerSrs);
@@ -367,11 +360,8 @@ ol.format.GML3.prototype.readFlatPosList_ = function(node, objectStack) {
   } else if (node.getAttribute('dimension')) {
     dim = ol.format.XSD.readNonNegativeIntegerString(
         node.getAttribute('dimension'));
-  } else if (node.parentNode.getAttribute('srsDimension')) {
-    dim = ol.format.XSD.readNonNegativeIntegerString(
-        node.parentNode.getAttribute('srsDimension'));
-  } else if (contextDimension) {
-    dim = ol.format.XSD.readNonNegativeIntegerString(contextDimension);
+  } else if (containerDimension) {
+    dim = ol.format.XSD.readNonNegativeIntegerString(containerDimension);
   }
   var x, y, z;
   var flatCoordinates = [];
@@ -576,8 +566,6 @@ ol.format.GML3.prototype.SEGMENTS_PARSERS_ = {
 ol.format.GML3.prototype.writePos_ = function(node, value, objectStack) {
   var context = objectStack[objectStack.length - 1];
   var hasZ = context['hasZ'];
-  var srsDimension = hasZ ? 3 : 2;
-  node.setAttribute('srsDimension', srsDimension);
   var srsName = context['srsName'];
   var axisOrientation = 'enu';
   if (srsName) {
@@ -634,8 +622,6 @@ ol.format.GML3.prototype.getCoords_ = function(point, opt_srsName, opt_hasZ) {
 ol.format.GML3.prototype.writePosList_ = function(node, value, objectStack) {
   var context = objectStack[objectStack.length - 1];
   var hasZ = context['hasZ'];
-  var srsDimension = hasZ ? 3 : 2;
-  node.setAttribute('srsDimension', srsDimension);
   var srsName = context['srsName'];
   // only 2d for simple features profile
   var points = value.getCoordinates();

src/ol/format/gmlbase.js

@@ -198,7 +198,6 @@ ol.format.GMLBase.prototype.readFeaturesInternal = function(node, objectStack) {
 ol.format.GMLBase.prototype.readGeometryElement = function(node, objectStack) {
   var context = /** @type {Object} */ (objectStack[0]);
   context['srsName'] = node.firstElementChild.getAttribute('srsName');
-  context['srsDimension'] = node.firstElementChild.getAttribute('srsDimension');
   /** @type {ol.geom.Geometry} */
   var geometry = ol.xml.pushParseAndPop(null,
       this.GEOMETRY_PARSERS_, node, objectStack, this);