mobility-toolbox-js 2.0.0-beta.62 → 2.0.0-beta.64

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.
Files changed (7) hide show
  1. package/mbt.js +17 -7
  2. package/mbt.js.map +2 -2
  3. package/mbt.min.js +1 -1
  4. package/mbt.min.js.map +2 -2
  5. package/ol/layers/Layer.d.ts.map +1 -1
  6. package/ol/layers/Layer.js +20 -14
  7. package/package.json +1 -1
package/ol/layers/Layer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/Layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,UAAU,MAAM,gBAAgB,CAAC;AACxC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAE3D,oBAAY,cAAc,GAAG,kBAAkB,GAAG;IAChD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;;AAEF;;;;;;;;;;;;;;GAcG;AACH,cAAM,KAAM,SAAQ,UAAkC;IACpD,OAAO,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IAE/B,eAAe,EAAG,SAAS,EAAE,CAAC;IAI9B,OAAO,EAAG,cAAc,CAAC;IAEzB,OAAO,EAAG,OAAO,CAAC;IAElB,UAAU,EAAG,MAAM,EAAE,CAAC;IAEtB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,sBAAsB,EAAG,SAAS,CAAC;IAEnC,sBAAsB,EAAG,SAAS,CAAC;IAInC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,kBAAkB,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAE/C,kBAAkB,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAE/C,mBAAmB,EAAG,MAAM,IAAI,CAAC;IAEjC,kBAAkB,EAAG,MAAM,IAAI,CAAC;IAEhC;;;;;;;;;;;OAWG;gBACS,OAAO,EAAE,cAAc;IAQnC;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,cAAc;IAUxC;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,GAAG;IA4DpB;;OAEG;IACH,aAAa;IAcb,wBAAwB;IA2BxB,0BAA0B;IAI1B;;;OAGG;IACH,sBAAsB;IAQtB;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,cAAc;CAGjC;AACD,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/Layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,UAAU,MAAM,gBAAgB,CAAC;AACxC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAE3D,oBAAY,cAAc,GAAG,kBAAkB,GAAG;IAChD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;;AAEF;;;;;;;;;;;;;;GAcG;AACH,cAAM,KAAM,SAAQ,UAAkC;IACpD,OAAO,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IAE/B,eAAe,EAAG,SAAS,EAAE,CAAC;IAI9B,OAAO,EAAG,cAAc,CAAC;IAEzB,OAAO,EAAG,OAAO,CAAC;IAElB,UAAU,EAAG,MAAM,EAAE,CAAC;IAEtB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,sBAAsB,EAAG,SAAS,CAAC;IAEnC,sBAAsB,EAAG,SAAS,CAAC;IAInC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,kBAAkB,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAE/C,kBAAkB,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAE/C,mBAAmB,EAAG,MAAM,IAAI,CAAC;IAEjC,kBAAkB,EAAG,MAAM,IAAI,CAAC;IAEhC;;;;;;;;;;;OAWG;gBACS,OAAO,EAAE,cAAc;IAQnC;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,cAAc;IAyBxC;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,GAAG;IAiDpB;;OAEG;IACH,aAAa;IAcb,wBAAwB;IA2BxB,0BAA0B;IAI1B;;;OAGG;IACH,sBAAsB;IAQtB;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,cAAc;CAGjC;AACD,eAAe,KAAK,CAAC"}
package/ol/layers/Layer.js CHANGED
@@ -42,8 +42,23 @@ class Layer extends userInteractionsMixin(LayerCommon) {
42
42
  */
43
43
  defineProperties(options) {
44
44
  super.defineProperties(options);
45
+ let currOlLayer = options.olLayer;
45
46
  Object.defineProperties(this, {
46
- olLayer: { value: options.olLayer, writable: true },
47
+ olLayer: {
48
+ get: () => {
49
+ return currOlLayer;
50
+ },
51
+ set: (newOlLayer) => {
52
+ if (currOlLayer === newOlLayer) {
53
+ return;
54
+ }
55
+ currOlLayer = newOlLayer;
56
+ if (currOlLayer) {
57
+ currOlLayer.setVisible(this.visible);
58
+ }
59
+ this.toggleVisibleListeners();
60
+ },
61
+ },
47
62
  olListenersKeys: {
48
63
  value: [],
49
64
  },
@@ -54,31 +69,22 @@ class Layer extends userInteractionsMixin(LayerCommon) {
54
69
  * @param {ol/Map~Map} map
55
70
  */
56
71
  attachToMap(map) {
57
- var _a, _b, _c, _d;
72
+ var _a, _b, _c, _d, _e;
58
73
  super.attachToMap(map);
59
74
  if (!this.map) {
60
75
  return;
61
76
  }
77
+ (_a = this.olLayer) === null || _a === void 0 ? void 0 : _a.setVisible(this.visible);
62
78
  if (this.olLayer &&
63
- !((_c = (_b = (_a = this.map) === null || _a === void 0 ? void 0 : _a.getLayers()) === null || _b === void 0 ? void 0 : _b.getArray()) === null || _c === void 0 ? void 0 : _c.includes(this.olLayer))) {
79
+ !((_d = (_c = (_b = this.map) === null || _b === void 0 ? void 0 : _b.getLayers()) === null || _c === void 0 ? void 0 : _c.getArray()) === null || _d === void 0 ? void 0 : _d.includes(this.olLayer))) {
64
80
  this.map.addLayer(this.olLayer);
65
81
  }
66
- this.olListenersKeys.push(
67
- // @ts-ignore
68
- this.on('change:visible', () => {
69
- if (this.olLayer) {
70
- this.olLayer.setVisible(this.visible);
71
- }
72
- }));
73
82
  this.olListenersKeys.push(this.map.getLayers().on('remove', (evt) => {
74
83
  if (evt.element === this.olLayer) {
75
84
  this.detachFromMap();
76
85
  }
77
86
  }));
78
87
  this.toggleVisibleListeners();
79
- this.olListenersKeys.push(
80
- // @ts-ignore
81
- this.on('change:visible', this.toggleVisibleListeners));
82
88
  // We set the copyright to the source used by the layer.
83
89
  if (this.copyrights && this.olLayer) {
84
90
  const attributions = this.copyrights || [];
@@ -98,7 +104,7 @@ class Layer extends userInteractionsMixin(LayerCommon) {
98
104
  }
99
105
  else if (this.olLayer.getSource) {
100
106
  // @ts-ignore
101
- (_d = this.olLayer.getSource()) === null || _d === void 0 ? void 0 : _d.setAttributions(attributions);
107
+ (_e = this.olLayer.getSource()) === null || _e === void 0 ? void 0 : _e.setAttributions(attributions);
102
108
  }
103
109
  }
104
110
  }
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "mobility-toolbox-js",
3
3
  "license": "MIT",
4
4
  "description": "Toolbox for JavaScript applications in the domains of mobility and logistics.",
5
- "version": "2.0.0-beta.62",
5
+ "version": "2.0.0-beta.64",
6
6
  "module": "index.js",
7
7
  "exports": {
8
8
  ".": "./index.js",