All coordinates and extents need to be provided in view projection (default: EPSG:3857). To transform, use [ol/proj#transform()](module-ol_proj.html#.transform) and [ol/proj#transformExtent()](module-ol_proj.html#.transformExtent).
[ol/proj](module-ol_proj.html) |
-Changes to all [ol/Object](module-ol_Object-BaseObject.html)s can be observed by calling the [object.on('propertychange')](module-ol_Object-BaseObject.html#on) method. Listeners receive an [ol/Object~ObjectEvent](module-ol_Object-ObjectEvent.html) with information on the changed property and old value.
+ | Changes to all [ol/Object](module-ol_Object-BaseObject.html)s can be observed by calling the [object.on('propertychange')](module-ol_Object-BaseObject.html#on) method. Listeners receive an [ol/Object.ObjectEvent](module-ol_Object-ObjectEvent.html) with information on the changed property and old value.
|
[ol/Geolocation](module-ol_Geolocation.html)
[ol/Overlay](module-ol_Overlay-Overlay.html)
|
diff --git a/config/jsdoc/api/plugins/api.js b/config/jsdoc/api/plugins/api.js
index b283ab35b4..248e7c0d52 100644
--- a/config/jsdoc/api/plugins/api.js
+++ b/config/jsdoc/api/plugins/api.js
@@ -102,6 +102,8 @@ exports.handlers = {
modules[doclet.longname.split(/[~\.]/).shift()] = true;
if (!(doclet.longname in classes)) {
classes[doclet.longname] = doclet;
+ } else if ('augments' in doclet) {
+ classes[doclet.longname].augments = doclet.augments;
}
}
if (doclet.name === doclet.longname && !doclet.memberof) {
diff --git a/config/jsdoc/api/plugins/convert-types.js b/config/jsdoc/api/plugins/convert-types.js
deleted file mode 100644
index effc1a4b3b..0000000000
--- a/config/jsdoc/api/plugins/convert-types.js
+++ /dev/null
@@ -1,139 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-
-const importRegEx = /(typeof )?import\("([^"]*)"\)\.([^ \.\|\}><,\)=\n]*)([ \.\|\}><,\)=\n])/g;
-const typedefRegEx = /@typedef \{[^\}]*\} ([^ \r?\n?]*)/;
-
-const defaultExports = {};
-const fileNodes = {};
-
-function getDefaultExportName(moduleId, parser) {
- if (!defaultExports[moduleId]) {
- if (!fileNodes[moduleId]) {
- const classDeclarations = {};
- const absolutePath = path.join(process.cwd(), 'src', moduleId + '.js');
- const file = fs.readFileSync(absolutePath, 'UTF-8');
- const node = fileNodes[moduleId] = parser.astBuilder.build(file, absolutePath);
- if (node.program && node.program.body) {
- const nodes = node.program.body;
- for (let i = 0, ii = nodes.length; i < ii; ++i) {
- const node = nodes[i];
- if (node.type === 'ClassDeclaration') {
- classDeclarations[node.id.name] = node;
- } else if (node.type === 'ExportDefaultDeclaration') {
- const classDeclaration = classDeclarations[node.declaration.name];
- if (classDeclaration) {
- defaultExports[moduleId] = classDeclaration.id.name;
- }
- }
- }
- }
- }
- }
- if (!defaultExports[moduleId]) {
- defaultExports[moduleId] = '';
- }
- return defaultExports[moduleId];
-}
-
-exports.astNodeVisitor = {
-
- visitNode: function(node, e, parser, currentSourceName) {
- if (node.type === 'File') {
- const modulePath = path.relative(path.join(process.cwd(), 'src'), currentSourceName).replace(/\.js$/, '');
- fileNodes[modulePath] = node;
- const identifiers = {};
- if (node.program && node.program.body) {
- const nodes = node.program.body;
- for (let i = 0, ii = nodes.length; i < ii; ++i) {
- let node = nodes[i];
- if (node.type === 'ExportNamedDeclaration' && node.declaration) {
- node = node.declaration;
- }
- if (node.type === 'ImportDeclaration') {
- node.specifiers.forEach(specifier => {
- let defaultImport = false;
- switch (specifier.type) {
- case 'ImportDefaultSpecifier':
- defaultImport = true;
- // fallthrough
- case 'ImportSpecifier':
- identifiers[specifier.local.name] = {
- defaultImport,
- value: node.source.value
- };
- break;
- default:
- }
- });
- } else if (node.type === 'ClassDeclaration') {
- if (node.id && node.id.name) {
- identifiers[node.id.name] = {
- value: path.basename(currentSourceName)
- };
- }
-
- // Add class inheritance information because JSDoc does not honor
- // the ES6 class's `extends` keyword
- if (node.superClass && node.leadingComments) {
- const leadingComment = node.leadingComments[node.leadingComments.length - 1];
- const lines = leadingComment.value.split(/\r?\n/);
- lines.push(lines[lines.length - 1]);
- const identifier = identifiers[node.superClass.name];
- if (identifier) {
- const absolutePath = path.resolve(path.dirname(currentSourceName), identifier.value);
- const moduleId = path.relative(path.join(process.cwd(), 'src'), absolutePath).replace(/\.js$/, '');
- const exportName = identifier.defaultImport ? getDefaultExportName(moduleId, parser) : node.superClass.name;
- lines[lines.length - 2] = ' * @extends ' + `module:${moduleId}${exportName ? '~' + exportName : ''}`;
- } else {
- lines[lines.length - 2] = ' * @extends ' + node.superClass.name;
- }
- leadingComment.value = lines.join('\n');
- }
-
- }
- }
- }
- if (node.comments) {
- node.comments.forEach(comment => {
- //TODO Handle typeof, to indicate that a constructor instead of an
- // instance is needed.
- comment.value = comment.value.replace(/typeof /g, '');
-
- // Convert `import("path/to/module").export` to
- // `module:path/to/module~Name`
- let importMatch;
- while ((importMatch = importRegEx.exec(comment.value))) {
- importRegEx.lastIndex = 0;
- const rel = path.resolve(path.dirname(currentSourceName), importMatch[2]);
- const importModule = path.relative(path.join(process.cwd(), 'src'), rel).replace(/\.js$/, '');
- const exportName = importMatch[3] === 'default' ? getDefaultExportName(importModule, parser) : importMatch[3];
- const replacement = `module:${importModule}${exportName ? '~' + exportName : ''}`;
- comment.value = comment.value.replace(importMatch[0], replacement + importMatch[4]);
- }
-
- // Treat `@typedef`s like named exports
- const typedefMatch = comment.value.replace(/\r?\n?\s*\*\s/g, ' ').match(typedefRegEx);
- if (typedefMatch) {
- identifiers[typedefMatch[1]] = {
- value: path.basename(currentSourceName)
- };
- }
-
- // Replace local types with the full `module:` path
- Object.keys(identifiers).forEach(key => {
- const regex = new RegExp(`(@fires |[\{<\|,] ?)${key}`, 'g');
- if (regex.test(comment.value)) {
- const identifier = identifiers[key];
- const absolutePath = path.resolve(path.dirname(currentSourceName), identifier.value);
- const moduleId = path.relative(path.join(process.cwd(), 'src'), absolutePath).replace(/\.js$/, '');
- const exportName = identifier.defaultImport ? getDefaultExportName(moduleId, parser) : key;
- comment.value = comment.value.replace(regex, '$1' + `module:${moduleId}${exportName ? '~' + exportName : ''}`);
- }
- });
- });
- }
- }
- }
-
-};
diff --git a/config/jsdoc/api/plugins/normalize-longnames.js b/config/jsdoc/api/plugins/normalize-longnames.js
deleted file mode 100644
index 34bda84717..0000000000
--- a/config/jsdoc/api/plugins/normalize-longnames.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @filedesc
- * Normalize module path to make no distinction between static and member at
- * the module level.
- */
-
-exports.handlers = {
-
- /**
- * Adds default export to module path types without name
- * @param {Object} e Event object.
- */
- newDoclet: function(e) {
- const doclet = e.doclet;
- const module = doclet.longname.split('#').shift();
- if (module.indexOf('module:') == 0 && module.indexOf('.') !== -1) {
- doclet.longname = doclet.longname.replace(module, module.replace('.', '~'));
- }
- }
-
-};
diff --git a/config/jsdoc/api/plugins/observable.js b/config/jsdoc/api/plugins/observable.js
index 744be13123..f001ebe5cb 100644
--- a/config/jsdoc/api/plugins/observable.js
+++ b/config/jsdoc/api/plugins/observable.js
@@ -47,7 +47,7 @@ exports.handlers = {
if (!cls.fires) {
cls.fires = [];
}
- event = 'module:ol/Object~ObjectEvent#event:change:' + name;
+ event = 'module:ol/Object.ObjectEvent#event:change:' + name;
if (cls.fires.indexOf(event) == -1) {
cls.fires.push(event);
}
diff --git a/config/jsdoc/api/template/tmpl/method.tmpl b/config/jsdoc/api/template/tmpl/method.tmpl
index 35b5de1324..8db940d7ed 100644
--- a/config/jsdoc/api/template/tmpl/method.tmpl
+++ b/config/jsdoc/api/template/tmpl/method.tmpl
@@ -77,7 +77,7 @@ var self = this;
()
-
+
-
diff --git a/config/jsdoc/api/template/tmpl/observables.tmpl b/config/jsdoc/api/template/tmpl/observables.tmpl
index 2bd88204b1..0edca6272a 100644
--- a/config/jsdoc/api/template/tmpl/observables.tmpl
+++ b/config/jsdoc/api/template/tmpl/observables.tmpl
@@ -8,7 +8,7 @@
Name |
Type |
Settable |
- ol/Object~ObjectEvent type |
+ ol/Object.ObjectEvent type |
Description |
|---|
diff --git a/config/jsdoc/info/conf.json b/config/jsdoc/info/conf.json
index b40d1d7c43..be9422ef95 100644
--- a/config/jsdoc/info/conf.json
+++ b/config/jsdoc/info/conf.json
@@ -10,8 +10,12 @@
"includePattern": "\\.js$"
},
"plugins": [
+ "jsdoc-plugin-typescript",
"config/jsdoc/info/api-plugin",
"config/jsdoc/info/define-plugin",
"config/jsdoc/info/virtual-plugin"
- ]
+ ],
+ "typescript": {
+ "moduleRoot": "src"
+ }
}
diff --git a/config/rollup.js b/config/rollup.js
deleted file mode 100644
index 4d19d05ffd..0000000000
--- a/config/rollup.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Rollup configuration for the full build
-
-import noderesolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
-import {uglify} from 'rollup-plugin-uglify';
-import buble from 'rollup-plugin-buble';
-import sourcemaps from 'rollup-plugin-sourcemaps';
-
-export default {
- input: 'build/index.js',
- output: [
- {file: 'build/ol.js', format: 'iife', sourcemap: true}
- ],
- plugins: [
- noderesolve(),
- commonjs(),
- buble(),
- uglify(),
- sourcemaps()
- ]
-};
diff --git a/config/webpack-config-legacy-build.js b/config/webpack-config-legacy-build.js
new file mode 100644
index 0000000000..ca374a0e61
--- /dev/null
+++ b/config/webpack-config-legacy-build.js
@@ -0,0 +1,13 @@
+const path = require('path');
+module.exports = {
+ entry: './build/index.js',
+ devtool: 'source-map',
+ mode: 'production',
+ output: {
+ path: path.resolve('./build/legacy'),
+ filename: 'ol.js',
+ library: 'ol',
+ libraryTarget: 'umd',
+ libraryExport: 'default'
+ }
+};
diff --git a/package.json b/package.json
index b4e0f0a834..bb4b24c311 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"build-examples": "webpack --config examples/webpack/config.js --mode production",
"build-package": "npm run transpile && npm run copy-css && node tasks/prepare-package && cp README.md build/ol",
"build-index": "npm run build-package && node tasks/generate-index",
- "build-legacy": "rm -rf build && npm run build-index && rollup --config config/rollup.js && cleancss --source-map src/ol/ol.css -o build/ol.css",
+ "build-legacy": "rm -rf build && npm run build-index && webpack --config config/webpack-config-legacy-build.js && cleancss --source-map src/ol/ol.css -o build/legacy/ol.css",
"copy-css": "cp src/ol/ol.css build/ol/ol.css",
"transpile": "rm -rf build/ol && mkdir -p build && buble --input src/ol --output build/ol --no modules --sourcemap",
"typecheck": "tsc --pretty",
@@ -60,6 +60,7 @@
"istanbul": "0.4.5",
"jquery": "3.3.1",
"jsdoc": "3.5.5",
+ "jsdoc-plugin-typescript": "^1.0.2",
"karma": "^3.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-coverage": "^1.1.1",
@@ -74,11 +75,6 @@
"pixelmatch": "^4.0.2",
"proj4": "2.5.0",
"rollup": "0.66.6",
- "rollup-plugin-buble": "0.19.4",
- "rollup-plugin-commonjs": "9.2.0",
- "rollup-plugin-node-resolve": "3.4.0",
- "rollup-plugin-sourcemaps": "0.4.2",
- "rollup-plugin-uglify": "6.0.0",
"sinon": "^6.0.0",
"typescript": "^3.1.0-dev.20180905",
"uglifyjs-webpack-plugin": "^2.0.1",
diff --git a/src/ol/CollectionEventType.js b/src/ol/CollectionEventType.js
index 0676fa4e2e..a54821b67f 100644
--- a/src/ol/CollectionEventType.js
+++ b/src/ol/CollectionEventType.js
@@ -8,13 +8,13 @@
export default {
/**
* Triggered when an item is added to the collection.
- * @event module:ol/Collection~CollectionEvent#add
+ * @event module:ol/Collection.CollectionEvent#add
* @api
*/
ADD: 'add',
/**
* Triggered when an item is removed from the collection.
- * @event module:ol/Collection~CollectionEvent#remove
+ * @event module:ol/Collection.CollectionEvent#remove
* @api
*/
REMOVE: 'remove'
diff --git a/src/ol/ObjectEventType.js b/src/ol/ObjectEventType.js
index 6bbdd2c8af..1cfd272211 100644
--- a/src/ol/ObjectEventType.js
+++ b/src/ol/ObjectEventType.js
@@ -8,7 +8,7 @@
export default {
/**
* Triggered when a property is changed.
- * @event module:ol/Object~ObjectEvent#propertychange
+ * @event module:ol/Object.ObjectEvent#propertychange
* @api
*/
PROPERTYCHANGE: 'propertychange'
diff --git a/src/ol/source/TileEventType.js b/src/ol/source/TileEventType.js
index 378bc0433b..f8a0c2ba3c 100644
--- a/src/ol/source/TileEventType.js
+++ b/src/ol/source/TileEventType.js
@@ -9,7 +9,7 @@ export default {
/**
* Triggered when a tile starts loading.
- * @event module:ol/source/Tile~TileSourceEvent#tileloadstart
+ * @event module:ol/source/Tile.TileSourceEvent#tileloadstart
* @api
*/
TILELOADSTART: 'tileloadstart',
@@ -17,14 +17,14 @@ export default {
/**
* Triggered when a tile finishes loading, either when its data is loaded,
* or when loading was aborted because the tile is no longer needed.
- * @event module:ol/source/Tile~TileSourceEvent#tileloadend
+ * @event module:ol/source/Tile.TileSourceEvent#tileloadend
* @api
*/
TILELOADEND: 'tileloadend',
/**
* Triggered if tile loading results in an error.
- * @event module:ol/source/Tile~TileSourceEvent#tileloaderror
+ * @event module:ol/source/Tile.TileSourceEvent#tileloaderror
* @api
*/
TILELOADERROR: 'tileloaderror'
diff --git a/src/ol/source/Vector.js b/src/ol/source/Vector.js
index f0ea2d23ce..8b616ace92 100644
--- a/src/ol/source/Vector.js
+++ b/src/ol/source/Vector.js
@@ -154,7 +154,7 @@ export class VectorSourceEvent extends Event {
* by this source are suitable for editing. See {@link module:ol/source/VectorTile~VectorTile} for
* vector data that is optimized for rendering.
*
- * @fires ol/source/Vector~VectorSourceEvent
+ * @fires ol/source/Vector.VectorSourceEvent
* @api
*/
class VectorSource extends Source {
@@ -469,7 +469,7 @@ class VectorSource extends Source {
/**
* Remove all features from the source.
- * @param {boolean=} opt_fast Skip dispatching of {@link module:ol/source/Vector~VectorSourceEvent#removefeature} events.
+ * @param {boolean=} opt_fast Skip dispatching of {@link module:ol/source/Vector.VectorSourceEvent#removefeature} events.
* @api
*/
clear(opt_fast) {
diff --git a/src/ol/source/VectorEventType.js b/src/ol/source/VectorEventType.js
index 85cc1256b8..61f977b2ad 100644
--- a/src/ol/source/VectorEventType.js
+++ b/src/ol/source/VectorEventType.js
@@ -8,21 +8,21 @@
export default {
/**
* Triggered when a feature is added to the source.
- * @event ol/source/Vector~VectorSourceEvent#addfeature
+ * @event ol/source/Vector.VectorSourceEvent#addfeature
* @api
*/
ADDFEATURE: 'addfeature',
/**
* Triggered when a feature is updated.
- * @event ol/source/Vector~VectorSourceEvent#changefeature
+ * @event ol/source/Vector.VectorSourceEvent#changefeature
* @api
*/
CHANGEFEATURE: 'changefeature',
/**
* Triggered when the clear method is called on the source.
- * @event ol/source/Vector~VectorSourceEvent#clear
+ * @event ol/source/Vector.VectorSourceEvent#clear
* @api
*/
CLEAR: 'clear',
@@ -30,7 +30,7 @@ export default {
/**
* Triggered when a feature is removed from the source.
* See {@link module:ol/source/Vector#clear source.clear()} for exceptions.
- * @event ol/source/Vector~VectorSourceEvent#removefeature
+ * @event ol/source/Vector.VectorSourceEvent#removefeature
* @api
*/
REMOVEFEATURE: 'removefeature'
diff --git a/tasks/generate-index.js b/tasks/generate-index.js
index 4c91f6f111..8d5dce47df 100644
--- a/tasks/generate-index.js
+++ b/tasks/generate-index.js
@@ -13,44 +13,41 @@ async function getSymbols() {
}
/**
- * Generate a list of imports.
- * @param {Array