ol 7.0.0-dev.1659218281631 → 7.0.0-dev.1659255011672

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -345,7 +345,6 @@ function isFullScreenSupported(doc) {
345
345
  const body = doc.body;
346
346
  return !!(
347
347
  body['webkitRequestFullscreen'] ||
348
- (body['msRequestFullscreen'] && doc['msFullscreenEnabled']) ||
349
348
  (body.requestFullscreen && doc.fullscreenEnabled)
350
349
  );
351
350
  }
@@ -355,11 +354,7 @@ function isFullScreenSupported(doc) {
355
354
  * @return {boolean} Element is currently in fullscreen.
356
355
  */
357
356
  function isFullScreen(doc) {
358
- return !!(
359
- doc['webkitIsFullScreen'] ||
360
- doc['msFullscreenElement'] ||
361
- doc.fullscreenElement
362
- );
357
+ return !!(doc['webkitIsFullScreen'] || doc.fullscreenElement);
363
358
  }
364
359
 
365
360
  /**
@@ -369,8 +364,6 @@ function isFullScreen(doc) {
369
364
  function requestFullScreen(element) {
370
365
  if (element.requestFullscreen) {
371
366
  element.requestFullscreen();
372
- } else if (element['msRequestFullscreen']) {
373
- element['msRequestFullscreen']();
374
367
  } else if (element['webkitRequestFullscreen']) {
375
368
  element['webkitRequestFullscreen']();
376
369
  }
@@ -395,8 +388,6 @@ function requestFullScreenWithKeys(element) {
395
388
  function exitFullScreen(doc) {
396
389
  if (doc.exitFullscreen) {
397
390
  doc.exitFullscreen();
398
- } else if (doc['msExitFullscreen']) {
399
- doc['msExitFullscreen']();
400
391
  } else if (doc['webkitExitFullscreen']) {
401
392
  doc['webkitExitFullscreen']();
402
393
  }
@@ -29,17 +29,12 @@ export type Options = {
29
29
  target?: string | HTMLElement | undefined;
30
30
  /**
31
31
  * Markup to show when the mouse position is not
32
- * available (e.g. when the pointer leaves the map viewport). By default, a non-breaking space
33
- * is rendered when the mouse leaves the viewport. To render something else, provide a string
34
- * to be used as the text content (e.g. 'no position' or '' for an empty string). Set the placeholder
35
- * to `false` to retain the last position when the mouse leaves the viewport. In a future release, this
36
- * will be the default behavior.
32
+ * available (e.g. when the pointer leaves the map viewport). By default, a non-breaking space is rendered
33
+ * initially and the last position is retained when the mouse leaves the viewport.
34
+ * When a string is provided (e.g. `'no position'` or `''` for an empty string) it is used as a
35
+ * placeholder.
37
36
  */
38
- placeholder?: string | boolean | undefined;
39
- /**
40
- * This option is deprecated. Use the `placeholder` option instead.
41
- */
42
- undefinedHTML?: string | undefined;
37
+ placeholder?: string | undefined;
43
38
  };
44
39
  /***
45
40
  * @template Return
@@ -59,13 +54,11 @@ export type Options = {
59
54
  * callback.
60
55
  * @property {HTMLElement|string} [target] Specify a target if you want the
61
56
  * control to be rendered outside of the map's viewport.
62
- * @property {string|boolean} [placeholder] Markup to show when the mouse position is not
63
- * available (e.g. when the pointer leaves the map viewport). By default, a non-breaking space
64
- * is rendered when the mouse leaves the viewport. To render something else, provide a string
65
- * to be used as the text content (e.g. 'no position' or '' for an empty string). Set the placeholder
66
- * to `false` to retain the last position when the mouse leaves the viewport. In a future release, this
67
- * will be the default behavior.
68
- * @property {string} [undefinedHTML=' '] This option is deprecated. Use the `placeholder` option instead.
57
+ * @property {string} [placeholder] Markup to show when the mouse position is not
58
+ * available (e.g. when the pointer leaves the map viewport). By default, a non-breaking space is rendered
59
+ * initially and the last position is retained when the mouse leaves the viewport.
60
+ * When a string is provided (e.g. `'no position'` or `''` for an empty string) it is used as a
61
+ * placeholder.
69
62
  */
70
63
  /**
71
64
  * @classdesc
@@ -98,14 +91,14 @@ declare class MousePosition extends Control {
98
91
  un: MousePositionOnSignature<void>;
99
92
  /**
100
93
  * @private
101
- * @type {string}
94
+ * @type {boolean}
102
95
  */
103
- private placeholder_;
96
+ private renderOnMouseOut_;
104
97
  /**
105
98
  * @private
106
- * @type {boolean}
99
+ * @type {string}
107
100
  */
108
- private renderOnMouseOut_;
101
+ private placeholder_;
109
102
  /**
110
103
  * @private
111
104
  * @type {string}
@@ -1 +1 @@
1
- {"version":3,"file":"MousePosition.d.ts","sourceRoot":"","sources":["MousePosition.js"],"names":[],"mappings":";;;;+CA0Ba,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,oBAAoB,EAAE,KAAK,GAC1E,yBAA+B,GAAC,mBAAmB,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GAC7F,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GACrH,yBAA+B,GAAC,mBAAmB,EAAE,MAAM,CAAC;;;;;;;;;;;;;iBAO/C,OAAO,YAAY,EAAE,cAAc;;;;;;qBAC1B,OAAO,gBAAgB,EAAE,OAAO,KAAE,IAAI;;;;;;;;;;;;;;;;;;;;AAd7D;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;;GAWG;AACH;IACE;;OAEG;IACH,+CA2FC;IA9EC;;OAEG;IACH,IAFU,yBAAyB,OAAO,WAAW,EAAE,SAAS,CAAC,CAE1D;IAEP;;OAEG;IACH,MAFU,yBAAyB,OAAO,WAAW,EAAE,SAAS,CAAC,CAExD;IAET;;OAEG;IACH,IAFU,yBAAyB,IAAI,CAAC,CAEjC;IAoCP;;;OAGG;IACH,qBAA+B;IAE/B;;;OAGG;IACH,0BAAyC;IAEzC;;;OAGG;IACH,sBAAsC;IAEtC;;;OAGG;IACH,uBAA0B;IAE1B;;;OAGG;IACH,mBAAsB;IAGxB;;OAEG;IACH,iCAEC;IAED;;;;;;;OAOG;IACH,uBALY,OAAO,kBAAkB,EAAE,gBAAgB,GAAC,SAAS,CAShE;IAED;;;;;;OAMG;IACH,iBALY,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAS5D;IAED;;;OAGG;IACH,iCAHW,UAAU,QAMpB;IAED;;;OAGG;IACH,gCAHW,KAAK,QAKf;IA0BD;;;;;;OAMG;IACH,4BALW,OAAO,kBAAkB,EAAE,gBAAgB,QAOrD;IAED;;;;;;OAMG;IACH,0BALW,OAAO,YAAY,EAAE,cAAc,QAO7C;IAED;;;OAGG;IACH,oBAqCC;CAmBF"}
1
+ {"version":3,"file":"MousePosition.d.ts","sourceRoot":"","sources":["MousePosition.js"],"names":[],"mappings":";;;;+CA0Ba,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,oBAAoB,EAAE,KAAK,GAC1E,yBAA+B,GAAC,mBAAmB,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GAC7F,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GACrH,yBAA+B,GAAC,mBAAmB,EAAE,MAAM,CAAC;;;;;;;;;;;;;iBAO/C,OAAO,YAAY,EAAE,cAAc;;;;;;qBAC1B,OAAO,gBAAgB,EAAE,OAAO,KAAE,IAAI;;;;;;;;;;;;;;;AAd7D;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;GAeG;AAEH;;;;;;;;;;;GAWG;AACH;IACE;;OAEG;IACH,+CAkEC;IArDC;;OAEG;IACH,IAFU,yBAAyB,OAAO,WAAW,EAAE,SAAS,CAAC,CAE1D;IAEP;;OAEG;IACH,MAFU,yBAAyB,OAAO,WAAW,EAAE,SAAS,CAAC,CAExD;IAET;;OAEG;IACH,IAFU,yBAAyB,IAAI,CAAC,CAEjC;IAWP;;;OAGG;IACH,0BAA0D;IAE1D;;;OAGG;IACH,qBAA2E;IAE3E;;;OAGG;IACH,sBAAsC;IAEtC;;;OAGG;IACH,uBAA0B;IAE1B;;;OAGG;IACH,mBAAsB;IAGxB;;OAEG;IACH,iCAEC;IAED;;;;;;;OAOG;IACH,uBALY,OAAO,kBAAkB,EAAE,gBAAgB,GAAC,SAAS,CAShE;IAED;;;;;;OAMG;IACH,iBALY,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAS5D;IAED;;;OAGG;IACH,iCAHW,UAAU,QAMpB;IAED;;;OAGG;IACH,gCAHW,KAAK,QAKf;IA0BD;;;;;;OAMG;IACH,4BALW,OAAO,kBAAkB,EAAE,gBAAgB,QAOrD;IAED;;;;;;OAMG;IACH,0BALW,OAAO,YAAY,EAAE,cAAc,QAO7C;IAED;;;OAGG;IACH,oBAqCC;CAmBF"}
@@ -41,13 +41,11 @@ const COORDINATE_FORMAT = 'coordinateFormat';
41
41
  * callback.
42
42
  * @property {HTMLElement|string} [target] Specify a target if you want the
43
43
  * control to be rendered outside of the map's viewport.
44
- * @property {string|boolean} [placeholder] Markup to show when the mouse position is not
45
- * available (e.g. when the pointer leaves the map viewport). By default, a non-breaking space
46
- * is rendered when the mouse leaves the viewport. To render something else, provide a string
47
- * to be used as the text content (e.g. 'no position' or '' for an empty string). Set the placeholder
48
- * to `false` to retain the last position when the mouse leaves the viewport. In a future release, this
49
- * will be the default behavior.
50
- * @property {string} [undefinedHTML='&#160;'] This option is deprecated. Use the `placeholder` option instead.
44
+ * @property {string} [placeholder] Markup to show when the mouse position is not
45
+ * available (e.g. when the pointer leaves the map viewport). By default, a non-breaking space is rendered
46
+ * initially and the last position is retained when the mouse leaves the viewport.
47
+ * When a string is provided (e.g. `'no position'` or `''` for an empty string) it is used as a
48
+ * placeholder.
51
49
  */
52
50
 
53
51
  /**
@@ -104,41 +102,16 @@ class MousePosition extends Control {
104
102
  }
105
103
 
106
104
  /**
107
- * Change this to `false` when removing the deprecated `undefinedHTML` option.
105
+ * @private
108
106
  * @type {boolean}
109
107
  */
110
- let renderOnMouseOut = true;
111
-
112
- /**
113
- * @type {string}
114
- */
115
- let placeholder = '&#160;';
116
-
117
- if ('undefinedHTML' in options) {
118
- // deprecated behavior
119
- if (options.undefinedHTML !== undefined) {
120
- placeholder = options.undefinedHTML;
121
- }
122
- renderOnMouseOut = !!placeholder;
123
- } else if ('placeholder' in options) {
124
- if (options.placeholder === false) {
125
- renderOnMouseOut = false;
126
- } else {
127
- placeholder = String(options.placeholder);
128
- }
129
- }
108
+ this.renderOnMouseOut_ = options.placeholder !== undefined;
130
109
 
131
110
  /**
132
111
  * @private
133
112
  * @type {string}
134
113
  */
135
- this.placeholder_ = placeholder;
136
-
137
- /**
138
- * @private
139
- * @type {boolean}
140
- */
141
- this.renderOnMouseOut_ = renderOnMouseOut;
114
+ this.placeholder_ = this.renderOnMouseOut_ ? options.placeholder : '&#160;';
142
115
 
143
116
  /**
144
117
  * @private
package/ol.css CHANGED
@@ -78,7 +78,6 @@
78
78
  -webkit-touch-callout: none;
79
79
  -webkit-user-select: none;
80
80
  -moz-user-select: none;
81
- -ms-user-select: none;
82
81
  user-select: none;
83
82
  -webkit-tap-highlight-color: rgba(0,0,0,0);
84
83
  }
@@ -89,7 +88,6 @@
89
88
  -webkit-touch-callout: default;
90
89
  -webkit-user-select: text;
91
90
  -moz-user-select: text;
92
- -ms-user-select: text;
93
91
  user-select: text;
94
92
  }
95
93
  .ol-grabbing {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ol",
3
- "version": "7.0.0-dev.1659218281631",
3
+ "version": "7.0.0-dev.1659255011672",
4
4
  "description": "OpenLayers mapping library",
5
5
  "keywords": [
6
6
  "map",
@@ -1 +1 @@
1
- {"version":3,"file":"ImageLayer.d.ts","sourceRoot":"","sources":["ImageLayer.js"],"names":[],"mappings":";AAyBA;;;;GAIG;AACH;IACE;;OAEG;IACH,qEAQC;IALC;;;OAGG;IACH,kBAFW,OAAO,oBAAoB,EAAE,OAAO,QAE7B;IAGpB;;OAEG;IACH,YAFY,iBAAiB,GAAC,gBAAgB,GAAC,gBAAgB,CAI9D;IA2DD;;;OAGG;IACH,eAHW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,CAyC5B;CAwHF"}
1
+ {"version":3,"file":"ImageLayer.d.ts","sourceRoot":"","sources":["ImageLayer.js"],"names":[],"mappings":";AAwBA;;;;GAIG;AACH;IACE;;OAEG;IACH,qEAQC;IALC;;;OAGG;IACH,kBAFW,OAAO,oBAAoB,EAAE,OAAO,QAE7B;IAGpB;;OAEG;IACH,YAFY,iBAAiB,GAAC,gBAAgB,GAAC,gBAAgB,CAI9D;IA2DD;;;OAGG;IACH,eAHW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,CAyC5B;CAwHF"}
@@ -5,7 +5,6 @@ import CanvasLayerRenderer from './Layer.js';
5
5
  import ImageState from '../../ImageState.js';
6
6
  import ViewHint from '../../ViewHint.js';
7
7
  import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js';
8
- import {IMAGE_SMOOTHING_DISABLED, IMAGE_SMOOTHING_ENABLED} from './common.js';
9
8
  import {
10
9
  apply as applyTransform,
11
10
  compose as composeTransform,
@@ -238,7 +237,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
238
237
  const dh = img.height * transform[3];
239
238
 
240
239
  if (!this.getLayer().getSource().getInterpolate()) {
241
- Object.assign(context, IMAGE_SMOOTHING_DISABLED);
240
+ context.imageSmoothingEnabled = false;
242
241
  }
243
242
 
244
243
  this.preRender(context, frameState);
@@ -261,7 +260,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
261
260
  if (clipped) {
262
261
  context.restore();
263
262
  }
264
- Object.assign(context, IMAGE_SMOOTHING_ENABLED);
263
+ context.imageSmoothingEnabled = true;
265
264
 
266
265
  if (canvasTransform !== canvas.style.transform) {
267
266
  canvas.style.transform = canvasTransform;
@@ -1 +1 @@
1
- {"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";AA+BA;;;;;;GAMG;AACH;IACE;;OAEG;IACH,uBAFW,SAAS,EA0DnB;IArDC;;;OAGG;IACH,eAFU,OAAO,CAEQ;IAEzB;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,8BAFU,MAAM,CAEO;IAEvB;;;OAGG;IACH,8BAFU,OAAO,0BAA0B,EAAE,OAAO,CAEtB;IAE9B;;;OAGG;IACH,4BAFU,MAAM,CAEK;IAErB;;;OAGG;IACH,yBAFW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAE1B;IAEvB;;;OAGG;IACH,kBAAsB;IAEtB;;;OAGG;IACH,qBAFU,OAAO,iBAAiB,EAAE,MAAM,CAEZ;IAE9B;;;OAGG;IACH,sBAA8C;IAGhD;;;;OAIG;IACH,+BAHW,OAAO,eAAe,EAAE,OAAO,GAC9B,OAAO,CAWlB;IAED;;;;;;OAMG;IACH,WANW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,uBAAuB,EAAE,UAAU,GACxC,OAAO,eAAe,EAAE,OAAO,CAkB3C;IAED;;;OAGG;IACH,eAHW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,CAyE5B;IAoWD;;;;;;;;;OASG;IACH,oBATW,OAAO,oBAAoB,EAAE,OAAO,cACpC,OAAO,uBAAuB,EAAE,UAAU,KAC1C,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,UACN,MAAM,cACN,OAAO,QAqCjB;IAED;;OAEG;IACH,YAFY,iBAAiB,CAK5B;IAED;;;;;OAKG;IACH,6BAJW,OAAO,oBAAoB,EAAE,OAAO,GACnC,iBAAiB,GAAC,gBAAgB,GAAC,gBAAgB,CAK9D;IAED;;;;OAIG;IACH,0CAJW,OAAO,uBAAuB,EAAE,UAAU,cAC1C,OAAO,sBAAsB,EAAE,OAAO,QA0BhD;IAED;;;;;OAKG;IACH;YALmB,MAAM;gBAAU,MAAM,GAAE,OAAO;;mBACvC,OAAO,sBAAsB,EAAE,OAAO,QACtC,OAAO,eAAe,EAAE,OAAO,QAUzC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH,wCAXW,OAAO,uBAAuB,EAAE,UAAU,cAC1C,OAAO,sBAAsB,EAAE,OAAO,YACtC,OAAO,4BAA4B,EAAE,OAAO,cAC5C,MAAM,cACN,OAAO,0BAA0B,EAAE,OAAO,UAC1C,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM,WACN,MAAM,6BACG,OAAO,eAAe,EAAE,OAAO,KAAE,IAAI,qBAmExD;CACF"}
1
+ {"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";AA8BA;;;;;;GAMG;AACH;IACE;;OAEG;IACH,uBAFW,SAAS,EA0DnB;IArDC;;;OAGG;IACH,eAFU,OAAO,CAEQ;IAEzB;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,8BAFU,MAAM,CAEO;IAEvB;;;OAGG;IACH,8BAFU,OAAO,0BAA0B,EAAE,OAAO,CAEtB;IAE9B;;;OAGG;IACH,4BAFU,MAAM,CAEK;IAErB;;;OAGG;IACH,yBAFW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAE1B;IAEvB;;;OAGG;IACH,kBAAsB;IAEtB;;;OAGG;IACH,qBAFU,OAAO,iBAAiB,EAAE,MAAM,CAEZ;IAE9B;;;OAGG;IACH,sBAA8C;IAGhD;;;;OAIG;IACH,+BAHW,OAAO,eAAe,EAAE,OAAO,GAC9B,OAAO,CAWlB;IAED;;;;;;OAMG;IACH,WANW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,uBAAuB,EAAE,UAAU,GACxC,OAAO,eAAe,EAAE,OAAO,CAkB3C;IAED;;;OAGG;IACH,eAHW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,CAyE5B;IAoWD;;;;;;;;;OASG;IACH,oBATW,OAAO,oBAAoB,EAAE,OAAO,cACpC,OAAO,uBAAuB,EAAE,UAAU,KAC1C,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,UACN,MAAM,cACN,OAAO,QAqCjB;IAED;;OAEG;IACH,YAFY,iBAAiB,CAK5B;IAED;;;;;OAKG;IACH,6BAJW,OAAO,oBAAoB,EAAE,OAAO,GACnC,iBAAiB,GAAC,gBAAgB,GAAC,gBAAgB,CAK9D;IAED;;;;OAIG;IACH,0CAJW,OAAO,uBAAuB,EAAE,UAAU,cAC1C,OAAO,sBAAsB,EAAE,OAAO,QA0BhD;IAED;;;;;OAKG;IACH;YALmB,MAAM;gBAAU,MAAM,GAAE,OAAO;;mBACvC,OAAO,sBAAsB,EAAE,OAAO,QACtC,OAAO,eAAe,EAAE,OAAO,QAUzC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH,wCAXW,OAAO,uBAAuB,EAAE,UAAU,cAC1C,OAAO,sBAAsB,EAAE,OAAO,YACtC,OAAO,4BAA4B,EAAE,OAAO,cAC5C,MAAM,cACN,OAAO,0BAA0B,EAAE,OAAO,UAC1C,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM,WACN,MAAM,6BACG,OAAO,eAAe,EAAE,OAAO,KAAE,IAAI,qBAmExD;CACF"}
@@ -6,7 +6,6 @@ import ImageTile from '../../ImageTile.js';
6
6
  import ReprojTile from '../../reproj/Tile.js';
7
7
  import TileRange from '../../TileRange.js';
8
8
  import TileState from '../../TileState.js';
9
- import {IMAGE_SMOOTHING_DISABLED, IMAGE_SMOOTHING_ENABLED} from './common.js';
10
9
  import {
11
10
  apply as applyTransform,
12
11
  compose as composeTransform,
@@ -410,7 +409,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
410
409
  }
411
410
 
412
411
  if (!tileSource.getInterpolate()) {
413
- Object.assign(context, IMAGE_SMOOTHING_DISABLED);
412
+ context.imageSmoothingEnabled = false;
414
413
  }
415
414
 
416
415
  this.preRender(context, frameState);
@@ -561,7 +560,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
561
560
  if (layerState.extent) {
562
561
  context.restore();
563
562
  }
564
- Object.assign(context, IMAGE_SMOOTHING_ENABLED);
563
+ context.imageSmoothingEnabled = true;
565
564
 
566
565
  if (canvasTransform !== canvas.style.transform) {
567
566
  canvas.style.transform = canvasTransform;
package/reproj.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"reproj.d.ts","sourceRoot":"","sources":["reproj.js"],"names":[],"mappings":"AA0FA;;;;;;;;;;;GAWG;AACH,sDANW,OAAO,sBAAsB,EAAE,OAAO,cACtC,OAAO,sBAAsB,EAAE,OAAO,gBACtC,OAAO,iBAAiB,EAAE,UAAU,oBACpC,MAAM,GACL,MAAM,CAyCjB;AAED;;;;;;;;;;;GAWG;AACH,4DANW,OAAO,sBAAsB,EAAE,OAAO,cACtC,OAAO,sBAAsB,EAAE,OAAO,gBACtC,OAAO,aAAa,EAAE,MAAM,oBAC5B,MAAM,GACL,MAAM,CA6BjB;AAED;;;;GAIG;AAEH;;;;;;;;;;;;;;;;GAgBG;AACH,8BAdW,MAAM,UACN,MAAM,cACN,MAAM,oBACN,MAAM,gBACN,OAAO,aAAa,EAAE,MAAM,oBAC5B,MAAM,gBACN,OAAO,aAAa,EAAE,MAAM,iBAC5B,OAAO,2BAA2B,EAAE,OAAO,WAC3C,MAAM,WAAW,CAAC,UAClB,MAAM,iFAGL,iBAAiB,CAsO5B;AA/ZD;;GAEG;AACH,yBAFU,MAAM,iBAAiB,CAAC,CAEL;;;;;YAmKf,OAAO,aAAa,EAAE,MAAM;;;;WAC5B,iBAAiB,GAAC,gBAAgB,GAAC,gBAAgB"}
1
+ {"version":3,"file":"reproj.d.ts","sourceRoot":"","sources":["reproj.js"],"names":[],"mappings":"AAyFA;;;;;;;;;;;GAWG;AACH,sDANW,OAAO,sBAAsB,EAAE,OAAO,cACtC,OAAO,sBAAsB,EAAE,OAAO,gBACtC,OAAO,iBAAiB,EAAE,UAAU,oBACpC,MAAM,GACL,MAAM,CAyCjB;AAED;;;;;;;;;;;GAWG;AACH,4DANW,OAAO,sBAAsB,EAAE,OAAO,cACtC,OAAO,sBAAsB,EAAE,OAAO,gBACtC,OAAO,aAAa,EAAE,MAAM,oBAC5B,MAAM,GACL,MAAM,CA6BjB;AAED;;;;GAIG;AAEH;;;;;;;;;;;;;;;;GAgBG;AACH,8BAdW,MAAM,UACN,MAAM,cACN,MAAM,oBACN,MAAM,gBACN,OAAO,aAAa,EAAE,MAAM,oBAC5B,MAAM,gBACN,OAAO,aAAa,EAAE,MAAM,iBAC5B,OAAO,2BAA2B,EAAE,OAAO,WAC3C,MAAM,WAAW,CAAC,UAClB,MAAM,iFAGL,iBAAiB,CAsO5B;AA/ZD;;GAEG;AACH,yBAFU,MAAM,iBAAiB,CAAC,CAEL;;;;;YAmKf,OAAO,aAAa,EAAE,MAAM;;;;WAC5B,iBAAiB,GAAC,gBAAgB,GAAC,gBAAgB"}
package/reproj.js CHANGED
@@ -1,7 +1,6 @@
1
1
  /**
2
2
  * @module ol/reproj
3
3
  */
4
- import {IMAGE_SMOOTHING_DISABLED} from './renderer/canvas/common.js';
5
4
  import {
6
5
  containsCoordinate,
7
6
  createEmpty,
@@ -226,7 +225,7 @@ export function render(
226
225
  );
227
226
 
228
227
  if (!opt_interpolate) {
229
- Object.assign(context, IMAGE_SMOOTHING_DISABLED);
228
+ context.imageSmoothingEnabled = false;
230
229
  }
231
230
 
232
231
  if (sources.length === 0) {
@@ -254,7 +253,7 @@ export function render(
254
253
  );
255
254
 
256
255
  if (!opt_interpolate) {
257
- Object.assign(stitchContext, IMAGE_SMOOTHING_DISABLED);
256
+ stitchContext.imageSmoothingEnabled = false;
258
257
  }
259
258
 
260
259
  const stitchScale = pixelRatio / sourceResolution;
@@ -1 +1 @@
1
- {"version":3,"file":"ImageStatic.d.ts","sourceRoot":"","sources":["ImageStatic.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAyBc,OAAO,YAAY,EAAE,cAAc;;;;;;;;;SAGnC,MAAM;;AAfpB;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA0DjB;IAnCC;;;OAGG;IACH,aAAuB;IAEvB;;;OAGG;IACH,qBAAuC;IAEvC;;;OAGG;IACH,eAOC;IAED;;;OAGG;IACH,mBAA8D;IAQhE;;;;OAIG;IACH,kBAHY,OAAO,cAAc,EAAE,MAAM,CAKxC;IAED;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,MAAM,cAC7B,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,aAAa,EAAE,OAAO,CAOxC;IAED;;;;OAIG;IACH,UAHY,MAAM,CAKjB;CAkDF"}
1
+ {"version":3,"file":"ImageStatic.d.ts","sourceRoot":"","sources":["ImageStatic.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAwBc,OAAO,YAAY,EAAE,cAAc;;;;;;;;;SAGnC,MAAM;;AAfpB;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA0DjB;IAnCC;;;OAGG;IACH,aAAuB;IAEvB;;;OAGG;IACH,qBAAuC;IAEvC;;;OAGG;IACH,eAOC;IAED;;;OAGG;IACH,mBAA8D;IAQhE;;;;OAIG;IACH,kBAHY,OAAO,cAAc,EAAE,MAAM,CAKxC;IAED;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,MAAM,cAC7B,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,aAAa,EAAE,OAAO,CAOxC;IAED;;;;OAIG;IACH,UAHY,MAAM,CAKjB;CAkDF"}
@@ -6,7 +6,6 @@ import EventType from '../events/EventType.js';
6
6
  import ImageSource, {defaultImageLoadFunction} from './Image.js';
7
7
  import ImageState from '../ImageState.js';
8
8
  import ImageWrapper from '../Image.js';
9
- import {IMAGE_SMOOTHING_DISABLED} from '../renderer/canvas/common.js';
10
9
  import {createCanvasContext2D} from '../dom.js';
11
10
  import {getHeight, getWidth, intersects} from '../extent.js';
12
11
  import {get as getProjection} from '../proj.js';
@@ -157,7 +156,7 @@ class Static extends ImageSource {
157
156
  if (targetWidth !== imageWidth || targetHeight !== imageHeight) {
158
157
  const context = createCanvasContext2D(targetWidth, targetHeight);
159
158
  if (!this.getInterpolate()) {
160
- Object.assign(context, IMAGE_SMOOTHING_DISABLED);
159
+ context.imageSmoothingEnabled = false;
161
160
  }
162
161
  const canvas = context.canvas;
163
162
  context.drawImage(
@@ -1 +1 @@
1
- {"version":3,"file":"IconImage.d.ts","sourceRoot":"","sources":["IconImage.js"],"names":[],"mappings":"AA+SA;;;;;;;;GAQG;AACH,2BARW,gBAAgB,GAAC,iBAAiB,OAClC,MAAM,QACN,OAAO,YAAY,EAAE,IAAI,eACxB,MAAM,iCAEP,OAAO,aAAa,EAAE,KAAK,GAC1B,SAAS,CASpB;;AA9SD;IACE;;;;;;;OAOG;IACH,mBAPW,gBAAgB,GAAC,iBAAiB,OAClC,MAAM,GAAC,SAAS,QAChB,OAAO,YAAY,EAAE,IAAI,eACxB,MAAM,iCAEP,OAAO,aAAa,EAAE,KAAK,EA+DrC;IA1DC;;;OAGG;IACH,2BAA8B;IAE9B;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,qBAA+B;IAE/B;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,kBAAqB;IAErB;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,aAAe;IAQjB;;OAEG;IACH,yBAKC;IAED;;;OAGG;IACH,mBAeC;IAPK,8BAAqB;IAS3B;;OAEG;IACH,6BAEC;IAED;;OAEG;IACH,0BAIC;IAED;;OAEG;IACH,yBAUC;IAED;;;OAGG;IACH,qBAHW,MAAM,GACL,gBAAgB,GAAC,iBAAiB,CAQ7C;IAED;;;OAGG;IACH,0BAHW,MAAM,GACL,MAAM,CAKjB;IAED;;OAEG;IACH,qBAEC;IAED;;OAEG;IACH,wBAFY,gBAAgB,GAAC,iBAAiB,CAkB7C;IAED;;;OAGG;IACH,WAFY,OAAO,YAAY,EAAE,IAAI,CAIpC;IAED;;OAEG;IACH,UAFY,MAAM,GAAC,SAAS,CAI3B;IAED;;OAEG;IACH,aAmBC;IAED;;;OAGG;IACH,sBA6CC;IAED;;;;OAIG;IACH,uBAKC;CACF"}
1
+ {"version":3,"file":"IconImage.d.ts","sourceRoot":"","sources":["IconImage.js"],"names":[],"mappings":"AA4RA;;;;;;;;GAQG;AACH,2BARW,gBAAgB,GAAC,iBAAiB,OAClC,MAAM,QACN,OAAO,YAAY,EAAE,IAAI,eACxB,MAAM,iCAEP,OAAO,aAAa,EAAE,KAAK,GAC1B,SAAS,CASpB;;AA3RD;IACE;;;;;;;OAOG;IACH,mBAPW,gBAAgB,GAAC,iBAAiB,OAClC,MAAM,GAAC,SAAS,QAChB,OAAO,YAAY,EAAE,IAAI,eACxB,MAAM,iCAEP,OAAO,aAAa,EAAE,KAAK,EA+DrC;IA1DC;;;OAGG;IACH,2BAA8B;IAE9B;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,qBAA+B;IAE/B;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,kBAAqB;IAErB;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,aAAe;IAQjB;;OAEG;IACH,yBAKC;IAED;;;OAGG;IACH,mBAeC;IAPK,8BAAqB;IAS3B;;OAEG;IACH,6BAEC;IAED;;OAEG;IACH,0BAIC;IAED;;OAEG;IACH,yBAUC;IAED;;;OAGG;IACH,qBAHW,MAAM,GACL,gBAAgB,GAAC,iBAAiB,CAQ7C;IAED;;;OAGG;IACH,0BAHW,MAAM,GACL,MAAM,CAKjB;IAED;;OAEG;IACH,qBAEC;IAED;;OAEG;IACH,wBAFY,gBAAgB,GAAC,iBAAiB,CAkB7C;IAED;;;OAGG;IACH,WAFY,OAAO,YAAY,EAAE,IAAI,CAIpC;IAED;;OAEG;IACH,UAFY,MAAM,GAAC,SAAS,CAI3B;IAED;;OAEG;IACH,aAmBC;IAED;;;OAGG;IACH,sBA0BC;IAED;;;;OAIG;IACH,uBAKC;CACF"}
@@ -250,42 +250,23 @@ class IconImage extends EventTarget {
250
250
  return;
251
251
  }
252
252
 
253
+ const image = this.image_;
253
254
  const canvas = document.createElement('canvas');
254
- this.canvas_[pixelRatio] = canvas;
255
-
256
- canvas.width = Math.ceil(this.image_.width * pixelRatio);
257
- canvas.height = Math.ceil(this.image_.height * pixelRatio);
255
+ canvas.width = Math.ceil(image.width * pixelRatio);
256
+ canvas.height = Math.ceil(image.height * pixelRatio);
258
257
 
259
258
  const ctx = canvas.getContext('2d');
260
259
  ctx.scale(pixelRatio, pixelRatio);
261
- ctx.drawImage(this.image_, 0, 0);
260
+ ctx.drawImage(image, 0, 0);
262
261
 
263
262
  ctx.globalCompositeOperation = 'multiply';
264
- // Internet Explorer 11 does not support the multiply operation.
265
- // If the canvas is tainted in Internet Explorer this still produces
266
- // a solid color image with the shape of the icon.
267
- if (ctx.globalCompositeOperation === 'multiply' || this.isTainted_()) {
268
- ctx.fillStyle = asString(this.color_);
269
- ctx.fillRect(0, 0, canvas.width / pixelRatio, canvas.height / pixelRatio);
270
-
271
- ctx.globalCompositeOperation = 'destination-in';
272
- ctx.drawImage(this.image_, 0, 0);
273
- } else {
274
- const imgData = ctx.getImageData(0, 0, canvas.width, canvas.height);
275
- const data = imgData.data;
276
- const r = this.color_[0] / 255.0;
277
- const g = this.color_[1] / 255.0;
278
- const b = this.color_[2] / 255.0;
279
- const a = this.color_[3];
280
-
281
- for (let i = 0, ii = data.length; i < ii; i += 4) {
282
- data[i] *= r;
283
- data[i + 1] *= g;
284
- data[i + 2] *= b;
285
- data[i + 3] *= a;
286
- }
287
- ctx.putImageData(imgData, 0, 0);
288
- }
263
+ ctx.fillStyle = asString(this.color_);
264
+ ctx.fillRect(0, 0, canvas.width / pixelRatio, canvas.height / pixelRatio);
265
+
266
+ ctx.globalCompositeOperation = 'destination-in';
267
+ ctx.drawImage(image, 0, 0);
268
+
269
+ this.canvas_[pixelRatio] = canvas;
289
270
  }
290
271
 
291
272
  /**
@@ -1,14 +0,0 @@
1
- /**
2
- * @module ol/renderer/canvas/common
3
- */
4
- /**
5
- * Context options to disable image smoothing.
6
- * @type {Object}
7
- */
8
- export const IMAGE_SMOOTHING_DISABLED: any;
9
- /**
10
- * Context options to enable image smoothing.
11
- * @type {Object}
12
- */
13
- export const IMAGE_SMOOTHING_ENABLED: any;
14
- //# sourceMappingURL=common.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["common.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;GAGG;AACH,2CAGE;AAEF;;;GAGG;AACH,0CAGE"}
@@ -1,21 +0,0 @@
1
- /**
2
- * @module ol/renderer/canvas/common
3
- */
4
-
5
- /**
6
- * Context options to disable image smoothing.
7
- * @type {Object}
8
- */
9
- export const IMAGE_SMOOTHING_DISABLED = {
10
- imageSmoothingEnabled: false,
11
- msImageSmoothingEnabled: false,
12
- };
13
-
14
- /**
15
- * Context options to enable image smoothing.
16
- * @type {Object}
17
- */
18
- export const IMAGE_SMOOTHING_ENABLED = {
19
- imageSmoothingEnabled: true,
20
- msImageSmoothingEnabled: true,
21
- };