geojs 1.14.2 → 1.14.4

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 (11) hide show
  1. package/.github/workflows/main.yml +6 -3
  2. package/.pre-commit-config.yaml +3 -3
  3. package/geo.js +8 -9
  4. package/geo.lean.js +8 -9
  5. package/geo.lean.min.js +1 -1
  6. package/geo.min.js +1 -1
  7. package/package.json +1 -1
  8. package/src/mapInteractor.js +2 -2
  9. package/src/osmLayer.js +2 -1
  10. package/src/pixelmapLayer.js +2 -1
  11. package/src/tileLayer.js +2 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geojs",
3
- "version": "1.14.2",
3
+ "version": "1.14.4",
4
4
  "description": "JavaScript Geo Visualization and Analysis Library",
5
5
  "homepage": "https://github.com/OpenGeoscience/geojs",
6
6
  "license": "Apache-2.0",
package/src/mapInteractor.js CHANGED
@@ -229,7 +229,7 @@ var mapInteractor = function (args) {
229
229
  }, {
230
230
  action: geo_action.zoom,
231
231
  input: 'wheel',
232
- modifiers: {shift: false, ctrl: false},
232
+ modifiers: {shift: false},
233
233
  owner: 'geo.mapInteractor',
234
234
  name: 'wheel zoom'
235
235
  }, {
@@ -241,7 +241,7 @@ var mapInteractor = function (args) {
241
241
  }, {
242
242
  action: geo_action.rotate,
243
243
  input: 'wheel',
244
- modifiers: {shift: false, ctrl: true},
244
+ modifiers: {shift: true, ctrl: false},
245
245
  owner: 'geo.mapInteractor',
246
246
  name: 'wheel rotate'
247
247
  }, {
package/src/osmLayer.js CHANGED
@@ -79,7 +79,8 @@ var osmLayer = function (arg) {
79
79
  overlap: m_this._options.tileOverlap,
80
80
  scale: m_this._options.tileScale,
81
81
  url: m_this._options.url.call(
82
- m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0),
82
+ m_this, urlParams.x, urlParams.y,
83
+ Math.max(urlParams.level || 0, Math.min(0, m_this._options.minLevel || 0)),
83
84
  m_this._options.subdomains),
84
85
  crossDomain: m_this._options.crossDomain
85
86
  });
package/src/pixelmapLayer.js CHANGED
@@ -81,7 +81,8 @@ var pixelmapLayer = function (arg) {
81
81
  overlap: m_this._options.tileOverlap,
82
82
  scale: m_this._options.tileScale,
83
83
  url: m_this._options.url.call(
84
- m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0),
84
+ m_this, urlParams.x, urlParams.y,
85
+ Math.max(urlParams.level || 0, Math.min(0, m_this._options.minLevel || 0)),
85
86
  m_this._options.subdomains),
86
87
  crossDomain: m_this._options.crossDomain
87
88
  });
package/src/tileLayer.js CHANGED
@@ -601,7 +601,8 @@ var tileLayer = function (arg) {
601
601
  size: {x: m_this._options.tileWidth, y: m_this._options.tileHeight},
602
602
  queue: m_this._queue,
603
603
  url: m_this._options.url.call(
604
- m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0),
604
+ m_this, urlParams.x, urlParams.y,
605
+ Math.max(urlParams.level || 0, Math.min(0, m_this._options.minLevel || 0)),
605
606
  m_this._options.subdomains)
606
607
  });
607
608
  };