Update package version to 6.4.2

Changelog for v6.4.2
Merge pull request #11364 from ahocevar/pep-examples
2020-07-30 23:09:27 +02:00 · 2020-07-30 23:08:46 +02:00 · 2020-07-30 22:55:37 +02:00 · 2020-07-30 22:54:28 +02:00 · 2020-07-30 22:49:18 +02:00 · 2020-07-30 20:11:11 +01:00
15 changed files with 171 additions and 12 deletions
--- a/changelog/v6.4.1
+++ b/changelog/v6.4.1
@@ -2,7 +2,9 @@

 This is a bugfix release which removes a few regressions that were introduced by v6.4.0, and fixes a few issues in examples caused by the website facelift.

-## List of all changes * [#11346](https://github.com/openlayers/openlayers/pull/11346) - Fix text instruction flat coordinates when stride is not 2 ([@ahocevar](https://github.com/ahocevar))
+## List of all changes
+
+ * [#11346](https://github.com/openlayers/openlayers/pull/11346) - Fix text instruction flat coordinates when stride is not 2 ([@ahocevar](https://github.com/ahocevar))
 * [#11348](https://github.com/openlayers/openlayers/pull/11348) - Add all layers to layer export ([@M393](https://github.com/M393))
 * [#11337](https://github.com/openlayers/openlayers/pull/11337) - Do not rely on old value for target ([@ahocevar](https://github.com/ahocevar))
 * [#11345](https://github.com/openlayers/openlayers/pull/11345) - Fix the popup in the geographic example ([@MoonE](https://github.com/MoonE))
--- a/changelog/v6.4.2.md
+++ b/changelog/v6.4.2.md
@@ -0,0 +1,14 @@
+# 6.4.1
+
+This is a bugfix release which removes a few regressions that were introduced by v6.4.0, and fixes a few issues in examples.
+
+See the [v6.4.0 release notes](https://github.com/openlayers/openlayers/releases/tag/v6.4.0) for a complete list of changes and upgrade notes when upgrading from v6.3.x.
+
+## List of all changes
+
+ * [#11364](https://github.com/openlayers/openlayers/pull/11364) - Load pointer events polyfill - before other polyfills ([@ahocevar](https://github.com/ahocevar))
+ * [#11365](https://github.com/openlayers/openlayers/pull/11365) - Revert to original method proposed in #11193 ([@mike-000](https://github.com/mike-000))
+ * [#11359](https://github.com/openlayers/openlayers/pull/11359) - check projection can wrap before getting width ([@mike-000](https://github.com/mike-000))
+ * [#11355](https://github.com/openlayers/openlayers/pull/11355) - Cloak API key with instructions where to get one ([@ahocevar](https://github.com/ahocevar))
+ * [#11354](https://github.com/openlayers/openlayers/pull/11354) - Fix line breaks in changelog ([@ahocevar](https://github.com/ahocevar))
+
--- a/examples/geolocation-orientation.html
+++ b/examples/geolocation-orientation.html
@@ -35,6 +35,8 @@ tags: "fullscreen, geolocation, orientation, mobile"
          left: 10px;
      }
    </style>
+    <script src="https://unpkg.com/elm-pep"></script>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=fetch,requestAnimationFrame,Element.prototype.classList,URL"></script>
  </head>
  <body>
    <div id="map" class="map"></div>
--- a/examples/mobile-full-screen.html
+++ b/examples/mobile-full-screen.html
@@ -23,6 +23,8 @@ cloak:
        height: 100%;
      }
    </style>
+    <script src="https://unpkg.com/elm-pep"></script>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=fetch,requestAnimationFrame,Element.prototype.classList,URL"></script>
  </head>
  <body>
    <div id="map" class="map"></div>
--- a/examples/offscreen-canvas.html
+++ b/examples/offscreen-canvas.html
@@ -6,5 +6,9 @@ docs: >
  The map in this example is rendered in a web worker, using `OffscreenCanvas`. **Note:** This is currently only supported in Chrome and Edge.
 tags: "worker, offscreencanvas, vector-tiles"
 experimental: true
+cloak:
+  - key: get_your_own_D6rA4zTHduk6KOKTXzGB
+    value: Get your own API key at https://www.maptiler.com/cloud/
+
 ---
 <div id="map" class="map"></div>
--- a/examples/templates/example.html
+++ b/examples/templates/example.html
@@ -67,8 +67,8 @@
    <link rel="stylesheet" href="./resources/prism/prism-1.20.0.css" type="text/css">
    <link rel="stylesheet" href="./css/ol.css" type="text/css">
    <link rel="stylesheet" href="./resources/layout.css" type="text/css">
-    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=fetch,requestAnimationFrame,Element.prototype.classList,URL"></script>
    <script src="https://unpkg.com/elm-pep"></script>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=fetch,requestAnimationFrame,Element.prototype.classList,URL"></script>
    {{{ extraHead.local }}}
    {{{ css.tag }}}
    <title>{{ title }}</title>
@@ -190,10 +190,10 @@
 &lt;html lang="en"&gt;
  &lt;head&gt;
    &lt;title&gt;{{ title }}&lt;/title&gt;
+    &lt;!-- Pointer events polyfill for old browsers, see https://caniuse.com/#feat=pointer --&gt;
+    &lt;script src="https://unpkg.com/elm-pep"&gt;&lt;/script&gt;{{#if extraHead.remote}}
    &lt;!-- The line below is only needed for old environments like Internet Explorer and Android 4.x --&gt;
    &lt;script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=fetch,requestAnimationFrame,Element.prototype.classList,URL"&gt;&lt;/script&gt;
-    &lt;!-- Pointer events polyfill for old browsers, see https://caniuse.com/#feat=pointer --&gt;
-    &lt;script src="https://unpkg.com/@openlayers/pepjs"&gt;&lt;/script&gt;{{#if extraHead.remote}}
 {{ indent extraHead.remote spaces=4 }}{{/if}}
    &lt;style&gt;
      .map {
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "ol",
-  "version": "6.4.1",
+  "version": "6.4.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ol",
-  "version": "6.4.1",
+  "version": "6.4.2",
  "description": "OpenLayers mapping library",
  "keywords": [
    "map",
--- a/rendering/cases/layer-vectorimage-extent-rotation-intersection/expected.png
+++ b/rendering/cases/layer-vectorimage-extent-rotation-intersection/expected.png
--- a/rendering/cases/layer-vectorimage-extent-rotation-intersection/main.js
+++ b/rendering/cases/layer-vectorimage-extent-rotation-intersection/main.js
@@ -0,0 +1,72 @@
+import Feature from '../../../src/ol/Feature.js';
+import Map from '../../../src/ol/Map.js';
+import Point from '../../../src/ol/geom/Point.js';
+import VectorImageLayer from '../../../src/ol/layer/VectorImage.js';
+import VectorSource from '../../../src/ol/source/Vector.js';
+import View from '../../../src/ol/View.js';
+import {Fill, RegularShape, Stroke, Style} from '../../../src/ol/style.js';
+import {fromExtent} from '../../../src/ol/geom/Polygon.js';
+
+const extent = [
+  1900e3 - 100000,
+  6300e3 - 100000,
+  1900e3 + 100000,
+  6300e3 + 100000,
+];
+
+const pt1 = new Feature({
+  name: 'point',
+  geometry: new Point([1900e3, 6300e3]),
+});
+pt1.setStyle(
+  new Style({
+    image: new RegularShape({
+      points: 4,
+      radius: 20,
+      fill: new Fill({
+        color: 'fuchsia',
+      }),
+    }),
+  })
+);
+
+const border = new Feature({
+  name: 'extent border',
+  geometry: fromExtent(extent),
+});
+
+new Map({
+  layers: [
+    new VectorImageLayer({
+      style: new Style({
+        stroke: new Stroke({
+          color: 'yellow',
+          width: 20,
+        }),
+      }),
+      source: new VectorSource({
+        features: [border],
+      }),
+    }),
+    new VectorImageLayer({
+      style: new Style({
+        stroke: new Stroke({
+          color: 'green',
+          width: 20,
+        }),
+      }),
+      source: new VectorSource({
+        features: [pt1, border],
+      }),
+      extent: extent,
+    }),
+  ],
+  target: 'map',
+  view: new View({
+    center: [1900e3, 6300e3],
+    zoom: 7,
+    rotation: Math.PI / 4,
+  }),
+});
+
+render();
--- a/src/ol/coordinate.js
+++ b/src/ol/coordinate.js
@@ -410,11 +410,13 @@ export function toStringXY(coordinate, opt_fractionDigits) {
 * @return {Coordinate} The coordinate within the real world extent.
 */
 export function wrapX(coordinate, projection) {
+  if (projection.canWrapX()) {
    const worldWidth = getWidth(projection.getExtent());
    const worldsAway = getWorldsAway(coordinate, projection, worldWidth);
    if (worldsAway) {
      coordinate[0] -= worldsAway * worldWidth;
    }
+  }
  return coordinate;
 }
 /**
--- a/src/ol/renderer/canvas/VectorImageLayer.js
+++ b/src/ol/renderer/canvas/VectorImageLayer.js
@@ -115,7 +115,6 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
        {},
        frameState,
        {
-          coordinateToPixelTransform: create(),
          declutterItems: [],
          extent: renderedExtent,
          size: [width, height],
@@ -138,6 +137,7 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
            vectorRenderer.prepareFrame(imageFrameState) &&
            vectorRenderer.replayGroupChanged
          ) {
+            vectorRenderer.clipping = false;
            vectorRenderer.renderFrame(imageFrameState, null);
            renderDeclutterItems(imageFrameState, null);
            callback();
--- a/src/ol/renderer/canvas/VectorLayer.js
+++ b/src/ol/renderer/canvas/VectorLayer.js
@@ -129,6 +129,12 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
     * @type {boolean}
     */
    this.replayGroupChanged = true;
+
+    /**
+     * Clipping to be performed by `renderFrame()`
+     * @type {boolean}
+     */
+    this.clipping = true;
  }

  /**
@@ -198,7 +204,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {

    // clipped rendering if layer extent is set
    let clipped = false;
-    if (layerState.extent) {
+    if (layerState.extent && this.clipping) {
      const layerExtent = fromUserExtent(layerState.extent, projection);
      clipped =
        !containsExtent(layerExtent, frameState.extent) &&
--- a/test/spec/ol/coordinate.test.js
+++ b/test/spec/ol/coordinate.test.js
@@ -1,4 +1,5 @@
 import Circle from '../../../src/ol/geom/Circle.js';
+import Projection from '../../../src/ol/proj/Projection.js';
 import {
  add as addCoordinate,
  closestOnCircle,
@@ -271,5 +272,11 @@ describe('ol.coordinate', function () {
    it('moves far off right coordinate to real world', function () {
      expect(wrapX([1096, 48], projection)).to.eql([16, 48]);
    });
+
+    const swiss = new Projection({code: 'EPSG:21781', units: 'm'});
+
+    it('leaves non-global projection coordinates untouched', function () {
+      expect(wrapX([1096, 48], swiss)).to.eql([1096, 48]);
+    });
  });
 });
--- a/test/spec/ol/renderer/map.test.js
+++ b/test/spec/ol/renderer/map.test.js
@@ -1,6 +1,12 @@
 import Disposable from '../../../../src/ol/Disposable.js';
+import Feature from '../../../../src/ol/Feature.js';
 import Map from '../../../../src/ol/Map.js';
 import MapRenderer from '../../../../src/ol/renderer/Map.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
+import VectorSource from '../../../../src/ol/source/Vector.js';
+import View from '../../../../src/ol/View.js';
+import {Point} from '../../../../src/ol/geom.js';
+import {Projection} from '../../../../src/ol/proj.js';

 describe('ol.renderer.Map', function () {
  describe('constructor', function () {
@@ -13,4 +19,46 @@ describe('ol.renderer.Map', function () {
      map.dispose();
    });
  });
+
+  describe('#forEachFeatureAtCoordinate', function () {
+    let map;
+    beforeEach(function () {
+      const target = document.createElement('div');
+      target.style.width = '100px';
+      target.style.height = '100px';
+      document.body.appendChild(target);
+      const projection = new Projection({
+        code: 'EPSG:21781',
+        units: 'm',
+      });
+      map = new Map({
+        target: target,
+        layers: [
+          new VectorLayer({
+            source: new VectorSource({
+              projection: projection,
+              features: [new Feature(new Point([660000, 190000]))],
+            }),
+          }),
+        ],
+        view: new View({
+          projection: projection,
+          center: [660000, 190000],
+          zoom: 9,
+        }),
+      });
+      map.renderSync();
+    });
+
+    afterEach(function () {
+      const target = map.getTargetElement();
+      map.setTarget(null);
+      document.body.removeChild(target);
+    });
+
+    it('works with custom projection', function () {
+      const features = map.getFeaturesAtPixel([50, 50]);
+      expect(features.length).to.be(1);
+    });
+  });
 });
Author	SHA1	Message	Date
Andreas Hocevar	7c93439383	Update package version to 6.4.2	2020-07-30 23:09:27 +02:00
Andreas Hocevar	873505e82a	Changelog for v6.4.2	2020-07-30 23:08:46 +02:00
Andreas Hocevar	52afff2e29	Merge pull request #11364 from ahocevar/pep-examples Load pointer events polyfill - before other polyfills	2020-07-30 22:55:37 +02:00
Andreas Hocevar	82118b0e4d	Merge pull request #11365 from mike-000/patch-6 Revert to original method proposed in #11193	2020-07-30 22:54:28 +02:00
Andreas Hocevar	5a86e1aaa4	Add rendering test for rotated image vector clipping with intersection	2020-07-30 22:49:18 +02:00
mike-000	562b2f632f	Revert #11193 , set vectorRenderer.clipping = false	2020-07-30 20:11:11 +01:00
Andreas Hocevar	7b297283f2	Load pointer events polyfill - before other polyfills	2020-07-30 21:01:10 +02:00
mike-000	6610391c0b	Add clipping property	2020-07-30 19:58:23 +01:00
Andreas Hocevar	6db0e1d2dc	Merge pull request #11359 from mike-000/patch-3 check projection can wrap before getting width	2020-07-30 18:24:01 +02:00
Andreas Hocevar	f9792f69a4	Add more tests	2020-07-30 18:04:44 +02:00
mike-000	e6592c95ea	remove whitespace	2020-07-30 14:23:51 +01:00
mike-000	eee7e2523c	fix prettier	2020-07-30 14:18:58 +01:00
mike-000	dcdaf6ddc5	add non-global projection wrapX text	2020-07-30 14:15:17 +01:00
mike-000	39334fa95d	check projection can wrap before getting width	2020-07-30 12:24:03 +01:00
Andreas Hocevar	ba41100799	Merge pull request #11355 from ahocevar/api-key Cloak API key with instructions where to get one	2020-07-30 12:02:55 +02:00
Andreas Hocevar	4f0f81c802	Cloak API key with instructions where to get one	2020-07-30 09:39:34 +02:00
Andreas Hocevar	82ff027a30	Merge pull request #11354 from ahocevar/line-breaks Fix line breaks in changelog	2020-07-30 09:18:10 +02:00
Andreas Hocevar	c0223590dc	Fix line breaks in changelog	2020-07-30 09:16:14 +02:00
Andreas Hocevar	f43ea770e1	Merge pull request #11351 from openlayers/release-v6.4.1 Release v6.4.1	2020-07-29 20:33:06 +02:00
Andreas Hocevar	e128804e2a	Develop on 4.6.1-dev	2020-07-29 20:31:06 +02:00